From dce2bfe2b80bb0d962daf10899fc9e40283114ba Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Mon, 20 May 2024 06:24:15 -0500
Subject: [PATCH 001/568] Remove extra gear prototype (#28062)

Remove extra prototype
---
 Resources/Prototypes/Entities/Mobs/Player/humanoid.yml |  2 +-
 .../Prototypes/Roles/Jobs/Fun/misc_startinggear.yml    | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 7a4aedd5e16a..c5805f0ed921 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -888,7 +888,7 @@
         settings: short
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ SyndicateOperativeGearDisasterVictim ]
+      prototypes: [ SyndicateOperativeGearCivilian ]
     - type: RandomMetadata
       nameSegments:
       - names_first
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 181746a64abd..d4cfc3e29cf8 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -79,19 +79,9 @@
     back: ClothingBackpackDuffelSyndicate
     shoes: ClothingShoesBootsCombat
     gloves: ClothingHandsGlovesColorBlack
-
-# Syndicate Operative Outfit - Disaster Victim
-- type: startingGear
-  id: SyndicateOperativeGearDisasterVictim
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSyndieFormal
-    back: ClothingBackpackDuffelSyndicate
-    shoes: ClothingShoesBootsCombat
-    gloves: ClothingHandsGlovesColorBlack
     id: SyndiPDA
     ears: ClothingHeadsetAltSyndicate
 
-
 #Syndicate Operative Outfit - Basic
 - type: startingGear
   id: SyndicateOperativeGearBasic

From 68ec204a674641953d7d983821d6f9f3bb83b05b Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 20 May 2024 09:32:25 -0400
Subject: [PATCH 002/568] Slightly emphasize popup when someone points at you
 (#28152)

Slightly emphasize when someone points at you
---
 Content.Server/Pointing/EntitySystems/PointingSystem.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index 7bbf6409cdd3..960c8dc28aa5 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -88,7 +88,10 @@ private void SendMessage(EntityUid source, IEnumerable<ICommonSession> viewers,
                         ? viewerPointedAtMessage
                         : viewerMessage;
 
-                RaiseNetworkEvent(new PopupEntityEvent(message, PopupType.Small, netSource), viewerEntity);
+                // Someone pointing at YOU is slightly more important
+                var popupType = viewerEntity == pointed ? PopupType.Medium : PopupType.Small;
+
+                RaiseNetworkEvent(new PopupEntityEvent(message, popupType, netSource), viewerEntity);
             }
 
             _replay.RecordServerMessage(new PopupEntityEvent(viewerMessage, PopupType.Small, netSource));

From 4ed12b60d3df7b6de7317d2dd3100924811bb963 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 20 May 2024 13:33:31 +0000
Subject: [PATCH 003/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a7de6f036971..73771ef3cdfd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Nimfar11
-  changes:
-  - message: Slimes can now drink FourteenLoko without harming their bodies.
-    type: Tweak
-  id: 6108
-  time: '2024-03-07T20:50:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25889
 - author: NakataRin
   changes:
   - message: Evacuation shuttle arrives 10 minutes on green alert now.
@@ -3868,3 +3861,11 @@
   id: 6607
   time: '2024-05-19T23:01:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28038
+- author: Tayrtahn
+  changes:
+  - message: The popup for someone pointing at you is now slightly larger than normal
+      popups.
+    type: Tweak
+  id: 6608
+  time: '2024-05-20T13:32:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28152

From fa06783986a0f890e0f3466f059e72df1eba0680 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 20 May 2024 09:52:49 -0400
Subject: [PATCH 004/568] Prevent ghosts from spawning on terminating
 maps/grids (#28099)

* Extra checks to prevent ghosts spawning on terminating maps/grids

* Add test for grid deletion
---
 .../Tests/Minds/GhostTests.cs                 | 16 +++++++++++
 .../GameTicking/GameTicker.Spawning.cs        | 15 +++++++---
 Content.Server/Ghost/GhostSystem.cs           | 28 +++++++++++++++----
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Minds/GhostTests.cs b/Content.IntegrationTests/Tests/Minds/GhostTests.cs
index ad9d53a70dbf..7a156e71e419 100644
--- a/Content.IntegrationTests/Tests/Minds/GhostTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/GhostTests.cs
@@ -156,4 +156,20 @@ public async Task TestGridGhostOnQueueDelete()
         await data.Pair.CleanReturnAsync();
     }
 
+    [Test]
+    public async Task TestGhostGridNotTerminating()
+    {
+        var data = await SetupData();
+
+        Assert.DoesNotThrowAsync(async () =>
+        {
+            // Delete the grid
+            await data.Server.WaitPost(() => data.SEntMan.DeleteEntity(data.MapData.Grid.Owner));
+        });
+
+        await data.Pair.RunTicksSync(5);
+
+        await data.Pair.CleanReturnAsync();
+    }
+
 }
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 74785603799b..843122e0feaa 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -369,11 +369,16 @@ public void SpawnObserver(ICommonSession player)
         public EntityCoordinates GetObserverSpawnPoint()
         {
             _possiblePositions.Clear();
-
-            foreach (var (point, transform) in EntityManager.EntityQuery<SpawnPointComponent, TransformComponent>(true))
+            var spawnPointQuery = EntityManager.EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+            while (spawnPointQuery.MoveNext(out var uid, out var point, out var transform))
             {
-                if (point.SpawnType != SpawnPointType.Observer)
+                if (point.SpawnType != SpawnPointType.Observer
+                   || TerminatingOrDeleted(uid)
+                   || transform.MapUid == null
+                   || TerminatingOrDeleted(transform.MapUid.Value))
+                {
                     continue;
+                }
 
                 _possiblePositions.Add(transform.Coordinates);
             }
@@ -415,7 +420,9 @@ public EntityCoordinates GetObserverSpawnPoint()
 
             if (_mapManager.MapExists(DefaultMap))
             {
-                return new EntityCoordinates(_mapManager.GetMapEntityId(DefaultMap), Vector2.Zero);
+                var mapUid = _mapManager.GetMapEntityId(DefaultMap);
+                if (!TerminatingOrDeleted(mapUid))
+                    return new EntityCoordinates(mapUid, Vector2.Zero);
             }
 
             // Just pick a point at this point I guess.
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index f4e6a4d607da..6c3d69fea7f1 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -409,23 +409,41 @@ public bool DoGhostBooEvent(EntityUid target)
             return SpawnGhost(mind, spawnPosition, canReturn);
         }
 
+        private bool IsValidSpawnPosition(EntityCoordinates? spawnPosition)
+        {
+            if (spawnPosition?.IsValid(EntityManager) != true)
+                return false;
+
+            var mapUid = spawnPosition?.GetMapUid(EntityManager);
+            var gridUid = spawnPosition?.EntityId;
+            // Test if the map is being deleted
+            if (mapUid == null || TerminatingOrDeleted(mapUid.Value))
+                return false;
+            // Test if the grid is being deleted
+            if (gridUid != null && TerminatingOrDeleted(gridUid.Value))
+                return false;
+
+            return true;
+        }
+
         public EntityUid? SpawnGhost(Entity<MindComponent?> mind, EntityCoordinates? spawnPosition = null,
             bool canReturn = false)
         {
             if (!Resolve(mind, ref mind.Comp))
                 return null;
 
-            // Test if the map is being deleted
-            var mapUid = spawnPosition?.GetMapUid(EntityManager);
-            if (mapUid == null || TerminatingOrDeleted(mapUid.Value))
+            // Test if the map or grid is being deleted
+            if (!IsValidSpawnPosition(spawnPosition))
                 spawnPosition = null;
 
+            // If it's bad, look for a valid point to spawn
             spawnPosition ??= _ticker.GetObserverSpawnPoint();
 
-            if (!spawnPosition.Value.IsValid(EntityManager))
+            // Make sure the new point is valid too
+            if (!IsValidSpawnPosition(spawnPosition))
             {
                 Log.Warning($"No spawn valid ghost spawn position found for {mind.Comp.CharacterName}"
-                    + " \"{ToPrettyString(mind)}\"");
+                    + $" \"{ToPrettyString(mind)}\"");
                 _minds.TransferTo(mind.Owner, null, createGhost: false, mind: mind.Comp);
                 return null;
             }

From 8995810ade1daf49daac4738d3b1eb247302acc6 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 20 May 2024 10:12:05 -0400
Subject: [PATCH 005/568] Fix non-ghosts and admins counting toward most
 followed (#28120)

* Fixed non-ghosts and admins counting toward most followed

* Redone to better leverage EntityQueryEnumerator

* Remember to test your code before you commit it, kids

* Review revisions

* Update Content.Shared/Follower/FollowerSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Update Content.Shared/Follower/FollowerSystem.cs

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>

* Update Content.Shared/Follower/FollowerSystem.cs

* Clean up

---------

Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 Content.Server/Ghost/GhostSystem.cs       |  2 +-
 Content.Shared/Follower/FollowerSystem.cs | 35 ++++++++++++++++-------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 6c3d69fea7f1..1a411f13a05f 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -306,7 +306,7 @@ private void OnGhostnadoRequest(GhostnadoRequestEvent msg, EntitySessionEventArg
                 return;
             }
 
-            if (_followerSystem.GetMostFollowed() is not {} target)
+            if (_followerSystem.GetMostGhostFollowed() is not {} target)
                 return;
 
             WarpTo(uid, target);
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index 6c02b130762f..8027ee449c4a 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -1,11 +1,11 @@
 using System.Numerics;
+using Content.Shared.Administration.Managers;
 using Content.Shared.Database;
 using Content.Shared.Follower.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Hands;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Events;
-using Content.Shared.Movement.Systems;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
@@ -14,6 +14,7 @@
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Follower;
@@ -26,6 +27,7 @@ public sealed class FollowerSystem : EntitySystem
     [Dependency] private readonly SharedJointSystem _jointSystem = default!;
     [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
     [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly ISharedAdminManager _adminManager = default!;
 
     public override void Initialize()
     {
@@ -249,20 +251,33 @@ public void StopAllFollowers(EntityUid uid,
     }
 
     /// <summary>
-    /// Get the most followed entity.
+    /// Gets the entity with the most non-admin ghosts following it.
     /// </summary>
-    public EntityUid? GetMostFollowed()
+    public EntityUid? GetMostGhostFollowed()
     {
         EntityUid? picked = null;
-        int most = 0;
-        var query = EntityQueryEnumerator<FollowedComponent>();
-        while (query.MoveNext(out var uid, out var comp))
+        var most = 0;
+
+        // Keep a tally of how many ghosts are following each entity
+        var followedEnts = new Dictionary<EntityUid, int>();
+
+        // Look for followers that are ghosts and are player controlled
+        var query = EntityQueryEnumerator<FollowerComponent, GhostComponent, ActorComponent>();
+        while (query.MoveNext(out _, out var follower, out _, out var actor))
         {
-            var count = comp.Following.Count;
-            if (count > most)
+            // Exclude admins
+            if (_adminManager.IsAdmin(actor.PlayerSession))
+                continue;
+
+            var followed = follower.Following;
+            // Add new entry or increment existing
+            followedEnts.TryGetValue(followed, out var currentValue);
+            followedEnts[followed] = currentValue + 1;
+
+            if (followedEnts[followed] > most)
             {
-                picked = uid;
-                most = count;
+                picked = followed;
+                most = followedEnts[followed];
             }
         }
 

From c22329b86ce6c808c511f3861c831e8ab677228c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 20 May 2024 14:13:11 +0000
Subject: [PATCH 006/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 73771ef3cdfd..08d13027c8fb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: NakataRin
-  changes:
-  - message: Evacuation shuttle arrives 10 minutes on green alert now.
-    type: Tweak
-  id: 6109
-  time: '2024-03-07T21:01:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25906
 - author: Admiral-Obvious-001
   changes:
   - message: Zombies are now tougher to kill.
@@ -3869,3 +3862,11 @@
   id: 6608
   time: '2024-05-20T13:32:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28152
+- author: Tayrtahn
+  changes:
+  - message: '"Warp to most followed" ghost option no longer includes admins and non-ghost
+      followers.'
+    type: Fix
+  id: 6609
+  time: '2024-05-20T14:12:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28120

From 3b6136894661e3a2858dccdf5a5c68afa95e6bb6 Mon Sep 17 00:00:00 2001
From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Date: Mon, 20 May 2024 21:59:07 +0200
Subject: [PATCH 007/568] rotate forensic scanner stored sprite (#28162)

rotate forensic scanner
---
 .../Prototypes/Entities/Objects/Devices/forensic_scanner.yml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
index 170751766bed..a0ada5ebe34b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -9,6 +9,7 @@
     state: forensicnew
   - type: Item
     size: Small
+    storedRotation: 90
   - type: Clothing
     sprite: Objects/Devices/forensic_scanner.rsi
     quickEquip: false

From 0f6e1196d85ff08b5766d29adcd98b83a60191a9 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 21 May 2024 17:40:35 +1200
Subject: [PATCH 008/568] Use non-generic `TryComp()` for metadata & transform
 (#28133)

---
 Content.Client/Gravity/GravitySystem.Shake.cs          |  4 ++--
 Content.Client/Maps/GridDraggingSystem.cs              |  4 ++--
 Content.Client/Salvage/SalvageSystem.cs                |  2 +-
 Content.Client/Sprite/SpriteFadeSystem.cs              |  2 +-
 Content.Client/Weapons/Misc/TetherGunSystem.cs         |  2 +-
 .../Atmos/EntitySystems/AtmosphereSystem.Commands.cs   |  2 +-
 Content.Server/Bible/BibleSystem.cs                    |  2 +-
 .../EntitySystems/DisassembleOnAltVerbSystem.cs        |  2 +-
 .../Explosion/EntitySystems/TriggerSystem.cs           |  2 +-
 Content.Server/Fax/FaxSystem.cs                        |  4 ++--
 Content.Server/Gravity/GravityGeneratorSystem.cs       |  4 ++--
 Content.Server/Medical/MedicalScannerSystem.cs         |  2 +-
 .../NPC/Pathfinding/PathfindingSystem.Distance.cs      |  4 ++--
 .../NPC/Pathfinding/PathfindingSystem.Grid.cs          |  2 +-
 Content.Server/NPC/Pathfinding/PathfindingSystem.cs    | 10 +++++-----
 Content.Server/NPC/Systems/NPCUtilitySystem.cs         |  8 ++++----
 Content.Server/PAI/PAISystem.cs                        |  2 +-
 Content.Server/Paper/PaperSystem.cs                    |  2 +-
 Content.Server/Physics/Controllers/MoverController.cs  |  2 +-
 Content.Server/Polymorph/Systems/PolymorphSystem.cs    |  2 +-
 Content.Server/Projectiles/ProjectileSystem.cs         |  2 +-
 Content.Server/Salvage/FultonSystem.cs                 |  2 +-
 Content.Server/Salvage/SalvageSystem.Runner.cs         |  2 +-
 Content.Server/Shuttles/Systems/ArrivalsSystem.cs      |  4 ++--
 .../Shuttles/Systems/EmergencyShuttleSystem.cs         |  6 +++---
 .../Shuttles/Systems/ShuttleConsoleSystem.cs           |  2 +-
 .../Shuttles/Systems/ShuttleSystem.GridFill.cs         |  4 ++--
 Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs   |  6 +++---
 .../Spawners/EntitySystems/SpawnOnDespawnSystem.cs     |  2 +-
 Content.Shared/Interaction/SharedInteractionSystem.cs  |  4 ++--
 Content.Shared/Movement/Systems/SharedJetpackSystem.cs |  2 +-
 .../Movement/Systems/SharedMoverController.Input.cs    |  2 +-
 .../EntitySystems/PressurizedSolutionSystem.cs         |  2 +-
 .../Nutrition/EntitySystems/SharedDrinkSystem.cs       |  2 +-
 Content.Shared/Random/RulesSystem.cs                   | 10 +++++-----
 Content.Shared/Sound/SharedEmitSoundSystem.cs          |  2 +-
 .../Storage/EntitySystems/SharedStorageSystem.cs       |  2 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs           | 10 +++++-----
 38 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Content.Client/Gravity/GravitySystem.Shake.cs b/Content.Client/Gravity/GravitySystem.Shake.cs
index c4356588d355..9b9918ca3e74 100644
--- a/Content.Client/Gravity/GravitySystem.Shake.cs
+++ b/Content.Client/Gravity/GravitySystem.Shake.cs
@@ -25,7 +25,7 @@ private void OnShakeInit(EntityUid uid, GravityShakeComponent component, Compone
     {
         var localPlayer = _playerManager.LocalEntity;
 
-        if (!TryComp<TransformComponent>(localPlayer, out var xform) ||
+        if (!TryComp(localPlayer, out TransformComponent? xform) ||
             xform.GridUid != uid && xform.MapUid != uid)
         {
             return;
@@ -46,7 +46,7 @@ protected override void ShakeGrid(EntityUid uid, GravityComponent? gravity = nul
 
         var localPlayer = _playerManager.LocalEntity;
 
-        if (!TryComp<TransformComponent>(localPlayer, out var xform))
+        if (!TryComp(localPlayer, out TransformComponent? xform))
             return;
 
         if (xform.GridUid != uid ||
diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs
index 16357c898387..e82786847e31 100644
--- a/Content.Client/Maps/GridDraggingSystem.cs
+++ b/Content.Client/Maps/GridDraggingSystem.cs
@@ -61,7 +61,7 @@ private void StopDragging()
     {
         if (_dragging == null) return;
 
-        if (_lastMousePosition != null && TryComp<TransformComponent>(_dragging.Value, out var xform) &&
+        if (_lastMousePosition != null && TryComp(_dragging.Value, out TransformComponent? xform) &&
             TryComp<PhysicsComponent>(_dragging.Value, out var body) &&
             xform.MapID == _lastMousePosition.Value.MapId)
         {
@@ -104,7 +104,7 @@ public override void Update(float frameTime)
             StartDragging(gridUid, Transform(gridUid).InvWorldMatrix.Transform(mousePos.Position));
         }
 
-        if (!TryComp<TransformComponent>(_dragging, out var xform))
+        if (!TryComp(_dragging, out TransformComponent? xform))
         {
             StopDragging();
             return;
diff --git a/Content.Client/Salvage/SalvageSystem.cs b/Content.Client/Salvage/SalvageSystem.cs
index fb305c5fdc4a..e1bce367caea 100644
--- a/Content.Client/Salvage/SalvageSystem.cs
+++ b/Content.Client/Salvage/SalvageSystem.cs
@@ -38,7 +38,7 @@ private void OnPlayAmbientMusic(ref PlayAmbientMusicEvent ev)
 
         var player = _playerManager.LocalEntity;
 
-        if (!TryComp<TransformComponent>(player, out var xform) ||
+        if (!TryComp(player, out TransformComponent? xform) ||
             !TryComp<SalvageExpeditionComponent>(xform.MapUid, out var expedition) ||
             expedition.Stage < ExpeditionStage.MusicCountdown)
         {
diff --git a/Content.Client/Sprite/SpriteFadeSystem.cs b/Content.Client/Sprite/SpriteFadeSystem.cs
index d9584b60a653..676a6e583d51 100644
--- a/Content.Client/Sprite/SpriteFadeSystem.cs
+++ b/Content.Client/Sprite/SpriteFadeSystem.cs
@@ -45,7 +45,7 @@ public override void FrameUpdate(float frameTime)
         var spriteQuery = GetEntityQuery<SpriteComponent>();
         var change = ChangeRate * frameTime;
 
-        if (TryComp<TransformComponent>(player, out var playerXform) &&
+        if (TryComp(player, out TransformComponent? playerXform) &&
             _stateManager.CurrentState is GameplayState state &&
             spriteQuery.TryGetComponent(player, out var playerSprite))
         {
diff --git a/Content.Client/Weapons/Misc/TetherGunSystem.cs b/Content.Client/Weapons/Misc/TetherGunSystem.cs
index 634dbd24e792..398aeabb839b 100644
--- a/Content.Client/Weapons/Misc/TetherGunSystem.cs
+++ b/Content.Client/Weapons/Misc/TetherGunSystem.cs
@@ -82,7 +82,7 @@ public override void Update(float frameTime)
 
         const float BufferDistance = 0.1f;
 
-        if (TryComp<TransformComponent>(gun.TetherEntity, out var tetherXform) &&
+        if (TryComp(gun.TetherEntity, out TransformComponent? tetherXform) &&
             tetherXform.Coordinates.TryDistance(EntityManager, TransformSystem, coords, out var distance) &&
             distance < BufferDistance)
         {
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index f711b235af6f..5a41a7567b27 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -165,7 +165,7 @@ private CompletionResult FixGridAtmosCommandCompletions(IConsoleShell shell, str
         foreach (var grid in _mapManager.GetAllGrids(playerMap.Value).OrderBy(o => o.Owner))
         {
             var uid = grid.Owner;
-            if (!TryComp<TransformComponent>(uid, out var gridXform))
+            if (!TryComp(uid, out TransformComponent? gridXform))
                 continue;
 
             options.Add(new CompletionOption(uid.ToString(), $"{MetaData(uid).EntityName} - Map {gridXform.MapID}"));
diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index 0c60e40dacb0..2cb0ac1dd76e 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -167,7 +167,7 @@ private void AddSummonVerb(EntityUid uid, SummonableComponent component, GetVerb
             {
                 Act = () =>
                 {
-                    if (!TryComp<TransformComponent>(args.User, out var userXform))
+                    if (!TryComp(args.User, out TransformComponent? userXform))
                         return;
 
                     AttemptSummon((uid, component), args.User, userXform);
diff --git a/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs b/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
index 61b6f3d93d2f..d694f84a9c74 100644
--- a/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs
@@ -56,7 +56,7 @@ public async void AttemptDisassemble(EntityUid uid, EntityUid user, EntityUid ta
             if (component.Deleted || Deleted(uid))
                 return;
 
-            if (!TryComp<TransformComponent>(uid, out var transformComp))
+            if (!TryComp(uid, out TransformComponent? transformComp))
                 return;
 
             var entity = EntityManager.SpawnEntity(component.Prototype, transformComp.Coordinates);
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 8e0a75ea24f9..7c6b5df7f143 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -166,7 +166,7 @@ private void HandleDeleteTrigger(EntityUid uid, DeleteOnTriggerComponent compone
 
         private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, TriggerEvent args)
         {
-            if (!TryComp<TransformComponent>(uid, out var xform))
+            if (!TryComp(uid, out TransformComponent? xform))
                 return;
             if (component.DeleteItems)
             {
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index e86dbca4a135..16d2d391f65a 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -459,7 +459,7 @@ public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage a
         if (sendEntity == null)
             return;
 
-        if (!TryComp<MetaDataComponent>(sendEntity, out var metadata) ||
+        if (!TryComp(sendEntity, out MetaDataComponent? metadata) ||
             !TryComp<PaperComponent>(sendEntity, out var paper))
             return;
 
@@ -506,7 +506,7 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a
         if (!component.KnownFaxes.TryGetValue(component.DestinationFaxAddress, out var faxName))
             return;
 
-        if (!TryComp<MetaDataComponent>(sendEntity, out var metadata) ||
+        if (!TryComp(sendEntity, out MetaDataComponent? metadata) ||
            !TryComp<PaperComponent>(sendEntity, out var paper))
             return;
 
diff --git a/Content.Server/Gravity/GravityGeneratorSystem.cs b/Content.Server/Gravity/GravityGeneratorSystem.cs
index 8e4da75fac82..0b53df63fd0a 100644
--- a/Content.Server/Gravity/GravityGeneratorSystem.cs
+++ b/Content.Server/Gravity/GravityGeneratorSystem.cs
@@ -41,7 +41,7 @@ private void OnParentChanged(EntityUid uid, GravityGeneratorComponent component,
         private void OnComponentShutdown(EntityUid uid, GravityGeneratorComponent component, ComponentShutdown args)
         {
             if (component.GravityActive &&
-                TryComp<TransformComponent>(uid, out var xform) &&
+                TryComp(uid, out TransformComponent? xform) &&
                 TryComp(xform.ParentUid, out GravityComponent? gravity))
             {
                 component.GravityActive = false;
@@ -114,7 +114,7 @@ public override void Update(float frameTime)
                     UpdateUI(ent, chargeRate);
 
                 if (active != gravGen.GravityActive &&
-                    TryComp<TransformComponent>(uid, out var xform) &&
+                    TryComp(uid, out TransformComponent? xform) &&
                     TryComp<GravityComponent>(xform.ParentUid, out var gravity))
                 {
                     // Force it on in the faster path.
diff --git a/Content.Server/Medical/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs
index 91184ddc1628..b24690e204a9 100644
--- a/Content.Server/Medical/MedicalScannerSystem.cs
+++ b/Content.Server/Medical/MedicalScannerSystem.cs
@@ -86,7 +86,7 @@ private void AddInsertOtherVerb(EntityUid uid, MedicalScannerComponent component
                 return;
 
             var name = "Unknown";
-            if (TryComp<MetaDataComponent>(args.Using.Value, out var metadata))
+            if (TryComp(args.Using.Value, out MetaDataComponent? metadata))
                 name = metadata.EntityName;
 
             InteractionVerb verb = new()
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
index 95d5c9c46510..5daf38c4209e 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
@@ -30,8 +30,8 @@ private Vector2 GetDiff(PathPoly start, PathPoly end)
 
         if (end.GraphUid != start.GraphUid)
         {
-            if (!TryComp<TransformComponent>(start.GraphUid, out var startXform) ||
-                !TryComp<TransformComponent>(end.GraphUid, out var endXform))
+            if (!TryComp(start.GraphUid, out TransformComponent? startXform) ||
+                !TryComp(end.GraphUid, out TransformComponent? endXform))
             {
                 return Vector2.Zero;
             }
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
index 6462c10fe55b..52f7db77ed65 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
@@ -261,7 +261,7 @@ private void OnCollisionLayerChange(ref CollisionLayerChangeEvent ev)
 
     private void OnBodyTypeChange(ref PhysicsBodyTypeChangedEvent ev)
     {
-        if (TryComp<TransformComponent>(ev.Entity, out var xform) &&
+        if (TryComp(ev.Entity, out TransformComponent? xform) &&
             xform.GridUid != null)
         {
             var aabb = _lookup.GetAABBNoContainer(ev.Entity, xform.Coordinates.Position, xform.LocalRotation);
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index a59af88ff58d..3672ad047b44 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -264,7 +264,7 @@ public async Task<PathResultEvent> GetRandomPath(
             int limit = 40,
             PathFlags flags = PathFlags.None)
         {
-            if (!TryComp<TransformComponent>(entity, out var start))
+            if (!TryComp(entity, out TransformComponent? start))
                 return new PathResultEvent(PathResult.NoPath, new List<PathPoly>());
 
             var layer = 0;
@@ -294,7 +294,7 @@ public async Task<PathResultEvent> GetRandomPath(
             CancellationToken cancelToken,
             PathFlags flags = PathFlags.None)
         {
-            if (!TryComp<TransformComponent>(entity, out var start))
+            if (!TryComp(entity, out TransformComponent? start))
                 return null;
 
             var request = GetRequest(entity, start.Coordinates, end, range, cancelToken, flags);
@@ -325,8 +325,8 @@ public async Task<PathResultEvent> GetPath(
             CancellationToken cancelToken,
             PathFlags flags = PathFlags.None)
         {
-            if (!TryComp<TransformComponent>(entity, out var xform) ||
-                !TryComp<TransformComponent>(target, out var targetXform))
+            if (!TryComp(entity, out TransformComponent? xform) ||
+                !TryComp(target, out TransformComponent? targetXform))
                 return new PathResultEvent(PathResult.NoPath, new List<PathPoly>());
 
             var request = GetRequest(entity, xform.Coordinates, targetXform.Coordinates, range, cancelToken, flags);
@@ -400,7 +400,7 @@ public async void GetPathEvent(
             var gridUid = coordinates.GetGridUid(EntityManager);
 
             if (!TryComp<GridPathfindingComponent>(gridUid, out var comp) ||
-                !TryComp<TransformComponent>(gridUid, out var xform))
+                !TryComp(gridUid, out TransformComponent? xform))
             {
                 return null;
             }
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 4b0ccafa1d40..2e8c628b5030 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -260,8 +260,8 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
             {
                 var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
 
-                if (!TryComp<TransformComponent>(targetUid, out var targetXform) ||
-                    !TryComp<TransformComponent>(owner, out var xform))
+                if (!TryComp(targetUid, out TransformComponent? targetXform) ||
+                    !TryComp(owner, out TransformComponent? xform))
                 {
                     return 0f;
                 }
@@ -308,8 +308,8 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
 
                 if (blackboard.TryGetValue<EntityUid>("Target", out var currentTarget, EntityManager) &&
                     currentTarget == targetUid &&
-                    TryComp<TransformComponent>(owner, out var xform) &&
-                    TryComp<TransformComponent>(targetUid, out var targetXform) &&
+                    TryComp(owner, out TransformComponent? xform) &&
+                    TryComp(targetUid, out TransformComponent? targetXform) &&
                     xform.Coordinates.TryDistance(EntityManager, _transform, targetXform.Coordinates, out var distance) &&
                     distance <= radius + bufferRange)
                 {
diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs
index 091afb155767..0cdb0bc29a2d 100644
--- a/Content.Server/PAI/PAISystem.cs
+++ b/Content.Server/PAI/PAISystem.cs
@@ -111,7 +111,7 @@ public void PAITurningOff(EntityUid uid)
         if (TryComp<InstrumentComponent>(uid, out var instrument))
             _instrumentSystem.Clean(uid, instrument);
 
-        if (TryComp<MetaDataComponent>(uid, out var metadata))
+        if (TryComp(uid, out MetaDataComponent? metadata))
         {
             var proto = metadata.EntityPrototype;
             if (proto != null)
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
index d10d04cfb9a9..4a7828c78c8f 100644
--- a/Content.Server/Paper/PaperSystem.cs
+++ b/Content.Server/Paper/PaperSystem.cs
@@ -148,7 +148,7 @@ private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperIn
                 if (TryComp<AppearanceComponent>(uid, out var appearance))
                     _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance);
 
-                if (TryComp<MetaDataComponent>(uid, out var meta))
+                if (TryComp(uid, out MetaDataComponent? meta))
                     _metaSystem.SetEntityDescription(uid, "", meta);
 
                 _adminLogger.Add(LogType.Chat, LogImpact.Low,
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 759b8ef29c6e..6edc202d153b 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -271,7 +271,7 @@ private void HandleShuttleMovement(float frameTime)
                     consoleEnt = cargoConsole.Entity;
                 }
 
-                if (!TryComp<TransformComponent>(consoleEnt, out var xform)) continue;
+                if (!TryComp(consoleEnt, out TransformComponent? xform)) continue;
 
                 var gridId = xform.GridUid;
                 // This tries to see if the grid is a shuttle and if the console should work.
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index e6ba1d02afdc..d4a9159d44ff 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -248,7 +248,7 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
             }
         }
 
-        if (configuration.TransferName && TryComp<MetaDataComponent>(uid, out var targetMeta))
+        if (configuration.TransferName && TryComp(uid, out MetaDataComponent? targetMeta))
             _metaData.SetEntityName(child, targetMeta.EntityName);
 
         if (configuration.TransferHumanoidAppearance)
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 0061b16e47c5..f8c8ef64b791 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -72,7 +72,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
         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));
         }
diff --git a/Content.Server/Salvage/FultonSystem.cs b/Content.Server/Salvage/FultonSystem.cs
index a24bab458468..ad998e535989 100644
--- a/Content.Server/Salvage/FultonSystem.cs
+++ b/Content.Server/Salvage/FultonSystem.cs
@@ -53,7 +53,7 @@ public override void Update(float frameTime)
     private void Fulton(EntityUid uid, FultonedComponent component)
     {
         if (!Deleted(component.Beacon) &&
-            TryComp<TransformComponent>(component.Beacon, out var beaconXform) &&
+            TryComp(component.Beacon, out TransformComponent? beaconXform) &&
             !Container.IsEntityOrParentInContainer(component.Beacon.Value, xform: beaconXform) &&
             CanFulton(uid))
         {
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 23607e2bdc55..161b79108446 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -32,7 +32,7 @@ private void InitializeRunner()
 
     private void OnConsoleFTLAttempt(ref ConsoleFTLAttemptEvent ev)
     {
-        if (!TryComp<TransformComponent>(ev.Uid, out var xform) ||
+        if (!TryComp(ev.Uid, out TransformComponent? xform) ||
             !TryComp<SalvageExpeditionComponent>(xform.MapUid, out var salvage))
         {
             return;
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 23f7e10a3e32..e87e781e620e 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -316,7 +316,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
 
         TryGetArrivals(out var arrivals);
 
-        if (TryComp<TransformComponent>(arrivals, out var arrivalsXform))
+        if (TryComp(arrivals, out TransformComponent? arrivalsXform))
         {
             var mapId = arrivalsXform.MapID;
 
@@ -413,7 +413,7 @@ public override void Update(float frameTime)
         var curTime = _timing.CurTime;
         TryGetArrivals(out var arrivals);
 
-        if (TryComp<TransformComponent>(arrivals, out var arrivalsXform))
+        if (TryComp(arrivals, out TransformComponent? arrivalsXform))
         {
             while (query.MoveNext(out var uid, out var comp, out var shuttle, out var xform))
             {
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index 9bfe1bf98666..2d8ae4b735e5 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -261,7 +261,7 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
         if (!Resolve(stationUid, ref stationShuttle))
             return;
 
-        if (!TryComp<TransformComponent>(stationShuttle.EmergencyShuttle, out var xform) ||
+        if (!TryComp(stationShuttle.EmergencyShuttle, out TransformComponent? xform) ||
             !TryComp<ShuttleComponent>(stationShuttle.EmergencyShuttle, out var shuttle))
         {
             Log.Error($"Attempted to call an emergency shuttle for an uninitialized station? Station: {ToPrettyString(stationUid)}. Shuttle: {ToPrettyString(stationShuttle.EmergencyShuttle)}");
@@ -284,7 +284,7 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
 
         if (_shuttle.TryFTLDock(stationShuttle.EmergencyShuttle.Value, shuttle, targetGrid.Value, DockTag))
         {
-            if (TryComp<TransformComponent>(targetGrid.Value, out var targetXform))
+            if (TryComp(targetGrid.Value, out TransformComponent? targetXform))
             {
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
                 _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir())), playDefaultSound: false);
@@ -330,7 +330,7 @@ private void OnStationInit(EntityUid uid, StationCentcommComponent component, Ma
             return;
 
         // Post mapinit? fancy
-        if (TryComp<TransformComponent>(component.Entity, out var xform))
+        if (TryComp(component.Entity, out TransformComponent? xform))
         {
             component.MapEntity = xform.MapUid;
             return;
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 89dc114cafca..2b5769881d27 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -242,7 +242,7 @@ private void UpdateState(EntityUid consoleUid, ref DockingInterfaceState? dockSt
         RaiseLocalEvent(entity.Value, ref getShuttleEv);
         entity = getShuttleEv.Console;
 
-        TryComp<TransformComponent>(entity, out var consoleXform);
+        TryComp(entity, out TransformComponent? consoleXform);
         var shuttleGridUid = consoleXform?.GridUid;
 
         NavInterfaceState navState;
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index c4cf2820e246..853548add37c 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -184,7 +184,7 @@ private void OnGridFillMapInit(EntityUid uid, GridFillComponent component, MapIn
             return;
 
         if (!TryComp<DockingComponent>(uid, out var dock) ||
-            !TryComp<TransformComponent>(uid, out var xform) ||
+            !TryComp(uid, out TransformComponent? xform) ||
             xform.GridUid == null)
         {
             return;
@@ -196,7 +196,7 @@ private void OnGridFillMapInit(EntityUid uid, GridFillComponent component, MapIn
 
         if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) &&
             ent.Count == 1 &&
-            TryComp<TransformComponent>(ent[0], out var shuttleXform))
+            TryComp(ent[0], out TransformComponent? shuttleXform))
         {
             var escape = GetSingleDock(ent[0]);
 
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
index ce79466b5891..ed5d109e852e 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
@@ -16,7 +16,7 @@ private void InitializeIFF()
 
     private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFMessage args)
     {
-        if (!TryComp<TransformComponent>(uid, out var xform) || xform.GridUid == null ||
+        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null ||
             (component.AllowedFlags & IFFFlags.HideLabel) == 0x0)
         {
             return;
@@ -34,7 +34,7 @@ private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFM
 
     private void OnIFFShowVessel(EntityUid uid, IFFConsoleComponent component, IFFShowVesselMessage args)
     {
-        if (!TryComp<TransformComponent>(uid, out var xform) || xform.GridUid == null ||
+        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null ||
             (component.AllowedFlags & IFFFlags.Hide) == 0x0)
         {
             return;
@@ -54,7 +54,7 @@ private void OnIFFConsoleAnchor(EntityUid uid, IFFConsoleComponent component, re
     {
         // If we anchor / re-anchor then make sure flags up to date.
         if (!args.Anchored ||
-            !TryComp<TransformComponent>(uid, out var xform) ||
+            !TryComp(uid, out TransformComponent? xform) ||
             !TryComp<IFFComponent>(xform.GridUid, out var iff))
         {
             _uiSystem.SetUiState(uid, IFFConsoleUiKey.Key, new IFFConsoleBoundUserInterfaceState()
diff --git a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
index 77927c9bba94..f5a34728dc86 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnOnDespawnSystem.cs
@@ -14,7 +14,7 @@ public override void Initialize()
 
     private void OnDespawn(EntityUid uid, SpawnOnDespawnComponent comp, ref TimedDespawnEvent args)
     {
-        if (!TryComp<TransformComponent>(uid, out var xform))
+        if (!TryComp(uid, out TransformComponent? xform))
             return;
 
         Spawn(comp.Prototype, xform.Coordinates);
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 8b3431cb0246..c82a749755d6 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -570,7 +570,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            if (!TryComp<TransformComponent>(other, out var otherXform))
+            if (!TryComp(other, out TransformComponent? otherXform))
                 return false;
 
             return InRangeUnobstructed(origin, other, otherXform.Coordinates, otherXform.LocalRotation, range, collisionMask, predicate,
@@ -633,7 +633,7 @@ public bool InRangeUnobstructed(
                 fixtureA.FixtureCount > 0 &&
                 TryComp<FixturesComponent>(other, out var fixtureB) &&
                 fixtureB.FixtureCount > 0 &&
-                TryComp<TransformComponent>(origin, out var xformA))
+                TryComp(origin, out TransformComponent? xformA))
             {
                 var (worldPosA, worldRotA) = xformA.GetWorldPositionRotation();
                 var xfA = new Transform(worldPosA, worldRotA);
diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
index 8c42511f8469..724eca682fbe 100644
--- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
@@ -113,7 +113,7 @@ private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJe
         if (args.Handled)
             return;
 
-        if (TryComp<TransformComponent>(uid, out var xform) && !CanEnableOnGrid(xform.GridUid))
+        if (TryComp(uid, out TransformComponent? xform) && !CanEnableOnGrid(xform.GridUid))
         {
             _popup.PopupClient(Loc.GetString("jetpack-no-station"), uid, args.Performer);
 
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index ba175b345f8c..1ccb7f0c3f14 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -313,7 +313,7 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo
             // For stuff like "Moving out of locker" or the likes
             // We'll relay a movement input to the parent.
             if (_container.IsEntityInContainer(entity) &&
-                TryComp<TransformComponent>(entity, out var xform) &&
+                TryComp(entity, out TransformComponent? xform) &&
                 xform.ParentUid.IsValid() &&
                 _mobState.IsAlive(entity))
             {
diff --git a/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs b/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs
index d63b8e7326c9..82d90f4c928c 100644
--- a/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs
@@ -179,7 +179,7 @@ public bool TrySpray(Entity<PressurizedSolutionComponent?> entity, EntityUid? ta
         var solution = _solutionContainer.SplitSolution(soln.Value, interactions.Volume);
 
         // Spray the solution onto the ground and anyone nearby
-        if (TryComp<TransformComponent>(entity, out var transform))
+        if (TryComp(entity, out TransformComponent? transform))
             _puddle.TrySplashSpillAt(entity, transform.Coordinates, solution, out _, sound: false);
 
         var drinkName = Identity.Entity(entity, EntityManager);
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
index 7cae3b920866..bf1e585fab9a 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
@@ -81,7 +81,7 @@ private string HalfEmptyOrHalfFull(ExaminedEvent args)
     {
         string remainingString = "drink-component-on-examine-is-half-full";
 
-        if (TryComp<MetaDataComponent>(args.Examiner, out var examiner) && examiner.EntityName.Length > 0
+        if (TryComp(args.Examiner, out MetaDataComponent? examiner) && examiner.EntityName.Length > 0
             && string.Compare(examiner.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0)
             remainingString = "drink-component-on-examine-is-half-empty";
 
diff --git a/Content.Shared/Random/RulesSystem.cs b/Content.Shared/Random/RulesSystem.cs
index f8711fb63e01..6b8a58abb712 100644
--- a/Content.Shared/Random/RulesSystem.cs
+++ b/Content.Shared/Random/RulesSystem.cs
@@ -26,7 +26,7 @@ public bool IsTrue(EntityUid uid, RulesPrototype rules)
                     break;
                 case GridInRangeRule griddy:
                 {
-                    if (!TryComp<TransformComponent>(uid, out var xform))
+                    if (!TryComp(uid, out TransformComponent? xform))
                     {
                         return false;
                     }
@@ -50,7 +50,7 @@ public bool IsTrue(EntityUid uid, RulesPrototype rules)
                 }
                 case InSpaceRule:
                 {
-                    if (!TryComp<TransformComponent>(uid, out var xform) ||
+                    if (!TryComp(uid, out TransformComponent? xform) ||
                         xform.GridUid != null)
                     {
                         return false;
@@ -146,7 +146,7 @@ public bool IsTrue(EntityUid uid, RulesPrototype rules)
                 }
                 case NearbyEntitiesRule entity:
                 {
-                    if (!TryComp<TransformComponent>(uid, out var xform) ||
+                    if (!TryComp(uid, out TransformComponent? xform) ||
                         xform.MapUid == null)
                     {
                         return false;
@@ -177,7 +177,7 @@ public bool IsTrue(EntityUid uid, RulesPrototype rules)
                 }
                 case NearbyTilesPercentRule tiles:
                 {
-                    if (!TryComp<TransformComponent>(uid, out var xform) ||
+                    if (!TryComp(uid, out TransformComponent? xform) ||
                         !TryComp<MapGridComponent>(xform.GridUid, out var grid))
                     {
                         return false;
@@ -227,7 +227,7 @@ public bool IsTrue(EntityUid uid, RulesPrototype rules)
                 }
                 case OnMapGridRule:
                 {
-                    if (!TryComp<TransformComponent>(uid, out var xform) ||
+                    if (!TryComp(uid, out TransformComponent? xform) ||
                         xform.GridUid != xform.MapUid ||
                         xform.MapUid == null)
                     {
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index a9a50698d7d5..0dcdc44c9f21 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -72,7 +72,7 @@ private void OnEmitSpawnOnInit(EntityUid uid, EmitSoundOnSpawnComponent componen
     private void OnEmitSoundOnLand(EntityUid uid, BaseEmitSoundComponent component, ref LandEvent args)
     {
         if (!args.PlaySound ||
-            !TryComp<TransformComponent>(uid, out var xform) ||
+            !TryComp(uid, out TransformComponent? xform) ||
             !TryComp<MapGridComponent>(xform.GridUid, out var grid))
         {
             return;
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 4f0b760345b5..6dd7f9d41844 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -463,7 +463,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;
 
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 6fa11f87d2a9..0fb6ac3eff96 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -315,7 +315,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);
@@ -323,7 +323,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);
@@ -446,7 +446,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         // 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))
         {
@@ -534,7 +534,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
     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);
@@ -748,7 +748,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);

From c0f158bd19afdc50d5d8c71d37de8bf0045583b4 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Tue, 21 May 2024 12:23:55 +0300
Subject: [PATCH 009/568] Ed anomalies (#28175)

Update CODEOWNERS
---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 69c5f0138ff5..21c3070b8022 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -27,7 +27,7 @@
 /Content.YAMLLinter @DrSmugleaf
 /Content.Shared/Damage/ @DrSmugleaf
 
-/Content.*/Anomaly/ @EmoGarbage404
+/Content.*/Anomaly/ @EmoGarbage404 @TheShuEd
 /Content.*/Lathe/ @EmoGarbage404
 /Content.*/Materials/ @EmoGarbage404
 /Content.*/Mech/ @EmoGarbage404
@@ -35,7 +35,7 @@
 /Content.*/Stack/ @EmoGarbage404
 /Content.*/Xenoarchaeology/ @EmoGarbage404
 /Content.*/Zombies/ @EmoGarbage404
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
+/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404 @TheShuEd
 /Resources/Prototypes/Research/ @EmoGarbage404
 
 /Content.*/Forensics/ @ficcialfaint

From 79c77635faf1db1ecb2dd8f46e424503a000e13c Mon Sep 17 00:00:00 2001
From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Date: Tue, 21 May 2024 12:16:35 +0200
Subject: [PATCH 010/568] sleeper agent appear later into the round and only
 once (#28160)

---
 Resources/Prototypes/GameRules/events.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 19c9f7d5dc4f..3b9ad5aadf2c 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -433,10 +433,10 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 25
+    earliestStart: 30
     weight: 8
     minimumPlayers: 15
-    reoccurrenceDelay: 30
+    maxOccurrences: 1 # can only happen once per round
     startAnnouncement: station-event-communication-interception
     startAudio:
       path: /Audio/Announcements/intercept.ogg

From 68a0e568e4a5fdbd0ee551b5254b94dd6ca38375 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 21 May 2024 10:17:43 +0000
Subject: [PATCH 011/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 08d13027c8fb..12da3a2a9009 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Admiral-Obvious-001
-  changes:
-  - message: Zombies are now tougher to kill.
-    type: Tweak
-  id: 6110
-  time: '2024-03-07T21:02:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25876
 - author: TheShuEd
   changes:
   - message: Removed Hamlet, Smile and Pun Pun from Thief objectives
@@ -3870,3 +3863,10 @@
   id: 6609
   time: '2024-05-20T14:12:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28120
+- author: Killerqu00
+  changes:
+  - message: Sleeper Agents only appear once per round.
+    type: Tweak
+  id: 6610
+  time: '2024-05-21T10:16:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28160

From dbb7dcd16d97d7cf7a7d1430a07bb24cce55c3d9 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 012/568] 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      | 10 +++++++++-
 Content.Shared/Medical/DefibrillatorComponent.cs   |  6 ++++++
 Content.Shared/Medical/TargetDefibrillatedEvent.cs |  4 ++++
 3 files changed, 19 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 64861fdc5158..4373532f0186 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -162,6 +162,9 @@ public bool CanZap(EntityUid uid, EntityUid target, EntityUid? user = null, Defi
         if (_mobState.IsAlive(target, mobState))
             return false;
 
+        if (!component.CanDefibCrit && _mobState.IsCritical(target, mobState))
+            return false;
+
         return true;
     }
 
@@ -179,7 +182,8 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
             {
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnMove = !component.AllowDoAfterMovement
             });
     }
 
@@ -254,6 +258,10 @@ 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);
+
+        // 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.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index 2da528528547..61a02187d09b 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -60,6 +60,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 000000000000..60d1a2158459
--- /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 ede1406128a2ad4d6f378bc0dae35e777d904a34 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Wed, 22 May 2024 10:52:57 +0300
Subject: [PATCH 013/568] Artifact portal effect changes (#28200)

Update portal.yml
---
 Resources/Prototypes/Entities/Effects/portal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml
index eb69ac821f58..75300693cd94 100644
--- a/Resources/Prototypes/Entities/Effects/portal.yml
+++ b/Resources/Prototypes/Entities/Effects/portal.yml
@@ -65,7 +65,7 @@
     energy: 1
     netsync: false
   - type: TimedDespawn
-    lifetime: 120
+    lifetime: 1
   - type: Portal
     canTeleportToOtherMaps: true
 

From 6a9139b4e1427fa8ea397383c04f9391ee287fb7 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 22 May 2024 07:54:04 +0000
Subject: [PATCH 014/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 12da3a2a9009..d20cf44cdb96 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: TheShuEd
-  changes:
-  - message: Removed Hamlet, Smile and Pun Pun from Thief objectives
-    type: Remove
-  id: 6111
-  time: '2024-03-07T23:53:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25921
 - author: MACMAN2003
   changes:
   - message: Diagonal windows no longer space you when in a pressurized environment.
@@ -3870,3 +3863,10 @@
   id: 6610
   time: '2024-05-21T10:16:35.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28160
+- author: TheShuEd
+  changes:
+  - message: Artifact portal lifespan reduced from 120 seconds to 1 second
+    type: Tweak
+  id: 6611
+  time: '2024-05-22T07:52:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28200

From df8b9a659ecbd412243acdbf02fa96e2a74d5789 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Wed, 22 May 2024 11:16:20 +0000
Subject: [PATCH 015/568] Firelock improvements part 1 (#26582)

* Change prying system and pryunpoweredcomp to allow for custom time modifiers

This will be useful if I go the route of making firelocks pryable when
unpowered instead of just being able to open and close instantly when
unpowered.

* Make firelocks properly predicted

Shared system made. Since atmos checks can only be done on the server we
just have it set relevant bools on the component and then dirty it.
Ditched atmos checks on trying to open, they now only happen whenever
firelocks are updated.

* Make firelocks pryable without a crowbar

While this usually would only allow you to do this when a door is
unpowered, firelocks do not have the airlock component which actually
does that check. As such firelocks will always allow you to pry them
open/closed by hand.

* Clean up System. Change update interval to be based on ticks. Move as much as possible to shared

* Make firelocks unable to emergency close for 2 seconds after being pried open

* Clean up

* More cleanup

* Reorganize SharedFirelockSystem methods to match Initialize order

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 Content.Client/Doors/FirelockSystem.cs        |   3 +-
 .../Doors/Systems/FirelockSystem.cs           | 134 +++---------------
 .../Doors/Components/FirelockComponent.cs     |  48 ++++++-
 .../Doors/Systems/SharedDoorSystem.cs         |   3 +-
 .../Doors/Systems/SharedFirelockSystem.cs     | 125 ++++++++++++++++
 .../Components/PryUnpoweredComponent.cs       |   2 +
 Content.Shared/Prying/Systems/PryingSystem.cs |   8 +-
 .../Structures/Doors/Firelocks/firelock.yml   |   2 +
 8 files changed, 200 insertions(+), 125 deletions(-)
 create mode 100644 Content.Shared/Doors/Systems/SharedFirelockSystem.cs

diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index cfd84a471336..f64b4c8e5222 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -1,9 +1,10 @@
 using Content.Shared.Doors.Components;
+using Content.Shared.Doors.Systems;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Doors;
 
-public sealed class FirelockSystem : EntitySystem
+public sealed class FirelockSystem : SharedFirelockSystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
 
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 3d4c8a4ec59e..5ad86fb20aab 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -1,67 +1,56 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Monitor.Systems;
-using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Shuttles.Components;
-using Content.Shared.Access.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Prying.Components;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Doors.Systems
 {
-    public sealed class FirelockSystem : EntitySystem
+    public sealed class FirelockSystem : SharedFirelockSystem
     {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedDoorSystem _doorSystem = default!;
         [Dependency] private readonly AtmosAlarmableSystem _atmosAlarmable = default!;
         [Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-        [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
+        [Dependency] private readonly SharedMapSystem _mapping = default!;
 
-        private static float _visualUpdateInterval = 0.5f;
-        private float _accumulatedFrameTime;
+        private const int UpdateInterval = 30;
+        private int _accumulatedTicks;
 
         public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
-            SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
-            SubscribeLocalEvent<FirelockComponent, DoorStateChangedEvent>(OnUpdateState);
 
             SubscribeLocalEvent<FirelockComponent, BeforeDoorAutoCloseEvent>(OnBeforeDoorAutoclose);
             SubscribeLocalEvent<FirelockComponent, AtmosAlarmEvent>(OnAtmosAlarm);
 
-            // Visuals
-            SubscribeLocalEvent<FirelockComponent, MapInitEvent>(UpdateVisuals);
-            SubscribeLocalEvent<FirelockComponent, ComponentStartup>(UpdateVisuals);
             SubscribeLocalEvent<FirelockComponent, PowerChangedEvent>(PowerChanged);
+
         }
 
         private void PowerChanged(EntityUid uid, FirelockComponent component, ref PowerChangedEvent args)
         {
             // TODO this should REALLLLY not be door specific appearance thing.
             _appearance.SetData(uid, DoorVisuals.Powered, args.Powered);
+            component.Powered = args.Powered;
+            Dirty(uid, component);
         }
 
-        #region Visuals
-        private void UpdateVisuals(EntityUid uid, FirelockComponent component, EntityEventArgs args) => UpdateVisuals(uid, component);
-
         public override void Update(float frameTime)
         {
-            _accumulatedFrameTime += frameTime;
-            if (_accumulatedFrameTime < _visualUpdateInterval)
+            _accumulatedTicks += 1;
+            if (_accumulatedTicks < UpdateInterval)
                 return;
 
-            _accumulatedFrameTime -= _visualUpdateInterval;
+            _accumulatedTicks = 0;
 
             var airtightQuery = GetEntityQuery<AirtightComponent>();
             var appearanceQuery = GetEntityQuery<AppearanceComponent>();
@@ -84,94 +73,13 @@ public override void Update(float frameTime)
                 {
                     var (fire, pressure) = CheckPressureAndFire(uid, firelock, xform, airtight, airtightQuery);
                     _appearance.SetData(uid, DoorVisuals.ClosedLights, fire || pressure, appearance);
+                    firelock.Temperature = fire;
+                    firelock.Pressure = pressure;
+                    Dirty(uid, firelock);
                 }
             }
         }
 
-        private void UpdateVisuals(EntityUid uid,
-            FirelockComponent? firelock = null,
-            DoorComponent? door = null,
-            AirtightComponent? airtight = null,
-            AppearanceComponent? appearance = null,
-            TransformComponent? xform = null)
-        {
-            if (!Resolve(uid, ref door, ref appearance, false))
-                return;
-
-            // only bother to check pressure on doors that are some variation of closed.
-            if (door.State != DoorState.Closed
-                && door.State != DoorState.Welded
-                && door.State != DoorState.Denying)
-            {
-                _appearance.SetData(uid, DoorVisuals.ClosedLights, false, appearance);
-                return;
-            }
-
-            var query = GetEntityQuery<AirtightComponent>();
-            if (!Resolve(uid, ref firelock, ref airtight, ref appearance, ref xform, false) || !query.Resolve(uid, ref airtight, false))
-                return;
-
-            var (fire, pressure) = CheckPressureAndFire(uid, firelock, xform, airtight, query);
-            _appearance.SetData(uid, DoorVisuals.ClosedLights, fire || pressure, appearance);
-        }
-        #endregion
-
-        public bool EmergencyPressureStop(EntityUid uid, FirelockComponent? firelock = null, DoorComponent? door = null)
-        {
-            if (!Resolve(uid, ref firelock, ref door))
-                return false;
-
-            if (door.State == DoorState.Open)
-            {
-                if (_doorSystem.TryClose(uid, door))
-                {
-                    return _doorSystem.OnPartialClose(uid, door);
-                }
-            }
-            return false;
-        }
-
-        private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, BeforeDoorOpenedEvent args)
-        {
-            // Give the Door remote the ability to force a firelock open even if it is holding back dangerous gas
-            var overrideAccess = (args.User != null) && _accessReaderSystem.IsAllowed(args.User.Value, uid);
-
-            if (!this.IsPowered(uid, EntityManager) || (!overrideAccess && IsHoldingPressureOrFire(uid, component)))
-                args.Cancel();
-        }
-
-        private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, ref GetPryTimeModifierEvent args)
-        {
-            var state = CheckPressureAndFire(uid, component);
-
-            if (state.Fire)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-fire-message"),
-                    uid, args.User, PopupType.MediumCaution);
-            }
-            else if (state.Pressure)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-pressure-message"),
-                    uid, args.User, PopupType.MediumCaution);
-            }
-
-            if (state.Fire || state.Pressure)
-                args.PryTimeModifier *= component.LockedPryTimeModifier;
-        }
-
-        private void OnUpdateState(EntityUid uid, FirelockComponent component, DoorStateChangedEvent args)
-        {
-            var ev = new BeforeDoorAutoCloseEvent();
-            RaiseLocalEvent(uid, ev);
-            UpdateVisuals(uid, component, args);
-            if (ev.Cancelled)
-            {
-                return;
-            }
-
-            _doorSystem.SetNextStateChange(uid, component.AutocloseDelay);
-        }
-
         private void OnBeforeDoorAutoclose(EntityUid uid, FirelockComponent component, BeforeDoorAutoCloseEvent args)
         {
             if (!this.IsPowered(uid, EntityManager))
@@ -204,12 +112,6 @@ private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosAlarm
             }
         }
 
-        public bool IsHoldingPressureOrFire(EntityUid uid, FirelockComponent firelock)
-        {
-            var result = CheckPressureAndFire(uid, firelock);
-            return result.Pressure || result.Fire;
-        }
-
         public (bool Pressure, bool Fire) CheckPressureAndFire(EntityUid uid, FirelockComponent firelock)
         {
             var query = GetEntityQuery<AirtightComponent>();
@@ -234,17 +136,17 @@ public bool IsHoldingPressureOrFire(EntityUid uid, FirelockComponent firelock)
                 return (false, false);
             }
 
-            if (!TryComp(xform.ParentUid, out GridAtmosphereComponent? gridAtmosphere))
+            if (!HasComp<GridAtmosphereComponent>(xform.ParentUid))
                 return (false, false);
 
             var grid = Comp<MapGridComponent>(xform.ParentUid);
-            var pos = grid.CoordinatesToTile(xform.Coordinates);
+            var pos = _mapping.CoordinatesToTile(xform.ParentUid, grid, xform.Coordinates);
             var minPressure = float.MaxValue;
             var maxPressure = float.MinValue;
             var minTemperature = float.MaxValue;
             var maxTemperature = float.MinValue;
-            bool holdingFire = false;
-            bool holdingPressure = false;
+            var holdingFire = false;
+            var holdingPressure = false;
 
             // We cannot simply use `_atmosSystem.GetAdjacentTileMixtures` because of how the `includeBlocked` option
             // works, we want to ignore the firelock's blocking, while including blockers on other tiles.
@@ -284,7 +186,7 @@ public bool IsHoldingPressureOrFire(EntityUid uid, FirelockComponent firelock)
                 {
                     // Is there some airtight entity blocking this direction? If yes, don't include this direction in the
                     // pressure differential
-                    if (HasAirtightBlocker(grid.GetAnchoredEntities(adjacentPos), dir.GetOpposite(), airtightQuery))
+                    if (HasAirtightBlocker(_mapping.GetAnchoredEntities(xform.ParentUid, grid, adjacentPos), dir.GetOpposite(), airtightQuery))
                         continue;
 
                     var p = gas.Pressure;
diff --git a/Content.Shared/Doors/Components/FirelockComponent.cs b/Content.Shared/Doors/Components/FirelockComponent.cs
index 97e57185cac9..ca62daaa0fd1 100644
--- a/Content.Shared/Doors/Components/FirelockComponent.cs
+++ b/Content.Shared/Doors/Components/FirelockComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Doors.Components;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Doors.Components
 {
@@ -7,9 +7,11 @@ namespace Content.Shared.Doors.Components
     /// auto-closing on depressurization, air/fire alarm interactions, and preventing normal door functions when
     /// retaining pressure..
     /// </summary>
-    [RegisterComponent]
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
     public sealed partial class FirelockComponent : Component
     {
+        #region Settings
+
         /// <summary>
         /// Pry time modifier to be used when the firelock is currently closed due to fire or pressure.
         /// </summary>
@@ -39,5 +41,47 @@ public sealed partial class FirelockComponent : Component
         /// </summary>
         [DataField("alarmAutoClose"), ViewVariables(VVAccess.ReadWrite)]
         public bool AlarmAutoClose = true;
+
+        /// <summary>
+        /// The cooldown duration before a firelock can automatically close due to a hazardous environment after it has
+        /// been pried open. Measured in seconds.
+        /// </summary>
+        [DataField]
+        public TimeSpan EmergencyCloseCooldownDuration = TimeSpan.FromSeconds(2);
+
+        #endregion
+
+        #region Set by system
+
+        /// <summary>
+        /// When the firelock will be allowed to automatically close again due to a hazardous environment.
+        /// </summary>
+        [DataField]
+        public TimeSpan? EmergencyCloseCooldown;
+
+        /// <summary>
+        /// Whether the firelock can open, or is locked due to its environment.
+        /// </summary>
+        public bool IsLocked => Pressure || Temperature;
+
+        /// <summary>
+        /// Whether the firelock is holding back a hazardous pressure.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool Pressure;
+
+        /// <summary>
+        /// Whether the firelock is holding back extreme temperatures.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool Temperature;
+
+        /// <summary>
+        /// Whether the airlock is powered.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public bool Powered;
+
+        #endregion
     }
 }
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index b58b7b265e9a..20456c14777b 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -6,7 +6,6 @@
 using Content.Shared.Database;
 using Content.Shared.Doors.Components;
 using Content.Shared.Emag.Systems;
-using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
@@ -466,7 +465,7 @@ public bool OnPartialClose(EntityUid uid, DoorComponent? door = null, PhysicsCom
 
         door.Partial = true;
 
-        // Make sure no entity waled into the airlock when it started closing.
+        // Make sure no entity walked into the airlock when it started closing.
         if (!CanClose(uid, door))
         {
             door.NextStateChange = GameTiming.CurTime + door.OpenTimeTwo;
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
new file mode 100644
index 000000000000..7d033efdd408
--- /dev/null
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -0,0 +1,125 @@
+using Content.Shared.Access.Systems;
+using Content.Shared.Doors.Components;
+using Content.Shared.Popups;
+using Content.Shared.Prying.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Doors.Systems;
+
+public abstract class SharedFirelockSystem : EntitySystem
+{
+    [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedDoorSystem _doorSystem = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FirelockComponent, DoorStateChangedEvent>(OnUpdateState);
+
+        // Access/Prying
+        SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+        SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
+        SubscribeLocalEvent<FirelockComponent, PriedEvent>(OnAfterPried);
+
+        // Visuals
+        SubscribeLocalEvent<FirelockComponent, MapInitEvent>(UpdateVisuals);
+        SubscribeLocalEvent<FirelockComponent, ComponentStartup>(UpdateVisuals);
+    }
+
+    public bool EmergencyPressureStop(EntityUid uid, FirelockComponent? firelock = null, DoorComponent? door = null)
+    {
+        if (!Resolve(uid, ref firelock, ref door))
+            return false;
+
+        if (door.State != DoorState.Open
+            || firelock.EmergencyCloseCooldown != null
+            && _gameTiming.CurTime < firelock.EmergencyCloseCooldown)
+            return false;
+
+        if (!_doorSystem.TryClose(uid, door))
+            return false;
+
+        return _doorSystem.OnPartialClose(uid, door);
+    }
+
+    private void OnUpdateState(EntityUid uid, FirelockComponent component, DoorStateChangedEvent args)
+    {
+        var ev = new BeforeDoorAutoCloseEvent();
+        RaiseLocalEvent(uid, ev);
+        UpdateVisuals(uid, component, args);
+        if (ev.Cancelled)
+        {
+            return;
+        }
+
+        _doorSystem.SetNextStateChange(uid, component.AutocloseDelay);
+    }
+
+    #region Access/Prying
+
+    private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, BeforeDoorOpenedEvent args)
+    {
+        // Give the Door remote the ability to force a firelock open even if it is holding back dangerous gas
+        var overrideAccess = (args.User != null) && _accessReaderSystem.IsAllowed(args.User.Value, uid);
+
+        if (!component.Powered || (!overrideAccess && component.IsLocked))
+            args.Cancel();
+    }
+
+    private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, ref GetPryTimeModifierEvent args)
+    {
+        if (component.Temperature)
+        {
+            _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-fire-message"),
+                uid, args.User, PopupType.MediumCaution);
+        }
+        else if (component.Pressure)
+        {
+            _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-pressure-message"),
+                uid, args.User, PopupType.MediumCaution);
+        }
+
+        if (component.IsLocked)
+            args.PryTimeModifier *= component.LockedPryTimeModifier;
+    }
+
+    private void OnAfterPried(EntityUid uid, FirelockComponent component, ref PriedEvent args)
+    {
+        component.EmergencyCloseCooldown = _gameTiming.CurTime + component.EmergencyCloseCooldownDuration;
+    }
+
+    #endregion
+
+    #region Visuals
+
+    private void UpdateVisuals(EntityUid uid, FirelockComponent component, EntityEventArgs args) => UpdateVisuals(uid, component);
+
+    private void UpdateVisuals(EntityUid uid,
+        FirelockComponent? firelock = null,
+        DoorComponent? door = null,
+        AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(uid, ref door, ref appearance, false))
+            return;
+
+        // only bother to check pressure on doors that are some variation of closed.
+        if (door.State != DoorState.Closed
+            && door.State != DoorState.Welded
+            && door.State != DoorState.Denying)
+        {
+            _appearance.SetData(uid, DoorVisuals.ClosedLights, false, appearance);
+            return;
+        }
+
+        if (!Resolve(uid, ref firelock, ref appearance, false))
+            return;
+
+        _appearance.SetData(uid, DoorVisuals.ClosedLights, firelock.IsLocked, appearance);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Prying/Components/PryUnpoweredComponent.cs b/Content.Shared/Prying/Components/PryUnpoweredComponent.cs
index f0e61dc9685d..b6b69a2577d2 100644
--- a/Content.Shared/Prying/Components/PryUnpoweredComponent.cs
+++ b/Content.Shared/Prying/Components/PryUnpoweredComponent.cs
@@ -8,4 +8,6 @@ namespace Content.Shared.Prying.Components;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class PryUnpoweredComponent : Component
 {
+    [DataField]
+    public float PryModifier = 0.1f;
 }
diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
index ab87585c706f..372c89c9ae09 100644
--- a/Content.Shared/Prying/Systems/PryingSystem.cs
+++ b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -93,17 +93,17 @@ public bool TryPry(EntityUid target, EntityUid user, out DoAfterId? id)
         id = null;
 
         // We don't care about displaying a message if no tool was used.
-        if (!CanPry(target, user, out _))
+        if (!TryComp<PryUnpoweredComponent>(target, out var unpoweredComp) || !CanPry(target, user, out _, unpoweredComp: unpoweredComp))
             // If we have reached this point we want the event that caused this
             // to be marked as handled.
             return true;
 
         // hand-prying is much slower
-        var modifier = CompOrNull<PryingComponent>(user)?.SpeedModifier ?? 0.1f;
+        var modifier = CompOrNull<PryingComponent>(user)?.SpeedModifier ?? unpoweredComp.PryModifier;
         return StartPry(target, user, null, modifier, out id);
     }
 
-    private bool CanPry(EntityUid target, EntityUid user, out string? message, PryingComponent? comp = null)
+    private bool CanPry(EntityUid target, EntityUid user, out string? message, PryingComponent? comp = null, PryUnpoweredComponent? unpoweredComp = null)
     {
         BeforePryEvent canev;
 
@@ -113,7 +113,7 @@ private bool CanPry(EntityUid target, EntityUid user, out string? message, Pryin
         }
         else
         {
-            if (!TryComp<PryUnpoweredComponent>(target, out _))
+            if (!Resolve(target, ref unpoweredComp))
             {
                 message = null;
                 return false;
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index fcdb432dce60..860db862aeef 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -108,6 +108,8 @@
     - type: DoorBolt
     - type: AccessReader
       access: [ [ "Engineering" ] ]
+    - type: PryUnpowered
+      pryModifier: 0.5
 
 - type: entity
   id: Firelock

From 456e6f07ec4c98a72a0900bde6aee4051ae7ee4f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 22 May 2024 11:17:27 +0000
Subject: [PATCH 016/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d20cf44cdb96..a8e3a5f155b4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: MACMAN2003
-  changes:
-  - message: Diagonal windows no longer space you when in a pressurized environment.
-    type: Fix
-  id: 6112
-  time: '2024-03-08T07:50:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25926
 - author: mryikes
   changes:
   - message: New Nuke Detonation Song "Clearly Nuclear".
@@ -3870,3 +3863,15 @@
   id: 6611
   time: '2024-05-22T07:52:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28200
+- author: nikthechampiongr
+  changes:
+  - message: Firelocks can now be pried by hand.
+    type: Tweak
+  - message: Firelocks will now not automatically close for 2 seconds after you pry
+      them open.
+    type: Tweak
+  - message: Firelocks are now properly predicted.
+    type: Fix
+  id: 6612
+  time: '2024-05-22T11:16:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26582

From 687bf8caaa1f3c75224f8cdb367a358d6e1ebfbe Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Wed, 22 May 2024 05:29:19 -0700
Subject: [PATCH 017/568] Revert "Make hotplate and grill anchorable on table"
 (#28202)

Revert "Make hotplate and grill anchorable on table (#28026)"

This reverts commit 26747be232c364abcb4e43fb934c85ef0e3e1264.
---
 .../Prototypes/Entities/Structures/Machines/hotplate.yml      | 4 +++-
 .../Prototypes/Entities/Structures/Machines/microwave.yml     | 1 -
 .../Entities/Structures/Machines/reagent_grinder.yml          | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
index 05cbb60ed305..3764f1359156 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
@@ -15,7 +15,9 @@
         mask:
         - TabletopMachineMask
         layer:
-        - TabletopMachineLayer
+        - Impassable
+        - MidImpassable
+        - LowImpassable
         hard: false
   - type: ApcPowerReceiver
     powerLoad: 300
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index d78960030d63..fe4eb1451832 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -58,7 +58,6 @@
         - TabletopMachineMask
         layer:
         - TabletopMachineLayer
-        hard: false
   - type: Sprite
     sprite: Structures/Machines/microwave.rsi
     drawdepth: SmallObjects
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 9894a2691fea..d6e733331330 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -32,7 +32,6 @@
         - TabletopMachineMask
         layer:
         - TabletopMachineLayer
-        hard: false
   - type: Sprite
     sprite: Structures/Machines/juicer.rsi
     drawdepth: SmallObjects

From 1fa493e1af0e3f31b53c40bda0d7cefe885af343 Mon Sep 17 00:00:00 2001
From: Julian Giebel <juliangiebel@live.de>
Date: Wed, 22 May 2024 16:23:55 +0200
Subject: [PATCH 018/568] Implement permissive version of AddMarkup and use it
 for tips (#28204)

* Implement permissive version of ddMarkup
Use permissive ddMarkup for news article input
Use permissive ddMarkup for tips

* Fix doc comment format
---
 .../MassMedia/Ui/ArticleEditorPanel.xaml.cs    |  2 +-
 Content.Client/Message/RichTextLabelExt.cs     | 18 ++++++++++++++++++
 Content.Client/Tips/TippyUIController.cs       |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
index 7f98e3e0c3db..5e068f1e9c53 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
@@ -76,7 +76,7 @@ private void OnPreview(BaseButton.ButtonEventArgs eventArgs)
 
         TextEditPanel.Visible = !_preview;
         PreviewPanel.Visible = _preview;
-        PreviewLabel.SetMarkup(Rope.Collapse(ContentField.TextRope));
+        PreviewLabel.SetMarkupPermissive(Rope.Collapse(ContentField.TextRope));
     }
 
     private void OnCancel(BaseButton.ButtonEventArgs eventArgs)
diff --git a/Content.Client/Message/RichTextLabelExt.cs b/Content.Client/Message/RichTextLabelExt.cs
index ab6d17bf44d5..7ff6390764b2 100644
--- a/Content.Client/Message/RichTextLabelExt.cs
+++ b/Content.Client/Message/RichTextLabelExt.cs
@@ -5,9 +5,27 @@ namespace Content.Client.Message;
 
 public static class RichTextLabelExt
 {
+
+
+     /// <summary>
+     /// Sets the labels markup.
+     /// </summary>
+     /// <remarks>
+     /// Invalid markup will cause exceptions to be thrown. Don't use this for user input!
+     /// </remarks>
     public static RichTextLabel SetMarkup(this RichTextLabel label, string markup)
     {
         label.SetMessage(FormattedMessage.FromMarkup(markup));
         return label;
     }
+
+     /// <summary>
+     /// Sets the labels markup.<br/>
+     /// Uses <c>FormatedMessage.FromMarkupPermissive</c> which treats invalid markup as text.
+     /// </summary>
+    public static RichTextLabel SetMarkupPermissive(this RichTextLabel label, string markup)
+    {
+        label.SetMessage(FormattedMessage.FromMarkupPermissive(markup));
+        return label;
+    }
 }
diff --git a/Content.Client/Tips/TippyUIController.cs b/Content.Client/Tips/TippyUIController.cs
index 67c3ee45a7ed..2cc694d97d46 100644
--- a/Content.Client/Tips/TippyUIController.cs
+++ b/Content.Client/Tips/TippyUIController.cs
@@ -175,7 +175,7 @@ private void NextState(TippyUI tippy)
                     sprite.LayerSetVisible("hiding", false);
                 }
                 sprite.Rotation = 0;
-                tippy.Label.SetMarkup(_currentMessage.Msg);
+                tippy.Label.SetMarkupPermissive(_currentMessage.Msg);
                 tippy.Label.Visible = false;
                 tippy.LabelPanel.Visible = false;
                 tippy.Visible = true;

From 79d4c0eee0861e8499134a34db0231a189206b0f Mon Sep 17 00:00:00 2001
From: Doctor-Cpu <77215380+Doctor-Cpu@users.noreply.github.com>
Date: Wed, 22 May 2024 17:59:33 +0100
Subject: [PATCH 019/568] misc atlas fixes (#28191)

misc fixes
---
 Resources/Maps/atlas.yml | 111 ++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 67 deletions(-)

diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index cfd5f3b5acde..cb7dc8e778bd 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -89,7 +89,7 @@ entities:
           version: 6
         0,1:
           ind: 0,1
-          tiles: AwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAPgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAPgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAA
+          tiles: AwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAPgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAPgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAA
           version: 6
         1,1:
           ind: 1,1
@@ -3360,6 +3360,13 @@ entities:
     - type: Transform
       pos: -44.5,-15.5
       parent: 30
+- proto: AirlockArmoryGlassLocked
+  entities:
+  - uid: 1448
+    components:
+    - type: Transform
+      pos: 9.5,14.5
+      parent: 30
 - proto: AirlockAtmosphericsGlassLocked
   entities:
   - uid: 241
@@ -3940,6 +3947,9 @@ entities:
     - type: Transform
       pos: 18.5,-6.5
       parent: 30
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
   - uid: 2282
     components:
     - type: Transform
@@ -4053,12 +4063,6 @@ entities:
       parent: 30
 - proto: AirlockHeadOfSecurityGlassLocked
   entities:
-  - uid: 1448
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,14.5
-      parent: 30
   - uid: 7378
     components:
     - type: Transform
@@ -4239,6 +4243,9 @@ entities:
     - type: Transform
       pos: -6.5,17.5
       parent: 30
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
 - proto: AirlockMedicalGlass
   entities:
   - uid: 2408
@@ -7082,7 +7089,7 @@ entities:
   - uid: 2074
     components:
     - type: Transform
-      pos: -10.5,8.5
+      pos: -7.5,8.5
       parent: 30
   - uid: 2075
     components:
@@ -23899,14 +23906,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -44.5,-16.5
       parent: 30
-- proto: EncryptionKeyCargo
-  entities:
-  - uid: 8041
-    components:
-    - type: Transform
-      parent: 8035
-    - type: Physics
-      canCollide: False
 - proto: EncryptionKeyCommand
   entities:
   - uid: 6716
@@ -23931,14 +23930,6 @@ entities:
       parent: 6972
     - type: Physics
       canCollide: False
-- proto: EncryptionKeyMedical
-  entities:
-  - uid: 7916
-    components:
-    - type: Transform
-      parent: 7915
-    - type: Physics
-      canCollide: False
 - proto: EncryptionKeyScience
   entities:
   - uid: 7393
@@ -38622,6 +38613,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -11.5,-9.5
       parent: 30
+- proto: HydroponicsToolClippers
+  entities:
+  - uid: 7916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.368904,17.565664
+      parent: 30
 - proto: HydroponicsToolHatchet
   entities:
   - uid: 1498
@@ -41743,14 +41742,6 @@ entities:
       parent: 30
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7438
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-11.5
-      parent: 30
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 7439
     components:
     - type: Transform
@@ -41773,6 +41764,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-15.5
       parent: 30
+  - uid: 8041
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-11.5
+      parent: 30
   - uid: 8112
     components:
     - type: Transform
@@ -46316,6 +46313,14 @@ entities:
     - type: Transform
       pos: 10.5,15.5
       parent: 30
+- proto: SpawnMobMonkeyPunpun
+  entities:
+  - uid: 8035
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,3.5
+      parent: 30
 - proto: SpawnMobMouse
   entities:
   - uid: 1570
@@ -48692,48 +48697,20 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-- proto: TelecomServerFilled
+- proto: TelecomServerFilledCargo
   entities:
-  - uid: 7915
+  - uid: 7438
     components:
     - type: Transform
-      pos: -47.5,6.5
+      pos: -48.5,6.5
       parent: 30
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7916
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-  - uid: 8035
+- proto: TelecomServerFilledMedical
+  entities:
+  - uid: 7915
     components:
     - type: Transform
-      pos: -48.5,6.5
+      pos: -47.5,6.5
       parent: 30
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 8041
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: ToiletDirtyWater
   entities:
   - uid: 7674

From c082773b5fa50741cd6d35dea95452a940feb36e Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 22 May 2024 18:59:49 +0200
Subject: [PATCH 020/568] Remove dupe closet janitor bombsuit (#28177)

* Remove dupe closet janitor bombsuit

* Update Resources/migration.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
---
 .../Prototypes/Catalog/Cargo/cargo_service.yml      |  2 +-
 .../Prototypes/Catalog/Fills/Crates/service.yml     | 13 -------------
 .../Prototypes/Catalog/Fills/Lockers/service.yml    |  2 +-
 Resources/migration.yml                             |  3 +++
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index ebcd9dfc5e6e..d2ca08e1166d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -173,7 +173,7 @@
   icon:
     sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi
     state: icon
-  product: CrateJanitorExplosive
+  product: ClosetJanitorBombFilled
   cost: 1000
   category: cargoproduct-category-name-service
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 35e66ac4d351..5b16b91f8b48 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -321,16 +321,3 @@
           prob: 0.1
         - id: ShardGlassPlasma
           prob: 0.1
-
-- type: entity
-  id: CrateJanitorExplosive
-  parent: ClosetJanitorBomb
-  name: janitorial bomb suit crate
-  description: Supplies a bomb suit for cleaning up any explosive compounds, buy one today!
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterSuitJanitorBomb
-        amount: 1
-      - id: ClothingHeadHelmetJanitorBombSuit
-        amount: 1
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index 945ae0dd7b8c..6d0577a16eb0 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -130,7 +130,7 @@
 - type: entity
   id: ClosetJanitorBombFilled
   parent: ClosetJanitorBomb
-  suffix: Filled
+  suffix: DO NOT MAP, Filled
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 28d63be99208..c19f1408707c 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -339,3 +339,6 @@ DrinkBottleGoldschlager: DrinkBottleGildlager
 # 2024-05-14
 soda_dispenser: SodaDispenser
 chem_master: ChemMaster
+
+# 2024-05-21
+CrateJanitorExplosive: ClosetJanitorBombFilled

From 0e0f50f3d1d76c0ba1283d5fa2a92678e3de0466 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Wed, 22 May 2024 21:16:14 -0700
Subject: [PATCH 021/568] Prioritize empty item slots when inserting (#28203)

* Prioritize empty item slots when inserting

* Revert "Prioritize empty item slots when inserting"

This reverts commit 4272a65cba5fc18df801812b0af20123aec08409.

* Prioritize empty item slots when inserting

* Try drop

* Check for any can insert before dropping
---
 .../Containers/ItemSlot/ItemSlotsSystem.cs    | 76 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index 914b34d3c125..2e3f9ed461a3 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -197,6 +197,7 @@ private void OnInteractUsing(EntityUid uid, ItemSlotsComponent itemSlots, Intera
             if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands))
                 return;
 
+            var slots = new List<ItemSlot>();
             foreach (var slot in itemSlots.Slots.Values)
             {
                 if (!slot.InsertOnInteract)
@@ -205,10 +206,20 @@ private void OnInteractUsing(EntityUid uid, ItemSlotsComponent itemSlots, Intera
                 if (!CanInsert(uid, args.Used, args.User, slot, swap: slot.Swap, popup: args.User))
                     continue;
 
-                // Drop the held item onto the floor. Return if the user cannot drop.
-                if (!_handsSystem.TryDrop(args.User, args.Used, handsComp: hands))
-                    return;
+                slots.Add(slot);
+            }
 
+            if (slots.Count == 0)
+                return;
+
+            // Drop the held item onto the floor. Return if the user cannot drop.
+            if (!_handsSystem.TryDrop(args.User, args.Used, handsComp: hands))
+                return;
+
+            slots.Sort(SortEmpty);
+
+            foreach (var slot in slots)
+            {
                 if (slot.Item != null)
                     _handsSystem.TryPickupAnyHand(args.User, slot.Item.Value, handsComp: hands);
 
@@ -333,6 +344,65 @@ public bool TryInsertFromHand(EntityUid uid, ItemSlot slot, EntityUid user, Hand
             Insert(uid, slot, held, user, excludeUserAudio: excludeUserAudio);
             return true;
         }
+
+        /// <summary>
+        ///     Tries to insert an item into any empty slot.
+        /// </summary>
+        /// <param name="ent">The entity that has the item slots.</param>
+        /// <param name="item">The item to be inserted.</param>
+        /// <param name="user">The entity performing the interaction.</param>
+        /// <param name="excludeUserAudio">
+        ///     If true, will exclude the user when playing sound. Does nothing client-side.
+        ///     Useful for predicted interactions
+        /// </param>
+        /// <returns>False if failed to insert item</returns>
+        public bool TryInsertEmpty(Entity<ItemSlotsComponent?> ent, EntityUid item, EntityUid? user, bool excludeUserAudio = false)
+        {
+            if (!Resolve(ent, ref ent.Comp, false))
+                return false;
+
+            var slots = new List<ItemSlot>();
+            foreach (var slot in ent.Comp.Slots.Values)
+            {
+                if (slot.ContainerSlot?.ContainedEntity != null)
+                    continue;
+
+                if (CanInsert(ent, item, user, slot))
+                    slots.Add(slot);
+            }
+
+            if (slots.Count == 0)
+                return false;
+
+            if (user != null && _handsSystem.IsHolding(user.Value, item))
+            {
+                if (!_handsSystem.TryDrop(user.Value, item))
+                    return false;
+            }
+
+            slots.Sort(SortEmpty);
+
+            foreach (var slot in slots)
+            {
+                if (TryInsert(ent, slot, item, user, excludeUserAudio: excludeUserAudio))
+                    return true;
+            }
+
+            return false;
+        }
+
+        private static int SortEmpty(ItemSlot a, ItemSlot b)
+        {
+            var aEnt = a.ContainerSlot?.ContainedEntity;
+            var bEnt = b.ContainerSlot?.ContainedEntity;
+            if (aEnt == null && bEnt == null)
+                return a.Priority.CompareTo(b.Priority);
+
+            if (aEnt == null)
+                return -1;
+
+            return 1;
+        }
         #endregion
 
         #region Eject

From 2ccd8e234d9acfb368c51fcf79485deb3d21ad4c Mon Sep 17 00:00:00 2001
From: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Date: Thu, 23 May 2024 16:27:45 -0400
Subject: [PATCH 022/568] Add Fruit Tag to watermelon slice (#28226)

---
 .../Prototypes/Entities/Objects/Consumable/Food/produce.yml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 1bd895829bde..888e4e4e3530 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1647,6 +1647,9 @@
       reagents:
       - ReagentId: JuiceWatermelon
         Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: grapes

From 5cb914e4a62270d07d2c2f87e1d4762d14bc722f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 23 May 2024 20:28:53 +0000
Subject: [PATCH 023/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a8e3a5f155b4..9ae89dad4a3f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: mryikes
-  changes:
-  - message: New Nuke Detonation Song "Clearly Nuclear".
-    type: Add
-  id: 6113
-  time: '2024-03-09T01:44:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25765
 - author: Plykiya
   changes:
   - message: Pre-filled syringes start in inject mode now.
@@ -3875,3 +3868,10 @@
   id: 6612
   time: '2024-05-22T11:16:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/26582
+- author: blueDev2
+  changes:
+  - message: Watermelon slices are now considered fruit
+    type: Fix
+  id: 6613
+  time: '2024-05-23T20:27:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28226

From 594a8982602ca9e7cfe10dd77745e55b953088fb Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Thu, 23 May 2024 18:23:55 -0700
Subject: [PATCH 024/568] Fix whatever the fuck is going on in storage system
 slightly (#28236)

* Fix whatever the fuck is going on in storage system slightly

* Fix inverted check

* h

* Add silent bool

* Silent
---
 .../BypassInteractionChecksComponent.cs       |  6 ++
 .../Inventory/InventorySystem.Slots.cs        |  2 +-
 Content.Shared/Lock/LockSystem.cs             |  9 +++
 .../EntitySystems/SharedStorageSystem.cs      | 62 ++++++++++---------
 Content.Shared/Storage/StorageComponent.cs    |  4 +-
 .../Entities/Mobs/Player/admin_ghost.yml      |  1 +
 6 files changed, 52 insertions(+), 32 deletions(-)
 create mode 100644 Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs

diff --git a/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs b/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs
new file mode 100644
index 000000000000..ca0ff963151a
--- /dev/null
+++ b/Content.Shared/Interaction/Components/BypassInteractionChecksComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Interaction.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BypassInteractionChecksComponent : Component;
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 19831278b0a5..228b788722ec 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -75,7 +75,7 @@ private void OnOpenSlotStorage(OpenSlotStorageNetworkMessage ev, EntitySessionEv
 
         if (TryGetSlotEntity(uid, ev.Slot, out var entityUid) && TryComp<StorageComponent>(entityUid, out var storageComponent))
         {
-            _storageSystem.OpenStorageUI(entityUid.Value, uid, storageComponent);
+            _storageSystem.OpenStorageUI(entityUid.Value, uid, storageComponent, false);
         }
     }
 
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 54f5d801ea0c..4115358d9d78 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
@@ -42,11 +43,13 @@ public override void Initialize()
         SubscribeLocalEvent<LockComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<LockComponent, LockDoAfter>(OnDoAfterLock);
         SubscribeLocalEvent<LockComponent, UnlockDoAfter>(OnDoAfterUnlock);
+        SubscribeLocalEvent<LockComponent, StorageInteractAttemptEvent>(OnStorageInteractAttempt);
 
         SubscribeLocalEvent<LockedWiresPanelComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
         SubscribeLocalEvent<LockedWiresPanelComponent, AttemptChangePanelEvent>(OnAttemptChangePanel);
         SubscribeLocalEvent<LockedAnchorableComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
     }
+
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
     {
         _appearanceSystem.SetData(uid, LockVisuals.Locked, lockComp.Locked);
@@ -293,6 +296,12 @@ private void OnDoAfterUnlock(EntityUid uid, LockComponent component, UnlockDoAft
         TryUnlock(uid, args.User, skipDoAfter: true);
     }
 
+    private void OnStorageInteractAttempt(Entity<LockComponent> ent, ref StorageInteractAttemptEvent args)
+    {
+        if (ent.Comp.Locked)
+            args.Cancelled = true;
+    }
+
     private void OnLockToggleAttempt(Entity<LockedWiresPanelComponent> ent, ref LockToggleAttemptEvent args)
     {
         if (args.Cancelled)
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 6dd7f9d41844..ea0c9632f0ec 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -2,17 +2,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Administration;
-using Content.Shared.Administration.Managers;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
-using Content.Shared.Ghost;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Implants.Components;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Item;
 using Content.Shared.Lock;
@@ -40,7 +38,6 @@ public abstract class SharedStorageSystem : EntitySystem
 {
     [Dependency] private   readonly IPrototypeManager _prototype = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
-    [Dependency] private readonly ISharedAdminManager _admin = default!;
     [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!;
     [Dependency] private   readonly EntityLookupSystem _entityLookupSystem = default!;
     [Dependency] private   readonly SharedAppearanceSystem _appearance = default!;
@@ -249,17 +246,8 @@ private void OnBoundUIClosed(EntityUid uid, StorageComponent storageComp, BoundU
 
     private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent<ActivationVerb> args)
     {
-        var silent = false;
-        if (!args.CanAccess || !args.CanInteract || TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
-        {
-            // we allow admins to open the storage anyways
-            if (!_admin.HasAdminFlag(args.User, AdminFlags.Admin))
-                return;
-
-            silent = true;
-        }
-
-        silent |= HasComp<GhostComponent>(args.User);
+        if (!CanInteract(args.User, (uid, component), args.CanAccess && args.CanInteract))
+            return;
 
         // Does this player currently have the storage UI open?
         var uiOpen = _ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.User);
@@ -274,7 +262,7 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent<
                 }
                 else
                 {
-                    OpenStorageUI(uid, args.User, component, silent);
+                    OpenStorageUI(uid, args.User, component);
                 }
             }
         };
@@ -298,13 +286,16 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent<
     ///     Opens the storage UI for an entity
     /// </summary>
     /// <param name="entity">The entity to open the UI for</param>
-    public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? storageComp = null, bool silent = false)
+    public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? storageComp = null, bool silent = true)
     {
         if (!Resolve(uid, ref storageComp, false))
             return;
 
         // prevent spamming bag open / honkerton honk sound
         silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay));
+        if (!CanInteract(entity, (uid, storageComp), silent: silent))
+            return;
+
         if (!silent)
         {
             if (!_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key))
@@ -326,7 +317,7 @@ private void AddTransferVerbs(EntityUid uid, StorageComponent component, GetVerb
 
         var entities = component.Container.ContainedEntities;
 
-        if (entities.Count == 0 || TryComp(uid, out LockComponent? lockComponent) && lockComponent.Locked)
+        if (entities.Count == 0 || !CanInteract(args.User, (uid, component)))
             return;
 
         // if the target is storage, add a verb to transfer storage.
@@ -337,7 +328,7 @@ private void AddTransferVerbs(EntityUid uid, StorageComponent component, GetVerb
             {
                 Text = Loc.GetString("storage-component-transfer-verb"),
                 IconEntity = GetNetEntity(args.Using),
-                Act = () => TransferEntities(uid, args.Target, args.User, component, lockComponent, targetStorage, targetLock)
+                Act = () => TransferEntities(uid, args.Target, args.User, component, null, targetStorage, targetLock)
             };
 
             args.Verbs.Add(verb);
@@ -350,7 +341,7 @@ private void AddTransferVerbs(EntityUid uid, StorageComponent component, GetVerb
     /// <returns>true if inserted, false otherwise</returns>
     private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, InteractUsingEvent args)
     {
-        if (args.Handled || !storageComp.ClickInsert || TryComp(uid, out LockComponent? lockComponent) && lockComponent.Locked)
+        if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert, false))
             return;
 
         if (HasComp<PlaceableSurfaceComponent>(uid))
@@ -368,7 +359,7 @@ private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, Intera
     /// </summary>
     private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInWorldEvent args)
     {
-        if (args.Handled || TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
+        if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
             return;
 
         // Toggle
@@ -378,7 +369,7 @@ private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInW
         }
         else
         {
-            OpenStorageUI(uid, args.User, storageComp);
+            OpenStorageUI(uid, args.User, storageComp, false);
         }
 
         args.Handled = true;
@@ -392,7 +383,7 @@ private void OnImplantActivate(EntityUid uid, StorageComponent storageComp, Open
         if (args.Handled)
             return;
 
-        OpenStorageUI(uid, args.Performer, storageComp);
+        OpenStorageUI(uid, args.Performer, storageComp, false);
         args.Handled = true;
     }
 
@@ -1403,7 +1394,7 @@ public ItemSizePrototype GetMaxItemSize(Entity<StorageComponent?> uid)
     }
 
     /// <summary>
-    /// Checks if a storage's UI is open by anyone when locked, and closes it unless they're an admin.
+    /// Checks if a storage's UI is open by anyone when locked, and closes it.
     /// </summary>
     private void OnLockToggled(EntityUid uid, StorageComponent component, ref LockToggledEvent args)
     {
@@ -1413,11 +1404,8 @@ private void OnLockToggled(EntityUid uid, StorageComponent component, ref LockTo
         // Gets everyone looking at the UI
         foreach (var actor in _ui.GetActors(uid, StorageComponent.StorageUiKey.Key).ToList())
         {
-            if (_admin.HasAdminFlag(actor, AdminFlags.Admin))
-                continue;
-
-            // And closes it unless they're an admin
-            _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, actor);
+            if (!CanInteract(actor, (uid, component)))
+                _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, actor);
         }
     }
 
@@ -1457,7 +1445,7 @@ private void HandleToggleSlotUI(ICommonSession? session, string slot)
 
         if (!_ui.IsUiOpen(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt))
         {
-            OpenStorageUI(storageEnt.Value, playerEnt);
+            OpenStorageUI(storageEnt.Value, playerEnt, silent: false);
         }
         else
         {
@@ -1472,6 +1460,20 @@ protected void ClearCantFillReasons()
 #endif
     }
 
+    private bool CanInteract(EntityUid user, Entity<StorageComponent> storage, bool canInteract = true, bool silent = true)
+    {
+        if (HasComp<BypassInteractionChecksComponent>(user))
+            return true;
+
+        if (!canInteract)
+            return false;
+
+        var ev = new StorageInteractAttemptEvent(silent);
+        RaiseLocalEvent(storage, ref ev);
+
+        return !ev.Cancelled;
+    }
+
     /// <summary>
     /// Plays a clientside pickup animation for the specified uid.
     /// </summary>
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index ef682dd4f94c..2860f8dacfe8 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -5,7 +5,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
@@ -228,6 +227,9 @@ public AnimateInsertingEntitiesEvent(NetEntity storage, List<NetEntity> storedEn
         }
     }
 
+    [ByRefEvent]
+    public record struct StorageInteractAttemptEvent(bool Silent, bool Cancelled = false);
+
     [NetSerializable]
     [Serializable]
     public enum StorageVisuals : byte
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 8171ec0053ca..b294729e07a4 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -90,6 +90,7 @@
   - type: InventorySlots
   - type: Loadout
     prototypes: [ MobAghostGear ]
+  - type: BypassInteractionChecks
 
 - type: entity
   id: ActionAGhostShowSolar

From 8a95cb186c922eee64c4c389c5ff247090861210 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 23 May 2024 22:43:04 -0400
Subject: [PATCH 025/568] Remove AlertType and AlertCategory (#27933)

---
 Content.Client/Alerts/ClientAlertsSystem.cs   |   2 +-
 Content.Client/Revenant/RevenantSystem.cs     |   3 +-
 .../Systems/Alerts/AlertsUIController.cs      |   3 +-
 .../Systems/Alerts/Widgets/AlertsUI.xaml.cs   |  13 +-
 .../Components/Mobs/AlertsComponentTests.cs   |  15 +-
 .../Tests/Gravity/WeightlessStatusTests.cs    |   8 +-
 .../Abilities/Mime/MimePowersComponent.cs     |   8 +
 .../Abilities/Mime/MimePowersSystem.cs        |  11 +-
 Content.Server/Alert/Commands/ClearAlert.cs   |   4 +-
 Content.Server/Alert/Commands/ShowAlert.cs    |   4 +-
 .../Atmos/Components/BarotraumaComponent.cs   |  10 +
 .../Atmos/Components/FlammableComponent.cs    |   5 +
 .../Atmos/EntitySystems/BarotraumaSystem.cs   |  10 +-
 .../Atmos/EntitySystems/FlammableSystem.cs    |   4 +-
 .../Body/Components/BloodstreamComponent.cs   |   4 +
 .../Body/Components/InternalsComponent.cs     |   6 +
 .../Body/Components/LungComponent.cs          |   4 +-
 .../Body/Systems/BloodstreamSystem.cs         |   4 +-
 .../Body/Systems/InternalsSystem.cs           |  14 +-
 .../Chemistry/ReagentEffects/AdjustAlert.cs   |   8 +-
 Content.Server/Clothing/MagbootsSystem.cs     |   4 +-
 .../Ensnaring/EnsnareableSystem.Ensnaring.cs  |   4 +-
 .../Ninja/Systems/SpaceNinjaSystem.cs         |  11 +-
 .../Revenant/EntitySystems/RevenantSystem.cs  |   2 +-
 .../Shuttles/Systems/ShuttleConsoleSystem.cs  |   4 +-
 Content.Server/Silicons/Borgs/BorgSystem.cs   |  18 +-
 .../Components/TemperatureComponent.cs        |   8 +
 .../Temperature/Systems/TemperatureSystem.cs  |  14 +-
 Content.Shared/Alert/AlertCategory.cs         |  20 --
 .../Alert/AlertCategoryPrototype.cs           |  14 ++
 Content.Shared/Alert/AlertKey.cs              |  12 +-
 Content.Shared/Alert/AlertOrderPrototype.cs   |  35 +--
 Content.Shared/Alert/AlertPrototype.cs        | 206 +++++++++---------
 Content.Shared/Alert/AlertState.cs            |   3 +-
 Content.Shared/Alert/AlertType.cs             |  59 -----
 Content.Shared/Alert/AlertsSystem.cs          |  26 +--
 Content.Shared/Alert/ClickAlertEvent.cs       |   7 +-
 .../Buckle/Components/StrapComponent.cs       |   3 +-
 .../Buckle/SharedBuckleSystem.Buckle.cs       |   5 +-
 Content.Shared/Clothing/MagbootsComponent.cs  |   4 +
 .../Pacification/PacificationSystem.cs        |   5 +-
 .../Pacification/PacifiedComponent.cs         |   4 +
 .../Cuffs/Components/CuffableComponent.cs     |   5 +
 Content.Shared/Cuffs/SharedCuffableSystem.cs  |   4 +-
 .../Damage/Components/StaminaComponent.cs     |   5 +
 .../Damage/Systems/StaminaSystem.cs           |   8 +-
 .../Components/EnsnareableComponent.cs        |   5 +
 Content.Shared/Gravity/SharedGravitySystem.cs |  15 +-
 .../Mobs/Components/MobThresholdsComponent.cs |  28 ++-
 .../Mobs/Systems/MobThresholdSystem.cs        |   2 +-
 .../Pulling/Components/PullableComponent.cs   |   5 +
 .../Pulling/Components/PullerComponent.cs     |   7 +-
 .../Movement/Pulling/Systems/PullingSystem.cs |   8 +-
 .../Ninja/Components/SpaceNinjaComponent.cs   |   4 +
 .../Nutrition/Components/HungerComponent.cs   |  14 +-
 .../Nutrition/Components/ThirstComponent.cs   |  12 +-
 .../Nutrition/EntitySystems/HungerSystem.cs   |   4 +-
 .../Nutrition/EntitySystems/ThirstSystem.cs   |   2 +-
 .../Revenant/Components/RevenantComponent.cs  |   4 +
 .../Shuttles/Components/PilotComponent.cs     |   5 +
 .../Borgs/Components/BorgChassisComponent.cs  |  10 +-
 .../StatusEffect/StatusEffectPrototype.cs     |   2 +-
 .../StatusEffect/StatusEffectsSystem.cs       |   2 +-
 .../Weapons/Reflect/ReflectSystem.cs          |   7 +-
 .../Shared/Alert/AlertManagerTests.cs         |  17 +-
 .../Shared/Alert/AlertOrderPrototypeTests.cs  |  26 +--
 .../Shared/Alert/AlertPrototypeTests.cs       |   6 +-
 .../Alert/ServerAlertsComponentTests.cs       |  17 +-
 Resources/Prototypes/Alerts/categories.yml    |  35 +++
 69 files changed, 482 insertions(+), 385 deletions(-)
 delete mode 100644 Content.Shared/Alert/AlertCategory.cs
 create mode 100644 Content.Shared/Alert/AlertCategoryPrototype.cs
 delete mode 100644 Content.Shared/Alert/AlertType.cs
 create mode 100644 Resources/Prototypes/Alerts/categories.yml

diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 223bf7876ac0..359c8957f9d7 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -91,7 +91,7 @@ private void OnPlayerDetached(EntityUid uid, AlertsComponent component, LocalPla
         ClearAlerts?.Invoke(this, EventArgs.Empty);
     }
 
-    public void AlertClicked(AlertType alertType)
+    public void AlertClicked(ProtoId<AlertPrototype> alertType)
     {
         RaiseNetworkEvent(new ClickAlertEvent(alertType));
     }
diff --git a/Content.Client/Revenant/RevenantSystem.cs b/Content.Client/Revenant/RevenantSystem.cs
index 49d29d8a5f4c..e050fe35aa2c 100644
--- a/Content.Client/Revenant/RevenantSystem.cs
+++ b/Content.Client/Revenant/RevenantSystem.cs
@@ -1,5 +1,4 @@
 using Content.Client.Alerts;
-using Content.Shared.Alert;
 using Content.Shared.Revenant;
 using Content.Shared.Revenant.Components;
 using Robust.Client.GameObjects;
@@ -42,7 +41,7 @@ private void OnAppearanceChange(EntityUid uid, RevenantComponent component, ref
 
     private void OnUpdateAlert(Entity<RevenantComponent> ent, ref UpdateAlertSpriteEvent args)
     {
-        if (args.Alert.AlertType != AlertType.Essence)
+        if (args.Alert.ID != ent.Comp.EssenceAlert)
             return;
 
         var sprite = args.SpriteViewEnt.Comp;
diff --git a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
index 3b85972a9b24..5c1951203892 100644
--- a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs
@@ -7,6 +7,7 @@
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.UserInterface.Systems.Alerts;
 
@@ -43,7 +44,7 @@ private void OnScreenLoad()
         SyncAlerts();
     }
 
-    private void OnAlertPressed(object? sender, AlertType e)
+    private void OnAlertPressed(object? sender, ProtoId<AlertPrototype> e)
     {
         _alertsSystem?.AlertClicked(e);
     }
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
index a1a494c47b33..d6a79a81c461 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -4,6 +4,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Input;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.UserInterface.Systems.Alerts.Widgets;
 
@@ -21,8 +22,10 @@ public AlertsUI()
         RobustXamlLoader.Load(this);
     }
 
-    public void SyncControls(AlertsSystem alertsSystem, AlertOrderPrototype? alertOrderPrototype,
-        IReadOnlyDictionary<AlertKey, AlertState> alertStates)
+    public void SyncControls(AlertsSystem alertsSystem,
+        AlertOrderPrototype? alertOrderPrototype,
+        IReadOnlyDictionary<AlertKey,
+        AlertState> alertStates)
     {
         // remove any controls with keys no longer present
         if (SyncRemoveControls(alertStates))
@@ -46,7 +49,7 @@ public void ClearAllControls()
         _alertControls.Clear();
     }
 
-    public event EventHandler<AlertType>? AlertPressed;
+    public event EventHandler<ProtoId<AlertPrototype>>? AlertPressed;
 
     private bool SyncRemoveControls(IReadOnlyDictionary<AlertKey, AlertState> alertStates)
     {
@@ -88,7 +91,7 @@ private void SyncUpdateControls(AlertsSystem alertsSystem, AlertOrderPrototype?
             }
 
             if (_alertControls.TryGetValue(newAlert.AlertKey, out var existingAlertControl) &&
-                existingAlertControl.Alert.AlertType == newAlert.AlertType)
+                existingAlertControl.Alert.ID == newAlert.ID)
             {
                 // key is the same, simply update the existing control severity / cooldown
                 existingAlertControl.SetSeverity(alertState.Severity);
@@ -155,6 +158,6 @@ private void AlertControlPressed(BaseButton.ButtonEventArgs args)
         if (args.Event.Function != EngineKeyFunctions.UIClick)
             return;
 
-        AlertPressed?.Invoke(this, control.Alert.AlertType);
+        AlertPressed?.Invoke(this, control.Alert.ID);
     }
 }
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
index 1da77ac55892..ef4e6326cda5 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -5,7 +5,6 @@
 using Robust.Client.UserInterface;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
 {
@@ -45,8 +44,8 @@ await server.WaitAssertion(() =>
                 Assert.That(alerts, Is.Not.Null);
                 var alertCount = alerts.Count;
 
-                alertsSystem.ShowAlert(playerUid, AlertType.Debug1);
-                alertsSystem.ShowAlert(playerUid, AlertType.Debug2);
+                alertsSystem.ShowAlert(playerUid, "Debug1");
+                alertsSystem.ShowAlert(playerUid, "Debug2");
 
                 Assert.That(alerts, Has.Count.EqualTo(alertCount + 2));
             });
@@ -87,14 +86,14 @@ static AlertsUI FindAlertsUI(Control control)
                 // we should be seeing 3 alerts - our health, and the 2 debug alerts, in a specific order.
                 Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3));
                 var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
-                var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
-                var expectedIDs = new[] { AlertType.HumanHealth, AlertType.Debug1, AlertType.Debug2 };
+                var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray();
+                var expectedIDs = new[] { "HumanHealth", "Debug1", "Debug2" };
                 Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
             });
 
             await server.WaitAssertion(() =>
             {
-                alertsSystem.ClearAlert(playerUid, AlertType.Debug1);
+                alertsSystem.ClearAlert(playerUid, "Debug1");
             });
 
             await pair.RunTicksSync(5);
@@ -104,8 +103,8 @@ await client.WaitAssertion(() =>
                 // we should be seeing 2 alerts now because one was cleared
                 Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2));
                 var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
-                var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
-                var expectedIDs = new[] { AlertType.HumanHealth, AlertType.Debug2 };
+                var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray();
+                var expectedIDs = new[] { "HumanHealth", "Debug2" };
                 Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
             });
 
diff --git a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
index 0ad198d6ef2e..74641126aee8 100644
--- a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
+++ b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
@@ -1,5 +1,6 @@
 using Content.Server.Gravity;
 using Content.Shared.Alert;
+using Content.Shared.Gravity;
 using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.Gravity
@@ -38,6 +39,7 @@ public async Task WeightlessStatusTest()
 
             var entityManager = server.ResolveDependency<IEntityManager>();
             var alertsSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<AlertsSystem>();
+            var weightlessAlert = SharedGravitySystem.WeightlessAlert;
 
             EntityUid human = default;
 
@@ -56,7 +58,7 @@ await server.WaitAssertion(() =>
             await server.WaitAssertion(() =>
             {
                 // No gravity without a gravity generator
-                Assert.That(alertsSystem.IsShowingAlert(human, AlertType.Weightless));
+                Assert.That(alertsSystem.IsShowingAlert(human, weightlessAlert));
 
                 generatorUid = entityManager.SpawnEntity("WeightlessGravityGeneratorDummy", entityManager.GetComponent<TransformComponent>(human).Coordinates);
             });
@@ -66,7 +68,7 @@ await server.WaitAssertion(() =>
 
             await server.WaitAssertion(() =>
             {
-                Assert.That(alertsSystem.IsShowingAlert(human, AlertType.Weightless), Is.False);
+                Assert.That(alertsSystem.IsShowingAlert(human, weightlessAlert), Is.False);
 
                 // This should kill gravity
                 entityManager.DeleteEntity(generatorUid);
@@ -76,7 +78,7 @@ await server.WaitAssertion(() =>
 
             await server.WaitAssertion(() =>
             {
-                Assert.That(alertsSystem.IsShowingAlert(human, AlertType.Weightless));
+                Assert.That(alertsSystem.IsShowingAlert(human, weightlessAlert));
             });
 
             await pair.RunTicksSync(10);
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
index fd4fc2c2af9c..d56644ed1914 100644
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ b/Content.Server/Abilities/Mime/MimePowersComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Alert;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -47,5 +48,12 @@ public sealed partial class MimePowersComponent : Component
         /// </summary>
         [DataField("vowCooldown")]
         public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
+
+        [DataField]
+        public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
+
+        [DataField]
+        public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
+
     }
 }
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index 629fe993448e..f3bf6e703f52 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Popups;
-using Content.Server.Speech.Muting;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Events;
 using Content.Shared.Alert;
@@ -54,7 +53,7 @@ public override void Update(float frameTime)
         private void OnComponentInit(EntityUid uid, MimePowersComponent component, ComponentInit args)
         {
             EnsureComp<MutedComponent>(uid);
-            _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence);
+            _alertsSystem.ShowAlert(uid, component.VowAlert);
             _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
         }
 
@@ -115,8 +114,8 @@ public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
             mimePowers.VowBroken = true;
             mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
             RemComp<MutedComponent>(uid);
-            _alertsSystem.ClearAlert(uid, AlertType.VowOfSilence);
-            _alertsSystem.ShowAlert(uid, AlertType.VowBroken);
+            _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
+            _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
             _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
         }
 
@@ -138,8 +137,8 @@ public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
             mimePowers.ReadyToRepent = false;
             mimePowers.VowBroken = false;
             AddComp<MutedComponent>(uid);
-            _alertsSystem.ClearAlert(uid, AlertType.VowBroken);
-            _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence);
+            _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
+            _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
             _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
         }
     }
diff --git a/Content.Server/Alert/Commands/ClearAlert.cs b/Content.Server/Alert/Commands/ClearAlert.cs
index 73a6ca52c70f..2e317de75472 100644
--- a/Content.Server/Alert/Commands/ClearAlert.cs
+++ b/Content.Server/Alert/Commands/ClearAlert.cs
@@ -40,13 +40,13 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
 
             var alertType = args[0];
             var alertsSystem = _e.System<AlertsSystem>();
-            if (!alertsSystem.TryGet(Enum.Parse<AlertType>(alertType), out var alert))
+            if (!alertsSystem.TryGet(alertType, out var alert))
             {
                 shell.WriteLine("unrecognized alertType " + alertType);
                 return;
             }
 
-            alertsSystem.ClearAlert(attachedEntity, alert.AlertType);
+            alertsSystem.ClearAlert(attachedEntity, alert.ID);
         }
     }
 }
diff --git a/Content.Server/Alert/Commands/ShowAlert.cs b/Content.Server/Alert/Commands/ShowAlert.cs
index f37ab23f2fa3..cae24ff33604 100644
--- a/Content.Server/Alert/Commands/ShowAlert.cs
+++ b/Content.Server/Alert/Commands/ShowAlert.cs
@@ -41,7 +41,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             var alertType = args[0];
             var severity = args[1];
             var alertsSystem = _e.System<AlertsSystem>();
-            if (!alertsSystem.TryGet(Enum.Parse<AlertType>(alertType), out var alert))
+            if (!alertsSystem.TryGet(alertType, out var alert))
             {
                 shell.WriteLine("unrecognized alertType " + alertType);
                 return;
@@ -53,7 +53,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             short? severity1 = sevint == -1 ? null : sevint;
-            alertsSystem.ShowAlert(attachedEntity, alert.AlertType, severity1, null);
+            alertsSystem.ShowAlert(attachedEntity, alert.ID, severity1, null);
         }
     }
 }
diff --git a/Content.Server/Atmos/Components/BarotraumaComponent.cs b/Content.Server/Atmos/Components/BarotraumaComponent.cs
index 4e29699872e7..d261c5ab0308 100644
--- a/Content.Server/Atmos/Components/BarotraumaComponent.cs
+++ b/Content.Server/Atmos/Components/BarotraumaComponent.cs
@@ -1,5 +1,7 @@
+using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Atmos.Components
 {
@@ -46,5 +48,13 @@ public sealed partial class BarotraumaComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         public bool HasImmunity = false;
 
+        [DataField]
+        public ProtoId<AlertPrototype> HighPressureAlert = "HighPressure";
+
+        [DataField]
+        public ProtoId<AlertPrototype> LowPressureAlert = "LowPressure";
+
+        [DataField]
+        public ProtoId<AlertCategoryPrototype> PressureAlertCategory = "Pressure";
     }
 }
diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs
index e00f5efbdc5c..9ae99a15136e 100644
--- a/Content.Server/Atmos/Components/FlammableComponent.cs
+++ b/Content.Server/Atmos/Components/FlammableComponent.cs
@@ -1,5 +1,7 @@
+using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Atmos.Components
 {
@@ -77,5 +79,8 @@ public sealed partial class FlammableComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float FirestackFade = -0.1f;
+
+        [DataField]
+        public ProtoId<AlertPrototype> FireAlert = "Fire";
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index 98a5ffa70a86..ec508790ba87 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -245,7 +245,7 @@ public override void Update(float frameTime)
                         _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} started taking low pressure damage");
                     }
 
-                    _alertsSystem.ShowAlert(uid, AlertType.LowPressure, 2);
+                    _alertsSystem.ShowAlert(uid, barotrauma.LowPressureAlert, 2);
                 }
                 else if (pressure >= Atmospherics.HazardHighPressure)
                 {
@@ -260,7 +260,7 @@ public override void Update(float frameTime)
                         _adminLogger.Add(LogType.Barotrauma, $"{ToPrettyString(uid):entity} started taking high pressure damage");
                     }
 
-                    _alertsSystem.ShowAlert(uid, AlertType.HighPressure, 2);
+                    _alertsSystem.ShowAlert(uid, barotrauma.HighPressureAlert, 2);
                 }
                 else
                 {
@@ -275,13 +275,13 @@ public override void Update(float frameTime)
                     switch (pressure)
                     {
                         case <= Atmospherics.WarningLowPressure:
-                            _alertsSystem.ShowAlert(uid, AlertType.LowPressure, 1);
+                            _alertsSystem.ShowAlert(uid, barotrauma.LowPressureAlert, 1);
                             break;
                         case >= Atmospherics.WarningHighPressure:
-                            _alertsSystem.ShowAlert(uid, AlertType.HighPressure, 1);
+                            _alertsSystem.ShowAlert(uid, barotrauma.HighPressureAlert, 1);
                             break;
                         default:
-                            _alertsSystem.ClearAlertCategory(uid, AlertCategory.Pressure);
+                            _alertsSystem.ClearAlertCategory(uid, barotrauma.PressureAlertCategory);
                             break;
                     }
                 }
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 4a8cbbdc884d..e8721920dd8c 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -415,11 +415,11 @@ public override void Update(float frameTime)
 
                 if (!flammable.OnFire)
                 {
-                    _alertsSystem.ClearAlert(uid, AlertType.Fire);
+                    _alertsSystem.ClearAlert(uid, flammable.FireAlert);
                     continue;
                 }
 
-                _alertsSystem.ShowAlert(uid, AlertType.Fire);
+                _alertsSystem.ShowAlert(uid, flammable.FireAlert);
 
                 if (flammable.FireStacks > 0)
                 {
diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
index 1d8aa9ffd3d4..a6d2afab2191 100644
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -1,5 +1,6 @@
 using Content.Server.Body.Systems;
 using Content.Server.Chemistry.EntitySystems;
+using Content.Shared.Alert;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
@@ -171,5 +172,8 @@ public sealed partial class BloodstreamComponent : Component
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         public TimeSpan StatusTime;
+
+        [DataField]
+        public ProtoId<AlertPrototype> BleedingAlert = "Bleed";
     }
 }
diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs
index 18caab8dcf04..098f1789218f 100644
--- a/Content.Server/Body/Components/InternalsComponent.cs
+++ b/Content.Server/Body/Components/InternalsComponent.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+
 namespace Content.Server.Body.Components
 {
     /// <summary>
@@ -18,5 +21,8 @@ public sealed partial class InternalsComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public TimeSpan Delay = TimeSpan.FromSeconds(3);
+
+        [DataField]
+        public ProtoId<AlertPrototype> InternalsAlert = "Internals";
     }
 }
diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs
index 46600b302073..72af4d9e63a9 100644
--- a/Content.Server/Body/Components/LungComponent.cs
+++ b/Content.Server/Body/Components/LungComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.Atmos;
 using Content.Server.Body.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Chemistry.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Body.Components;
 
@@ -33,5 +33,5 @@ public sealed partial class LungComponent : Component
     /// The type of gas this lung needs. Used only for the breathing alerts, not actual metabolism.
     /// </summary>
     [DataField]
-    public AlertType Alert = AlertType.LowOxygen;
+    public ProtoId<AlertPrototype> Alert = "LowOxygen";
 }
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index ddeb154e790a..f961307fc6a0 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -392,11 +392,11 @@ public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamCompone
         component.BleedAmount = Math.Clamp(component.BleedAmount, 0, component.MaxBleedAmount);
 
         if (component.BleedAmount == 0)
-            _alertsSystem.ClearAlert(uid, AlertType.Bleed);
+            _alertsSystem.ClearAlert(uid, component.BleedingAlert);
         else
         {
             var severity = (short) Math.Clamp(Math.Round(component.BleedAmount, MidpointRounding.ToZero), 0, 10);
-            _alertsSystem.ShowAlert(uid, AlertType.Bleed, severity);
+            _alertsSystem.ShowAlert(uid, component.BleedingAlert, severity);
         }
 
         return true;
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 8afd1c767f66..c1e1de2baad8 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -144,12 +144,12 @@ private void OnDoAfter(Entity<InternalsComponent> ent, ref InternalsDoAfterEvent
 
     private void OnInternalsStartup(Entity<InternalsComponent> ent, ref ComponentStartup args)
     {
-        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
+        _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
     }
 
     private void OnInternalsShutdown(Entity<InternalsComponent> ent, ref ComponentShutdown args)
     {
-        _alerts.ClearAlert(ent, AlertType.Internals);
+        _alerts.ClearAlert(ent, ent.Comp.InternalsAlert);
     }
 
     private void OnInhaleLocation(Entity<InternalsComponent> ent, ref InhaleLocationEvent args)
@@ -159,7 +159,7 @@ private void OnInhaleLocation(Entity<InternalsComponent> ent, ref InhaleLocation
             var gasTank = Comp<GasTankComponent>(ent.Comp.GasTankEntity!.Value);
             args.Gas = _gasTank.RemoveAirVolume((ent.Comp.GasTankEntity.Value, gasTank), Atmospherics.BreathVolume);
             // TODO: Should listen to gas tank updates instead I guess?
-            _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
+            _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
         }
     }
     public void DisconnectBreathTool(Entity<InternalsComponent> ent)
@@ -173,7 +173,7 @@ public void DisconnectBreathTool(Entity<InternalsComponent> ent)
             DisconnectTank(ent);
         }
 
-        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
+        _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
     }
 
     public void ConnectBreathTool(Entity<InternalsComponent> ent, EntityUid toolEntity)
@@ -184,7 +184,7 @@ public void ConnectBreathTool(Entity<InternalsComponent> ent, EntityUid toolEnti
         }
 
         ent.Comp.BreathToolEntity = toolEntity;
-        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
+        _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
     }
 
     public void DisconnectTank(InternalsComponent? component)
@@ -196,7 +196,7 @@ public void DisconnectTank(InternalsComponent? component)
             _gasTank.DisconnectFromInternals((component.GasTankEntity.Value, tank));
 
         component.GasTankEntity = null;
-        _alerts.ShowAlert(component.Owner, AlertType.Internals, GetSeverity(component));
+        _alerts.ShowAlert(component.Owner, component.InternalsAlert, GetSeverity(component));
     }
 
     public bool TryConnectTank(Entity<InternalsComponent> ent, EntityUid tankEntity)
@@ -208,7 +208,7 @@ public bool TryConnectTank(Entity<InternalsComponent> ent, EntityUid tankEntity)
             _gasTank.DisconnectFromInternals((ent.Comp.GasTankEntity.Value, tank));
 
         ent.Comp.GasTankEntity = tankEntity;
-        _alerts.ShowAlert(ent, AlertType.Internals, GetSeverity(ent));
+        _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
         return true;
     }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs b/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
index 8d475570ad01..40858176bd15 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
+++ b/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
@@ -10,8 +10,8 @@ public sealed partial class AdjustAlert : ReagentEffect
     /// <summary>
     /// The specific Alert that will be adjusted
     /// </summary>
-    [DataField("alertType", required: true)]
-    public AlertType Type;
+    [DataField(required: true)]
+    public ProtoId<AlertPrototype> AlertType;
 
     /// <summary>
     /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
@@ -42,7 +42,7 @@ public override void Effect(ReagentEffectArgs args)
 
         if (Clear && Time <= 0)
         {
-                alertSys.ClearAlert(args.SolutionEntity, Type);
+                alertSys.ClearAlert(args.SolutionEntity, 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, Type, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+            alertSys.ShowAlert(args.SolutionEntity, AlertType, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
         }
 
     }
diff --git a/Content.Server/Clothing/MagbootsSystem.cs b/Content.Server/Clothing/MagbootsSystem.cs
index f12558389e3b..3838ad168d1b 100644
--- a/Content.Server/Clothing/MagbootsSystem.cs
+++ b/Content.Server/Clothing/MagbootsSystem.cs
@@ -29,11 +29,11 @@ protected override void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bo
 
         if (state)
         {
-            _alerts.ShowAlert(parent, AlertType.Magboots);
+            _alerts.ShowAlert(parent, component.MagbootsAlert);
         }
         else
         {
-            _alerts.ClearAlert(parent, AlertType.Magboots);
+            _alerts.ClearAlert(parent, component.MagbootsAlert);
         }
     }
 
diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
index 105a8f9720de..51d3242ce4f2 100644
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -163,8 +163,8 @@ public void ForceFree(EntityUid ensnare, EnsnaringComponent component)
     public void UpdateAlert(EntityUid target, EnsnareableComponent component)
     {
         if (!component.IsEnsnared)
-            _alerts.ClearAlert(target, AlertType.Ensnared);
+            _alerts.ClearAlert(target, component.EnsnaredAlert);
         else
-            _alerts.ShowAlert(target, AlertType.Ensnared);
+            _alerts.ShowAlert(target, component.EnsnaredAlert);
     }
 }
diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
index 1dfaf4f3393b..0c1e88653fa4 100644
--- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
+++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
@@ -102,20 +102,23 @@ private int Download(EntityUid uid, List<string> ids)
     /// </summary>
     public void SetSuitPowerAlert(EntityUid uid, SpaceNinjaComponent? comp = null)
     {
-        if (!Resolve(uid, ref comp, false) || comp.Deleted || comp.Suit == null)
+        if (!Resolve(uid, ref comp, false))
+            return;
+
+        if (comp.Deleted || comp.Suit == null)
         {
-            _alerts.ClearAlert(uid, AlertType.SuitPower);
+            _alerts.ClearAlert(uid, comp.SuitPowerAlert);
             return;
         }
 
         if (GetNinjaBattery(uid, out _, out var battery))
         {
             var severity = ContentHelpers.RoundToLevels(MathF.Max(0f, battery.CurrentCharge), battery.MaxCharge, 8);
-            _alerts.ShowAlert(uid, AlertType.SuitPower, (short) severity);
+            _alerts.ShowAlert(uid, comp.SuitPowerAlert, (short) severity);
         }
         else
         {
-            _alerts.ClearAlert(uid, AlertType.SuitPower);
+            _alerts.ClearAlert(uid, comp.SuitPowerAlert);
         }
     }
 
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 86be70c41fea..c390432f3a1b 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -141,7 +141,7 @@ public bool ChangeEssenceAmount(EntityUid uid, FixedPoint2 amount, RevenantCompo
         if (TryComp<StoreComponent>(uid, out var store))
             _store.UpdateUserInterface(uid, uid, store);
 
-        _alerts.ShowAlert(uid, AlertType.Essence);
+        _alerts.ShowAlert(uid, component.EssenceAlert);
 
         if (component.Essence <= 0)
         {
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 2b5769881d27..7a19fd13b2e9 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -317,7 +317,7 @@ public void AddPilot(EntityUid uid, EntityUid entity, ShuttleConsoleComponent co
 
         component.SubscribedPilots.Add(entity);
 
-        _alertsSystem.ShowAlert(entity, AlertType.PilotingShuttle);
+        _alertsSystem.ShowAlert(entity, pilotComponent.PilotingAlert);
 
         pilotComponent.Console = uid;
         ActionBlockerSystem.UpdateCanMove(entity);
@@ -339,7 +339,7 @@ public void RemovePilot(EntityUid pilotUid, PilotComponent pilotComponent)
         if (!helm.SubscribedPilots.Remove(pilotUid))
             return;
 
-        _alertsSystem.ClearAlert(pilotUid, AlertType.PilotingShuttle);
+        _alertsSystem.ClearAlert(pilotUid, pilotComponent.PilotingAlert);
 
         _popup.PopupEntity(Loc.GetString("shuttle-pilot-end"), pilotUid, pilotUid);
 
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index ceab044d4c1c..97adfd00eb4c 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -84,7 +84,7 @@ public override void Initialize()
 
     private void OnMapInit(EntityUid uid, BorgChassisComponent component, MapInitEvent args)
     {
-        UpdateBatteryAlert(uid);
+        UpdateBatteryAlert((uid, component));
         _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
     }
 
@@ -183,7 +183,7 @@ private void OnMobStateChanged(EntityUid uid, BorgChassisComponent component, Mo
 
     private void OnPowerCellChanged(EntityUid uid, BorgChassisComponent component, PowerCellChangedEvent args)
     {
-        UpdateBatteryAlert(uid);
+        UpdateBatteryAlert((uid, component));
 
         if (!TryComp<PowerCellDrawComponent>(uid, out var draw))
             return;
@@ -256,12 +256,12 @@ private void OnBrainPointAttempt(EntityUid uid, BorgBrainComponent component, Po
         args.Cancel();
     }
 
-    private void UpdateBatteryAlert(EntityUid uid, PowerCellSlotComponent? slotComponent = null)
+    private void UpdateBatteryAlert(Entity<BorgChassisComponent> ent, PowerCellSlotComponent? slotComponent = null)
     {
-        if (!_powerCell.TryGetBatteryFromSlot(uid, out var battery, slotComponent))
+        if (!_powerCell.TryGetBatteryFromSlot(ent, out var battery, slotComponent))
         {
-            _alerts.ClearAlert(uid, AlertType.BorgBattery);
-            _alerts.ShowAlert(uid, AlertType.BorgBatteryNone);
+            _alerts.ClearAlert(ent, ent.Comp.BatteryAlert);
+            _alerts.ShowAlert(ent, ent.Comp.NoBatteryAlert);
             return;
         }
 
@@ -269,13 +269,13 @@ private void UpdateBatteryAlert(EntityUid uid, PowerCellSlotComponent? slotCompo
 
         // we make sure 0 only shows if they have absolutely no battery.
         // also account for floating point imprecision
-        if (chargePercent == 0 && _powerCell.HasDrawCharge(uid, cell: slotComponent))
+        if (chargePercent == 0 && _powerCell.HasDrawCharge(ent, cell: slotComponent))
         {
             chargePercent = 1;
         }
 
-        _alerts.ClearAlert(uid, AlertType.BorgBatteryNone);
-        _alerts.ShowAlert(uid, AlertType.BorgBattery, chargePercent);
+        _alerts.ClearAlert(ent, ent.Comp.NoBatteryAlert);
+        _alerts.ShowAlert(ent, ent.Comp.BatteryAlert, chargePercent);
     }
 
     /// <summary>
diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs
index ec00a570f964..3bfa12f26938 100644
--- a/Content.Server/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureComponent.cs
@@ -1,7 +1,9 @@
 using Content.Server.Temperature.Systems;
+using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Temperature.Components;
 
@@ -78,4 +80,10 @@ public float HeatCapacity
     /// </summary>
     [DataField]
     public bool TakingDamage = false;
+
+    [DataField]
+    public ProtoId<AlertPrototype> HotAlert = "Hot";
+
+    [DataField]
+    public ProtoId<AlertPrototype> ColdAlert = "Cold";
 }
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 6c9e99e5f3b9..23c8cb6783f1 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Temperature.Systems;
 
@@ -33,6 +34,9 @@ public sealed class TemperatureSystem : EntitySystem
 
     private float _accumulatedFrametime;
 
+    [ValidatePrototypeId<AlertCategoryPrototype>]
+    public const string TemperatureAlertCategory = "Temperature";
+
     public override void Initialize()
     {
         SubscribeLocalEvent<TemperatureComponent, OnTemperatureChangeEvent>(EnqueueDamage);
@@ -180,13 +184,13 @@ private void OnRejuvenate(EntityUid uid, TemperatureComponent comp, RejuvenateEv
 
     private void ServerAlert(EntityUid uid, AlertsComponent status, OnTemperatureChangeEvent args)
     {
-        AlertType type;
+        ProtoId<AlertPrototype> type;
         float threshold;
         float idealTemp;
 
         if (!TryComp<TemperatureComponent>(uid, out var temperature))
         {
-            _alerts.ClearAlertCategory(uid, AlertCategory.Temperature);
+            _alerts.ClearAlertCategory(uid, TemperatureAlertCategory);
             return;
         }
 
@@ -203,12 +207,12 @@ private void ServerAlert(EntityUid uid, AlertsComponent status, OnTemperatureCha
 
         if (args.CurrentTemperature <= idealTemp)
         {
-            type = AlertType.Cold;
+            type = temperature.ColdAlert;
             threshold = temperature.ColdDamageThreshold;
         }
         else
         {
-            type = AlertType.Hot;
+            type = temperature.HotAlert;
             threshold = temperature.HeatDamageThreshold;
         }
 
@@ -230,7 +234,7 @@ private void ServerAlert(EntityUid uid, AlertsComponent status, OnTemperatureCha
                 break;
 
             case > 0.66f:
-                _alerts.ClearAlertCategory(uid, AlertCategory.Temperature);
+                _alerts.ClearAlertCategory(uid, TemperatureAlertCategory);
                 break;
         }
     }
diff --git a/Content.Shared/Alert/AlertCategory.cs b/Content.Shared/Alert/AlertCategory.cs
deleted file mode 100644
index 7450f585a4e0..000000000000
--- a/Content.Shared/Alert/AlertCategory.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Content.Shared.Alert;
-
-/// <summary>
-/// Every category of alert. Corresponds to category field in alert prototypes defined in YML
-/// </summary>
-public enum AlertCategory
-{
-    Pressure,
-    Temperature,
-    Breathing,
-    Buckled,
-    Health,
-    Internals,
-    Stamina,
-    Piloting,
-    Hunger,
-    Thirst,
-    Toxins,
-    Battery
-}
diff --git a/Content.Shared/Alert/AlertCategoryPrototype.cs b/Content.Shared/Alert/AlertCategoryPrototype.cs
new file mode 100644
index 000000000000..7c7d04752149
--- /dev/null
+++ b/Content.Shared/Alert/AlertCategoryPrototype.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Alert;
+
+/// <summary>
+/// This is a prototype for a category for marking alerts as mutually exclusive.
+/// </summary>
+[Prototype]
+public sealed partial class AlertCategoryPrototype : IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; } = default!;
+}
diff --git a/Content.Shared/Alert/AlertKey.cs b/Content.Shared/Alert/AlertKey.cs
index c784af4cd48a..c5c3a7643eca 100644
--- a/Content.Shared/Alert/AlertKey.cs
+++ b/Content.Shared/Alert/AlertKey.cs
@@ -1,5 +1,5 @@
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Alert;
 
@@ -11,13 +11,13 @@ namespace Content.Shared.Alert;
 [Serializable, NetSerializable]
 public struct AlertKey
 {
-    public AlertType? AlertType { get; private set; } = Alert.AlertType.Error;
-    public readonly AlertCategory? AlertCategory;
+    public ProtoId<AlertPrototype>? AlertType { get; private set; } = default!;
+    public readonly ProtoId<AlertCategoryPrototype>? AlertCategory;
 
     /// NOTE: if the alert has a category you must pass the category for this to work
     /// properly as a key. I.e. if the alert has a category and you pass only the alert type, and you
     /// compare this to another AlertKey that has both the category and the same alert type, it will not consider them equal.
-    public AlertKey(AlertType? alertType, AlertCategory? alertCategory)
+    public AlertKey(ProtoId<AlertPrototype>? alertType, ProtoId<AlertCategoryPrototype>? alertCategory)
     {
         AlertCategory = alertCategory;
         AlertType = alertType;
@@ -49,7 +49,7 @@ public override int GetHashCode()
     /// <param name="category">alert category, must not be null</param>
     /// <returns>An alert key for the provided alert category. This must only be used for
     /// queries and never storage, as it is lacking an alert type.</returns>
-    public static AlertKey ForCategory(AlertCategory category)
+    public static AlertKey ForCategory(ProtoId<AlertCategoryPrototype> category)
     {
         return new(null, category);
     }
diff --git a/Content.Shared/Alert/AlertOrderPrototype.cs b/Content.Shared/Alert/AlertOrderPrototype.cs
index 8279d592b4bc..af4241a27e71 100644
--- a/Content.Shared/Alert/AlertOrderPrototype.cs
+++ b/Content.Shared/Alert/AlertOrderPrototype.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Alert
     /// <summary>
     /// Defines the order of alerts so they show up in a consistent order.
     /// </summary>
-    [Prototype("alertOrder")]
+    [Prototype]
     [DataDefinition]
     public sealed partial class AlertOrderPrototype : IPrototype, IComparer<AlertPrototype>
     {
@@ -15,7 +15,7 @@ public sealed partial class AlertOrderPrototype : IPrototype, IComparer<AlertPro
         [IdDataField]
         public string ID { get; private set; } = default!;
 
-        [DataField("order")]
+        [DataField]
         private (string type, string alert)[] Order
         {
             // why would paul do this to me.
@@ -46,10 +46,10 @@ public sealed partial class AlertOrderPrototype : IPrototype, IComparer<AlertPro
                     switch (type)
                     {
                         case "alertType":
-                            _typeToIdx[Enum.Parse<AlertType>(alert)] = i++;
+                            _typeToIdx[alert] = i++;
                             break;
                         case "category":
-                            _categoryToIdx[Enum.Parse<AlertCategory>(alert)] = i++;
+                            _categoryToIdx[alert] = i++;
                             break;
                         default:
                             throw new ArgumentException();
@@ -58,17 +58,17 @@ public sealed partial class AlertOrderPrototype : IPrototype, IComparer<AlertPro
             }
         }
 
-        private readonly Dictionary<AlertType, int> _typeToIdx = new();
-        private readonly Dictionary<AlertCategory, int> _categoryToIdx = new();
+        private readonly Dictionary<ProtoId<AlertPrototype>, int> _typeToIdx = new();
+        private readonly Dictionary<ProtoId<AlertCategoryPrototype>, int> _categoryToIdx = new();
 
         private int GetOrderIndex(AlertPrototype alert)
         {
-            if (_typeToIdx.TryGetValue(alert.AlertType, out var idx))
+            if (_typeToIdx.TryGetValue(alert.ID, out var idx))
             {
                 return idx;
             }
             if (alert.Category != null &&
-                _categoryToIdx.TryGetValue((AlertCategory) alert.Category, out idx))
+                _categoryToIdx.TryGetValue(alert.Category.Value, out idx))
             {
                 return idx;
             }
@@ -78,20 +78,25 @@ private int GetOrderIndex(AlertPrototype alert)
 
         public int Compare(AlertPrototype? x, AlertPrototype? y)
         {
-            if ((x == null) && (y == null)) return 0;
-            if (x == null) return 1;
-            if (y == null) return -1;
+            if (x == null && y == null)
+                return 0;
+            if (x == null)
+                return 1;
+            if (y == null)
+                return -1;
             var idx = GetOrderIndex(x);
             var idy = GetOrderIndex(y);
             if (idx == -1 && idy == -1)
             {
                 // break ties by type value
                 // Must cast to int to avoid integer overflow when subtracting (enum's unsigned)
-                return (int)x.AlertType - (int)y.AlertType;
+                return string.Compare(x.ID, y.ID, StringComparison.InvariantCulture);
             }
 
-            if (idx == -1) return 1;
-            if (idy == -1) return -1;
+            if (idx == -1)
+                return 1;
+            if (idy == -1)
+                return -1;
             var result = idx - idy;
             // not strictly necessary (we don't care about ones that go at the same index)
             // but it makes the sort stable
@@ -99,7 +104,7 @@ public int Compare(AlertPrototype? x, AlertPrototype? y)
             {
                 // break ties by type value
                 // Must cast to int to avoid integer overflow when subtracting (enum's unsigned)
-                return (int)x.AlertType - (int)y.AlertType;
+                return string.Compare(x.ID, y.ID, StringComparison.InvariantCulture);
             }
 
             return result;
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index 248cc00ba401..f53da27c0dea 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -1,120 +1,116 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Alert
+namespace Content.Shared.Alert;
+
+/// <summary>
+/// An alert popup with associated icon, tooltip, and other data.
+/// </summary>
+[Prototype]
+public sealed partial class AlertPrototype : IPrototype
 {
     /// <summary>
-    /// An alert popup with associated icon, tooltip, and other data.
+    /// Type of alert, no 2 alert prototypes should have the same one.
     /// </summary>
-    [Prototype("alert")]
-    public sealed partial class AlertPrototype : IPrototype
-    {
-        [ViewVariables]
-        string IPrototype.ID => AlertType.ToString();
-
-        /// <summary>
-        /// Type of alert, no 2 alert prototypes should have the same one.
-        /// </summary>
-        [IdDataField]
-        public AlertType AlertType { get; private set; }
-
-        /// <summary>
-        /// List of icons to use for this alert. Each entry corresponds to a different severity level, starting from the
-        /// minimum and incrementing upwards. If severities are not supported, the first entry is used.
-        /// </summary>
-        [DataField("icons", required: true)]
-        public List<SpriteSpecifier> Icons = new();
-
-        /// <summary>
-        /// An entity used for displaying the <see cref="Icons"/> in the UI control.
-        /// </summary>
-        [DataField]
-        public EntProtoId AlertViewEntity = "AlertSpriteView";
-
-        /// <summary>
-        /// Name to show in tooltip window. Accepts formatting.
-        /// </summary>
-        [DataField("name")]
-        public string Name { get; private set; } = "";
-
-        /// <summary>
-        /// Description to show in tooltip window. Accepts formatting.
-        /// </summary>
-        [DataField("description")]
-        public string Description { get; private set; } = "";
-
-        /// <summary>
-        /// Category the alert belongs to. Only one alert of a given category
-        /// can be shown at a time. If one is shown while another is already being shown,
-        /// it will be replaced. This can be useful for categories of alerts which should naturally
-        /// replace each other and are mutually exclusive, for example lowpressure / highpressure,
-        /// hot / cold. If left unspecified, the alert will not replace or be replaced by any other alerts.
-        /// </summary>
-        [DataField("category")]
-        public AlertCategory? Category { get; private set; }
-
-        /// <summary>
-        /// Key which is unique w.r.t category semantics (alerts with same category have equal keys,
-        /// alerts with no category have different keys).
-        /// </summary>
-        public AlertKey AlertKey => new(AlertType, Category);
-
-        /// <summary>
-        /// -1 (no effect) unless MaxSeverity is specified. Defaults to 1. Minimum severity level supported by this state.
-        /// </summary>
-        public short MinSeverity => MaxSeverity == -1 ? (short) -1 : _minSeverity;
-
-        [DataField("minSeverity")] private short _minSeverity = 1;
-
-        /// <summary>
-        /// Maximum severity level supported by this state. -1 (default) indicates
-        /// no severity levels are supported by the state.
-        /// </summary>
-        [DataField("maxSeverity")]
-        public short MaxSeverity = -1;
-
-        /// <summary>
-        /// Indicates whether this state support severity levels
-        /// </summary>
-        public bool SupportsSeverity => MaxSeverity != -1;
-
-        /// <summary>
-        /// Defines what to do when the alert is clicked.
-        /// This will always be null on clientside.
-        /// </summary>
-        [DataField("onClick", serverOnly: true)]
-        public IAlertClick? OnClick { get; private set; }
-
-        /// <param name="severity">severity level, if supported by this alert</param>
-        /// <returns>the icon path to the texture for the provided severity level</returns>
-        public SpriteSpecifier GetIcon(short? severity = null)
-        {
-            var minIcons = SupportsSeverity
-                ? MaxSeverity - MinSeverity
-                : 1;
+    [IdDataField]
+    public string ID { get; private set; } = default!;
 
-            if (Icons.Count < minIcons)
-                throw new InvalidOperationException($"Insufficient number of icons given for alert {AlertType}");
+    /// <summary>
+    /// List of icons to use for this alert. Each entry corresponds to a different severity level, starting from the
+    /// minimum and incrementing upwards. If severities are not supported, the first entry is used.
+    /// </summary>
+    [DataField(required: true)]
+    public List<SpriteSpecifier> Icons = new();
 
-            if (!SupportsSeverity)
-                return Icons[0];
+    /// <summary>
+    /// An entity used for displaying the <see cref="Icons"/> in the UI control.
+    /// </summary>
+    [DataField]
+    public EntProtoId AlertViewEntity = "AlertSpriteView";
 
-            if (severity == null)
-            {
-                throw new ArgumentException($"No severity specified but this alert ({AlertKey}) has severity.", nameof(severity));
-            }
+    /// <summary>
+    /// Name to show in tooltip window. Accepts formatting.
+    /// </summary>
+    [DataField]
+    public string Name { get; private set; } = string.Empty;
 
-            if (severity < MinSeverity)
-            {
-                throw new ArgumentOutOfRangeException(nameof(severity), $"Severity below minimum severity in {AlertKey}.");
-            }
+    /// <summary>
+    /// Description to show in tooltip window. Accepts formatting.
+    /// </summary>
+    [DataField]
+    public string Description { get; private set; } = string.Empty;
 
-            if (severity > MaxSeverity)
-            {
-                throw new ArgumentOutOfRangeException(nameof(severity), $"Severity above maximum severity in {AlertKey}.");
-            }
+    /// <summary>
+    /// Category the alert belongs to. Only one alert of a given category
+    /// can be shown at a time. If one is shown while another is already being shown,
+    /// it will be replaced. This can be useful for categories of alerts which should naturally
+    /// replace each other and are mutually exclusive, for example lowpressure / highpressure,
+    /// hot / cold. If left unspecified, the alert will not replace or be replaced by any other alerts.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertCategoryPrototype>? Category { get; private set; }
+
+    /// <summary>
+    /// Key which is unique w.r.t category semantics (alerts with same category have equal keys,
+    /// alerts with no category have different keys).
+    /// </summary>
+    public AlertKey AlertKey => new(ID, Category);
 
-            return Icons[severity.Value - _minSeverity];
+    /// <summary>
+    /// -1 (no effect) unless MaxSeverity is specified. Defaults to 1. Minimum severity level supported by this state.
+    /// </summary>
+    public short MinSeverity => MaxSeverity == -1 ? (short) -1 : _minSeverity;
+
+    [DataField("minSeverity")] private short _minSeverity = 1;
+
+    /// <summary>
+    /// Maximum severity level supported by this state. -1 (default) indicates
+    /// no severity levels are supported by the state.
+    /// </summary>
+    [DataField]
+    public short MaxSeverity = -1;
+
+    /// <summary>
+    /// Indicates whether this state support severity levels
+    /// </summary>
+    public bool SupportsSeverity => MaxSeverity != -1;
+
+    /// <summary>
+    /// Defines what to do when the alert is clicked.
+    /// This will always be null on clientside.
+    /// </summary>
+    [DataField(serverOnly: true)]
+    public IAlertClick? OnClick { get; private set; }
+
+    /// <param name="severity">severity level, if supported by this alert</param>
+    /// <returns>the icon path to the texture for the provided severity level</returns>
+    public SpriteSpecifier GetIcon(short? severity = null)
+    {
+        var minIcons = SupportsSeverity
+            ? MaxSeverity - MinSeverity
+            : 1;
+
+        if (Icons.Count < minIcons)
+            throw new InvalidOperationException($"Insufficient number of icons given for alert {ID}");
+
+        if (!SupportsSeverity)
+            return Icons[0];
+
+        if (severity == null)
+        {
+            throw new ArgumentException($"No severity specified but this alert ({AlertKey}) has severity.", nameof(severity));
+        }
+
+        if (severity < MinSeverity)
+        {
+            throw new ArgumentOutOfRangeException(nameof(severity), $"Severity below minimum severity in {AlertKey}.");
         }
+
+        if (severity > MaxSeverity)
+        {
+            throw new ArgumentOutOfRangeException(nameof(severity), $"Severity above maximum severity in {AlertKey}.");
+        }
+
+        return Icons[severity.Value - _minSeverity];
     }
 }
diff --git a/Content.Shared/Alert/AlertState.cs b/Content.Shared/Alert/AlertState.cs
index effd9522036a..d6309f6b4265 100644
--- a/Content.Shared/Alert/AlertState.cs
+++ b/Content.Shared/Alert/AlertState.cs
@@ -1,3 +1,4 @@
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Alert;
@@ -9,5 +10,5 @@ public struct AlertState
     public (TimeSpan, TimeSpan)? Cooldown;
     public bool AutoRemove;
     public bool ShowCooldown;
-    public AlertType Type;
+    public ProtoId<AlertPrototype> Type;
 }
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
deleted file mode 100644
index b989b8d4b6f5..000000000000
--- a/Content.Shared/Alert/AlertType.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace Content.Shared.Alert
-{
-    /// <summary>
-    /// Every kind of alert. Corresponds to alertType field in alert prototypes defined in YML
-    /// NOTE: Using byte for a compact encoding when sending this in messages, can upgrade
-    /// to ushort
-    /// </summary>
-    public enum AlertType : byte
-    {
-        Error,
-        LowOxygen,
-        LowNitrogen,
-        LowPressure,
-        HighPressure,
-        Fire,
-        Cold,
-        Hot,
-        Weightless,
-        Stun,
-        Handcuffed,
-        Ensnared,
-        Buckled,
-        HumanCrit,
-        HumanDead,
-        HumanHealth,
-        BorgBattery,
-        BorgBatteryNone,
-        PilotingShuttle,
-        Peckish,
-        Starving,
-        Thirsty,
-        Parched,
-        Stamina,
-        Pulled,
-        Pulling,
-        Magboots,
-        Internals,
-        Toxins,
-        Muted,
-        VowOfSilence,
-        VowBroken,
-        Essence,
-        Corporeal,
-        Bleed,
-        Pacified,
-        Debug1,
-        Debug2,
-        Debug3,
-        Debug4,
-        Debug5,
-        Debug6,
-        SuitPower,
-        BorgHealth,
-        BorgCrit,
-        BorgDead,
-        Deflecting
-    }
-
-}
diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs
index 5b888e30c4c7..83c6fcd0dd74 100644
--- a/Content.Shared/Alert/AlertsSystem.cs
+++ b/Content.Shared/Alert/AlertsSystem.cs
@@ -11,7 +11,7 @@ public abstract class AlertsSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private FrozenDictionary<AlertType, AlertPrototype> _typeToAlert = default!;
+    private FrozenDictionary<ProtoId<AlertPrototype>, AlertPrototype> _typeToAlert = default!;
 
     public IReadOnlyDictionary<AlertKey, AlertState>? GetActiveAlerts(EntityUid euid)
     {
@@ -20,23 +20,23 @@ public abstract class AlertsSystem : EntitySystem
             : null;
     }
 
-    public short GetSeverityRange(AlertType alertType)
+    public short GetSeverityRange(ProtoId<AlertPrototype> alertType)
     {
         var minSeverity = _typeToAlert[alertType].MinSeverity;
         return (short)MathF.Max(minSeverity,_typeToAlert[alertType].MaxSeverity - minSeverity);
     }
 
-    public short GetMaxSeverity(AlertType alertType)
+    public short GetMaxSeverity(ProtoId<AlertPrototype> alertType)
     {
         return _typeToAlert[alertType].MaxSeverity;
     }
 
-    public short GetMinSeverity(AlertType alertType)
+    public short GetMinSeverity(ProtoId<AlertPrototype> alertType)
     {
         return _typeToAlert[alertType].MinSeverity;
     }
 
-    public bool IsShowingAlert(EntityUid euid, AlertType alertType)
+    public bool IsShowingAlert(EntityUid euid, ProtoId<AlertPrototype> alertType)
     {
         if (!EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent))
             return false;
@@ -51,7 +51,7 @@ public bool IsShowingAlert(EntityUid euid, AlertType alertType)
     }
 
     /// <returns>true iff an alert of the indicated alert category is currently showing</returns>
-    public bool IsShowingAlertCategory(EntityUid euid, AlertCategory alertCategory)
+    public bool IsShowingAlertCategory(EntityUid euid, ProtoId<AlertCategoryPrototype> alertCategory)
     {
         return EntityManager.TryGetComponent(euid, out AlertsComponent? alertsComponent)
                && alertsComponent.Alerts.ContainsKey(AlertKey.ForCategory(alertCategory));
@@ -78,7 +78,7 @@ public bool TryGetAlertState(EntityUid euid, AlertKey key, out AlertState alertS
     ///     be erased if there is currently a cooldown for the alert)</param>
     /// <param name="autoRemove">if true, the alert will be removed at the end of the cooldown</param>
     /// <param name="showCooldown">if true, the cooldown will be visibly shown over the alert icon</param>
-    public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = null, (TimeSpan, TimeSpan)? cooldown = null, bool autoRemove = false, bool showCooldown = true )
+    public void ShowAlert(EntityUid euid, ProtoId<AlertPrototype> alertType, short? severity = null, (TimeSpan, TimeSpan)? cooldown = null, bool autoRemove = false, bool showCooldown = true )
     {
         // This should be handled as part of networking.
         if (_timing.ApplyingState)
@@ -131,7 +131,7 @@ public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = nul
     /// <summary>
     /// Clear the alert with the given category, if one is currently showing.
     /// </summary>
-    public void ClearAlertCategory(EntityUid euid, AlertCategory category)
+    public void ClearAlertCategory(EntityUid euid, ProtoId<AlertCategoryPrototype> category)
     {
         if(!TryComp(euid, out AlertsComponent? alertsComponent))
             return;
@@ -150,7 +150,7 @@ public void ClearAlertCategory(EntityUid euid, AlertCategory category)
     /// <summary>
     /// Clear the alert of the given type if it is currently showing.
     /// </summary>
-    public void ClearAlert(EntityUid euid, AlertType alertType)
+    public void ClearAlert(EntityUid euid, ProtoId<AlertPrototype> alertType)
     {
         if (_timing.ApplyingState)
             return;
@@ -286,13 +286,13 @@ private void HandlePrototypesReloaded(PrototypesReloadedEventArgs obj)
 
     protected virtual void LoadPrototypes()
     {
-        var dict = new Dictionary<AlertType, AlertPrototype>();
+        var dict = new Dictionary<ProtoId<AlertPrototype>, AlertPrototype>();
         foreach (var alert in _prototypeManager.EnumeratePrototypes<AlertPrototype>())
         {
-            if (!dict.TryAdd(alert.AlertType, alert))
+            if (!dict.TryAdd(alert.ID, alert))
             {
                 Log.Error("Found alert with duplicate alertType {0} - all alerts must have" +
-                          " a unique alertType, this one will be skipped", alert.AlertType);
+                          " a unique alertType, this one will be skipped", alert.ID);
             }
         }
 
@@ -303,7 +303,7 @@ protected virtual void LoadPrototypes()
     /// Tries to get the alert of the indicated type
     /// </summary>
     /// <returns>true if found</returns>
-    public bool TryGet(AlertType alertType, [NotNullWhen(true)] out AlertPrototype? alert)
+    public bool TryGet(ProtoId<AlertPrototype> alertType, [NotNullWhen(true)] out AlertPrototype? alert)
     {
         return _typeToAlert.TryGetValue(alertType, out alert);
     }
diff --git a/Content.Shared/Alert/ClickAlertEvent.cs b/Content.Shared/Alert/ClickAlertEvent.cs
index fe7ca97e4c27..43dd086b5628 100644
--- a/Content.Shared/Alert/ClickAlertEvent.cs
+++ b/Content.Shared/Alert/ClickAlertEvent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Alert;
 
@@ -8,9 +9,9 @@ namespace Content.Shared.Alert;
 [Serializable, NetSerializable]
 public sealed class ClickAlertEvent : EntityEventArgs
 {
-    public readonly AlertType Type;
+    public readonly ProtoId<AlertPrototype> Type;
 
-    public ClickAlertEvent(AlertType alertType)
+    public ClickAlertEvent(ProtoId<AlertPrototype> alertType)
     {
         Type = alertType;
     }
diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs
index 72c92ebf84b9..9a19cea0c9a7 100644
--- a/Content.Shared/Buckle/Components/StrapComponent.cs
+++ b/Content.Shared/Buckle/Components/StrapComponent.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Buckle.Components;
@@ -115,7 +116,7 @@ public sealed partial class StrapComponent : Component
     /// </summary>
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
-    public AlertType BuckledAlertType = AlertType.Buckled;
+    public ProtoId<AlertPrototype> BuckledAlertType = "Buckled";
 
     /// <summary>
     /// The sum of the sizes of all the buckled entities in this strap
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 0d67473ffee9..4e94c6134b4a 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -40,6 +40,9 @@ private void InitializeBuckle()
         SubscribeLocalEvent<BuckleComponent, UpdateCanMoveEvent>(OnBuckleUpdateCanMove);
     }
 
+    [ValidatePrototypeId<AlertCategoryPrototype>]
+    public const string BuckledAlertCategory = "Buckled";
+
     private void OnBuckleComponentStartup(EntityUid uid, BuckleComponent component, ComponentStartup args)
     {
         UpdateBuckleStatus(uid, component);
@@ -165,7 +168,7 @@ private void UpdateBuckleStatus(EntityUid uid, BuckleComponent buckleComp, Strap
         }
         else
         {
-            _alerts.ClearAlertCategory(uid, AlertCategory.Buckled);
+            _alerts.ClearAlertCategory(uid, BuckledAlertCategory);
         }
     }
 
diff --git a/Content.Shared/Clothing/MagbootsComponent.cs b/Content.Shared/Clothing/MagbootsComponent.cs
index 0d0d59f89f5f..0d074ff38b69 100644
--- a/Content.Shared/Clothing/MagbootsComponent.cs
+++ b/Content.Shared/Clothing/MagbootsComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Alert;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -16,4 +17,7 @@ public sealed partial class MagbootsComponent : Component
 
     [DataField("on"), AutoNetworkedField]
     public bool On;
+
+    [DataField]
+    public ProtoId<AlertPrototype> MagbootsAlert = "Magboots";
 }
diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
index 6d94c087af6a..a927e1a69702 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -7,7 +7,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using Content.Shared.Weapons.Ranged.Events;
-using Content.Shared.Weapons.Ranged.Systems;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.CombatMode.Pacification;
@@ -109,7 +108,7 @@ private void OnStartup(EntityUid uid, PacifiedComponent component, ComponentStar
             _actionsSystem.SetEnabled(combatMode.CombatToggleActionEntity, false);
         }
 
-        _alertsSystem.ShowAlert(uid, AlertType.Pacified);
+        _alertsSystem.ShowAlert(uid, component.PacifiedAlert);
     }
 
     private void OnShutdown(EntityUid uid, PacifiedComponent component, ComponentShutdown args)
@@ -121,7 +120,7 @@ private void OnShutdown(EntityUid uid, PacifiedComponent component, ComponentShu
             _combatSystem.SetCanDisarm(uid, true, combatMode);
 
         _actionsSystem.SetEnabled(combatMode.CombatToggleActionEntity, true);
-        _alertsSystem.ClearAlert(uid, AlertType.Pacified);
+        _alertsSystem.ClearAlert(uid, component.PacifiedAlert);
     }
 
     private void OnBeforeThrow(Entity<PacifiedComponent> ent, ref BeforeThrowEvent args)
diff --git a/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs b/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
index 464ef778851c..96081e5dc67e 100644
--- a/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
+++ b/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
@@ -1,4 +1,6 @@
+using Content.Shared.Alert;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.CombatMode.Pacification;
 
@@ -42,4 +44,6 @@ public sealed partial class PacifiedComponent : Component
     [DataField]
     public EntityUid? LastAttackedEntity = null;
 
+    [DataField]
+    public ProtoId<AlertPrototype> PacifiedAlert = "Pacified";
 }
diff --git a/Content.Shared/Cuffs/Components/CuffableComponent.cs b/Content.Shared/Cuffs/Components/CuffableComponent.cs
index 5da6fa41a5fd..4ddfe1b53ee1 100644
--- a/Content.Shared/Cuffs/Components/CuffableComponent.cs
+++ b/Content.Shared/Cuffs/Components/CuffableComponent.cs
@@ -1,6 +1,8 @@
+using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
@@ -39,6 +41,9 @@ public sealed partial class CuffableComponent : Component
     /// </summary>
     [DataField("canStillInteract"), ViewVariables(VVAccess.ReadWrite)]
     public bool CanStillInteract = true;
+
+    [DataField]
+    public ProtoId<AlertPrototype> CuffedAlert = "Handcuffed";
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 0077f5a358ef..f0f9a949839a 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -172,9 +172,9 @@ public void UpdateCuffState(EntityUid uid, CuffableComponent component)
             _actionBlocker.UpdateCanMove(uid);
 
             if (component.CanStillInteract)
-                _alerts.ClearAlert(uid, AlertType.Handcuffed);
+                _alerts.ClearAlert(uid, component.CuffedAlert);
             else
-                _alerts.ShowAlert(uid, AlertType.Handcuffed);
+                _alerts.ShowAlert(uid, component.CuffedAlert);
 
             var ev = new CuffedStateChangeEvent();
             RaiseLocalEvent(uid, ref ev);
diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index 5a2fba497016..14c3f6d9f538 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -1,4 +1,6 @@
+using Content.Shared.Alert;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Damage.Components;
@@ -51,4 +53,7 @@ public sealed partial class StaminaComponent : Component
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
     [AutoPausedField]
     public TimeSpan NextUpdate = TimeSpan.Zero;
+
+    [DataField]
+    public ProtoId<AlertPrototype> StaminaAlert = "Stamina";
 }
diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index 840b2e043118..1f9a7f1dd841 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -79,8 +79,7 @@ private void OnShutdown(EntityUid uid, StaminaComponent component, ComponentShut
         {
             RemCompDeferred<ActiveStaminaComponent>(uid);
         }
-
-        SetStaminaAlert(uid);
+        _alerts.ClearAlert(uid, component.StaminaAlert);
     }
 
     private void OnStartup(EntityUid uid, StaminaComponent component, ComponentStartup args)
@@ -204,13 +203,10 @@ private void OnCollide(EntityUid uid, StaminaDamageOnCollideComponent component,
     private void SetStaminaAlert(EntityUid uid, StaminaComponent? component = null)
     {
         if (!Resolve(uid, ref component, false) || component.Deleted)
-        {
-            _alerts.ClearAlert(uid, AlertType.Stamina);
             return;
-        }
 
         var severity = ContentHelpers.RoundToLevels(MathF.Max(0f, component.CritThreshold - component.StaminaDamage), component.CritThreshold, 7);
-        _alerts.ShowAlert(uid, AlertType.Stamina, (short) severity);
+        _alerts.ShowAlert(uid, component.StaminaAlert, (short) severity);
     }
 
     /// <summary>
diff --git a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
index 553f6df1c77d..2536fac4edcc 100644
--- a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
+++ b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs
@@ -1,5 +1,7 @@
+using Content.Shared.Alert;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Ensnaring.Components;
@@ -40,6 +42,9 @@ public sealed partial class EnsnareableComponent : Component
 
     [DataField("state")]
     public string? State;
+
+    [DataField]
+    public ProtoId<AlertPrototype> EnsnaredAlert = "Ensnared";
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index 100d2ee74fb8..df13be51fd4e 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.cs
@@ -17,6 +17,9 @@ public abstract partial class SharedGravitySystem : EntitySystem
         [Dependency] private readonly AlertsSystem _alerts = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
 
+        [ValidatePrototypeId<AlertPrototype>]
+        public const string WeightlessAlert = "Weightless";
+
         public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, TransformComponent? xform = null)
         {
             Resolve(uid, ref body, false);
@@ -93,11 +96,11 @@ private void OnGravityChange(ref GravityChangedEvent ev)
 
                 if (!ev.HasGravity)
                 {
-                    _alerts.ShowAlert(uid, AlertType.Weightless);
+                    _alerts.ShowAlert(uid, WeightlessAlert);
                 }
                 else
                 {
-                    _alerts.ClearAlert(uid, AlertType.Weightless);
+                    _alerts.ClearAlert(uid, WeightlessAlert);
                 }
             }
         }
@@ -106,11 +109,11 @@ private void OnAlertsSync(AlertSyncEvent ev)
         {
             if (IsWeightless(ev.Euid))
             {
-                _alerts.ShowAlert(ev.Euid, AlertType.Weightless);
+                _alerts.ShowAlert(ev.Euid, WeightlessAlert);
             }
             else
             {
-                _alerts.ClearAlert(ev.Euid, AlertType.Weightless);
+                _alerts.ClearAlert(ev.Euid, WeightlessAlert);
             }
         }
 
@@ -118,11 +121,11 @@ private void OnAlertsParentChange(EntityUid uid, AlertsComponent component, ref
         {
             if (IsWeightless(uid))
             {
-                _alerts.ShowAlert(uid, AlertType.Weightless);
+                _alerts.ShowAlert(uid, WeightlessAlert);
             }
             else
             {
-                _alerts.ClearAlert(uid, AlertType.Weightless);
+                _alerts.ClearAlert(uid, WeightlessAlert);
             }
         }
 
diff --git a/Content.Shared/Mobs/Components/MobThresholdsComponent.cs b/Content.Shared/Mobs/Components/MobThresholdsComponent.cs
index e97d3672a215..0e37cf9b10e8 100644
--- a/Content.Shared/Mobs/Components/MobThresholdsComponent.cs
+++ b/Content.Shared/Mobs/Components/MobThresholdsComponent.cs
@@ -2,6 +2,7 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Mobs.Components;
@@ -24,13 +25,16 @@ public sealed partial class MobThresholdsComponent : Component
     /// Used for alternate health alerts (silicons, for example)
     /// </summary>
     [DataField("stateAlertDict")]
-    public Dictionary<MobState, AlertType> StateAlertDict = new()
+    public Dictionary<MobState, ProtoId<AlertPrototype>> StateAlertDict = new()
     {
-        {MobState.Alive, AlertType.HumanHealth},
-        {MobState.Critical, AlertType.HumanCrit},
-        {MobState.Dead, AlertType.HumanDead},
+        {MobState.Alive, "HumanHealth"},
+        {MobState.Critical, "HumanCrit"},
+        {MobState.Dead, "HumanDead"},
     };
 
+    [DataField]
+    public ProtoId<AlertCategoryPrototype> HealthAlertCategory = "Health";
+
     /// <summary>
     /// Whether or not this entity should display damage overlays (robots don't feel pain, black out etc.)
     /// </summary>
@@ -53,19 +57,19 @@ public sealed class MobThresholdsComponentState : ComponentState
 
     public MobState CurrentThresholdState;
 
-    public Dictionary<MobState, AlertType> StateAlertDict = new()
-    {
-        {MobState.Alive, AlertType.HumanHealth},
-        {MobState.Critical, AlertType.HumanCrit},
-        {MobState.Dead, AlertType.HumanDead},
-    };
+    public Dictionary<MobState, ProtoId<AlertPrototype>> StateAlertDict;
 
     public bool ShowOverlays;
 
     public bool AllowRevives;
 
-    public MobThresholdsComponentState(Dictionary<FixedPoint2, MobState> unsortedThresholds, bool triggersAlerts, MobState currentThresholdState,
-        Dictionary<MobState, AlertType> stateAlertDict, bool showOverlays, bool allowRevives)
+    public MobThresholdsComponentState(Dictionary<FixedPoint2, MobState> unsortedThresholds,
+        bool triggersAlerts,
+        MobState currentThresholdState,
+        Dictionary<MobState,
+        ProtoId<AlertPrototype>> stateAlertDict,
+        bool showOverlays,
+        bool allowRevives)
     {
         UnsortedThresholds = unsortedThresholds;
         TriggersAlerts = triggersAlerts;
diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index 59d9fb4c2390..b11de9eac56d 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -431,7 +431,7 @@ private void MobThresholdStartup(EntityUid target, MobThresholdsComponent thresh
     private void MobThresholdShutdown(EntityUid target, MobThresholdsComponent component, ComponentShutdown args)
     {
         if (component.TriggersAlerts)
-            _alerts.ClearAlertCategory(target, AlertCategory.Health);
+            _alerts.ClearAlertCategory(target, component.HealthAlertCategory);
     }
 
     private void OnUpdateMobState(EntityUid target, MobThresholdsComponent component, ref UpdateMobStateEvent args)
diff --git a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
index db889e7e3bd9..100cd9d6d3e6 100644
--- a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs
@@ -1,4 +1,6 @@
+using Content.Shared.Alert;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Movement.Pulling.Components;
 
@@ -36,4 +38,7 @@ public sealed partial class PullableComponent : Component
     [Access(typeof(Systems.PullingSystem), Other = AccessPermissions.ReadExecute)]
     [AutoNetworkedField, DataField]
     public bool PrevFixedRotation;
+
+    [DataField]
+    public ProtoId<AlertPrototype> PulledAlert = "Pulled";
 }
diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
index 1fc9b731bd5f..061ec13ed2ab 100644
--- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -1,5 +1,7 @@
-using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Alert;
+using Content.Shared.Movement.Pulling.Systems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Movement.Pulling.Components;
@@ -38,4 +40,7 @@ public sealed partial class PullerComponent : Component
     /// </summary>
     [DataField]
     public bool NeedsHands = true;
+
+    [DataField]
+    public ProtoId<AlertPrototype> PullingAlert = "Pulling";
 }
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 81b2fee5695a..2781c4952989 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -223,7 +223,7 @@ private void StopPulling(EntityUid pullableUid, PullableComponent pullableComp)
         if (TryComp<PullerComponent>(oldPuller, out var pullerComp))
         {
             var pullerUid = oldPuller.Value;
-            _alertsSystem.ClearAlert(pullerUid, AlertType.Pulling);
+            _alertsSystem.ClearAlert(pullerUid, pullerComp.PullingAlert);
             pullerComp.Pulling = null;
             Dirty(oldPuller.Value, pullerComp);
 
@@ -237,7 +237,7 @@ private void StopPulling(EntityUid pullableUid, PullableComponent pullableComp)
         }
 
 
-        _alertsSystem.ClearAlert(pullableUid, AlertType.Pulled);
+        _alertsSystem.ClearAlert(pullableUid, pullableComp.PulledAlert);
     }
 
     public bool IsPulled(EntityUid uid, PullableComponent? component = null)
@@ -460,8 +460,8 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid,
 
         // Messaging
         var message = new PullStartedMessage(pullerUid, pullableUid);
-        _alertsSystem.ShowAlert(pullerUid, AlertType.Pulling);
-        _alertsSystem.ShowAlert(pullableUid, AlertType.Pulled);
+        _alertsSystem.ShowAlert(pullerUid, pullerComp.PullingAlert);
+        _alertsSystem.ShowAlert(pullableUid, pullableComp.PulledAlert);
 
         RaiseLocalEvent(pullerUid, message);
         RaiseLocalEvent(pullableUid, message);
diff --git a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
index 0f3bff265cba..91c816df5c93 100644
--- a/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
+++ b/Content.Shared/Ninja/Components/SpaceNinjaComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Alert;
 using Content.Shared.Ninja.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -53,4 +54,7 @@ public sealed partial class SpaceNinjaComponent : Component
     /// </summary>
     [DataField]
     public EntProtoId SpiderChargeObjective = "SpiderChargeObjective";
+
+    [DataField]
+    public ProtoId<AlertPrototype> SuitPowerAlert = "SuitPower";
 }
diff --git a/Content.Shared/Nutrition/Components/HungerComponent.cs b/Content.Shared/Nutrition/Components/HungerComponent.cs
index 9ac82ba283c9..79d895ddae66 100644
--- a/Content.Shared/Nutrition/Components/HungerComponent.cs
+++ b/Content.Shared/Nutrition/Components/HungerComponent.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Nutrition.EntitySystems;
 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.Generic;
@@ -65,15 +66,18 @@ public sealed partial class HungerComponent : Component
     /// <summary>
     /// A dictionary relating hunger thresholds to corresponding alerts.
     /// </summary>
-    [DataField("hungerThresholdAlerts", customTypeSerializer: typeof(DictionarySerializer<HungerThreshold, AlertType>))]
+    [DataField("hungerThresholdAlerts")]
     [AutoNetworkedField]
-    public Dictionary<HungerThreshold, AlertType> HungerThresholdAlerts = new()
+    public Dictionary<HungerThreshold, ProtoId<AlertPrototype>> HungerThresholdAlerts = new()
     {
-        { HungerThreshold.Peckish, AlertType.Peckish },
-        { HungerThreshold.Starving, AlertType.Starving },
-        { HungerThreshold.Dead, AlertType.Starving }
+        { HungerThreshold.Peckish, "Peckish" },
+        { HungerThreshold.Starving, "Starving" },
+        { HungerThreshold.Dead, "Starving" }
     };
 
+    [DataField]
+    public ProtoId<AlertCategoryPrototype> HungerAlertCategory = "Hunger";
+
     /// <summary>
     /// A dictionary relating HungerThreshold to how much they modify <see cref="BaseDecayRate"/>.
     /// </summary>
diff --git a/Content.Shared/Nutrition/Components/ThirstComponent.cs b/Content.Shared/Nutrition/Components/ThirstComponent.cs
index 731346401fd9..f3ac881361fc 100644
--- a/Content.Shared/Nutrition/Components/ThirstComponent.cs
+++ b/Content.Shared/Nutrition/Components/ThirstComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Alert;
 using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Nutrition.Components;
@@ -56,11 +57,14 @@ public sealed partial class ThirstComponent : Component
         {ThirstThreshold.Dead, 0.0f},
     };
 
-    public static readonly Dictionary<ThirstThreshold, AlertType> ThirstThresholdAlertTypes = new()
+    [DataField]
+    public ProtoId<AlertCategoryPrototype> ThirstyCategory = "Thirst";
+
+    public static readonly Dictionary<ThirstThreshold, ProtoId<AlertPrototype>> ThirstThresholdAlertTypes = new()
     {
-        {ThirstThreshold.Thirsty, AlertType.Thirsty},
-        {ThirstThreshold.Parched, AlertType.Parched},
-        {ThirstThreshold.Dead, AlertType.Parched},
+        {ThirstThreshold.Thirsty, "Thirsty"},
+        {ThirstThreshold.Parched, "Parched"},
+        {ThirstThreshold.Dead, "Parched"},
     };
 }
 
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index 4de4e4d5feb0..bff15f06ff9c 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -61,7 +61,7 @@ private void OnMapInit(EntityUid uid, HungerComponent component, MapInitEvent ar
 
     private void OnShutdown(EntityUid uid, HungerComponent component, ComponentShutdown args)
     {
-        _alerts.ClearAlertCategory(uid, AlertCategory.Hunger);
+        _alerts.ClearAlertCategory(uid, component.HungerAlertCategory);
     }
 
     private void OnRefreshMovespeed(EntityUid uid, HungerComponent component, RefreshMovementSpeedModifiersEvent args)
@@ -142,7 +142,7 @@ private void DoHungerThresholdEffects(EntityUid uid, HungerComponent? component
         }
         else
         {
-            _alerts.ClearAlertCategory(uid, AlertCategory.Hunger);
+            _alerts.ClearAlertCategory(uid, component.HungerAlertCategory);
         }
 
         if (component.HungerThresholdDecayModifiers.TryGetValue(component.CurrentThreshold, out var modifier))
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 8ea7d9140c36..205d8d6cde32 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -165,7 +165,7 @@ private void UpdateEffects(EntityUid uid, ThirstComponent component)
         }
         else
         {
-            _alerts.ClearAlertCategory(uid, AlertCategory.Thirst);
+            _alerts.ClearAlertCategory(uid, component.ThirstyCategory);
         }
 
         switch (component.CurrentThirstThreshold)
diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs
index 947c1a4b3fc6..d7fb28ef1360 100644
--- a/Content.Shared/Revenant/Components/RevenantComponent.cs
+++ b/Content.Shared/Revenant/Components/RevenantComponent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
 using Content.Shared.Whitelist;
@@ -200,6 +201,9 @@ public sealed partial class RevenantComponent : Component
     public EntityWhitelist? MalfunctionBlacklist;
     #endregion
 
+    [DataField]
+    public ProtoId<AlertPrototype> EssenceAlert = "Essence";
+
     #region Visualizer
     [DataField("state")]
     public string State = "idle";
diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs
index 1a6927cf813d..cb42db4436fc 100644
--- a/Content.Shared/Shuttles/Components/PilotComponent.cs
+++ b/Content.Shared/Shuttles/Components/PilotComponent.cs
@@ -1,7 +1,9 @@
 using System.Numerics;
+using Content.Shared.Alert;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Shuttles.Components
@@ -32,6 +34,9 @@ public sealed partial class PilotComponent : Component
         [ViewVariables]
         public ShuttleButtons HeldButtons = ShuttleButtons.None;
 
+        [DataField]
+        public ProtoId<AlertPrototype> PilotingAlert = "PilotingShuttle";
+
         public override bool SendOnlyToOwner => true;
     }
 }
diff --git a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
index 71d3a7bd166c..e1776873da91 100644
--- a/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
+++ b/Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs
@@ -1,6 +1,8 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Alert;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Silicons.Borgs.Components;
@@ -76,6 +78,12 @@ public sealed partial class BorgChassisComponent : Component
     [DataField("noMindState")]
     public string NoMindState = string.Empty;
     #endregion
+
+    [DataField]
+    public ProtoId<AlertPrototype> BatteryAlert = "BorgBattery";
+
+    [DataField]
+    public ProtoId<AlertPrototype> NoBatteryAlert = "BorgBatteryNone";
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/StatusEffect/StatusEffectPrototype.cs b/Content.Shared/StatusEffect/StatusEffectPrototype.cs
index ae9e26879ebb..8b1f84e4d81a 100644
--- a/Content.Shared/StatusEffect/StatusEffectPrototype.cs
+++ b/Content.Shared/StatusEffect/StatusEffectPrototype.cs
@@ -10,7 +10,7 @@ public sealed partial class StatusEffectPrototype : IPrototype
         public string ID { get; private set; } = default!;
 
         [DataField("alert")]
-        public AlertType? Alert { get; private set; }
+        public ProtoId<AlertPrototype>? Alert { get; private set; }
 
         /// <summary>
         ///     Whether a status effect should be able to apply to any entity,
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index f3e3e12bd8cc..9806077f9bb8 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -219,7 +219,7 @@ public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool re
         ///     This is mostly for stuns, since Stun and Knockdown share an alert key. Other times this pretty much
         ///     will not be useful.
         /// </remarks>
-        private (TimeSpan, TimeSpan)? GetAlertCooldown(EntityUid uid, AlertType alert, StatusEffectsComponent status)
+        private (TimeSpan, TimeSpan)? GetAlertCooldown(EntityUid uid, ProtoId<AlertPrototype> alert, StatusEffectsComponent status)
         {
             (TimeSpan, TimeSpan)? maxCooldown = null;
             foreach (var kvp in status.ActiveEffects)
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 36dbedb4cb16..03ad97edff27 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -42,6 +42,9 @@ public sealed class ReflectSystem : EntitySystem
     [Dependency] private readonly StandingStateSystem _standing = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
 
+    [ValidatePrototypeId<AlertPrototype>]
+    private const string DeflectingAlert = "Deflecting";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -296,11 +299,11 @@ private void RefreshReflectUser(EntityUid user)
 
     private void EnableAlert(EntityUid alertee)
     {
-        _alerts.ShowAlert(alertee, AlertType.Deflecting);
+        _alerts.ShowAlert(alertee, DeflectingAlert);
     }
 
     private void DisableAlert(EntityUid alertee)
     {
-        _alerts.ClearAlert(alertee, AlertType.Deflecting);
+        _alerts.ClearAlert(alertee, DeflectingAlert);
     }
 }
diff --git a/Content.Tests/Shared/Alert/AlertManagerTests.cs b/Content.Tests/Shared/Alert/AlertManagerTests.cs
index 2d5f6af5a7f1..c57df63d5b7d 100644
--- a/Content.Tests/Shared/Alert/AlertManagerTests.cs
+++ b/Content.Tests/Shared/Alert/AlertManagerTests.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using Content.Client.Alerts;
-using Content.Server.Alert;
 using Content.Shared.Alert;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
@@ -45,15 +44,15 @@ public void TestAlertManager()
             prototypeManager.Initialize();
             prototypeManager.LoadFromStream(new StringReader(PROTOTYPES));
 
-            Assert.That(alertsSystem.TryGet(AlertType.LowPressure, out var lowPressure));
-            Assert.That(lowPressure.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/lowpressure.png"))));
-            Assert.That(alertsSystem.TryGet(AlertType.HighPressure, out var highPressure));
-            Assert.That(highPressure.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/highpressure.png"))));
+            Assert.That(alertsSystem.TryGet("LowPressure", out var lowPressure));
+            Assert.That(lowPressure!.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/lowpressure.png"))));
+            Assert.That(alertsSystem.TryGet("HighPressure", out var highPressure));
+            Assert.That(highPressure!.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/highpressure.png"))));
 
-            Assert.That(alertsSystem.TryGet(AlertType.LowPressure, out lowPressure));
-            Assert.That(lowPressure.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/lowpressure.png"))));
-            Assert.That(alertsSystem.TryGet(AlertType.HighPressure, out highPressure));
-            Assert.That(highPressure.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/highpressure.png"))));
+            Assert.That(alertsSystem.TryGet("LowPressure", out lowPressure));
+            Assert.That(lowPressure!.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/lowpressure.png"))));
+            Assert.That(alertsSystem.TryGet("HighPressure", out highPressure));
+            Assert.That(highPressure!.Icons[0], Is.EqualTo(new SpriteSpecifier.Texture(new ("/Textures/Interface/Alerts/Pressure/highpressure.png"))));
         }
     }
 }
diff --git a/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs b/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
index 56f76d46a927..efcd59acbbb0 100644
--- a/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
+++ b/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
@@ -85,24 +85,24 @@ public void TestAlertOrderPrototype()
             var alerts = prototypeManager.EnumeratePrototypes<AlertPrototype>();
 
             // ensure they sort according to our expected criteria
-            var expectedOrder = new List<AlertType>();
-            expectedOrder.Add(AlertType.Handcuffed);
-            expectedOrder.Add(AlertType.Ensnared);
-            expectedOrder.Add(AlertType.HighPressure);
+            var expectedOrder = new List<string>();
+            expectedOrder.Add("Handcuffed");
+            expectedOrder.Add("Ensnared");
+            expectedOrder.Add("HighPressure");
             // stuff with only category + same category ordered by enum value
-            expectedOrder.Add(AlertType.Peckish);
-            expectedOrder.Add(AlertType.Hot);
-            expectedOrder.Add(AlertType.Stun);
-            expectedOrder.Add(AlertType.LowPressure);
-            expectedOrder.Add(AlertType.Cold);
-            // stuff at end of list ordered by enum value
-            expectedOrder.Add(AlertType.Weightless);
-            expectedOrder.Add(AlertType.PilotingShuttle);
+            expectedOrder.Add("Peckish");
+            expectedOrder.Add("Hot");
+            expectedOrder.Add("Stun");
+            expectedOrder.Add("LowPressure");
+            expectedOrder.Add("Cold");
+            // stuff at end of list ordered by ID
+            expectedOrder.Add("PilotingShuttle");
+            expectedOrder.Add("Weightless");
 
             var actual = alerts.ToList();
             actual.Sort(alertOrder);
 
-            Assert.That(actual.Select(a => a.AlertType).ToList(), Is.EqualTo(expectedOrder));
+            Assert.That(actual.Select(a => a.ID).ToList(), Is.EqualTo(expectedOrder));
         }
     }
 }
diff --git a/Content.Tests/Shared/Alert/AlertPrototypeTests.cs b/Content.Tests/Shared/Alert/AlertPrototypeTests.cs
index d95acb8aff49..43ae98b452b4 100644
--- a/Content.Tests/Shared/Alert/AlertPrototypeTests.cs
+++ b/Content.Tests/Shared/Alert/AlertPrototypeTests.cs
@@ -39,9 +39,9 @@ public void OneTimeSetUp()
         [Test]
         public void TestAlertKey()
         {
-            Assert.That(new AlertKey(AlertType.HumanHealth, null), Is.Not.EqualTo(AlertKey.ForCategory(AlertCategory.Health)));
-            Assert.That((new AlertKey(null, AlertCategory.Health)), Is.EqualTo(AlertKey.ForCategory(AlertCategory.Health)));
-            Assert.That((new AlertKey(AlertType.Buckled, AlertCategory.Health)), Is.EqualTo(AlertKey.ForCategory(AlertCategory.Health)));
+            Assert.That(new AlertKey("HumanHealth", null), Is.Not.EqualTo(AlertKey.ForCategory("Health")));
+            Assert.That((new AlertKey(null, "Health")), Is.EqualTo(AlertKey.ForCategory("Health")));
+            Assert.That((new AlertKey("Buckled", "Health")), Is.EqualTo(AlertKey.ForCategory("Health")));
         }
 
         [TestCase(0, "/Textures/Interface/Alerts/Human/human.rsi/human0.png")]
diff --git a/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs b/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs
index 47ae3ef74a68..bcc32e13deed 100644
--- a/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs
+++ b/Content.Tests/Shared/Alert/ServerAlertsComponentTests.cs
@@ -15,6 +15,9 @@ namespace Content.Tests.Shared.Alert
     public sealed class ServerAlertsComponentTests : ContentUnitTest
     {
         const string PROTOTYPES = @"
+- type: alertCategory
+  id: Pressure
+
 - type: alert
   id: LowPressure
   category: Pressure
@@ -49,10 +52,10 @@ public void ShowAlerts()
             var alertsComponent = new AlertsComponent();
             alertsComponent = IoCManager.InjectDependencies(alertsComponent);
 
-            Assert.That(entManager.System<AlertsSystem>().TryGet(AlertType.LowPressure, out var lowpressure));
-            Assert.That(entManager.System<AlertsSystem>().TryGet(AlertType.HighPressure, out var highpressure));
+            Assert.That(entManager.System<AlertsSystem>().TryGet("LowPressure", out var lowpressure));
+            Assert.That(entManager.System<AlertsSystem>().TryGet("HighPressure", out var highpressure));
 
-            entManager.System<AlertsSystem>().ShowAlert(alertsComponent.Owner, AlertType.LowPressure, null, null);
+            entManager.System<AlertsSystem>().ShowAlert(alertsComponent.Owner, "LowPressure");
 
             var getty = new ComponentGetState();
             entManager.EventBus.RaiseComponentEvent(alertsComponent, getty);
@@ -60,17 +63,17 @@ public void ShowAlerts()
             var alertState = (AlertsComponent.AlertsComponent_AutoState) getty.State!;
             Assert.That(alertState, Is.Not.Null);
             Assert.That(alertState.Alerts.Count, Is.EqualTo(1));
-            Assert.That(alertState.Alerts.ContainsKey(lowpressure.AlertKey));
+            Assert.That(alertState.Alerts.ContainsKey(lowpressure!.AlertKey));
 
-            entManager.System<AlertsSystem>().ShowAlert(alertsComponent.Owner, AlertType.HighPressure, null, null);
+            entManager.System<AlertsSystem>().ShowAlert(alertsComponent.Owner, "HighPressure");
 
             // Lazy
             entManager.EventBus.RaiseComponentEvent(alertsComponent, getty);
             alertState = (AlertsComponent.AlertsComponent_AutoState) getty.State!;
             Assert.That(alertState.Alerts.Count, Is.EqualTo(1));
-            Assert.That(alertState.Alerts.ContainsKey(highpressure.AlertKey));
+            Assert.That(alertState.Alerts.ContainsKey(highpressure!.AlertKey));
 
-            entManager.System<AlertsSystem>().ClearAlertCategory(alertsComponent.Owner, AlertCategory.Pressure);
+            entManager.System<AlertsSystem>().ClearAlertCategory(alertsComponent.Owner, "Pressure");
 
             entManager.EventBus.RaiseComponentEvent(alertsComponent, getty);
             alertState = (AlertsComponent.AlertsComponent_AutoState) getty.State!;
diff --git a/Resources/Prototypes/Alerts/categories.yml b/Resources/Prototypes/Alerts/categories.yml
new file mode 100644
index 000000000000..2365422ed914
--- /dev/null
+++ b/Resources/Prototypes/Alerts/categories.yml
@@ -0,0 +1,35 @@
+- type: alertCategory
+  id: Pressure
+
+- type: alertCategory
+  id: Temperature
+
+- type: alertCategory
+  id: Breathing
+
+- type: alertCategory
+  id: Buckled
+
+- type: alertCategory
+  id: Health
+
+- type: alertCategory
+  id: Internals
+
+- type: alertCategory
+  id: Stamina
+
+- type: alertCategory
+  id: Piloting
+
+- type: alertCategory
+  id: Hunger
+
+- type: alertCategory
+  id: Thirst
+
+- type: alertCategory
+  id: Toxins
+
+- type: alertCategory
+  id: Battery

From 5d5046746688639b95655dcb9cb3bab67484561b Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 24 May 2024 16:08:23 +1200
Subject: [PATCH 026/568] Content changes for engine delta-state PR (#28134)

* Update GasTileOverlayState

* Update DecalGridState

* Update NavMapState

* poke

* poke2

* poke3

* Poke dem tests
---
 .../EntitySystems/GasTileOverlaySystem.cs     | 39 ++++++++++------
 Content.Client/Decals/DecalSystem.cs          | 39 ++++++++++------
 Content.Client/Pinpointer/NavMapSystem.cs     | 41 +++++++++++------
 .../Components/GasTileOverlayComponent.cs     | 45 ++++++++----------
 .../SharedGasTileOverlaySystem.cs             |  2 +-
 Content.Shared/Decals/DecalGridComponent.cs   | 35 ++++++--------
 Content.Shared/Decals/SharedDecalSystem.cs    |  2 +-
 .../Pinpointer/SharedNavMapSystem.cs          | 46 ++++++++-----------
 8 files changed, 129 insertions(+), 120 deletions(-)

diff --git a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 78185ce6b0e6..86cf0a9eb824 100644
--- a/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -1,4 +1,5 @@
 using Content.Client.Atmos.Overlays;
+using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using JetBrains.Annotations;
@@ -36,28 +37,38 @@ public override void Shutdown()
 
         private void OnHandleState(EntityUid gridUid, GasTileOverlayComponent comp, ref ComponentHandleState args)
         {
-            if (args.Current is not GasTileOverlayState state)
-                return;
+            Dictionary<Vector2i, GasOverlayChunk> modifiedChunks;
 
-            // is this a delta or full state?
-            if (!state.FullState)
+            switch (args.Current)
             {
-                foreach (var index in comp.Chunks.Keys)
+                // is this a delta or full state?
+                case GasTileOverlayDeltaState delta:
                 {
-                    if (!state.AllChunks!.Contains(index))
-                        comp.Chunks.Remove(index);
+                    modifiedChunks = delta.ModifiedChunks;
+                    foreach (var index in comp.Chunks.Keys)
+                    {
+                        if (!delta.AllChunks.Contains(index))
+                            comp.Chunks.Remove(index);
+                    }
+
+                    break;
                 }
-            }
-            else
-            {
-                foreach (var index in comp.Chunks.Keys)
+                case GasTileOverlayState state:
                 {
-                    if (!state.Chunks.ContainsKey(index))
-                        comp.Chunks.Remove(index);
+                    modifiedChunks = state.Chunks;
+                    foreach (var index in comp.Chunks.Keys)
+                    {
+                        if (!state.Chunks.ContainsKey(index))
+                            comp.Chunks.Remove(index);
+                    }
+
+                    break;
                 }
+                default:
+                    return;
             }
 
-            foreach (var (index, data) in state.Chunks)
+            foreach (var (index, data) in modifiedChunks)
             {
                 comp.Chunks[index] = data;
             }
diff --git a/Content.Client/Decals/DecalSystem.cs b/Content.Client/Decals/DecalSystem.cs
index 901ab270fb59..41e5f39c2867 100644
--- a/Content.Client/Decals/DecalSystem.cs
+++ b/Content.Client/Decals/DecalSystem.cs
@@ -56,34 +56,43 @@ protected override void OnDecalRemoved(EntityUid gridId, uint decalId, DecalGrid
 
         private void OnHandleState(EntityUid gridUid, DecalGridComponent gridComp, ref ComponentHandleState args)
         {
-            if (args.Current is not DecalGridState state)
-                return;
-
             // is this a delta or full state?
             _removedChunks.Clear();
+            Dictionary<Vector2i, DecalChunk> modifiedChunks;
 
-            if (!state.FullState)
+            switch (args.Current)
             {
-                foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                case DecalGridDeltaState delta:
                 {
-                    if (!state.AllChunks!.Contains(key))
-                        _removedChunks.Add(key);
+                    modifiedChunks = delta.ModifiedChunks;
+                    foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                    {
+                        if (!delta.AllChunks.Contains(key))
+                            _removedChunks.Add(key);
+                    }
+
+                    break;
                 }
-            }
-            else
-            {
-                foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                case DecalGridState state:
                 {
-                    if (!state.Chunks.ContainsKey(key))
-                        _removedChunks.Add(key);
+                    modifiedChunks = state.Chunks;
+                    foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
+                    {
+                        if (!state.Chunks.ContainsKey(key))
+                            _removedChunks.Add(key);
+                    }
+
+                    break;
                 }
+                default:
+                    return;
             }
 
             if (_removedChunks.Count > 0)
                 RemoveChunks(gridUid, gridComp, _removedChunks);
 
-            if (state.Chunks.Count > 0)
-                UpdateChunks(gridUid, gridComp, state.Chunks);
+            if (modifiedChunks.Count > 0)
+                UpdateChunks(gridUid, gridComp, modifiedChunks);
         }
 
         private void OnChunkUpdate(DecalChunkUpdateEvent ev)
diff --git a/Content.Client/Pinpointer/NavMapSystem.cs b/Content.Client/Pinpointer/NavMapSystem.cs
index e33bc5d32917..9aeb792a429f 100644
--- a/Content.Client/Pinpointer/NavMapSystem.cs
+++ b/Content.Client/Pinpointer/NavMapSystem.cs
@@ -14,27 +14,40 @@ public override void Initialize()
 
     private void OnHandleState(EntityUid uid, NavMapComponent component, ref ComponentHandleState args)
     {
-        if (args.Current is not NavMapComponentState state)
-            return;
+        Dictionary<Vector2i, int[]> modifiedChunks;
+        Dictionary<NetEntity, NavMapBeacon> beacons;
 
-        if (!state.FullState)
+        switch (args.Current)
         {
-            foreach (var index in component.Chunks.Keys)
+            case NavMapDeltaState delta:
             {
-                if (!state.AllChunks!.Contains(index))
-                    component.Chunks.Remove(index);
+                modifiedChunks = delta.ModifiedChunks;
+                beacons = delta.Beacons;
+                foreach (var index in component.Chunks.Keys)
+                {
+                    if (!delta.AllChunks!.Contains(index))
+                        component.Chunks.Remove(index);
+                }
+
+                break;
             }
-        }
-        else
-        {
-            foreach (var index in component.Chunks.Keys)
+            case NavMapState state:
             {
-                if (!state.Chunks.ContainsKey(index))
-                    component.Chunks.Remove(index);
+                modifiedChunks = state.Chunks;
+                beacons = state.Beacons;
+                foreach (var index in component.Chunks.Keys)
+                {
+                    if (!state.Chunks.ContainsKey(index))
+                        component.Chunks.Remove(index);
+                }
+
+                break;
             }
+            default:
+                return;
         }
 
-        foreach (var (origin, chunk) in state.Chunks)
+        foreach (var (origin, chunk) in modifiedChunks)
         {
             var newChunk = new NavMapChunk(origin);
             Array.Copy(chunk, newChunk.TileData, chunk.Length);
@@ -42,7 +55,7 @@ private void OnHandleState(EntityUid uid, NavMapComponent component, ref Compone
         }
 
         component.Beacons.Clear();
-        foreach (var (nuid, beacon) in state.Beacons)
+        foreach (var (nuid, beacon) in beacons)
         {
             component.Beacons[nuid] = beacon;
         }
diff --git a/Content.Shared/Atmos/Components/GasTileOverlayComponent.cs b/Content.Shared/Atmos/Components/GasTileOverlayComponent.cs
index e72a1d675841..2c3149b11a8f 100644
--- a/Content.Shared/Atmos/Components/GasTileOverlayComponent.cs
+++ b/Content.Shared/Atmos/Components/GasTileOverlayComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Atmos.Components;
 
@@ -24,55 +23,47 @@ public sealed partial class GasTileOverlayComponent : Component
     public GameTick ForceTick { get; set; }
 }
 
-
 [Serializable, NetSerializable]
-public sealed class GasTileOverlayState : ComponentState, IComponentDeltaState
+public sealed class GasTileOverlayState(Dictionary<Vector2i, GasOverlayChunk> chunks) : ComponentState
 {
-    public readonly Dictionary<Vector2i, GasOverlayChunk> Chunks;
-    public bool FullState => AllChunks == null;
-
-    // required to infer deleted/missing chunks for delta states
-    public HashSet<Vector2i>? AllChunks;
+    public readonly Dictionary<Vector2i, GasOverlayChunk> Chunks = chunks;
+}
 
-    public GasTileOverlayState(Dictionary<Vector2i, GasOverlayChunk> chunks)
-    {
-        Chunks = chunks;
-    }
+[Serializable, NetSerializable]
+public sealed class GasTileOverlayDeltaState(
+    Dictionary<Vector2i, GasOverlayChunk> modifiedChunks,
+    HashSet<Vector2i> allChunks)
+    : ComponentState, IComponentDeltaState<GasTileOverlayState>
+{
+    public readonly Dictionary<Vector2i, GasOverlayChunk> ModifiedChunks = modifiedChunks;
+    public readonly HashSet<Vector2i> AllChunks = allChunks;
 
-    public void ApplyToFullState(IComponentState fullState)
+    public void ApplyToFullState(GasTileOverlayState state)
     {
-        DebugTools.Assert(!FullState);
-        var state = (GasTileOverlayState) fullState;
-        DebugTools.Assert(state.FullState);
-
         foreach (var key in state.Chunks.Keys)
         {
-            if (!AllChunks!.Contains(key))
+            if (!AllChunks.Contains(key))
                 state.Chunks.Remove(key);
         }
 
-        foreach (var (chunk, data) in Chunks)
+        foreach (var (chunk, data) in ModifiedChunks)
         {
             state.Chunks[chunk] = new(data);
         }
     }
 
-    public IComponentState CreateNewFullState(IComponentState fullState)
+    public GasTileOverlayState CreateNewFullState(GasTileOverlayState state)
     {
-        DebugTools.Assert(!FullState);
-        var state = (GasTileOverlayState) fullState;
-        DebugTools.Assert(state.FullState);
-
-        var chunks = new Dictionary<Vector2i, GasOverlayChunk>(state.Chunks.Count);
+        var chunks = new Dictionary<Vector2i, GasOverlayChunk>(AllChunks.Count);
 
-        foreach (var (chunk, data) in Chunks)
+        foreach (var (chunk, data) in ModifiedChunks)
         {
             chunks[chunk] = new(data);
         }
 
         foreach (var (chunk, data) in state.Chunks)
         {
-            if (AllChunks!.Contains(chunk))
+            if (AllChunks.Contains(chunk))
                 chunks.TryAdd(chunk, new(data));
         }
 
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
index f468724db333..8e7dfdedaf90 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
@@ -55,7 +55,7 @@ private void OnGetState(EntityUid uid, GasTileOverlayComponent component, ref Co
                     data[index] = chunk;
             }
 
-            args.State = new GasTileOverlayState(data) { AllChunks = new(component.Chunks.Keys) };
+            args.State = new GasTileOverlayDeltaState(data, new(component.Chunks.Keys));
         }
 
         public static Vector2i GetGasChunkIndices(Vector2i indices)
diff --git a/Content.Shared/Decals/DecalGridComponent.cs b/Content.Shared/Decals/DecalGridComponent.cs
index 8ac05cb280fa..67a9c037696d 100644
--- a/Content.Shared/Decals/DecalGridComponent.cs
+++ b/Content.Shared/Decals/DecalGridComponent.cs
@@ -62,46 +62,37 @@ public record DecalGridChunkCollection(Dictionary<Vector2i, DecalChunk> ChunkCol
     }
 
     [Serializable, NetSerializable]
-    public sealed class DecalGridState : ComponentState, IComponentDeltaState
+    public sealed class DecalGridState(Dictionary<Vector2i, DecalChunk> chunks) : ComponentState
     {
-        public Dictionary<Vector2i, DecalChunk> Chunks;
-        public bool FullState => AllChunks == null;
-
-        // required to infer deleted/missing chunks for delta states
-        public HashSet<Vector2i>? AllChunks;
+        public Dictionary<Vector2i, DecalChunk> Chunks = chunks;
+    }
 
-        public DecalGridState(Dictionary<Vector2i, DecalChunk> chunks)
-        {
-            Chunks = chunks;
-        }
+    [Serializable, NetSerializable]
+    public sealed class DecalGridDeltaState(Dictionary<Vector2i, DecalChunk> modifiedChunks, HashSet<Vector2i> allChunks)
+        : ComponentState, IComponentDeltaState<DecalGridState>
+    {
+        public Dictionary<Vector2i, DecalChunk> ModifiedChunks = modifiedChunks;
+        public HashSet<Vector2i> AllChunks = allChunks;
 
-        public void ApplyToFullState(IComponentState fullState)
+        public void ApplyToFullState(DecalGridState state)
         {
-            DebugTools.Assert(!FullState);
-            var state = (DecalGridState) fullState;
-            DebugTools.Assert(state.FullState);
-
             foreach (var key in state.Chunks.Keys)
             {
                 if (!AllChunks!.Contains(key))
                     state.Chunks.Remove(key);
             }
 
-            foreach (var (chunk, data) in Chunks)
+            foreach (var (chunk, data) in ModifiedChunks)
             {
                 state.Chunks[chunk] = new(data);
             }
         }
 
-        public IComponentState CreateNewFullState(IComponentState fullState)
+        public DecalGridState CreateNewFullState(DecalGridState state)
         {
-            DebugTools.Assert(!FullState);
-            var state = (DecalGridState) fullState;
-            DebugTools.Assert(state.FullState);
-
             var chunks = new Dictionary<Vector2i, DecalChunk>(state.Chunks.Count);
 
-            foreach (var (chunk, data) in Chunks)
+            foreach (var (chunk, data) in ModifiedChunks)
             {
                 chunks[chunk] = new(data);
             }
diff --git a/Content.Shared/Decals/SharedDecalSystem.cs b/Content.Shared/Decals/SharedDecalSystem.cs
index 0665ccbf84b3..0a2349ea299a 100644
--- a/Content.Shared/Decals/SharedDecalSystem.cs
+++ b/Content.Shared/Decals/SharedDecalSystem.cs
@@ -49,7 +49,7 @@ private void OnGetState(EntityUid uid, DecalGridComponent component, ref Compone
                     data[index] = chunk;
             }
 
-            args.State = new DecalGridState(data) { AllChunks = new(component.ChunkCollection.ChunkCollection.Keys) };
+            args.State = new DecalGridDeltaState(data, new(component.ChunkCollection.ChunkCollection.Keys));
         }
 
         private void OnGridInitialize(GridInitializeEvent msg)
diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
index ffe81c2d0ea4..7c12321b5db6 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -96,7 +96,7 @@ private void OnGetState(EntityUid uid, NavMapComponent component, ref ComponentG
                 chunks.Add(origin, chunk.TileData);
             }
 
-            args.State = new NavMapComponentState(chunks, component.Beacons);
+            args.State = new NavMapState(chunks, component.Beacons);
             return;
         }
 
@@ -109,12 +109,7 @@ private void OnGetState(EntityUid uid, NavMapComponent component, ref ComponentG
             chunks.Add(origin, chunk.TileData);
         }
 
-        args.State = new NavMapComponentState(chunks, component.Beacons)
-        {
-            // TODO NAVMAP cache a single AllChunks hashset in the component.
-            // Or maybe just only send them if a chunk gets removed.
-            AllChunks = new(component.Chunks.Keys),
-        };
+        args.State = new NavMapDeltaState(chunks, component.Beacons, new(component.Chunks.Keys));
     }
 
     #endregion
@@ -122,32 +117,35 @@ private void OnGetState(EntityUid uid, NavMapComponent component, ref ComponentG
     #region: System messages
 
     [Serializable, NetSerializable]
-    protected sealed class NavMapComponentState(
+    protected sealed class NavMapState(
         Dictionary<Vector2i, int[]> chunks,
         Dictionary<NetEntity, NavMapBeacon> beacons)
-        : ComponentState, IComponentDeltaState
+        : ComponentState
     {
         public Dictionary<Vector2i, int[]> Chunks = chunks;
         public Dictionary<NetEntity, NavMapBeacon> Beacons = beacons;
+    }
 
-        // Required to infer deleted/missing chunks for delta states
-        public HashSet<Vector2i>? AllChunks;
-
-        public bool FullState => AllChunks == null;
+    [Serializable, NetSerializable]
+    protected sealed class NavMapDeltaState(
+        Dictionary<Vector2i, int[]> modifiedChunks,
+        Dictionary<NetEntity, NavMapBeacon> beacons,
+        HashSet<Vector2i> allChunks)
+        : ComponentState, IComponentDeltaState<NavMapState>
+    {
+        public Dictionary<Vector2i, int[]> ModifiedChunks = modifiedChunks;
+        public Dictionary<NetEntity, NavMapBeacon> Beacons = beacons;
+        public HashSet<Vector2i> AllChunks = allChunks;
 
-        public void ApplyToFullState(IComponentState fullState)
+        public void ApplyToFullState(NavMapState state)
         {
-            DebugTools.Assert(!FullState);
-            var state = (NavMapComponentState) fullState;
-            DebugTools.Assert(state.FullState);
-
             foreach (var key in state.Chunks.Keys)
             {
                 if (!AllChunks!.Contains(key))
                     state.Chunks.Remove(key);
             }
 
-            foreach (var (index, data) in Chunks)
+            foreach (var (index, data) in ModifiedChunks)
             {
                 if (!state.Chunks.TryGetValue(index, out var stateValue))
                     state.Chunks[index] = stateValue = new int[data.Length];
@@ -162,12 +160,8 @@ public void ApplyToFullState(IComponentState fullState)
             }
         }
 
-        public IComponentState CreateNewFullState(IComponentState fullState)
+        public NavMapState CreateNewFullState(NavMapState state)
         {
-            DebugTools.Assert(!FullState);
-            var state = (NavMapComponentState) fullState;
-            DebugTools.Assert(state.FullState);
-
             var chunks = new Dictionary<Vector2i, int[]>(state.Chunks.Count);
             foreach (var (index, data) in state.Chunks)
             {
@@ -176,13 +170,13 @@ public IComponentState CreateNewFullState(IComponentState fullState)
 
                 var newData = chunks[index] = new int[ArraySize];
 
-                if (Chunks.TryGetValue(index, out var updatedData))
+                if (ModifiedChunks.TryGetValue(index, out var updatedData))
                     Array.Copy(newData, updatedData, ArraySize);
                 else
                     Array.Copy(newData, data, ArraySize);
             }
 
-            return new NavMapComponentState(chunks, new(Beacons));
+            return new NavMapState(chunks, new(Beacons));
         }
     }
 

From 01e7c9c37eaa34a4bc388f59eace26ab79684526 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 24 May 2024 16:11:45 +1200
Subject: [PATCH 027/568] Update engine to v223.0.0 (#28239)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index ec794ce4e469..6a6bfe33ca98 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit ec794ce4e4693069d3b3ebf7a88ead5ff2f860e0
+Subproject commit 6a6bfe33ca98dd3df6035ef4dcb7429f4dd5db66

From 76e13eed3595747135a8e0f4d668a9011d2ea06f Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 24 May 2024 17:03:03 +1200
Subject: [PATCH 028/568] Improve InteractionSystem range & BUI checks (#27999)

* Improve InteractionSystem range & BUI checks

* Ghost fixes

* AAA

* Fix test

* fix nullable

* revert to broadcast event

* Fixes for eengine PR

* Ah buckle code

* )
---
 .../UI/InstrumentBoundUserInterface.cs        |  10 +-
 .../Interactable/InteractionSystem.cs         |  22 +-
 Content.IntegrationTests/Tests/EntityTest.cs  |   4 +
 .../Configurable/ConfigurationSystem.cs       |   1 +
 .../Interaction/InteractionSystem.cs          |  29 +-
 .../StationEvents/Events/ImmovableRodRule.cs  |   4 +-
 .../Weapons/Melee/MeleeWeaponSystem.cs        |   9 +-
 Content.Shared/Actions/SharedActionsSystem.cs |   8 +-
 .../Buckle/SharedBuckleSystem.Buckle.cs       |   2 +-
 .../Interaction/SharedInteractionSystem.cs    | 254 ++++++++++++------
 .../Inventory/InventorySystem.Equip.cs        |   6 +-
 .../MagicMirror/SharedMagicMirrorSystem.cs    |  10 +-
 .../Movement/Pulling/Systems/PullingSystem.cs |  13 +-
 .../EntitySystems/SharedStorageSystem.cs      |   2 +-
 .../UserInterface/ActivatableUIComponent.cs   |   2 +-
 .../UserInterface/ActivatableUISystem.cs      |  88 ++----
 Content.Shared/Verbs/SharedVerbSystem.cs      |  14 +-
 .../Fun/Instruments/base_instruments.yml      |   2 +-
 18 files changed, 232 insertions(+), 248 deletions(-)

diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
index 2a846ff708a6..0f5729f55b10 100644
--- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
+++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
@@ -37,14 +37,8 @@ public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
-            switch (message)
-            {
-                case InstrumentBandResponseBuiMessage bandRx:
-                    _bandMenu?.Populate(bandRx.Nearby, EntMan);
-                    break;
-                default:
-                    break;
-            }
+            if (message is InstrumentBandResponseBuiMessage bandRx)
+                _bandMenu?.Populate(bandRx.Nearby, EntMan);
         }
 
         protected override void Open()
diff --git a/Content.Client/Interactable/InteractionSystem.cs b/Content.Client/Interactable/InteractionSystem.cs
index 0af8830e9acd..ff0a607920f3 100644
--- a/Content.Client/Interactable/InteractionSystem.cs
+++ b/Content.Client/Interactable/InteractionSystem.cs
@@ -4,24 +4,6 @@
 
 namespace Content.Client.Interactable
 {
-    public sealed class InteractionSystem : SharedInteractionSystem
-    {
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-
-        public override bool CanAccessViaStorage(EntityUid user, EntityUid target)
-        {
-            if (!EntityManager.EntityExists(target))
-                return false;
-
-            if (!_container.TryGetContainingContainer(target, out var container))
-                return false;
-
-            if (!HasComp<StorageComponent>(container.Owner))
-                return false;
-
-            // we don't check if the user can access the storage entity itself. This should be handed by the UI system.
-            // Need to return if UI is open or not
-            return true;
-        }
-    }
+    // TODO Remove Shared prefix
+    public sealed class InteractionSystem : SharedInteractionSystem;
 }
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index d3b1fb47221d..54af64122be0 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -350,8 +350,12 @@ public async Task AllComponentsOneToOneDeleteTest()
                 "DebrisFeaturePlacerController", // Above.
                 "LoadedChunk", // Worldgen chunk loading malding.
                 "BiomeSelection", // Whaddya know, requires config.
+                "ActivatableUI", // Requires enum key
             };
 
+            // TODO TESTS
+            // auto ignore any components that have a "required" data field.
+
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;
             var entityManager = server.ResolveDependency<IEntityManager>();
diff --git a/Content.Server/Configurable/ConfigurationSystem.cs b/Content.Server/Configurable/ConfigurationSystem.cs
index 2683bf4e0955..5f5f1ef7d166 100644
--- a/Content.Server/Configurable/ConfigurationSystem.cs
+++ b/Content.Server/Configurable/ConfigurationSystem.cs
@@ -24,6 +24,7 @@ public override void Initialize()
 
     private void OnInteractUsing(EntityUid uid, ConfigurationComponent component, InteractUsingEvent args)
     {
+        // TODO use activatable ui system
         if (args.Handled)
             return;
 
diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
index 4eac7e9ef1d4..9ac82b21858d 100644
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -7,31 +7,6 @@
 
 namespace Content.Server.Interaction
 {
-    /// <summary>
-    /// Governs interactions during clicking on entities
-    /// </summary>
-    [UsedImplicitly]
-    public sealed partial class InteractionSystem : SharedInteractionSystem
-    {
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-
-        public override bool CanAccessViaStorage(EntityUid user, EntityUid target)
-        {
-            if (Deleted(target))
-                return false;
-
-            if (!_container.TryGetContainingContainer(target, out var container))
-                return false;
-
-            if (!TryComp(container.Owner, out StorageComponent? storage))
-                return false;
-
-            if (storage.Container?.ID != container.ID)
-                return false;
-
-            // we don't check if the user can access the storage entity itself. This should be handed by the UI system.
-            return _uiSystem.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, user);
-        }
-    }
+    // TODO Remove Shared prefix
+    public sealed class InteractionSystem : SharedInteractionSystem;
 }
diff --git a/Content.Server/StationEvents/Events/ImmovableRodRule.cs b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
index cacb839cd398..aa193f2f4cbc 100644
--- a/Content.Server/StationEvents/Events/ImmovableRodRule.cs
+++ b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
@@ -28,7 +28,9 @@ protected override void Started(EntityUid uid, ImmovableRodRuleComponent compone
 
         if (proto.TryGetComponent<ImmovableRodComponent>(out var rod) && proto.TryGetComponent<TimedDespawnComponent>(out var despawn))
         {
-            TryFindRandomTile(out _, out _, out _, out var targetCoords);
+            if (!TryFindRandomTile(out _, out _, out _, out var targetCoords))
+                return;
+
             var speed = RobustRandom.NextFloat(rod.MinSpeed, rod.MaxSpeed);
             var angle = RobustRandom.NextAngle();
             var direction = angle.ToVec();
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 2612e99ec9af..190a2d0263e8 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -187,15 +187,10 @@ protected override bool InRange(EntityUid user, EntityUid target, float range, I
         if (session is { } pSession)
         {
             (targetCoordinates, targetLocalAngle) = _lag.GetCoordinatesAngle(target, pSession);
-        }
-        else
-        {
-            var xform = Transform(target);
-            targetCoordinates = xform.Coordinates;
-            targetLocalAngle = xform.LocalRotation;
+            return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range);
         }
 
-        return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range);
+        return Interaction.InRangeUnobstructed(user, target, range);
     }
 
     protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 30687c932256..c92d67ba8129 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -502,13 +502,7 @@ private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTa
             return distance <= action.Range;
         }
 
-        if (_interactionSystem.InRangeUnobstructed(user, target, range: action.Range)
-            && _containerSystem.IsInSameOrParentContainer(user, target))
-        {
-            return true;
-        }
-
-        return _interactionSystem.CanAccessViaStorage(user, target);
+        return _interactionSystem.InRangeAndAccessible(user, target, range: action.Range);
     }
 
     public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity<WorldTargetActionComponent> action)
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 4e94c6134b4a..00040211e36c 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -64,7 +64,7 @@ private void OnBuckleMove(EntityUid uid, BuckleComponent component, ref MoveEven
             return;
 
         var strapPosition = Transform(strapUid).Coordinates;
-        if (ev.NewPosition.InRange(EntityManager, _transform, strapPosition, strapComp.MaxBuckleDistance))
+        if (ev.NewPosition.EntityId.IsValid() && ev.NewPosition.InRange(EntityManager, _transform, strapPosition, strapComp.MaxBuckleDistance))
             return;
 
         TryUnbuckle(uid, uid, true, component);
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index c82a749755d6..3324ce5b9b8d 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1,11 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Administration;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Administration.Managers;
 using Content.Shared.CombatMode;
 using Content.Shared.Database;
+using Content.Shared.Ghost;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Input;
@@ -15,12 +14,13 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
 using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
+using Content.Shared.Storage;
 using Content.Shared.Tag;
 using Content.Shared.Timing;
+using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wall;
 using JetBrains.Annotations;
@@ -36,6 +36,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 #pragma warning disable 618
 
@@ -50,12 +51,11 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly INetManager _net = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly ISharedAdminManager _adminManager = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly SharedPhysicsSystem _sharedBroadphaseSystem = default!;
+        [Dependency] private readonly SharedPhysicsSystem _broadphase = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedVerbSystem _verbSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
@@ -64,6 +64,18 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+
+        private EntityQuery<IgnoreUIRangeComponent> _ignoreUiRangeQuery;
+        private EntityQuery<FixturesComponent> _fixtureQuery;
+        private EntityQuery<ItemComponent> _itemQuery;
+        private EntityQuery<PhysicsComponent> _physicsQuery;
+        private EntityQuery<HandsComponent> _handsQuery;
+        private EntityQuery<InteractionRelayComponent> _relayQuery;
+        private EntityQuery<CombatModeComponent> _combatQuery;
+        private EntityQuery<WallMountComponent> _wallMountQuery;
+        private EntityQuery<UseDelayComponent> _delayQuery;
+        private EntityQuery<ActivatableUIComponent> _uiQuery;
 
         private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
 
@@ -76,6 +88,17 @@ public abstract partial class SharedInteractionSystem : EntitySystem
 
         public override void Initialize()
         {
+            _ignoreUiRangeQuery = GetEntityQuery<IgnoreUIRangeComponent>();
+            _fixtureQuery = GetEntityQuery<FixturesComponent>();
+            _itemQuery = GetEntityQuery<ItemComponent>();
+            _physicsQuery = GetEntityQuery<PhysicsComponent>();
+            _handsQuery = GetEntityQuery<HandsComponent>();
+            _relayQuery = GetEntityQuery<InteractionRelayComponent>();
+            _combatQuery = GetEntityQuery<CombatModeComponent>();
+            _wallMountQuery = GetEntityQuery<WallMountComponent>();
+            _delayQuery = GetEntityQuery<UseDelayComponent>();
+            _uiQuery = GetEntityQuery<ActivatableUIComponent>();
+
             SubscribeLocalEvent<BoundUserInterfaceCheckRangeEvent>(HandleUserInterfaceRangeCheck);
             SubscribeLocalEvent<BoundUserInterfaceMessageAttempt>(OnBoundInterfaceInteractAttempt);
 
@@ -111,29 +134,57 @@ public override void Shutdown()
         /// </summary>
         private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev)
         {
-            var user = ev.Actor;
+            _uiQuery.TryComp(ev.Target, out var uiComp);
+            if (!_actionBlockerSystem.CanInteract(ev.Actor, ev.Target))
+            {
+                // We permit ghosts to open uis unless explicitly blocked
+                if (ev.Message is not OpenBoundInterfaceMessage || !HasComp<GhostComponent>(ev.Actor) || uiComp?.BlockSpectators == true)
+                {
+                    ev.Cancel();
+                    return;
+                }
+            }
+
+            var range = _ui.GetUiRange(ev.Target, ev.UiKey);
 
-            if (!_actionBlockerSystem.CanInteract(user, ev.Target))
+            // As long as range>0, the UI frame updates should have auto-closed the UI if it is out of range.
+            DebugTools.Assert(range <= 0 || UiRangeCheck(ev.Actor, ev.Target, range));
+
+            if (range <= 0 && !IsAccessible(ev.Actor, ev.Target))
             {
                 ev.Cancel();
                 return;
             }
 
-            // Check if the bound entity is accessible. Note that we allow admins to ignore this restriction, so that
-            // they can fiddle with UI's that people can't normally interact with (e.g., placing things directly into
-            // other people's backpacks).
-            if (!_containerSystem.IsInSameOrParentContainer(user, ev.Target)
-                && !CanAccessViaStorage(user, ev.Target)
-                && !_adminManager.HasAdminFlag(user, AdminFlags.Admin))
+            if (uiComp == null)
+                return;
+
+            if (uiComp.SingleUser && uiComp.CurrentSingleUser != ev.Actor)
             {
                 ev.Cancel();
                 return;
             }
 
-            if (!InRangeUnobstructed(user, ev.Target))
-            {
+            if (!uiComp.RequireHands)
+                return;
+
+            if (!_handsQuery.TryComp(ev.Actor, out var hands) || hands.Hands.Count == 0)
                 ev.Cancel();
-            }
+        }
+
+        private bool UiRangeCheck(Entity<TransformComponent?> user, Entity<TransformComponent?> target, float range)
+        {
+            if (!Resolve(target, ref target.Comp))
+                return false;
+
+            if (user.Owner == target.Owner)
+                return true;
+
+            // Fast check: if the user is the parent of the entity (e.g., holding it), we always assume that it is in range
+            if (target.Comp.ParentUid == user.Owner)
+                return true;
+
+            return InRangeAndAccessible(user, target, range) || _ignoreUiRangeQuery.HasComp(user);
         }
 
         /// <summary>
@@ -190,10 +241,7 @@ private bool HandleTryPullObject(ICommonSession? session, EntityCoordinates coor
             if (!InRangeUnobstructed(userEntity.Value, uid, popup: true))
                 return false;
 
-            if (!TryComp(uid, out PullableComponent? pull))
-                return false;
-
-            _pullSystem.TogglePull(uid, userEntity.Value, pull);
+            _pullSystem.TogglePull(uid, userEntity.Value);
             return false;
         }
 
@@ -269,7 +317,7 @@ private bool ShouldCheckAccess(EntityUid user)
         public bool CombatModeCanHandInteract(EntityUid user, EntityUid? target)
         {
             // Always allow attack in these cases
-            if (target == null || !TryComp<HandsComponent>(user, out var hands) || hands.ActiveHand?.HeldEntity is not null)
+            if (target == null || !_handsQuery.TryComp(user, out var hands) || hands.ActiveHand?.HeldEntity is not null)
                 return false;
 
             // Only eat input if:
@@ -277,7 +325,7 @@ public bool CombatModeCanHandInteract(EntityUid user, EntityUid? target)
             // - Target doesn't cancel should-interact event
             // This is intended to allow items to be picked up in combat mode,
             // but to also allow items to force attacks anyway (like mobs which are items, e.g. mice)
-            if (!HasComp<ItemComponent>(target))
+            if (!_itemQuery.HasComp(target))
                 return false;
 
             var combatEv = new CombatModeShouldHandInteractEvent();
@@ -307,7 +355,7 @@ public void UserInteraction(
             bool checkAccess = true,
             bool checkCanUse = true)
         {
-            if (TryComp<InteractionRelayComponent>(user, out var relay) && relay.RelayEntity is not null)
+            if (_relayQuery.TryComp(user, out var relay) && relay.RelayEntity is not null)
             {
                 // TODO this needs to be handled better. This probably bypasses many complex can-interact checks in weird roundabout ways.
                 if (_actionBlockerSystem.CanInteract(user, target))
@@ -321,7 +369,7 @@ public void UserInteraction(
             if (target != null && Deleted(target.Value))
                 return;
 
-            if (!altInteract && TryComp<CombatModeComponent>(user, out var combatMode) && combatMode.IsInCombatMode)
+            if (!altInteract && _combatQuery.TryComp(user, out var combatMode) && combatMode.IsInCombatMode)
             {
                 if (!CombatModeCanHandInteract(user, target))
                     return;
@@ -343,10 +391,7 @@ public void UserInteraction(
 
             // Check if interacted entity is in the same container, the direct child, or direct parent of the user.
             // Also checks if the item is accessible via some storage UI (e.g., open backpack)
-            if (checkAccess
-                && target != null
-                && !_containerSystem.IsInSameOrParentContainer(user, target.Value)
-                && !CanAccessViaStorage(user, target.Value))
+            if (checkAccess && target != null && !IsAccessible(user, target.Value))
                 return;
 
             var inRangeUnobstructed = target == null
@@ -354,7 +399,7 @@ public void UserInteraction(
                 : !checkAccess || InRangeUnobstructed(user, target.Value); // permits interactions with wall mounted entities
 
             // Does the user have hands?
-            if (!TryComp<HandsComponent>(user, out var hands) || hands.ActiveHand == null)
+            if (!_handsQuery.TryComp(user, out var hands) || hands.ActiveHand == null)
             {
                 var ev = new InteractNoHandEvent(user, target, coordinates);
                 RaiseLocalEvent(user, ev);
@@ -494,7 +539,7 @@ public float UnobstructedDistance(
 
             predicate ??= _ => false;
             var ray = new CollisionRay(origin.Position, dir.Normalized(), collisionMask);
-            var rayResults = _sharedBroadphaseSystem.IntersectRayWithPredicate(origin.MapId, ray, dir.Length(), predicate.Invoke, false).ToList();
+            var rayResults = _broadphase.IntersectRayWithPredicate(origin.MapId, ray, dir.Length(), predicate.Invoke, false).ToList();
 
             if (rayResults.Count == 0)
                 return dir.Length();
@@ -557,23 +602,29 @@ public bool InRangeUnobstructed(
             }
 
             var ray = new CollisionRay(origin.Position, dir.Normalized(), (int) collisionMask);
-            var rayResults = _sharedBroadphaseSystem.IntersectRayWithPredicate(origin.MapId, ray, length, predicate.Invoke, false).ToList();
+            var rayResults = _broadphase.IntersectRayWithPredicate(origin.MapId, ray, length, predicate.Invoke, false).ToList();
 
             return rayResults.Count == 0;
         }
 
         public bool InRangeUnobstructed(
-            EntityUid origin,
-            EntityUid other,
+            Entity<TransformComponent?> origin,
+            Entity<TransformComponent?> other,
             float range = InteractionRange,
             CollisionGroup collisionMask = InRangeUnobstructedMask,
             Ignored? predicate = null,
             bool popup = false)
         {
-            if (!TryComp(other, out TransformComponent? otherXform))
+            if (!Resolve(other, ref other.Comp))
                 return false;
 
-            return InRangeUnobstructed(origin, other, otherXform.Coordinates, otherXform.LocalRotation, range, collisionMask, predicate,
+            return InRangeUnobstructed(origin,
+                other,
+                other.Comp.Coordinates,
+                other.Comp.LocalRotation,
+                range,
+                collisionMask,
+                predicate,
                 popup);
         }
 
@@ -605,8 +656,8 @@ public bool InRangeUnobstructed(
         ///     True if the two points are within a given range without being obstructed.
         /// </returns>
         public bool InRangeUnobstructed(
-            EntityUid origin,
-            EntityUid other,
+            Entity<TransformComponent?> origin,
+            Entity<TransformComponent?> other,
             EntityCoordinates otherCoordinates,
             Angle otherAngle,
             float range = InteractionRange,
@@ -614,10 +665,10 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            Ignored combinedPredicate = e => e == origin || (predicate?.Invoke(e) ?? false);
+            Ignored combinedPredicate = e => e == origin.Owner || (predicate?.Invoke(e) ?? false);
             var inRange = true;
             MapCoordinates originPos = default;
-            var targetPos = otherCoordinates.ToMap(EntityManager, _transform);
+            var targetPos = _transform.ToMapCoordinates(otherCoordinates);
             Angle targetRot = default;
 
             // So essentially:
@@ -627,23 +678,30 @@ public bool InRangeUnobstructed(
             // Alternatively we could check centre distances first though
             // that means we wouldn't be able to easily check overlap interactions.
             if (range > 0f &&
-                TryComp<FixturesComponent>(origin, out var fixtureA) &&
+                _fixtureQuery.TryComp(origin, out var fixtureA) &&
                 // These fixture counts are stuff that has the component but no fixtures for <reasons> (e.g. buttons).
                 // At least until they get removed.
                 fixtureA.FixtureCount > 0 &&
-                TryComp<FixturesComponent>(other, out var fixtureB) &&
+                _fixtureQuery.TryComp(other, out var fixtureB) &&
                 fixtureB.FixtureCount > 0 &&
-                TryComp(origin, out TransformComponent? xformA))
+                Resolve(origin, ref origin.Comp))
             {
-                var (worldPosA, worldRotA) = xformA.GetWorldPositionRotation();
+                var (worldPosA, worldRotA) = origin.Comp.GetWorldPositionRotation();
                 var xfA = new Transform(worldPosA, worldRotA);
                 var parentRotB = _transform.GetWorldRotation(otherCoordinates.EntityId);
                 var xfB = new Transform(targetPos.Position, parentRotB + otherAngle);
 
                 // Different map or the likes.
-                if (!_sharedBroadphaseSystem.TryGetNearest(origin, other,
-                        out _, out _, out var distance,
-                        xfA, xfB, fixtureA, fixtureB))
+                if (!_broadphase.TryGetNearest(
+                        origin,
+                        other,
+                        out _,
+                        out _,
+                        out var distance,
+                        xfA,
+                        xfB,
+                        fixtureA,
+                        fixtureB))
                 {
                     inRange = false;
                 }
@@ -665,15 +723,15 @@ public bool InRangeUnobstructed(
                 else
                 {
                     // We'll still do the raycast from the centres but we'll bump the range as we know they're in range.
-                    originPos = _transform.GetMapCoordinates(origin, xform: xformA);
+                    originPos = _transform.GetMapCoordinates(origin, xform: origin.Comp);
                     range = (originPos.Position - targetPos.Position).Length();
                 }
             }
             // No fixtures, e.g. wallmounts.
             else
             {
-                originPos = _transform.GetMapCoordinates(origin);
-                var otherParent = Transform(other).ParentUid;
+                originPos = _transform.GetMapCoordinates(origin, origin);
+                var otherParent = (other.Comp ?? Transform(other)).ParentUid;
                 targetRot = otherParent.IsValid() ? Transform(otherParent).LocalRotation + otherAngle : otherAngle;
             }
 
@@ -724,13 +782,13 @@ private Ignored GetPredicate(
         {
             HashSet<EntityUid> ignored = new();
 
-            if (HasComp<ItemComponent>(target) && TryComp(target, out PhysicsComponent? physics) && physics.CanCollide)
+            if (_itemQuery.HasComp(target) && _physicsQuery.TryComp(target, out var physics) && physics.CanCollide)
             {
                 // If the target is an item, we ignore any colliding entities. Currently done so that if items get stuck
                 // inside of walls, users can still pick them up.
-                ignored.UnionWith(_sharedBroadphaseSystem.GetEntitiesIntersectingBody(target, (int) collisionMask, false, physics));
+                ignored.UnionWith(_broadphase.GetEntitiesIntersectingBody(target, (int) collisionMask, false, physics));
             }
-            else if (TryComp(target, out WallMountComponent? wallMount))
+            else if (_wallMountQuery.TryComp(target, out var wallMount))
             {
                 // wall-mount exemptions may be restricted to a specific angle range.da
 
@@ -748,13 +806,7 @@ private Ignored GetPredicate(
                     ignored.UnionWith(grid.GetAnchoredEntities(targetCoords));
             }
 
-            Ignored combinedPredicate = e =>
-            {
-                return e == target
-                       || (predicate?.Invoke(e) ?? false)
-                       || ignored.Contains(e);
-            };
-
+            Ignored combinedPredicate = e => e == target || (predicate?.Invoke(e) ?? false) || ignored.Contains(e);
             return combinedPredicate;
         }
 
@@ -951,10 +1003,8 @@ public bool InteractionActivate(
             bool checkUseDelay = true,
             bool checkAccess = true)
         {
-            UseDelayComponent? delayComponent = null;
-            if (checkUseDelay
-                && TryComp(used, out delayComponent)
-                && _useDelay.IsDelayed((used, delayComponent)))
+            _delayQuery.TryComp(used, out var delayComponent);
+            if (checkUseDelay && delayComponent != null && _useDelay.IsDelayed((used, delayComponent)))
                 return false;
 
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, used))
@@ -965,11 +1015,11 @@ public bool InteractionActivate(
 
             // Check if interacted entity is in the same container, the direct child, or direct parent of the user.
             // This is bypassed IF the interaction happened through an item slot (e.g., backpack UI)
-            if (checkAccess && !_containerSystem.IsInSameOrParentContainer(user, used) && !CanAccessViaStorage(user, used))
+            if (checkAccess && !IsAccessible(user, used))
                 return false;
 
             // Does the user have hands?
-            if (!HasComp<HandsComponent>(user))
+            if (!_handsQuery.HasComp(user))
                 return false;
 
             var activateMsg = new ActivateInWorldEvent(user, used);
@@ -979,7 +1029,9 @@ public bool InteractionActivate(
 
             DoContactInteraction(user, used, activateMsg);
             // Still need to call this even without checkUseDelay in case this gets relayed from Activate.
-            _useDelay.TryResetDelay(used, component: delayComponent);
+            if (delayComponent != null)
+                _useDelay.TryResetDelay(used, component: delayComponent);
+
             if (!activateMsg.WasLogged)
                 _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
             return true;
@@ -1000,11 +1052,8 @@ public bool UseInHandInteraction(
             bool checkCanInteract = true,
             bool checkUseDelay = true)
         {
-            UseDelayComponent? delayComponent = null;
-
-            if (checkUseDelay
-                && TryComp(used, out delayComponent)
-                && _useDelay.IsDelayed((used, delayComponent)))
+            _delayQuery.TryComp(used, out var delayComponent);
+            if (checkUseDelay && delayComponent != null && _useDelay.IsDelayed((used, delayComponent)))
                 return true; // if the item is on cooldown, we consider this handled.
 
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, used))
@@ -1066,11 +1115,60 @@ public void DroppedInteraction(EntityUid user, EntityUid item)
         }
         #endregion
 
+        /// <summary>
+        /// Check if a user can access a target (stored in the same containers) and is in range without obstructions.
+        /// </summary>
+        public bool InRangeAndAccessible(
+            Entity<TransformComponent?> user,
+            Entity<TransformComponent?> target,
+            float range = InteractionRange,
+            CollisionGroup collisionMask = InRangeUnobstructedMask,
+            Ignored? predicate = null)
+        {
+            if (user == target)
+                return true;
+
+            if (!Resolve(user, ref user.Comp))
+                return false;
+
+            if (!Resolve(target, ref target.Comp))
+                return false;
+
+            return IsAccessible(user, target) && InRangeUnobstructed(user, target, range, collisionMask, predicate);
+        }
+
+        /// <summary>
+        /// Check if a user can access a target or if they are stored in different containers.
+        /// </summary>
+        public bool IsAccessible(Entity<TransformComponent?> user, Entity<TransformComponent?> target)
+        {
+            if (_containerSystem.IsInSameOrParentContainer(user, target, out _, out var container))
+                return true;
+
+            return container != null && CanAccessViaStorage(user, target, container);
+        }
+
         /// <summary>
         ///     If a target is in range, but not in the same container as the user, it may be inside of a backpack. This
         ///     checks if the user can access the item in these situations.
         /// </summary>
-        public abstract bool CanAccessViaStorage(EntityUid user, EntityUid target);
+        public bool CanAccessViaStorage(EntityUid user, EntityUid target)
+        {
+            if (!_containerSystem.TryGetContainingContainer(target, out var container))
+                return false;
+
+            return CanAccessViaStorage(user, target, container);
+        }
+
+        /// <inheritdoc cref="CanAccessViaStorage(Robust.Shared.GameObjects.EntityUid,Robust.Shared.GameObjects.EntityUid)"/>
+        public bool CanAccessViaStorage(EntityUid user, EntityUid target, BaseContainer container)
+        {
+            if (StorageComponent.ContainerId != container.ID)
+                return false;
+
+            // we don't check if the user can access the storage entity itself. This should be handed by the UI system.
+            return _ui.IsUiOpen(target, StorageComponent.StorageUiKey.Key, user);
+        }
 
         /// <summary>
         ///     Checks whether an entity currently equipped by another player is accessible to some user. This shouldn't
@@ -1151,19 +1249,15 @@ public void DoContactInteraction(EntityUid uidA, EntityUid? uidB, HandledEntityE
             RaiseLocalEvent(uidB.Value, new ContactInteractionEvent(uidA));
         }
 
+
         private void HandleUserInterfaceRangeCheck(ref BoundUserInterfaceCheckRangeEvent ev)
         {
             if (ev.Result == BoundUserInterfaceRangeResult.Fail)
                 return;
 
-            if (InRangeUnobstructed(ev.Actor, ev.Target, ev.Data.InteractionRange))
-            {
-                ev.Result = BoundUserInterfaceRangeResult.Pass;
-            }
-            else
-            {
-                ev.Result = BoundUserInterfaceRangeResult.Fail;
-            }
+            ev.Result = UiRangeCheck(ev.Actor!, ev.Target, ev.Data.InteractionRange)
+                    ? BoundUserInterfaceRangeResult.Pass
+                    : BoundUserInterfaceRangeResult.Fail;
         }
     }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 400dfb0beb3d..7fd156213b45 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -210,11 +210,7 @@ public bool CanAccess(EntityUid actor, EntityUid target, EntityUid itemUid)
             return false;
 
         // Can the actor reach the item?
-        if (_interactionSystem.InRangeUnobstructed(actor, itemUid) && _containerSystem.IsInSameOrParentContainer(actor, itemUid))
-            return true;
-
-        // Is the item in an open storage UI, i.e., is the user quick-equipping from an open backpack?
-        if (_interactionSystem.CanAccessViaStorage(actor, itemUid))
+        if (_interactionSystem.InRangeAndAccessible(actor, itemUid))
             return true;
 
         // Is the actor currently stripping the target? Here we could check if the actor has the stripping UI open, but
diff --git a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
index 91059d60bfd3..433ad6b4fc94 100644
--- a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.UserInterface;
 using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.MagicMirror;
 
@@ -21,10 +22,13 @@ public override void Initialize()
 
     private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, ref BoundUserInterfaceCheckRangeEvent args)
     {
-        if (!Exists(component.Target) || !_interaction.InRangeUnobstructed(uid, component.Target.Value))
-        {
+        if (args.Result == BoundUserInterfaceRangeResult.Fail)
+            return;
+
+        DebugTools.Assert(component.Target != null && Exists(component.Target));
+
+        if (!_interaction.InRangeUnobstructed(uid, component.Target.Value))
             args.Result = BoundUserInterfaceRangeResult.Fail;
-        }
     }
 
     private void OnBeforeUIOpen(Entity<MagicMirrorComponent> ent, ref BeforeActivatableUIOpenEvent args)
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 2781c4952989..3de71172c72f 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -362,14 +362,17 @@ public bool CanPull(EntityUid puller, EntityUid pullableUid, PullerComponent? pu
         return !startPull.Cancelled && !getPulled.Cancelled;
     }
 
-    public bool TogglePull(EntityUid pullableUid, EntityUid pullerUid, PullableComponent pullable)
+    public bool TogglePull(Entity<PullableComponent?> pullable, EntityUid pullerUid)
     {
-        if (pullable.Puller == pullerUid)
+        if (!Resolve(pullable, ref pullable.Comp, false))
+            return false;
+
+        if (pullable.Comp.Puller == pullerUid)
         {
-            return TryStopPull(pullableUid, pullable);
+            return TryStopPull(pullable, pullable.Comp);
         }
 
-        return TryStartPull(pullerUid, pullableUid, pullableComp: pullable);
+        return TryStartPull(pullerUid, pullable, pullableComp: pullable);
     }
 
     public bool TogglePull(EntityUid pullerUid, PullerComponent puller)
@@ -377,7 +380,7 @@ public bool TogglePull(EntityUid pullerUid, PullerComponent puller)
         if (!TryComp<PullableComponent>(puller.Pulling, out var pullable))
             return false;
 
-        return TogglePull(puller.Pulling.Value, pullerUid, pullable);
+        return TogglePull((puller.Pulling.Value, pullable), pullerUid);
     }
 
     public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid,
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index ea0c9632f0ec..778e2b2e74e9 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -1078,7 +1078,7 @@ public bool PlayerInsertHeldEntity(EntityUid uid, EntityUid player, StorageCompo
     /// <returns>true if inserted, false otherwise</returns>
     public bool PlayerInsertEntityInWorld(Entity<StorageComponent?> uid, EntityUid player, EntityUid toInsert)
     {
-        if (!Resolve(uid, ref uid.Comp) || !_interactionSystem.InRangeUnobstructed(player, uid))
+        if (!Resolve(uid, ref uid.Comp) || !_interactionSystem.InRangeUnobstructed(player, uid.Owner))
             return false;
 
         if (!Insert(uid, toInsert, out _, user: player, uid.Comp))
diff --git a/Content.Shared/UserInterface/ActivatableUIComponent.cs b/Content.Shared/UserInterface/ActivatableUIComponent.cs
index 3f83816b7dea..93f05acac053 100644
--- a/Content.Shared/UserInterface/ActivatableUIComponent.cs
+++ b/Content.Shared/UserInterface/ActivatableUIComponent.cs
@@ -57,7 +57,7 @@ public sealed partial class ActivatableUIComponent : Component
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
-        public bool AllowSpectator = true;
+        public bool BlockSpectators;
 
         /// <summary>
         ///     Whether the item must be in the user's currently selected/active hand.
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs
index a6d27ac5459f..c1822c4ee335 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.cs
@@ -8,7 +8,7 @@
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Containers;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.UserInterface;
 
@@ -19,15 +19,12 @@ 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 SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-
-    private readonly List<EntityUid> _toClose = new();
 
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<ActivatableUIComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<ActivatableUIComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<ActivatableUIComponent, ActivateInWorldEvent>(OnActivate);
         SubscribeLocalEvent<ActivatableUIComponent, InteractUsingEvent>(OnInteractUsing);
@@ -37,28 +34,24 @@ public override void Initialize()
         SubscribeLocalEvent<ActivatableUIComponent, GetVerbsEvent<ActivationVerb>>(GetActivationVerb);
         SubscribeLocalEvent<ActivatableUIComponent, GetVerbsEvent<Verb>>(GetVerb);
 
-        // TODO ActivatableUI
-        // Add UI-user component, and listen for user container changes.
-        // I.e., should lose a computer UI if a player gets shut into a locker.
-        SubscribeLocalEvent<ActivatableUIComponent, EntGotInsertedIntoContainerMessage>(OnGotInserted);
-        SubscribeLocalEvent<ActivatableUIComponent, EntGotRemovedFromContainerMessage>(OnGotRemoved);
-
-        SubscribeLocalEvent<BoundUserInterfaceMessageAttempt>(OnBoundInterfaceInteractAttempt);
         SubscribeLocalEvent<UserInterfaceComponent, OpenUiActionEvent>(OnActionPerform);
 
         InitializePower();
     }
 
-    private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev)
+    private void OnStartup(Entity<ActivatableUIComponent> ent, ref ComponentStartup args)
     {
-        if (!TryComp(ev.Target, out ActivatableUIComponent? comp))
-            return;
-
-        if (!comp.RequireHands)
+        if (ent.Comp.Key == null)
+        {
+            Log.Error($"Missing UI Key for entity: {ToPrettyString(ent)}");
             return;
+        }
 
-        if (!TryComp(ev.Actor, out HandsComponent? hands) || hands.Hands.Count == 0)
-            ev.Cancel();
+        // TODO BUI
+        // set interaction range to zero to avoid constant range checks.
+        //
+        // if (ent.Comp.InHandsOnly && _uiSystem.TryGetInterfaceData(ent.Owner, ent.Comp.Key, out var data))
+        //     data.InteractionRange = 0;
     }
 
     private void OnActionPerform(EntityUid uid, UserInterfaceComponent component, OpenUiActionEvent args)
@@ -77,9 +70,10 @@ private void GetActivationVerb(EntityUid uid, ActivatableUIComponent component,
 
         args.Verbs.Add(new ActivationVerb
         {
-            // TODO VERBS add "open UI" icon
             Act = () => InteractUI(args.User, uid, component),
-            Text = Loc.GetString(component.VerbText)
+            Text = Loc.GetString(component.VerbText),
+            // TODO VERB ICON find a better icon
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")),
         });
     }
 
@@ -90,9 +84,10 @@ private void GetVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEv
 
         args.Verbs.Add(new Verb
         {
-            // TODO VERBS add "open UI" icon
             Act = () => InteractUI(args.User, uid, component),
-            Text = Loc.GetString(component.VerbText)
+            Text = Loc.GetString(component.VerbText),
+            // TODO VERB ICON find a better icon
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")),
         });
     }
 
@@ -119,7 +114,7 @@ private bool ShouldAddVerb<T>(EntityUid uid, ActivatableUIComponent component, G
             }
         }
 
-        return args.CanInteract || component.AllowSpectator && HasComp<GhostComponent>(args.User);
+        return args.CanInteract || HasComp<GhostComponent>(args.User) && !component.BlockSpectators;
     }
 
     private void OnUseInHand(EntityUid uid, ActivatableUIComponent component, UseInHandEvent args)
@@ -191,7 +186,7 @@ private bool InteractUI(EntityUid user, EntityUid uiEntity, ActivatableUICompone
             return true;
         }
 
-        if (!_blockerSystem.CanInteract(user, uiEntity) && (!aui.AllowSpectator || !HasComp<GhostComponent>(user)))
+        if (!_blockerSystem.CanInteract(user, uiEntity) && (!HasComp<GhostComponent>(user) || aui.BlockSpectators))
             return false;
 
         if (aui.RequireHands)
@@ -286,47 +281,4 @@ private void OnHandUnequipped(Entity<ActivatableUIComponent> ent, ref GotUnequip
         if (ent.Comp.RequireHands && ent.Comp.InHandsOnly)
             CloseAll(ent, ent);
     }
-
-    private void OnGotInserted(Entity<ActivatableUIComponent> ent, ref EntGotInsertedIntoContainerMessage args)
-    {
-        CheckAccess((ent, ent));
-    }
-
-    private void OnGotRemoved(Entity<ActivatableUIComponent> ent, ref EntGotRemovedFromContainerMessage args)
-    {
-        CheckAccess((ent, ent));
-    }
-
-    public void CheckAccess(Entity<ActivatableUIComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
-        if (ent.Comp.Key == null)
-        {
-            Log.Error($"Encountered null key in activatable ui on entity {ToPrettyString(ent)}");
-            return;
-        }
-
-        foreach (var user in _uiSystem.GetActors(ent.Owner, ent.Comp.Key))
-        {
-            if (!_container.IsInSameOrParentContainer(user, ent)
-                && !_interaction.CanAccessViaStorage(user, ent))
-            {
-                _toClose.Add(user);
-                continue;
-
-            }
-
-            if (!_interaction.InRangeUnobstructed(user, ent))
-                _toClose.Add(user);
-        }
-
-        foreach (var user in _toClose)
-        {
-            _uiSystem.CloseUi(ent.Owner, ent.Comp.Key, user);
-        }
-
-        _toClose.Clear();
-    }
 }
diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs
index 60714aea8f38..e78fe98f4c3c 100644
--- a/Content.Shared/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/Verbs/SharedVerbSystem.cs
@@ -72,19 +72,7 @@ public SortedSet<Verb> GetLocalVerbs(EntityUid target, EntityUid user, List<Type
             extraCategories = new();
 
             // accessibility checks
-            bool canAccess = false;
-            if (force || target == user)
-                canAccess = true;
-            else if (_interactionSystem.InRangeUnobstructed(user, target))
-            {
-                // Note that being in a container does not count as an obstruction for InRangeUnobstructed
-                // Therefore, we need extra checks to ensure the item is actually accessible:
-                if (ContainerSystem.IsInSameOrParentContainer(user, target))
-                    canAccess = true;
-                else
-                    // the item might be in a backpack that the user has open
-                    canAccess = _interactionSystem.CanAccessViaStorage(user, target);
-            }
+            var canAccess = force || _interactionSystem.InRangeAndAccessible(user, target);
 
             // A large number of verbs need to check action blockers. Instead of repeatedly having each system individually
             // call ActionBlocker checks, just cache it for the verb request.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index 684260b737f7..122ff42eb20f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -29,7 +29,7 @@
   components:
   - type: Instrument
   - type: ActivatableUI
-    allowSpectator: false # otherwise they can play client-side music
+    blockSpectators: true # otherwise they can play client-side music
     inHandsOnly: false
     singleUser: true
     requireHands: true

From 933a679c1a03acb3adf090c7b485d2c7bf53b69a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 24 May 2024 05:04:10 +0000
Subject: [PATCH 029/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9ae89dad4a3f..d330b043c617 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: Pre-filled syringes start in inject mode now.
-    type: Tweak
-  id: 6114
-  time: '2024-03-09T10:19:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25881
 - author: EmoGarbage404
   changes:
   - message: Added a new "colorblind friendly" toggle in the accessibility menu. This
@@ -3875,3 +3868,10 @@
   id: 6613
   time: '2024-05-23T20:27:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28226
+- author: ElectroJr
+  changes:
+  - message: Ghosts can once again open paper & other UIs
+    type: Fix
+  id: 6614
+  time: '2024-05-24T05:03:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27999

From 926f72ee13ab3bea948d517f34957d0c75ccbe3a Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 24 May 2024 19:02:04 +1200
Subject: [PATCH 030/568] Update engine to v223.1.1 (#28245)

* Update engine to v223.1.0

* Update engine to v223.1.1
---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 6a6bfe33ca98..c250010dada8 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 6a6bfe33ca98dd3df6035ef4dcb7429f4dd5db66
+Subproject commit c250010dada8279a48f6861dc80c0eebafee3421

From b2ca9b6a9cafe1e6f630fc6f085393a367597da1 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Fri, 24 May 2024 14:44:42 +0000
Subject: [PATCH 031/568] Fix firelock prediction issues with periodic pulses
 of closing lights (#28227)

* Fix firelock prediction issues with periodic pulses of closing lights

For some reason this function was setting a time for the next state
which was triggering the door system to try to close the firelock.
This does not happen serverside because the function only fires from an
event called clientside apparently.
It appears to be an attempt to stop firelocks from closing instantly
that did not function properly, and I cannot discern any other purpose.
As such I have removed it.

* Remove redundant serverside check

This became redundant with commit 439a87f2
---
 Content.Server/Doors/Systems/FirelockSystem.cs    | 15 ---------------
 .../Doors/Components/FirelockComponent.cs         |  2 --
 .../Doors/Systems/SharedFirelockSystem.cs         | 15 ---------------
 3 files changed, 32 deletions(-)

diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index 5ad86fb20aab..e2b8b5829d18 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -28,8 +28,6 @@ public override void Initialize()
         {
             base.Initialize();
 
-
-            SubscribeLocalEvent<FirelockComponent, BeforeDoorAutoCloseEvent>(OnBeforeDoorAutoclose);
             SubscribeLocalEvent<FirelockComponent, AtmosAlarmEvent>(OnAtmosAlarm);
 
             SubscribeLocalEvent<FirelockComponent, PowerChangedEvent>(PowerChanged);
@@ -80,19 +78,6 @@ public override void Update(float frameTime)
             }
         }
 
-        private void OnBeforeDoorAutoclose(EntityUid uid, FirelockComponent component, BeforeDoorAutoCloseEvent args)
-        {
-            if (!this.IsPowered(uid, EntityManager))
-                args.Cancel();
-
-            // Make firelocks autoclose, but only if the last alarm type it
-            // remembers was a danger. This is to prevent people from
-            // flooding hallways with endless bad air/fire.
-            if (component.AlarmAutoClose &&
-                (_atmosAlarmable.TryGetHighestAlert(uid, out var alarm) && alarm != AtmosAlarmType.Danger || alarm == null))
-                args.Cancel();
-        }
-
         private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosAlarmEvent args)
         {
             if (!this.IsPowered(uid, EntityManager))
diff --git a/Content.Shared/Doors/Components/FirelockComponent.cs b/Content.Shared/Doors/Components/FirelockComponent.cs
index ca62daaa0fd1..3f7d6c3f7049 100644
--- a/Content.Shared/Doors/Components/FirelockComponent.cs
+++ b/Content.Shared/Doors/Components/FirelockComponent.cs
@@ -19,8 +19,6 @@ public sealed partial class FirelockComponent : Component
         [DataField("lockedPryTimeModifier"), ViewVariables(VVAccess.ReadWrite)]
         public float LockedPryTimeModifier = 1.5f;
 
-        [DataField("autocloseDelay")] public TimeSpan AutocloseDelay = TimeSpan.FromSeconds(3f);
-
         /// <summary>
         /// Maximum pressure difference before the firelock will refuse to open, in kPa.
         /// </summary>
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
index 7d033efdd408..47a29a4ba803 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -18,8 +18,6 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<FirelockComponent, DoorStateChangedEvent>(OnUpdateState);
-
         // Access/Prying
         SubscribeLocalEvent<FirelockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
         SubscribeLocalEvent<FirelockComponent, GetPryTimeModifierEvent>(OnDoorGetPryTimeModifier);
@@ -46,19 +44,6 @@ public bool EmergencyPressureStop(EntityUid uid, FirelockComponent? firelock = n
         return _doorSystem.OnPartialClose(uid, door);
     }
 
-    private void OnUpdateState(EntityUid uid, FirelockComponent component, DoorStateChangedEvent args)
-    {
-        var ev = new BeforeDoorAutoCloseEvent();
-        RaiseLocalEvent(uid, ev);
-        UpdateVisuals(uid, component, args);
-        if (ev.Cancelled)
-        {
-            return;
-        }
-
-        _doorSystem.SetNextStateChange(uid, component.AutocloseDelay);
-    }
-
     #region Access/Prying
 
     private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, BeforeDoorOpenedEvent args)

From aa09741a4143b469b78a7215def4f0fc5e5a068c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 24 May 2024 14:45:49 +0000
Subject: [PATCH 032/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d330b043c617..61b8e7ec78f6 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Added a new "colorblind friendly" toggle in the accessibility menu. This
-      allows you to toggle between a standard and colorblind-friendly palette for
-      things like progress bars and the medical HUD.
-    type: Add
-  - message: The medical HUD is now bright, even in low light levels.
-    type: Tweak
-  id: 6115
-  time: '2024-03-09T11:43:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25318
 - author: metalgearsloth
   changes:
   - message: Fix NPC mouse movement.
@@ -3875,3 +3864,10 @@
   id: 6614
   time: '2024-05-24T05:03:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27999
+- author: nikthechampiongr
+  changes:
+  - message: Firelocks will no longer randomly pulse closing lights.
+    type: Fix
+  id: 6615
+  time: '2024-05-24T14:44:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28227

From 98503fc793be26acde787a6ab765f38887d0ae78 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Fri, 24 May 2024 15:57:02 -0400
Subject: [PATCH 033/568] Hotfix for crashes from bad item names (#28256)

---
 Content.Client/Examine/ExamineSystem.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 45db4efa53ca..125ec62e4920 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -239,8 +239,10 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
 
             if (knowTarget)
             {
-                var itemName = FormattedMessage.RemoveMarkup(Identity.Name(target, EntityManager, player));
-                var labelMessage = FormattedMessage.FromMarkup($"[bold]{itemName}[/bold]");
+                // TODO: FormattedMessage.RemoveMarkupPermissive
+                // var itemName = FormattedMessage.RemoveMarkupPermissive(Identity.Name(target, EntityManager, player));
+                var itemName = FormattedMessage.FromMarkupPermissive(Identity.Name(target, EntityManager, player)).ToString();
+                var labelMessage = FormattedMessage.FromMarkupPermissive($"[bold]{itemName}[/bold]");
                 var label = new RichTextLabel();
                 label.SetMessage(labelMessage);
                 hBox.AddChild(label);

From d0cf620a85bd14ce8bdc641f6dde1715e771879e Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 25 May 2024 15:13:24 +1200
Subject: [PATCH 034/568] Fix weapon error logs (#28264)

---
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 0fb6ac3eff96..7fc440db4794 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -174,49 +174,39 @@ private void OnStopAttack(StopAttackEvent msg, EntitySessionEventArgs args)
 
     private void OnLightAttack(LightAttackEvent msg, EntitySessionEventArgs args)
     {
-        var user = args.SenderSession.AttachedEntity;
-
-        if (user == null)
+        if (args.SenderSession.AttachedEntity is not {} user)
             return;
 
-        if (!TryGetWeapon(user.Value, out var weaponUid, out var weapon) ||
+        if (!TryGetWeapon(user, out var weaponUid, out var weapon) ||
             weaponUid != GetEntity(msg.Weapon))
         {
             return;
         }
 
-        AttemptAttack(args.SenderSession.AttachedEntity!.Value, weaponUid, weapon, msg, args.SenderSession);
+        AttemptAttack(user, weaponUid, weapon, msg, args.SenderSession);
     }
 
     private void OnHeavyAttack(HeavyAttackEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity == null)
-        {
+        if (args.SenderSession.AttachedEntity is not {} user)
             return;
-        }
 
-        if (!TryGetWeapon(args.SenderSession.AttachedEntity.Value, out var weaponUid, out var weapon) ||
+        if (!TryGetWeapon(user, out var weaponUid, out var weapon) ||
             weaponUid != GetEntity(msg.Weapon))
         {
             return;
         }
 
-        AttemptAttack(args.SenderSession.AttachedEntity.Value, weaponUid, weapon, msg, args.SenderSession);
+        AttemptAttack(user, weaponUid, weapon, msg, args.SenderSession);
     }
 
     private void OnDisarmAttack(DisarmAttackEvent msg, EntitySessionEventArgs args)
     {
-        if (args.SenderSession.AttachedEntity == null)
-        {
-            return;
-        }
-
-        if (!TryGetWeapon(args.SenderSession.AttachedEntity.Value, out var weaponUid, out var weapon))
-        {
+        if (args.SenderSession.AttachedEntity is not {} user)
             return;
-        }
 
-        AttemptAttack(args.SenderSession.AttachedEntity.Value, weaponUid, weapon, msg, args.SenderSession);
+        if (TryGetWeapon(user, out var weaponUid, out var weapon))
+            AttemptAttack(user, weaponUid, weapon, msg, args.SenderSession);
     }
 
     /// <summary>
@@ -343,23 +333,32 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
         if (!CombatMode.IsInCombatMode(user))
             return false;
 
+        EntityUid? target = null;
         switch (attack)
         {
             case LightAttackEvent light:
-                var lightTarget = GetEntity(light.Target);
+                if (light.Target != null && !TryGetEntity(light.Target, out target))
+                {
+                    // Target was lightly attacked & deleted.
+                    return false;
+                }
 
-                if (!Blocker.CanAttack(user, lightTarget, (weaponUid, weapon)))
+                if (!Blocker.CanAttack(user, target, (weaponUid, weapon)))
                     return false;
 
                 // Can't self-attack if you're the weapon
-                if (weaponUid == lightTarget)
+                if (weaponUid == target)
                     return false;
 
                 break;
             case DisarmAttackEvent disarm:
-                var disarmTarget = GetEntity(disarm.Target);
+                if (disarm.Target != null && !TryGetEntity(disarm.Target, out target))
+                {
+                    // Target was lightly attacked & deleted.
+                    return false;
+                }
 
-                if (!Blocker.CanAttack(user, disarmTarget, (weaponUid, weapon), true))
+                if (!Blocker.CanAttack(user, target, (weaponUid, weapon), true))
                     return false;
                 break;
             default:

From a58323cca150af73814be6d4cb70741246289d54 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 25 May 2024 21:49:46 +1200
Subject: [PATCH 035/568] Update engine to v223.1.2 (#28273)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index c250010dada8..796abe123055 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit c250010dada8279a48f6861dc80c0eebafee3421
+Subproject commit 796abe1230554c31daffbfa6559a0a4bcf50b1af

From 4735cb7d2df3b54e7213913532a67f64be4ed606 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 26 May 2024 08:03:05 +1200
Subject: [PATCH 036/568] Fix dud modular grenade visuals (#28265)

---
 .../Objects/Weapons/Throwable/grenades.yml    |   3 +-
 .../Graphs/weapons/modular_grenade.yml        |  30 ++++++++++++++++--
 .../Weapons/Grenades/modular.rsi/meta.json    |   6 +++-
 .../Grenades/modular.rsi/no-trigger.png       | Bin 0 -> 347 bytes
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 0261bd8cadd9..b1d260c32761 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -320,11 +320,12 @@
           emptyCase: { state: empty }
           wiredCase: { state: wired }
           caseWithTrigger: { state: no-payload }
+          caseWithPayload: { state: no-trigger }
           grenade: { state: complete }
       enum.Trigger.TriggerVisuals.VisualState:
         enum.ConstructionVisuals.Layer:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          # Unprimed: <Use state determined by enum.ConstructionVisuals.Layer>
   - type: StaticPrice
     price: 25
 
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
index 020be4e09c3d..243a030c9810 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
@@ -12,7 +12,7 @@
         doAfter: 1
 
   - node: emptyCase
-    entity: ModularGrenade      
+    entity: ModularGrenade
     actions:
     - !type:AppearanceChange
     edges:
@@ -31,7 +31,7 @@
         doAfter: 2
 
   - node: wiredCase
-    entity: ModularGrenade      
+    entity: ModularGrenade
     actions:
     - !type:AppearanceChange
     - !type:PlaySound
@@ -50,6 +50,12 @@
         store: payloadTrigger
         name: Trigger
         doAfter: 0.5
+    - to: caseWithPayload
+      steps:
+      - tag: Payload
+        store: payload
+        name: Payload
+        doAfter: 0.5
 
   - node: caseWithTrigger
     actions:
@@ -71,6 +77,26 @@
         name: Payload
         doAfter: 0.5
 
+  - node: caseWithPayload
+    actions:
+    - !type:AppearanceChange
+    - !type:PlaySound
+      sound: /Audio/Machines/button.ogg
+    edges:
+    - to: wiredCase
+      steps:
+      - tool: Prying
+        doAfter: 0.5
+        completed:
+        - !type:EmptyContainer
+          container: payload
+    - to: grenade
+      steps:
+      - component: PayloadTrigger
+        store: payloadTrigger
+        name: Trigger
+        doAfter: 0.5
+
   - node: grenade
     actions:
     - !type:AppearanceChange
diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
index f23b6ec168d4..b0b12127c594 100644
--- a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Grenades/modular.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/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept & ElectroSR",
   "size": {
     "x": 32,
     "y": 32
@@ -19,6 +19,10 @@
         "name": "no-payload",
         "directions": 1
     },
+    {
+        "name": "no-trigger",
+        "directions": 1
+    },
     {
         "name": "complete",
         "directions": 1
diff --git a/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png b/Resources/Textures/Objects/Weapons/Grenades/modular.rsi/no-trigger.png
new file mode 100644
index 0000000000000000000000000000000000000000..1be2cbc421b2add226c928b7612c9b856a09c276
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;0I3^$B+p3WC_;A2_iie2RN2`G8GjS{a@(Q
z=H4$iF_n#H!Wzl6owH|4&)A=RU9U^#Aj{HDwiDBAYk!IOD7SO0Y<MH!z^35dc;qA}
z=OmK`okmt$qXt)I%RU85uB4<Si78X39z0n8^j2(}u=+WN)Dz4q?F>^m*=uT?c;?&f
zT^!F*VIz`Sv4yW`C8I|f!&b(Vd^Z&T&vMk`01F&g<k~G^WNa+CW$RYSB`H%DE_%Ye
zY0-lV3!Qo1+y7(OT=|3Lpb5u>V7>`++5XhtJuoB4;ERwVPtKh^+&!ACD#s<a9qO2~
iLmuooCXR#z28QMC;YapN+0q8|JA<dIpUXO@geCw%Y<n&M

literal 0
HcmV?d00001


From 87d073b81af50decf2a149250ad9f683999b190d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 25 May 2024 20:04:12 +0000
Subject: [PATCH 037/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 61b8e7ec78f6..d3b1dfb40504 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fix NPC mouse movement.
-    type: Fix
-  id: 6116
-  time: '2024-03-10T15:41:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25965
 - author: DoutorWhite
   changes:
   - message: Prevents rendering from crashing in certain scenarios
@@ -3871,3 +3864,10 @@
   id: 6615
   time: '2024-05-24T14:44:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28227
+- author: ElectroJr
+  changes:
+  - message: Fixed modular grenade visuals getting stuck in an incorrect state.
+    type: Fix
+  id: 6616
+  time: '2024-05-25T20:03:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28265

From 8619f241d4b44ff4e4bb40da83cc12334a966692 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 25 May 2024 13:07:37 -0700
Subject: [PATCH 038/568] Fix not networking whitelist and blacklist in storage
 component (#28238)

---
 .../Storage/EntitySystems/SharedStorageSystem.cs      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 778e2b2e74e9..18a8f20afc7e 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -21,6 +21,7 @@
 using Content.Shared.Storage.Components;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -151,7 +152,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
         };
     }
 
@@ -163,6 +166,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();
 
@@ -1490,5 +1495,9 @@ protected sealed class StorageComponentState : ComponentState
         public List<Box2i> Grid = new();
 
         public ProtoId<ItemSizePrototype>? MaxItemSize;
+
+        public EntityWhitelist? Whitelist;
+
+        public EntityWhitelist? Blacklist;
     }
 }

From 37ad81c59ca04b10cdc420eb66ae7a9487ecdfaf Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 25 May 2024 20:08:15 +0000
Subject: [PATCH 039/568] fix id card console not updating records (#28237)

* fix id card console not updating records

* test

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Server/Access/Systems/IdCardConsoleSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index e680b0c6f407..4e63c93a837d 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -135,6 +135,8 @@ private void TryWriteToTargetId(EntityUid uid,
             _idCard.TryChangeJobDepartment(targetId, job);
         }
 
+        UpdateStationRecord(uid, targetId, newFullName, newJobTitle, job);
+
         if (!newAccessList.TrueForAll(x => component.AccessLevels.Contains(x)))
         {
             _sawmill.Warning($"User {ToPrettyString(uid)} tried to write unknown access tag.");
@@ -168,8 +170,6 @@ private void TryWriteToTargetId(EntityUid uid,
         This current implementation is pretty shit as it logs 27 entries (27 lines) if someone decides to give themselves AA*/
         _adminLogger.Add(LogType.Action, LogImpact.Medium,
             $"{ToPrettyString(player):player} has modified {ToPrettyString(targetId):entity} with the following accesses: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]");
-
-        UpdateStationRecord(uid, targetId, newFullName, newJobTitle, job);
     }
 
     /// <summary>

From cb17fe2845e59c1b55b9594a9ed8a2c2c8169bf4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 25 May 2024 20:09:22 +0000
Subject: [PATCH 040/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d3b1dfb40504..22c9a547de79 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: DoutorWhite
-  changes:
-  - message: Prevents rendering from crashing in certain scenarios
-    type: Fix
-  id: 6117
-  time: '2024-03-10T17:07:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25960
 - author: nikthechampiongr
   changes:
   - message: Shields will no longer absorb asphyxiation damage, or any other damage
@@ -3871,3 +3864,10 @@
   id: 6616
   time: '2024-05-25T20:03:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28265
+- author: deltanedas
+  changes:
+  - message: Fixed ID Cards not updating the manifest when changed.
+    type: Fix
+  id: 6617
+  time: '2024-05-25T20:08:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28237

From f1c70d69f2669cac0bdbca758a9da3e7c3608cbc Mon Sep 17 00:00:00 2001
From: Vasilis <vasilis@pikachu.systems>
Date: Sat, 25 May 2024 23:09:52 +0300
Subject: [PATCH 041/568] Remove the network tab (#28231)

It is useless and bloat, if a user needs to change these settings they are free to modify their cvars manually via the clientconfig.toml file or via the cvar command.
---
 Content.Client/Options/UI/OptionsMenu.xaml    |   1 -
 Content.Client/Options/UI/OptionsMenu.xaml.cs |   1 -
 .../Options/UI/Tabs/NetworkTab.xaml           | 102 --------------
 .../Options/UI/Tabs/NetworkTab.xaml.cs        | 125 ------------------
 4 files changed, 229 deletions(-)
 delete mode 100644 Content.Client/Options/UI/Tabs/NetworkTab.xaml
 delete mode 100644 Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs

diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml
index ab3b88ca4e65..4f624c1bb69a 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml
+++ b/Content.Client/Options/UI/OptionsMenu.xaml
@@ -7,6 +7,5 @@
         <tabs:GraphicsTab Name="GraphicsTab" />
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
-        <tabs:NetworkTab Name="NetworkTab" />
     </TabContainer>
 </DefaultWindow>
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
index c3a8e664705c..35a3f751bbfe 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -19,7 +19,6 @@ public OptionsMenu()
             Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics"));
             Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
             Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
-            Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-network"));
 
             UpdateTabs();
         }
diff --git a/Content.Client/Options/UI/Tabs/NetworkTab.xaml b/Content.Client/Options/UI/Tabs/NetworkTab.xaml
deleted file mode 100644
index d010f0bd3147..000000000000
--- a/Content.Client/Options/UI/Tabs/NetworkTab.xaml
+++ /dev/null
@@ -1,102 +0,0 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         x:Class="Content.Client.Options.UI.Tabs.NetworkTab">
-    <BoxContainer Orientation="Vertical" >
-        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
-            <BoxContainer Orientation="Horizontal" Margin="4 10 4 0">
-                <CheckBox Name="NetPredictCheckbox" Text="{Loc 'ui-options-net-predict'}" />
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal" Margin="4 10 4 0">
-                <Label Text="{Loc 'ui-options-net-interp-ratio'}" />
-                <Control MinSize="8 0" />
-                <Slider Name="NetInterpRatioSlider"
-                            ToolTip="{Loc 'ui-options-net-interp-ratio-tooltip'}"
-                            MaxValue="8"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                <Control MinSize="8 0" />
-                <Label Name="NetInterpRatioLabel" MinSize="48 0" Align="Right" />
-                <Control MinSize="4 0"/>
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal" Margin="4 10 4 0">
-                <Label Text="{Loc 'ui-options-net-predict-tick-bias'}" />
-                <Control MinSize="8 0" />
-                <Slider Name="NetPredictTickBiasSlider"
-                            ToolTip="{Loc 'ui-options-net-predict-tick-bias-tooltip'}"
-                            MaxValue="6"
-                            MinValue="0"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                <Control MinSize="8 0" />
-                <Label Name="NetPredictTickBiasLabel" MinSize="48 0" Align="Right" />
-                <Control MinSize="4 0"/>
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal" Margin="4 10 4 0">
-                <Label Text="{Loc 'ui-options-net-pvs-spawn'}" />
-                <Control MinSize="8 0" />
-                <Slider Name="NetPvsSpawnSlider"
-                            ToolTip="{Loc 'ui-options-net-pvs-spawn-tooltip'}"
-                            MaxValue="150"
-                            MinValue="20"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                <Control MinSize="8 0" />
-                <Label Name="NetPvsSpawnLabel" MinSize="48 0" Align="Right" />
-                <Control MinSize="4 0"/>
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal" Margin="4 10 4 0">
-                <Label Text="{Loc 'ui-options-net-pvs-entry'}" />
-                <Control MinSize="8 0" />
-                <Slider Name="NetPvsEntrySlider"
-                            ToolTip="{Loc 'ui-options-net-pvs-entry-tooltip'}"
-                            MaxValue="500"
-                            MinValue="20"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                <Control MinSize="8 0" />
-                <Label Name="NetPvsEntryLabel" MinSize="48 0" Align="Right" />
-                <Control MinSize="4 0"/>
-            </BoxContainer>
-            <BoxContainer Orientation="Horizontal" Margin="4 10 4 10">
-                <Label Text="{Loc 'ui-options-net-pvs-leave'}" />
-                <Control MinSize="8 0" />
-                <Slider Name="NetPvsLeaveSlider"
-                            ToolTip="{Loc 'ui-options-net-pvs-leave-tooltip'}"
-                            MaxValue="300"
-                            MinValue="20"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                <Control MinSize="8 0" />
-                <Label Name="NetPvsLeaveLabel" MinSize="48 0" Align="Right" />
-                <Control MinSize="4 0"/>
-            </BoxContainer>
-        </BoxContainer>
-        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
-            <BoxContainer Orientation="Horizontal"
-                          Align="End"
-                          HorizontalExpand="True"
-                          VerticalExpand="True">
-                <Button Name="ResetButton"
-                        Text="{Loc 'ui-options-reset-all'}"
-                        StyleClasses="Caution"
-                        HorizontalExpand="True"
-                        HorizontalAlignment="Right" />
-                <Button Name="DefaultButton"
-                        Text="{Loc 'ui-options-default'}"
-                        TextAlign="Center"
-                        HorizontalAlignment="Right" />
-                <Control MinSize="2 0" />
-                <Button Name="ApplyButton"
-                        Text="{Loc 'ui-options-apply'}"
-                        TextAlign="Center"
-                        HorizontalAlignment="Right" />
-            </BoxContainer>
-        </controls:StripeBack>
-    </BoxContainer>
-</Control>
diff --git a/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs b/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
deleted file mode 100644
index 0cdc3b53fb85..000000000000
--- a/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System.Globalization;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared;
-using Robust.Shared.Configuration;
-using Robust.Client.GameStates;
-using Content.Client.Entry;
-
-namespace Content.Client.Options.UI.Tabs
-{
-    [GenerateTypedNameReferences]
-    public sealed partial class NetworkTab : Control
-    {
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
-        [Dependency] private readonly IClientGameStateManager _stateMan = default!;
-
-        public NetworkTab()
-        {
-
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-
-            ApplyButton.OnPressed += OnApplyButtonPressed;
-            ResetButton.OnPressed += OnResetButtonPressed;
-            DefaultButton.OnPressed += OnDefaultButtonPressed;
-            NetPredictCheckbox.OnToggled += OnPredictToggled;
-            NetInterpRatioSlider.OnValueChanged += OnSliderChanged;
-            NetInterpRatioSlider.MinValue = _stateMan.MinBufferSize;
-            NetPredictTickBiasSlider.OnValueChanged += OnSliderChanged;
-            NetPvsSpawnSlider.OnValueChanged += OnSliderChanged;
-            NetPvsEntrySlider.OnValueChanged += OnSliderChanged;
-            NetPvsLeaveSlider.OnValueChanged += OnSliderChanged;
-
-            Reset();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            ApplyButton.OnPressed -= OnApplyButtonPressed;
-            ResetButton.OnPressed -= OnResetButtonPressed;
-            DefaultButton.OnPressed -= OnDefaultButtonPressed;
-            NetPredictCheckbox.OnToggled -= OnPredictToggled;
-            NetInterpRatioSlider.OnValueChanged -= OnSliderChanged;
-            NetPredictTickBiasSlider.OnValueChanged -= OnSliderChanged;
-            NetPvsSpawnSlider.OnValueChanged -= OnSliderChanged;
-            NetPvsEntrySlider.OnValueChanged -= OnSliderChanged;
-            NetPvsLeaveSlider.OnValueChanged -= OnSliderChanged;
-            base.Dispose(disposing);
-        }
-
-        private void OnPredictToggled(BaseButton.ButtonToggledEventArgs obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnSliderChanged(Robust.Client.UserInterface.Controls.Range range)
-        {
-            UpdateChanges();
-        }
-
-        private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            _cfg.SetCVar(CVars.NetBufferSize, (int) NetInterpRatioSlider.Value - _stateMan.MinBufferSize);
-            _cfg.SetCVar(CVars.NetPredictTickBias, (int) NetPredictTickBiasSlider.Value);
-            _cfg.SetCVar(CVars.NetPVSEntityBudget, (int) NetPvsSpawnSlider.Value);
-            _cfg.SetCVar(CVars.NetPVSEntityEnterBudget, (int) NetPvsEntrySlider.Value);
-            _cfg.SetCVar(CVars.NetPVSEntityExitBudget, (int) NetPvsLeaveSlider.Value);
-            _cfg.SetCVar(CVars.NetPredict, NetPredictCheckbox.Pressed);
-
-            _cfg.SaveToFile();
-            UpdateChanges();
-        }
-
-        private void OnResetButtonPressed(BaseButton.ButtonEventArgs args)
-        {
-            Reset();
-        }
-
-        private void OnDefaultButtonPressed(BaseButton.ButtonEventArgs obj)
-        {
-            NetPredictTickBiasSlider.Value = CVars.NetPredictTickBias.DefaultValue;
-            NetPvsSpawnSlider.Value = CVars.NetPVSEntityBudget.DefaultValue;
-            NetPvsEntrySlider.Value = CVars.NetPVSEntityEnterBudget.DefaultValue;
-            NetPvsLeaveSlider.Value = CVars.NetPVSEntityExitBudget.DefaultValue;
-            NetInterpRatioSlider.Value = CVars.NetBufferSize.DefaultValue + _stateMan.MinBufferSize;
-
-            UpdateChanges();
-        }
-
-        private void Reset()
-        {
-            NetInterpRatioSlider.Value = _cfg.GetCVar(CVars.NetBufferSize) + _stateMan.MinBufferSize;
-            NetPredictTickBiasSlider.Value = _cfg.GetCVar(CVars.NetPredictTickBias);
-            NetPvsSpawnSlider.Value = _cfg.GetCVar(CVars.NetPVSEntityBudget);
-            NetPvsEntrySlider.Value = _cfg.GetCVar(CVars.NetPVSEntityEnterBudget);
-            NetPvsLeaveSlider.Value = _cfg.GetCVar(CVars.NetPVSEntityExitBudget);
-            NetPredictCheckbox.Pressed = _cfg.GetCVar(CVars.NetPredict);
-            UpdateChanges();
-        }
-
-        private void UpdateChanges()
-        {
-            var isEverythingSame =
-                NetInterpRatioSlider.Value == _cfg.GetCVar(CVars.NetBufferSize) + _stateMan.MinBufferSize &&
-                NetPredictTickBiasSlider.Value == _cfg.GetCVar(CVars.NetPredictTickBias) &&
-                NetPredictCheckbox.Pressed == _cfg.GetCVar(CVars.NetPredict) &&
-                NetPvsSpawnSlider.Value == _cfg.GetCVar(CVars.NetPVSEntityBudget) &&
-                NetPvsEntrySlider.Value == _cfg.GetCVar(CVars.NetPVSEntityEnterBudget) &&
-                NetPvsLeaveSlider.Value == _cfg.GetCVar(CVars.NetPVSEntityExitBudget);
-
-            ApplyButton.Disabled = isEverythingSame;
-            ResetButton.Disabled = isEverythingSame;
-            NetInterpRatioLabel.Text = NetInterpRatioSlider.Value.ToString(CultureInfo.InvariantCulture);
-            NetPredictTickBiasLabel.Text = NetPredictTickBiasSlider.Value.ToString(CultureInfo.InvariantCulture);
-            NetPvsSpawnLabel.Text = NetPvsSpawnSlider.Value.ToString(CultureInfo.InvariantCulture);
-            NetPvsEntryLabel.Text = NetPvsEntrySlider.Value.ToString(CultureInfo.InvariantCulture);
-            NetPvsLeaveLabel.Text = NetPvsLeaveSlider.Value.ToString(CultureInfo.InvariantCulture);
-
-            // TODO disable / grey-out the predict and interp sliders if prediction is disabled.
-            // Currently no option to do this, but should be added to the slider control in general
-        }
-    }
-}

From a06ea58249889febd1268d9a67397636d69bae57 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 042/568] antag objective issuing refactor (#28216)

* add AntagObjectives from GenericAntag

* add AntagRandomObjectives that traitor and thief can use

* make ObjectivesSystem use initial character name which AntagSelection passes

* make thief and traitor use AntagRandomObjectives

* remove now unused locale

* make sleeper agents rule use baseTraitorRule

* restore dragon rule oop

* bandaid for genericantag

* real

* typo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 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   | 23 ++++----
 Resources/Prototypes/GameRules/roundstart.yml | 18 ++++++-
 .../Prototypes/Objectives/objectiveGroups.yml |  7 ---
 18 files changed, 231 insertions(+), 153 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 000000000000..5aa31f66f676
--- /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 000000000000..c935b8c06481
--- /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 6acd17a35b27..d8554e3fb22a 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -124,7 +124,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 57df82d6fd9b..1d1783ed8756 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -7,6 +7,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;
@@ -50,6 +51,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<GhostRoleAntagSpawnerComponent, TakeGhostRoleEvent>(OnTakeGhostRole);
 
+        SubscribeLocalEvent<AntagSelectionComponent, ObjectivesTextGetInfoEvent>(OnObjectivesTextGetInfo);
+
         SubscribeLocalEvent<RulePlayerSpawningEvent>(OnPlayerSpawning);
         SubscribeLocalEvent<RulePlayerJobsAssignedEvent>(OnJobsAssigned);
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnSpawnComplete);
@@ -423,6 +426,15 @@ private 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 000000000000..357c138f46b0
--- /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 000000000000..9a551acc4990
--- /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 096be14049a7..3464ee56662a 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 01a078625ae3..6ad1e177755e 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 b85019d8afa6..62f92963aa7b 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 81bdda706bdf..0367aa1460ce 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 083085fa0d8e..faec4a9e9ca2 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 1c894a460cca..29de85a42e50 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -31,15 +31,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);
     }
 
@@ -67,7 +64,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))
@@ -112,37 +109,16 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool
         _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false);
         _npcFaction.AddFaction(traitor, component.SyndicateFaction);
 
-        // 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 47fe4eb5f889..f8ecc22828e5 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 b4314b2caff9..3da81fc96404 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 3b9ad5aadf2c..593122eee558 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -428,9 +428,9 @@
         prototype: Nukeops
 
 - type: entity
-  id: SleeperAgentsRule
-  parent: BaseGameRule
   noSpawn: true
+  parent: BaseTraitorRule
+  id: SleeperAgentsRule
   components:
   - type: StationEvent
     earliestStart: 30
@@ -441,7 +441,6 @@
     startAudio:
       path: /Audio/Announcements/intercept.ogg
   - type: AlertLevelInterceptionRule
-  - type: TraitorRule
   - type: AntagSelection
     definitions:
     - prefRoles: [ Traitor ]
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 5a4cde31018b..1b58ada64855 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:
@@ -53,14 +65,3 @@
         prototype: Thief
       briefing:
         sound: "/Audio/Misc/thief_greeting.ogg"
-
-#- type: entity
-#  noSpawn: true
-#  parent: BaseGameRule
-#  id: Exterminator
-#  components:
-#  - type: GenericAntagRule
-#    agentName: terminator-round-end-agent-name
-#    objectives:
-#    - TerminateObjective
-#    - ShutDownObjective
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index d87e7ccbe76d..be5f617c8dc8 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
   noSpawn: true
+  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 ff126eb5d162..bb74c92da3b5 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -55,13 +55,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 739c81c230ad4ae103b9a3b6a886cd7a46830361 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 043/568] 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    | 28 -------------
 Resources/Prototypes/GameRules/events.yml     |  4 +-
 Resources/Prototypes/GameRules/roundstart.yml | 16 ++++++--
 5 files changed, 60 insertions(+), 34 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 000000000000..fd3fb6cd655e
--- /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 000000000000..5e58fd14fc04
--- /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 232d24004b90..d6f1c3c619ab 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -1,11 +1,9 @@
 using Content.Server.Antag;
 using Content.Server.Communications;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Humanoid;
 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;
@@ -13,20 +11,16 @@
 using Content.Server.Station.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Prototypes;
 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.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 +30,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 +62,6 @@ public override void Initialize()
         SubscribeLocalEvent<WarDeclaredEvent>(OnWarDeclared);
         SubscribeLocalEvent<CommunicationConsoleCallShuttleAttemptEvent>(OnShuttleCallAttempt);
 
-        SubscribeLocalEvent<NukeopsRuleComponent, AntagSelectEntityEvent>(OnAntagSelectEntity);
         SubscribeLocalEvent<NukeopsRuleComponent, AfterAntagEntitySelectedEvent>(OnAfterAntagEntSelected);
     }
 
@@ -471,24 +461,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 593122eee558..b1b48258bade 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -394,9 +394,9 @@
         prototype: InitialInfected
 
 - type: entity
-  id: LoneOpsSpawn
-  parent: BaseGameRule
   noSpawn: true
+  parent: BaseNukeopsRule
+  id: LoneOpsSpawn
   components:
   - type: StationEvent
     earliestStart: 35
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index be5f617c8dc8..57e59f10e213 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
-  noSpawn: true
+  id: BaseNukeopsRule
   components:
-  - type: GameRule
-    minPlayers: 20
   - type: RandomMetadata #this generates the random operation name cuz it's cool.
     nameSegments:
     - operationPrefix
     - operationSuffix
   - type: NukeopsRule
+  - type: AntagSelection
+  - type: AntagLoadProfileRule
+
+- type: entity
+  noSpawn: true
+  parent: BaseNukeopsRule
+  id: Nukeops
+  components:
+  - type: GameRule
+    minPlayers: 20
   - type: LoadMapRule
     gameMap: NukieOutpost
   - type: AntagSelection

From 90d3699c1df2d0de21e887c893b9f17aaebcfced Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Sun, 26 May 2024 08:18:05 +1200
Subject: [PATCH 044/568] Fix gamerule display issues (#28178)

* A comprehensive rule list for joining admins and mid round command to get rule list added

* Fix up for when a rule is added vs started and some logging

* fix command help localization, fix admin flags and spam anouncement.

* Send admin message only to the joining player not all admins.

* Bit better formatting in chat box
---
 Content.Server/Chat/Managers/ChatManager.cs   |  8 ++
 Content.Server/Chat/Managers/IChatManager.cs  |  1 +
 .../GameTicking/GameTicker.GameRule.cs        | 74 ++++++++++++++++++-
 .../GameTicking/GameTicker.Player.cs          | 11 +++
 .../GameTicking/Rules/SecretRuleSystem.cs     |  1 -
 .../game-rules/gamerule-admin.ftl             |  6 ++
 .../game-ticking/game-rules/rule-secret.ftl   |  2 -
 7 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl
 delete mode 100644 Resources/Locale/en-US/game-ticking/game-rules/rule-secret.ftl

diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 812aed80bd76..79683db64117 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -150,6 +150,14 @@ public void SendAdminAnnouncement(string message, AdminFlags? flagBlacklist, Adm
             _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Admin announcement: {message}");
         }
 
+        public void SendAdminAnnouncementMessage(ICommonSession player, string message, bool suppressLog = true)
+        {
+            var wrappedMessage = Loc.GetString("chat-manager-send-admin-announcement-wrap-message",
+                ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
+                ("message", FormattedMessage.EscapeText(message)));
+            ChatMessageToOne(ChatChannel.Admin, message, wrappedMessage, default, false, player.Channel);
+        }
+
         public void SendAdminAlert(string message)
         {
             var clients = _adminManager.ActiveAdmins.Select(p => p.Channel);
diff --git a/Content.Server/Chat/Managers/IChatManager.cs b/Content.Server/Chat/Managers/IChatManager.cs
index 59945bf5ca6f..c8c057a1ad76 100644
--- a/Content.Server/Chat/Managers/IChatManager.cs
+++ b/Content.Server/Chat/Managers/IChatManager.cs
@@ -23,6 +23,7 @@ public interface IChatManager
 
         void SendHookOOC(string sender, string message);
         void SendAdminAnnouncement(string message, AdminFlags? flagBlacklist = null, AdminFlags? flagWhitelist = null);
+        void SendAdminAnnouncementMessage(ICommonSession player, string message, bool suppressLog = true);
         void SendAdminAlert(string message);
         void SendAdminAlert(EntityUid player, string message);
 
diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs
index f52a3cb296d2..a6d0a4baf0a9 100644
--- a/Content.Server/GameTicking/GameTicker.GameRule.cs
+++ b/Content.Server/GameTicking/GameTicker.GameRule.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking.Components;
+using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Prototypes;
@@ -42,6 +43,14 @@ private void InitializeGameRules()
             string.Empty,
             "cleargamerules",
             ClearGameRulesCommand);
+
+        // List game rules command.
+        var localizedHelp = Loc.GetString("listgamerules-command-help");
+
+        _consoleHost.RegisterCommand("listgamerules",
+            string.Empty,
+            $"listgamerules - {localizedHelp}",
+            ListGameRuleCommand);
     }
 
     private void ShutdownGameRules()
@@ -49,6 +58,7 @@ private void ShutdownGameRules()
         _consoleHost.UnregisterCommand("addgamerule");
         _consoleHost.UnregisterCommand("endgamerule");
         _consoleHost.UnregisterCommand("cleargamerules");
+        _consoleHost.UnregisterCommand("listgamerules");
     }
 
     /// <summary>
@@ -64,6 +74,13 @@ public EntityUid AddGameRule(string ruleId)
 
         var ev = new GameRuleAddedEvent(ruleEntity, ruleId);
         RaiseLocalEvent(ruleEntity, ref ev, true);
+
+        var currentTime = RunLevel == GameRunLevel.PreRoundLobby ? TimeSpan.Zero : RoundDuration();
+        if (!HasComp<RoundstartStationVariationRuleComponent>(ruleEntity) && !HasComp<StationVariationPassRuleComponent>(ruleEntity))
+        {
+            _allPreviousGameRules.Add((currentTime, ruleId + " (Pending)"));
+        }
+
         return ruleEntity;
     }
 
@@ -110,7 +127,8 @@ public bool StartGameRule(EntityUid ruleEntity, GameRuleComponent? ruleData = nu
             if (delayTime > TimeSpan.Zero)
             {
                 _sawmill.Info($"Queued start for game rule {ToPrettyString(ruleEntity)} with delay {delayTime}");
-                _adminLogger.Add(LogType.EventStarted, $"Queued start for game rule {ToPrettyString(ruleEntity)} with delay {delayTime}");
+                _adminLogger.Add(LogType.EventStarted,
+                    $"Queued start for game rule {ToPrettyString(ruleEntity)} with delay {delayTime}");
 
                 var delayed = EnsureComp<DelayedStartRuleComponent>(ruleEntity);
                 delayed.RuleStartTime = _gameTiming.CurTime + (delayTime);
@@ -118,7 +136,20 @@ public bool StartGameRule(EntityUid ruleEntity, GameRuleComponent? ruleData = nu
             }
         }
 
-        _allPreviousGameRules.Add((RoundDuration(), id));
+        var currentTime = RunLevel == GameRunLevel.PreRoundLobby ? TimeSpan.Zero : RoundDuration();
+
+        // Remove the first occurrence of the pending entry before adding the started entry
+        var pendingRuleIndex = _allPreviousGameRules.FindIndex(rule => rule.Item2 == id + " (Pending)");
+        if (pendingRuleIndex >= 0)
+        {
+            _allPreviousGameRules.RemoveAt(pendingRuleIndex);
+        }
+
+        if (!HasComp<RoundstartStationVariationRuleComponent>(ruleEntity) && !HasComp<StationVariationPassRuleComponent>(ruleEntity))
+        {
+            _allPreviousGameRules.Add((currentTime, id));
+        }
+
         _sawmill.Info($"Started game rule {ToPrettyString(ruleEntity)}");
         _adminLogger.Add(LogType.EventStarted, $"Started game rule {ToPrettyString(ruleEntity)}");
 
@@ -296,6 +327,7 @@ private void AddGameRuleCommand(IConsoleShell shell, string argstr, string[] arg
             if (shell.Player != null)
             {
                 _adminLogger.Add(LogType.EventStarted, $"{shell.Player} tried to add game rule [{rule}] via command");
+                _chatManager.SendAdminAnnouncement(Loc.GetString("add-gamerule-admin", ("rule", rule), ("admin", shell.Player)));
             }
             else
             {
@@ -306,6 +338,7 @@ private void AddGameRuleCommand(IConsoleShell shell, string argstr, string[] arg
             // Start rule if we're already in the middle of a round
             if(RunLevel == GameRunLevel.InRound)
                 StartGameRule(ent);
+
         }
     }
 
@@ -349,5 +382,42 @@ private void ClearGameRulesCommand(IConsoleShell shell, string argstr, string[]
         ClearGameRules();
     }
 
+    [AdminCommand(AdminFlags.Admin)]
+    private void ListGameRuleCommand(IConsoleShell shell, string argstr, string[] args)
+    {
+        _sawmill.Info($"{shell.Player} tried to get list of game rules via command");
+        _adminLogger.Add(LogType.Action, $"{shell.Player} tried to get list of game rules via command");
+        var message = GetGameRulesListMessage(false);
+        shell.WriteLine(message);
+    }
+    private string GetGameRulesListMessage(bool forChatWindow)
+    {
+        if (_allPreviousGameRules.Count > 0)
+        {
+            var sortedRules = _allPreviousGameRules.OrderBy(rule => rule.Item1).ToList();
+            var message = "\n";
+
+            if (!forChatWindow)
+            {
+                var header = Loc.GetString("list-gamerule-admin-header");
+                message += $"\n{header}\n";
+                message += "|------------|------------------\n";
+            }
+
+            foreach (var (time, rule) in sortedRules)
+            {
+                var formattedTime = time.ToString(@"hh\:mm\:ss");
+                message += $"| {formattedTime,-10} | {rule,-16} \n";
+            }
+
+            return message;
+        }
+        else
+        {
+            return Loc.GetString("list-gamerule-admin-no-rules");
+
+        }
+    }
+
     #endregion
 }
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index c1388f629036..61cdf6f8553f 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -1,4 +1,6 @@
+using System.Linq;
 using Content.Server.Database;
+using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
@@ -196,6 +198,15 @@ public void PlayerJoinGame(ICommonSession session, bool silent = false)
             _playerGameStatuses[session.UserId] = PlayerGameStatus.JoinedGame;
             _db.AddRoundPlayers(RoundId, session.UserId);
 
+            if (_adminManager.HasAdminFlag(session, AdminFlags.Admin))
+            {
+                if (_allPreviousGameRules.Count > 0)
+                {
+                    var rulesMessage = GetGameRulesListMessage(true);
+                    _chatManager.SendAdminAnnouncementMessage(session, Loc.GetString("starting-rule-selected-preset", ("preset", rulesMessage)));
+                }
+            }
+
             RaiseNetworkEvent(new TickerJoinGameEvent(), session.Channel);
         }
 
diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
index 95bf5986a5a6..d25262b797af 100644
--- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
@@ -46,7 +46,6 @@ protected override void Added(EntityUid uid, SecretRuleComponent component, Game
 
         Log.Info($"Selected {preset.ID} as the secret preset.");
         _adminLogger.Add(LogType.EventStarted, $"Selected {preset.ID} as the secret preset.");
-        _chatManager.SendAdminAnnouncement(Loc.GetString("rule-secret-selected-preset", ("preset", preset.ID)));
 
         foreach (var rule in preset.Rules)
         {
diff --git a/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl
new file mode 100644
index 000000000000..3b31fe466307
--- /dev/null
+++ b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl
@@ -0,0 +1,6 @@
+#When an admin adds a game rule
+add-gamerule-admin = Game rule({$rule}) added - {$admin}
+list-gamerule-admin-header = | Time       | Rule added
+list-gamerule-admin-no-rules = No game rules have been added.
+starting-rule-selected-preset = Current gamerules in use: {$preset}
+listgamerules-command-help = Lists all rules that have been added for the round so far.
diff --git a/Resources/Locale/en-US/game-ticking/game-rules/rule-secret.ftl b/Resources/Locale/en-US/game-ticking/game-rules/rule-secret.ftl
deleted file mode 100644
index c38220cca1dd..000000000000
--- a/Resources/Locale/en-US/game-ticking/game-rules/rule-secret.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-# Sent to admin chat
-rule-secret-selected-preset = Selected {$preset} for secret.

From 7c9e5a0779e7d44f183575b1fce6ab95dc0c8996 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 25 May 2024 23:18:40 +0300
Subject: [PATCH 045/568] Tomato killers don't kill the server anymore.
 (#28173)

* tomato killer auto death

* fix

* Update miscellaneous.yml
---
 .../Entities/Mobs/NPCs/miscellaneous.yml      | 27 ++++++++++++++++---
 .../Entities/Objects/Consumable/Food/meat.yml |  4 +++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index f77429d5978d..e09d3917c751 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -114,13 +114,22 @@
     - trigger:
         !type:DamageTypeTrigger
         damageType: Blunt
-        damage: 100
+        damage: 40
       behaviors:
-      - !type:GibBehavior { }
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          FoodMeatTomato:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: gib
   - type: MobThresholds
     thresholds:
       0: Alive
-      24: Dead
+      35: Dead
   - type: Fixtures
     fixtures:
       fix1:
@@ -136,7 +145,7 @@
     hidden: true
     damage:
       groups:
-        Brute: 4
+        Brute: 9
     animation: WeaponArcBite
   - type: Climbing
   - type: NameIdentifier
@@ -156,3 +165,13 @@
   - type: Appearance
   - type: Produce
     seedId: killerTomato
+  - type: PassiveDamage # Slight passive damage. 35 hp \ 5 min \ 60 sec = 0.08
+    allowedStates:
+    - Alive
+    - Dead
+    damageCap: 50
+    damage:
+      types:
+        Blunt: 0.11
+  - type: StaticPrice
+    price: 400
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 81c98750dc26..bb0f05c1814f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -599,6 +599,8 @@
   - type: SliceableFood
     count: 3
     slice: FoodMeatTomatoCutlet
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   name: salami
@@ -1270,6 +1272,8 @@
   - type: Sprite
     state: salami-slice
     color: red
+  - type: StaticPrice
+    price: 30
 
 - type: entity
   name: salami slice

From bc5b92b8154669194f1973f3564a336e5deaa35c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 25 May 2024 20:19:46 +0000
Subject: [PATCH 046/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml     | 11 +++++++++++
 Resources/Changelog/Changelog.yml | 20 ++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index f0bb5671028a..879eaff2329f 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -235,5 +235,16 @@ Entries:
   id: 29
   time: '2024-05-19T23:04:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28107
+- author: Repo
+  changes:
+  - message: Added listgamerules command, lists all run game modes for the round.
+    type: Add
+  - message: Added admin anouncement for addgamerule
+    type: Add
+  - message: Gamemode now shows after starting round.
+    type: Fix
+  id: 30
+  time: '2024-05-25T20:18:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28178
 Name: Admin
 Order: 1
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 22c9a547de79..1a290ea8c399 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: Shields will no longer absorb asphyxiation damage, or any other damage
-      they themselves can't take.
-    type: Fix
-  id: 6118
-  time: '2024-03-11T01:55:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25972
 - author: metalgearsloth
   changes:
   - message: Remove the buttons for generated debris from shuttle maps.
@@ -3871,3 +3863,15 @@
   id: 6617
   time: '2024-05-25T20:08:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28237
+- author: TheShuEd
+  changes:
+  - message: 'Killer tomatoes got a small health and damage buff: 24 -> 35 hp and
+      4->9 brute damage'
+    type: Tweak
+  - message: Killer tomatoes now die after 5 minutes of their existence
+    type: Tweak
+  - message: Killer tomatoes can now be profitably sold.
+    type: Add
+  id: 6618
+  time: '2024-05-25T20:18:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28173

From de8b6631245cc6a7a3641f43b68c61e077a06bf8 Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Sat, 25 May 2024 23:20:43 +0300
Subject: [PATCH 047/568] Add direction relative to station for emergency
 shuttle's docking & nearby announcement (#28164)

* Use nav beacon location for emergency shuttle's docking announcement

Location of the shuttle relative to the nearest nav beacon in docking announcement message of the emergency shuttle

* Add directions relative to station
---
 .../Shuttles/Systems/EmergencyShuttleSystem.cs        | 11 ++++++++---
 Resources/Locale/en-US/shuttles/emergency.ftl         |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index 2d8ae4b735e5..e2b1ad32cd7a 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -287,7 +287,8 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
             if (TryComp(targetGrid.Value, out TransformComponent? targetXform))
             {
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir())), playDefaultSound: false);
+                var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
+                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir()), ("location", location)), playDefaultSound: false);
             }
 
             // shuttle timers
@@ -313,8 +314,12 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
         }
         else
         {
-            var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
-            _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("direction", location)), playDefaultSound: false);
+            if (TryComp<TransformComponent>(targetGrid.Value, out var targetXform))
+            {
+                var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
+                var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
+                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir()), ("location", location)), playDefaultSound: false);
+            }
 
             _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle {ToPrettyString(stationUid)} unable to find a valid docking port for {ToPrettyString(stationUid)}");
             // TODO: Need filter extensions or something don't blame me.
diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl
index c71629113514..2fa3a7a1240a 100644
--- a/Resources/Locale/en-US/shuttles/emergency.ftl
+++ b/Resources/Locale/en-US/shuttles/emergency.ftl
@@ -13,9 +13,9 @@ emergency-shuttle-command-launch-desc = Early launches the emergency shuttle if
 # Emergency shuttle
 emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentCom.
 emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds.
-emergency-shuttle-docked = The Emergency Shuttle has docked with the station on the {$direction} side. It will leave in {$time} seconds.
+emergency-shuttle-docked = The Emergency Shuttle has docked {$direction} of the station, {$location}. It will leave in {$time} seconds.
 emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a station. Good luck.
-emergency-shuttle-nearby = The Emergency Shuttle is unable to find a valid docking port. It has warped {$direction}.
+emergency-shuttle-nearby = The Emergency Shuttle is unable to find a valid docking port. It has warped in {$direction} of the station, {$location}.
 
 # Emergency shuttle console popup / announcement
 emergency-shuttle-console-no-early-launches = Early launch is disabled

From afb1acab10a5abc2ff954d08107c5e7866d3db8e Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Sat, 25 May 2024 23:22:34 +0300
Subject: [PATCH 048/568] Fix candles (firestack fading) (#28139)

Update FlammableSystem.cs
---
 Content.Server/Atmos/EntitySystems/FlammableSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index e8721920dd8c..b6e26435a759 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -447,7 +447,7 @@ public override void Update(float frameTime)
 
                     _damageableSystem.TryChangeDamage(uid, flammable.Damage * flammable.FireStacks * ev.Multiplier, interruptsDoAfters: false);
 
-                    AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable);
+                    AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable, flammable.OnFire);
                 }
                 else
                 {

From 93f289c7dc94e0aa280b1b8544f8b9ba575d5294 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 26 May 2024 06:23:34 +1000
Subject: [PATCH 049/568] Fix water postshader (#28130)

---
 .../Movement/Systems/FloorOcclusionSystem.cs  | 41 +++++++++++--------
 .../Components/FloorOcclusionComponent.cs     |  9 ++--
 .../Systems/SharedFloorOcclusionSystem.cs     | 24 +++++------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
index 5c75f25ca2d9..44573f8e0844 100644
--- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
+++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
@@ -10,51 +10,56 @@ public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem
 {
     [Dependency] private readonly IPrototypeManager _proto = default!;
 
+    private EntityQuery<SpriteComponent> _spriteQuery;
+
     public override void Initialize()
     {
         base.Initialize();
+
+        _spriteQuery = GetEntityQuery<SpriteComponent>();
+
         SubscribeLocalEvent<FloorOcclusionComponent, ComponentStartup>(OnOcclusionStartup);
+        SubscribeLocalEvent<FloorOcclusionComponent, ComponentShutdown>(OnOcclusionShutdown);
         SubscribeLocalEvent<FloorOcclusionComponent, AfterAutoHandleStateEvent>(OnOcclusionAuto);
     }
 
-    private void OnOcclusionAuto(EntityUid uid, FloorOcclusionComponent component, ref AfterAutoHandleStateEvent args)
+    private void OnOcclusionAuto(Entity<FloorOcclusionComponent> ent, ref AfterAutoHandleStateEvent args)
     {
-        SetEnabled(uid, component, component.Enabled);
+        SetShader(ent.Owner, ent.Comp.Enabled);
     }
 
-    private void OnOcclusionStartup(EntityUid uid, FloorOcclusionComponent component, ComponentStartup args)
+    private void OnOcclusionStartup(Entity<FloorOcclusionComponent> ent, ref ComponentStartup args)
     {
-        if (component.Enabled && TryComp<SpriteComponent>(uid, out var sprite))
-            SetShader(sprite, true);
+        SetShader(ent.Owner, ent.Comp.Enabled);
     }
 
-    protected override void SetEnabled(EntityUid uid, FloorOcclusionComponent component, bool enabled)
+    private void OnOcclusionShutdown(Entity<FloorOcclusionComponent> ent, ref ComponentShutdown args)
     {
-        if (component.Enabled == enabled)
-            return;
-
-        base.SetEnabled(uid, component, enabled);
-
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-            return;
+        SetShader(ent.Owner, false);
+    }
 
-        SetShader(sprite, enabled);
+    protected override void SetEnabled(Entity<FloorOcclusionComponent> entity)
+    {
+        SetShader(entity.Owner, entity.Comp.Enabled);
     }
 
-    private void SetShader(SpriteComponent sprite, bool enabled)
+    private void SetShader(Entity<SpriteComponent?> sprite, bool enabled)
     {
+        if (!_spriteQuery.Resolve(sprite.Owner, ref sprite.Comp, false))
+            return;
+
         var shader = _proto.Index<ShaderPrototype>("HorizontalCut").Instance();
 
-        if (sprite.PostShader is not null && sprite.PostShader != shader)
+        if (sprite.Comp.PostShader is not null && sprite.Comp.PostShader != shader)
             return;
 
         if (enabled)
         {
-            sprite.PostShader = shader;
+            sprite.Comp.PostShader = shader;
         }
         else
         {
-            sprite.PostShader = null;
+            sprite.Comp.PostShader = null;
         }
     }
 }
diff --git a/Content.Shared/Movement/Components/FloorOcclusionComponent.cs b/Content.Shared/Movement/Components/FloorOcclusionComponent.cs
index aa9a1ced5521..5d412f694a0c 100644
--- a/Content.Shared/Movement/Components/FloorOcclusionComponent.cs
+++ b/Content.Shared/Movement/Components/FloorOcclusionComponent.cs
@@ -8,12 +8,9 @@ namespace Content.Shared.Movement.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class FloorOcclusionComponent : Component
 {
-    /// <summary>
-    /// Is the shader currently enabled.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("enabled"), AutoNetworkedField]
-    public bool Enabled;
+    [ViewVariables]
+    public bool Enabled => Colliding.Count > 0;
 
-    [DataField("colliding")]
+    [DataField, AutoNetworkedField]
     public List<EntityUid> Colliding = new();
 }
diff --git a/Content.Shared/Movement/Systems/SharedFloorOcclusionSystem.cs b/Content.Shared/Movement/Systems/SharedFloorOcclusionSystem.cs
index 9d27ea42c639..6b7023a1c64d 100644
--- a/Content.Shared/Movement/Systems/SharedFloorOcclusionSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedFloorOcclusionSystem.cs
@@ -15,39 +15,37 @@ public override void Initialize()
         SubscribeLocalEvent<FloorOccluderComponent, EndCollideEvent>(OnEndCollide);
     }
 
-    private void OnStartCollide(EntityUid uid, FloorOccluderComponent component, ref StartCollideEvent args)
+    private void OnStartCollide(Entity<FloorOccluderComponent> entity, ref StartCollideEvent args)
     {
         var other = args.OtherEntity;
 
         if (!TryComp<FloorOcclusionComponent>(other, out var occlusion) ||
-            occlusion.Colliding.Contains(uid))
+            occlusion.Colliding.Contains(entity.Owner))
         {
             return;
         }
 
-        SetEnabled(other, occlusion, true);
-        occlusion.Colliding.Add(uid);
+        occlusion.Colliding.Add(entity.Owner);
+        Dirty(other, occlusion);
+        SetEnabled((other, occlusion));
     }
 
-    private void OnEndCollide(EntityUid uid, FloorOccluderComponent component, ref EndCollideEvent args)
+    private void OnEndCollide(Entity<FloorOccluderComponent> entity, ref EndCollideEvent args)
     {
         var other = args.OtherEntity;
 
         if (!TryComp<FloorOcclusionComponent>(other, out var occlusion))
             return;
 
-        occlusion.Colliding.Remove(uid);
+        if (!occlusion.Colliding.Remove(entity.Owner))
+            return;
 
-        if (occlusion.Colliding.Count == 0)
-            SetEnabled(other, occlusion, false);
+        Dirty(other, occlusion);
+        SetEnabled((other, occlusion));
     }
 
-    protected virtual void SetEnabled(EntityUid uid, FloorOcclusionComponent component, bool enabled)
+    protected virtual void SetEnabled(Entity<FloorOcclusionComponent> entity)
     {
-        if (component.Enabled == enabled)
-            return;
 
-        component.Enabled = enabled;
-        Dirty(uid, component);
     }
 }

From ac08f0068fec2491b6558260a286d4c8213639ad Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 25 May 2024 20:24:40 +0000
Subject: [PATCH 050/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1a290ea8c399..7880f0a8d130 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Remove the buttons for generated debris from shuttle maps.
-    type: Tweak
-  id: 6119
-  time: '2024-03-11T02:11:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25897
 - author: Errant
   changes:
   - message: Species info is now available in the Guidebook and in the character editor.
@@ -3875,3 +3868,10 @@
   id: 6618
   time: '2024-05-25T20:18:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28173
+- author: metalgearsloth
+  changes:
+  - message: Fix water shader getting stuck on sometimes.
+    type: Fix
+  id: 6619
+  time: '2024-05-25T20:23:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28130

From 229f6d697cd1234f1d187bce79f70fe098571285 Mon Sep 17 00:00:00 2001
From: eoineoineoin <github@eoinrul.es>
Date: Sat, 25 May 2024 21:26:48 +0100
Subject: [PATCH 051/568] Objects ordered through cargo system shouldn't start
 anchored (#28115)

* Order normal space heater instead of anchored variant

* Make sure ordered objects don't spawn anchored

* Order space heater flatpack instead of a regular space heater

* Remove obsolete TODO

* Remove unnecessary name

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
---
 Content.Server/Cargo/Systems/CargoSystem.Orders.cs     |  5 +++++
 .../Prototypes/Catalog/Cargo/cargo_engineering.yml     |  2 +-
 .../Prototypes/Catalog/Fills/Crates/engineering.yml    | 10 ++++++++++
 Resources/Prototypes/Catalog/Fills/Crates/engines.yml  |  2 +-
 .../Prototypes/Entities/Objects/Devices/flatpack.yml   |  9 +++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 63556d2fbd73..c519362945e6 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -20,6 +20,8 @@ namespace Content.Server.Cargo.Systems
 {
     public sealed partial class CargoSystem
     {
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+
         /// <summary>
         /// How much time to wait (in seconds) before increasing bank accounts balance.
         /// </summary>
@@ -489,6 +491,9 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
             // Create the item itself
             var item = Spawn(order.ProductId, spawn);
 
+            // Ensure the item doesn't start anchored
+            _transformSystem.Unanchor(item, Transform(item));
+
             // Create a sheet of paper to write the order details on
             var printed = EntityManager.SpawnEntity(paperProto, spawn);
             if (TryComp<PaperComponent>(printed, out var paper))
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index 754e30f133a2..7ca6af84518d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -133,7 +133,7 @@
   icon:
     sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi
     state: sheaterOff
-  product: SpaceHeaterAnchored
+  product: CrateEngineeringSpaceHeater
   cost: 300
   category: cargoproduct-category-name-engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 03c870fa5808..26a8910c735e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -194,3 +194,13 @@
     contents:
     - id: WeaponParticleDecelerator
       amount: 3
+
+- type: entity
+  id: CrateEngineeringSpaceHeater
+  parent: CrateEngineering
+  name: space heater crate
+  description: Contains a space heater for climate control.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SpaceHeaterFlatpack
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 79698b550a75..c37b7b7535a0 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -42,7 +42,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: EmitterFlatpack # TODO change to flatpack
+      - id: EmitterFlatpack
 
 - type: entity
   id: CrateEngineeringSingularityCollector
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 2aecd1328809..e3e77d5c88ef 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -195,3 +195,12 @@
     - state: overlay
       color: "#cec8ac"
     - state: icon-default
+
+- type: entity
+  parent: BaseFlatpack
+  id: SpaceHeaterFlatpack
+  name: space heater flatpack
+  description: A flatpack used for constructing a space heater.
+  components:
+  - type: Flatpack
+    entity: SpaceHeaterAnchored

From f84e87a010be663d7d3c045c50c4904a00417ca6 Mon Sep 17 00:00:00 2001
From: Ady4ik <141335742+Ady4ik@users.noreply.github.com>
Date: Sun, 26 May 2024 00:07:18 +0300
Subject: [PATCH 052/568] Move PendingZombieComponent to Shared (#28143)

* Move PendingZombieComponent to Shared

* network me boy

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---
 .../Chemistry/ReagentEffects/CauseZombieInfection.cs         | 1 +
 .../Chemistry/ReagentEffects/CureZombieInfection.cs          | 1 +
 .../Zombies/PendingZombieComponent.cs                        | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename {Content.Server => Content.Shared}/Zombies/PendingZombieComponent.cs (94%)

diff --git a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs b/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
index 029b1495002b..96c57f74653e 100644
--- a/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
+++ b/Content.Server/Chemistry/ReagentEffects/CauseZombieInfection.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Content.Shared.Zombies;
 
 namespace Content.Server.Chemistry.ReagentEffects;
 
diff --git a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs b/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
index d56fc1153101..20e2c015c46f 100644
--- a/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
+++ b/Content.Server/Chemistry/ReagentEffects/CureZombieInfection.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Content.Shared.Zombies;
 
 namespace Content.Server.Chemistry.ReagentEffects;
 
diff --git a/Content.Server/Zombies/PendingZombieComponent.cs b/Content.Shared/Zombies/PendingZombieComponent.cs
similarity index 94%
rename from Content.Server/Zombies/PendingZombieComponent.cs
rename to Content.Shared/Zombies/PendingZombieComponent.cs
index 811d3f96440c..0fb61c84df11 100644
--- a/Content.Server/Zombies/PendingZombieComponent.cs
+++ b/Content.Shared/Zombies/PendingZombieComponent.cs
@@ -1,12 +1,13 @@
 using Content.Shared.Damage;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Zombies;
+namespace Content.Shared.Zombies;
 
 /// <summary>
 /// Temporary because diseases suck.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class PendingZombieComponent : Component
 {
     /// <summary>

From 436344c36da8af99d70e2d3247f694d639160931 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 25 May 2024 14:07:27 -0700
Subject: [PATCH 053/568] Make it possible to hide full health bars below a
 total damage threshold (#28127)

* Make it possible to hide full health bars below a total damage threshold

* Fix not setting state
---
 .../Overlays/EntityHealthBarOverlay.cs        | 20 +++++++-------
 .../Damage/Components/DamageableComponent.cs  | 26 +++++++++++--------
 .../Damage/Systems/DamageableSystem.cs        |  6 ++---
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index c1c0ae93ec11..2b2ff14a22b4 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -1,15 +1,14 @@
+using System.Numerics;
+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.Components;
 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 Robust.Shared.Prototypes;
 using static Robust.Shared.Maths.Color;
 
 namespace Content.Client.Overlays;
@@ -79,6 +78,10 @@ protected override void Draw(in OverlayDrawArgs args)
                 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 = Matrix3.CreateTranslation(worldPosition);
 
@@ -91,10 +94,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.
@@ -122,10 +121,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.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
index be66d51e3bcf..f8205568f101 100644
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -5,8 +5,6 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Damage
 {
@@ -18,7 +16,7 @@ namespace Content.Shared.Damage
     ///     may also have resistances to certain damage types, defined via a <see cref="DamageModifierSetPrototype"/>.
     /// </remarks>
     [RegisterComponent]
-    [NetworkedComponent()]
+    [NetworkedComponent]
     [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)]
     public sealed partial class DamageableComponent : Component
     {
@@ -26,8 +24,8 @@ public sealed partial class DamageableComponent : Component
         ///     This <see cref="DamageContainerPrototype"/> specifies what damage types are supported by this component.
         ///     If null, all damage types will be supported.
         /// </summary>
-        [DataField("damageContainer", customTypeSerializer: typeof(PrototypeIdSerializer<DamageContainerPrototype>))]
-        public string? DamageContainerID;
+        [DataField("damageContainer")]
+        public ProtoId<DamageContainerPrototype>? DamageContainerID;
 
         /// <summary>
         ///     This <see cref="DamageModifierSetPrototype"/> will be applied to any damage that is dealt to this container,
@@ -37,8 +35,8 @@ public sealed partial class DamageableComponent : Component
         ///     Though DamageModifierSets can be deserialized directly, we only want to use the prototype version here
         ///     to reduce duplication.
         /// </remarks>
-        [DataField("damageModifierSet", customTypeSerializer: typeof(PrototypeIdSerializer<DamageModifierSetPrototype>))]
-        public string? DamageModifierSetId;
+        [DataField("damageModifierSet")]
+        public ProtoId<DamageModifierSetPrototype>? DamageModifierSetId;
 
         /// <summary>
         ///     All the damage information is stored in this <see cref="DamageSpecifier"/>.
@@ -46,7 +44,7 @@ public sealed partial class DamageableComponent : Component
         /// <remarks>
         ///     If this data-field is specified, this allows damageable components to be initialized with non-zero damage.
         /// </remarks>
-        [DataField("damage", readOnly: true)] //todo remove this readonly when implementing writing to damagespecifier
+        [DataField(readOnly: true)] //todo remove this readonly when implementing writing to damagespecifier
         public DamageSpecifier Damage = new();
 
         /// <summary>
@@ -64,8 +62,8 @@ public sealed partial class DamageableComponent : Component
         [ViewVariables]
         public FixedPoint2 TotalDamage;
 
-        [DataField("radiationDamageTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
-        public List<string> RadiationDamageTypeIDs = new() { "Radiation" };
+        [DataField("radiationDamageTypes")]
+        public List<ProtoId<DamageTypePrototype>> RadiationDamageTypeIDs = new() { "Radiation" };
 
         [DataField]
         public Dictionary<MobState, ProtoId<StatusIconPrototype>> HealthIcons = new()
@@ -77,6 +75,9 @@ public sealed partial class DamageableComponent : Component
 
         [DataField]
         public ProtoId<StatusIconPrototype> RottingIcon = "HealthIconRotting";
+
+        [DataField]
+        public FixedPoint2? HealthBarThreshold;
     }
 
     [Serializable, NetSerializable]
@@ -84,13 +85,16 @@ public sealed class DamageableComponentState : ComponentState
     {
         public readonly Dictionary<string, FixedPoint2> DamageDict;
         public readonly string? ModifierSetId;
+        public readonly FixedPoint2? HealthBarThreshold;
 
         public DamageableComponentState(
             Dictionary<string, FixedPoint2> damageDict,
-            string? modifierSetId)
+            string? modifierSetId,
+            FixedPoint2? healthBarThreshold)
         {
             DamageDict = damageDict;
             ModifierSetId = modifierSetId;
+            HealthBarThreshold = healthBarThreshold;
         }
     }
 }
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index 4aaf380c47df..3c3e1b736df3 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Shared.Administration.Logs;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
@@ -229,12 +228,12 @@ private void DamageableGetState(EntityUid uid, DamageableComponent component, re
         {
             if (_netMan.IsServer)
             {
-                args.State = new DamageableComponentState(component.Damage.DamageDict, component.DamageModifierSetId);
+                args.State = new DamageableComponentState(component.Damage.DamageDict, component.DamageModifierSetId, component.HealthBarThreshold);
             }
             else
             {
                 // avoid mispredicting damage on newly spawned entities.
-                args.State = new DamageableComponentState(component.Damage.DamageDict.ShallowClone(), component.DamageModifierSetId);
+                args.State = new DamageableComponentState(component.Damage.DamageDict.ShallowClone(), component.DamageModifierSetId, component.HealthBarThreshold);
             }
         }
 
@@ -268,6 +267,7 @@ private void DamageableHandleState(EntityUid uid, DamageableComponent component,
             }
 
             component.DamageModifierSetId = state.ModifierSetId;
+            component.HealthBarThreshold = state.HealthBarThreshold;
 
             // Has the damage actually changed?
             DamageSpecifier newDamage = new() { DamageDict = new(state.DamageDict) };

From d99e73ed92f06d22840e38a4e41ac8bfb8e93cdd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 20:32:32 -0400
Subject: [PATCH 054/568] Update Credits (#28288)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
---
 Resources/Credits/GitHub.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 172dd2ad37a1..b7ec22c0b0db 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, KEEYNy, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, KEEYNy, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem

From 6574c9b7c31dc05831a95ddf121f2c29d9479fa4 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sun, 26 May 2024 03:17:01 +0200
Subject: [PATCH 055/568] Changing hands unwields item (#28161)

Unhand me, fiend
---
 Content.Shared/Wieldable/WieldableSystem.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index cee6c65fa11e..c09044f84b43 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -41,6 +41,7 @@ public override void Initialize()
         SubscribeLocalEvent<WieldableComponent, GotUnequippedHandEvent>(OnItemLeaveHand);
         SubscribeLocalEvent<WieldableComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
         SubscribeLocalEvent<WieldableComponent, GetVerbsEvent<InteractionVerb>>(AddToggleWieldVerb);
+        SubscribeLocalEvent<WieldableComponent, HandDeselectedEvent>(OnDeselectWieldable);
 
         SubscribeLocalEvent<MeleeRequiresWieldComponent, AttemptMeleeEvent>(OnMeleeAttempt);
         SubscribeLocalEvent<GunRequiresWieldComponent, ShotAttemptedEvent>(OnShootAttempt);
@@ -91,6 +92,14 @@ private void OnGunWielded(EntityUid uid, GunWieldBonusComponent component, ref I
         _gun.RefreshModifiers(uid);
     }
 
+    private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, HandDeselectedEvent args)
+    {
+        if (!component.Wielded)
+            return;
+
+        TryUnwield(uid, component, args.User);
+    }
+
     private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref GunRefreshModifiersEvent args)
     {
         if (TryComp(bonus, out WieldableComponent? wield) &&

From d5aae7a48b67d1d14322a2b5ae9fff2c4f0b9bd0 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 26 May 2024 01:18:07 +0000
Subject: [PATCH 056/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7880f0a8d130..4ec38486dac9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Errant
-  changes:
-  - message: Species info is now available in the Guidebook and in the character editor.
-    type: Add
-  id: 6120
-  time: '2024-03-11T03:01:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25844
 - author: Dygon
   changes:
   - message: 'The following criminal record statuses have been added: Suspect, Discharged,
@@ -3875,3 +3868,10 @@
   id: 6619
   time: '2024-05-25T20:23:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28130
+- author: Errant
+  changes:
+  - message: Changing hands while wielding an item will now immediately unwield it.
+    type: Tweak
+  id: 6620
+  time: '2024-05-26T01:17:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28161

From 12841da9a1de8e552df1117d945dd2b189ffcc4d Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 26 May 2024 14:11:37 +1200
Subject: [PATCH 057/568] Fix storage UI interactions (#28291)

* Fix storage UI interactions

* Add VV support
---
 .../UserInterface/Systems/Storage/Controls/ItemGridPiece.cs   | 4 +++-
 Content.Shared/Interaction/SharedInteractionSystem.cs         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
index f436cc8c39bb..dd9986e4c6e6 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
@@ -9,7 +9,7 @@
 
 namespace Content.Client.UserInterface.Systems.Storage.Controls;
 
-public sealed class ItemGridPiece : Control
+public sealed class ItemGridPiece : Control, IEntityControl
 {
     private readonly IEntityManager _entityManager;
     private readonly StorageUIController _storageController;
@@ -287,6 +287,8 @@ public static Vector2 GetCenterOffset(Entity<ItemComponent?> entity, ItemStorage
         var actualSize = new Vector2(boxSize.X + 1, boxSize.Y + 1);
         return actualSize * new Vector2i(8, 8);
     }
+
+    public EntityUid? UiEntity => Entity;
 }
 
 public enum ItemGridPieceMarks
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 3324ce5b9b8d..6f6777ee9648 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1167,7 +1167,7 @@ public bool CanAccessViaStorage(EntityUid user, EntityUid target, BaseContainer
                 return false;
 
             // we don't check if the user can access the storage entity itself. This should be handed by the UI system.
-            return _ui.IsUiOpen(target, StorageComponent.StorageUiKey.Key, user);
+            return _ui.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, user);
         }
 
         /// <summary>

From b8020776cc9eb9e8f6b487e5ba34f87d144b3b24 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 26 May 2024 02:12:43 +0000
Subject: [PATCH 058/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4ec38486dac9..36276ccfcef1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: Dygon
-  changes:
-  - message: 'The following criminal record statuses have been added: Suspect, Discharged,
-      Paroled.'
-    type: Add
-  - message: Security huds now show an icon on entities that have a visible name linked
-      to a criminal record.
-    type: Add
-  id: 6121
-  time: '2024-03-11T03:12:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25192
 - author: Lank
   changes:
   - message: The detective is no longer independent, and again works under Security.
@@ -3875,3 +3864,10 @@
   id: 6620
   time: '2024-05-26T01:17:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28161
+- author: ElectroJr
+  changes:
+  - message: Fixed being unable to interact with items via storage UIs
+    type: Fix
+  id: 6621
+  time: '2024-05-26T02:11:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28291

From a38e6475cb5d0505771ec827bcd9b4336a0392ae Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 26 May 2024 15:18:27 +1200
Subject: [PATCH 059/568] Fix stripping not marking interactions as handled
 (#28292)

---
 Content.Server/Strip/StrippableSystem.cs      | 33 ++-----------------
 .../Strip/SharedStrippableSystem.cs           | 27 +++++++++++++--
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 6f0a1ecb328d..397396de5016 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Ensnaring;
-using Content.Shared.CombatMode;
 using Content.Shared.Cuffs;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Database;
@@ -10,7 +9,6 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.VirtualItem;
@@ -18,7 +16,6 @@
 using Content.Shared.Strip;
 using Content.Shared.Strip.Components;
 using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
@@ -28,7 +25,6 @@ public sealed class StrippableSystem : SharedStrippableSystem
     {
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
         [Dependency] private readonly EnsnareableSystem _ensnaringSystem = default!;
-        [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
 
         [Dependency] private readonly SharedCuffableSystem _cuffableSystem = default!;
         [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
@@ -45,7 +41,6 @@ public override void Initialize()
 
             SubscribeLocalEvent<StrippableComponent, GetVerbsEvent<Verb>>(AddStripVerb);
             SubscribeLocalEvent<StrippableComponent, GetVerbsEvent<ExamineVerb>>(AddStripExamineVerb);
-            SubscribeLocalEvent<StrippableComponent, ActivateInWorldEvent>(OnActivateInWorld);
 
             // BUI
             SubscribeLocalEvent<StrippableComponent, StrippingSlotButtonPressed>(OnStripButtonPressed);
@@ -68,7 +63,7 @@ private void AddStripVerb(EntityUid uid, StrippableComponent component, GetVerbs
             {
                 Text = Loc.GetString("strip-verb-get-data-text"),
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
-                Act = () => StartOpeningStripper(args.User, (uid, component), true),
+                Act = () => TryOpenStrippingUi(args.User, (uid, component), true),
             };
 
             args.Verbs.Add(verb);
@@ -86,37 +81,13 @@ private void AddStripExamineVerb(EntityUid uid, StrippableComponent component, G
             {
                 Text = Loc.GetString("strip-verb-get-data-text"),
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/outfit.svg.192dpi.png")),
-                Act = () => StartOpeningStripper(args.User, (uid, component), true),
+                Act = () => TryOpenStrippingUi(args.User, (uid, component), true),
                 Category = VerbCategory.Examine,
             };
 
             args.Verbs.Add(verb);
         }
 
-        private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
-        {
-            if (args.Target == args.User)
-                return;
-
-            if (!HasComp<ActorComponent>(args.User))
-                return;
-
-            StartOpeningStripper(args.User, (uid, component));
-        }
-
-        public override void StartOpeningStripper(EntityUid user, Entity<StrippableComponent> strippable, bool openInCombat = false)
-        {
-            base.StartOpeningStripper(user, strippable, openInCombat);
-
-            if (TryComp<CombatModeComponent>(user, out var mode) && mode.IsInCombatMode && !openInCombat)
-                return;
-
-            if (HasComp<StrippingComponent>(user))
-            {
-                _userInterfaceSystem.OpenUi(strippable.Owner, StrippingUiKey.Key, user);
-            }
-        }
-
         private void OnStripButtonPressed(Entity<StrippableComponent> strippable, ref StrippingSlotButtonPressed args)
         {
             if (args.Actor is not { Valid: true } user ||
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 59b24ec943ef..075cf81a4cb9 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -1,17 +1,31 @@
+using Content.Shared.CombatMode;
 using Content.Shared.DragDrop;
 using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
 using Content.Shared.Strip.Components;
 
 namespace Content.Shared.Strip;
 
 public abstract class SharedStrippableSystem : EntitySystem
 {
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<StrippingComponent, CanDropTargetEvent>(OnCanDropOn);
         SubscribeLocalEvent<StrippableComponent, CanDropDraggedEvent>(OnCanDrop);
         SubscribeLocalEvent<StrippableComponent, DragDropDraggedEvent>(OnDragDrop);
+        SubscribeLocalEvent<StrippableComponent, ActivateInWorldEvent>(OnActivateInWorld);
+    }
+
+    private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
+    {
+        if (args.Handled || args.Target == args.User)
+            return;
+
+        if (TryOpenStrippingUi(args.User, (uid, component)))
+            args.Handled = true;
     }
 
     public (TimeSpan Time, bool Stealth) GetStripTimeModifiers(EntityUid user, EntityUid target, TimeSpan initialTime)
@@ -29,13 +43,20 @@ private void OnDragDrop(EntityUid uid, StrippableComponent component, ref DragDr
         if (args.Handled || args.Target != args.User)
             return;
 
-        StartOpeningStripper(args.User, (uid, component));
-        args.Handled = true;
+        if (TryOpenStrippingUi(args.User, (uid, component)))
+            args.Handled = true;
     }
 
-    public virtual void StartOpeningStripper(EntityUid user, Entity<StrippableComponent> component, bool openInCombat = false)
+    public bool TryOpenStrippingUi(EntityUid user, Entity<StrippableComponent> target, bool openInCombat = false)
     {
+        if (!openInCombat && TryComp<CombatModeComponent>(user, out var mode) && mode.IsInCombatMode)
+            return false;
+
+        if (!HasComp<StrippingComponent>(user))
+            return false;
 
+        _ui.OpenUi(target.Owner, StrippingUiKey.Key, user);
+        return true;
     }
 
     private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDropTargetEvent args)

From b177fb8179eaf7a3b1c9fc9dabe36835e582cd06 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 26 May 2024 15:20:29 +1200
Subject: [PATCH 060/568] Make NetworkConfigurator use
 BoundUserInterfaceCheckRangeEvent (#28293)

---
 .../Systems/NetworkConfiguratorSystem.cs      | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
index 346012415857..402d005dd475 100644
--- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -63,9 +63,21 @@ public override void Initialize()
         SubscribeLocalEvent<NetworkConfiguratorComponent, NetworkConfiguratorToggleLinkMessage>(OnToggleLinks);
         SubscribeLocalEvent<NetworkConfiguratorComponent, NetworkConfiguratorButtonPressedMessage>(OnConfigButtonPressed);
 
+        SubscribeLocalEvent<NetworkConfiguratorComponent, BoundUserInterfaceCheckRangeEvent>(OnUiRangeCheck);
+
         SubscribeLocalEvent<DeviceListComponent, ComponentRemove>(OnComponentRemoved);
     }
 
+    private void OnUiRangeCheck(Entity<NetworkConfiguratorComponent> ent, ref BoundUserInterfaceCheckRangeEvent args)
+    {
+        if (ent.Comp.ActiveDeviceList == null || args.Result == BoundUserInterfaceRangeResult.Fail)
+            return;
+
+        DebugTools.Assert(Exists(ent.Comp.ActiveDeviceList));
+        if (!_interactionSystem.InRangeUnobstructed(args.Actor!, ent.Comp.ActiveDeviceList.Value))
+            args.Result = BoundUserInterfaceRangeResult.Fail;
+    }
+
     private void OnShutdown(EntityUid uid, NetworkConfiguratorComponent component, ComponentShutdown args)
     {
         ClearDevices(uid, component);
@@ -75,23 +87,6 @@ private void OnShutdown(EntityUid uid, NetworkConfiguratorComponent component, C
         component.ActiveDeviceList = null;
     }
 
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<NetworkConfiguratorComponent>();
-        while (query.MoveNext(out var uid, out var component))
-        {
-            if (component.ActiveDeviceList != null
-            && EntityManager.EntityExists(component.ActiveDeviceList.Value)
-            && _interactionSystem.InRangeUnobstructed(uid, component.ActiveDeviceList.Value))
-                continue;
-
-            //The network configurator is a handheld device. There can only ever be an ui session open for the player holding the device.
-            _uiSystem.CloseUi(uid, NetworkConfiguratorUiKey.Configure);
-        }
-    }
-
     private void OnMapInit(EntityUid uid, NetworkConfiguratorComponent component, MapInitEvent args)
     {
         UpdateListUiState(uid, component);

From d747fa98f8d62344aeab379731c43335341bfc16 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 26 May 2024 00:46:41 -0400
Subject: [PATCH 061/568] actually fix magic mirrors (#28282)

---
 .../MagicMirror/MagicMirrorSystem.cs          | 32 +++++--------------
 .../MagicMirror/SharedMagicMirrorSystem.cs    | 21 ++++++++++--
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs
index fc1bff975660..8d8a6bfa3b4f 100644
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.DoAfter;
 using Content.Server.Humanoid;
-using Content.Shared.UserInterface;
 using Content.Shared.DoAfter;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -24,7 +23,6 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<MagicMirrorComponent, ActivatableUIOpenAttemptEvent>(OnOpenUIAttempt);
 
         Subs.BuiEvents<MagicMirrorComponent>(MagicMirrorUiKey.Key,
             subs =>
@@ -36,7 +34,6 @@ public override void Initialize()
             subs.Event<MagicMirrorRemoveSlotMessage>(OnTryMagicMirrorRemoveSlot);
         });
 
-        SubscribeLocalEvent<MagicMirrorComponent, AfterInteractEvent>(OnMagicMirrorInteract);
 
         SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorSelectDoAfterEvent>(OnSelectSlotDoAfter);
         SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorChangeColorDoAfterEvent>(OnChangeColorDoAfter);
@@ -44,23 +41,6 @@ public override void Initialize()
         SubscribeLocalEvent<MagicMirrorComponent, MagicMirrorAddSlotDoAfterEvent>(OnAddSlotDoAfter);
     }
 
-    private void OnMagicMirrorInteract(Entity<MagicMirrorComponent> mirror, ref AfterInteractEvent args)
-    {
-        if (!args.CanReach || args.Target == null)
-            return;
-
-        if (!_uiSystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User))
-            return;
-
-        UpdateInterface(mirror.Owner, args.Target.Value, mirror.Comp);
-    }
-
-    private void OnOpenUIAttempt(EntityUid uid, MagicMirrorComponent mirror, ActivatableUIOpenAttemptEvent args)
-    {
-        if (!HasComp<HumanoidAppearanceComponent>(args.User))
-            args.Cancel();
-    }
-
     private void OnMagicMirrorSelect(EntityUid uid, MagicMirrorComponent component, MagicMirrorSelectMessage message)
     {
         if (component.Target is not { } target)
@@ -83,7 +63,8 @@ private void OnMagicMirrorSelect(EntityUid uid, MagicMirrorComponent component,
             BreakOnMove = true,
             BreakOnHandChange = false,
             NeedHand = true
-        }, out var doAfterId);
+        },
+            out var doAfterId);
 
         component.DoAfter = doAfterId;
         _audio.PlayPvs(component.ChangeHairSound, uid);
@@ -137,7 +118,8 @@ private void OnTryMagicMirrorChangeColor(EntityUid uid, MagicMirrorComponent com
             BreakOnMove = true,
             BreakOnHandChange = false,
             NeedHand = true
-        }, out var doAfterId);
+        },
+            out var doAfterId);
 
         component.DoAfter = doAfterId;
     }
@@ -189,7 +171,8 @@ private void OnTryMagicMirrorRemoveSlot(EntityUid uid, MagicMirrorComponent comp
             BreakOnDamage = true,
             BreakOnHandChange = false,
             NeedHand = true
-        }, out var doAfterId);
+        },
+            out var doAfterId);
 
         component.DoAfter = doAfterId;
         _audio.PlayPvs(component.ChangeHairSound, uid);
@@ -241,7 +224,8 @@ private void OnTryMagicMirrorAddSlot(EntityUid uid, MagicMirrorComponent compone
             BreakOnMove = true,
             BreakOnHandChange = false,
             NeedHand = true
-        }, out var doAfterId);
+        },
+            out var doAfterId);
 
         component.DoAfter = doAfterId;
         _audio.PlayPvs(component.ChangeHairSound, uid);
diff --git a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
index 433ad6b4fc94..ea96d504c6e6 100644
--- a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
@@ -11,15 +11,27 @@ namespace Content.Shared.MagicMirror;
 public abstract class SharedMagicMirrorSystem : EntitySystem
 {
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] protected readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] protected readonly SharedUserInterfaceSystem UISystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
+        SubscribeLocalEvent<MagicMirrorComponent, AfterInteractEvent>(OnMagicMirrorInteract);
         SubscribeLocalEvent<MagicMirrorComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpen);
         SubscribeLocalEvent<MagicMirrorComponent, BoundUserInterfaceCheckRangeEvent>(OnMirrorRangeCheck);
     }
 
+    private void OnMagicMirrorInteract(Entity<MagicMirrorComponent> mirror, ref AfterInteractEvent args)
+    {
+        if (!args.CanReach || args.Target == null)
+            return;
+
+        if (!UISystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User))
+            return;
+
+        UpdateInterface(mirror, args.Target.Value, mirror);
+    }
+
     private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, ref BoundUserInterfaceCheckRangeEvent args)
     {
         if (args.Result == BoundUserInterfaceRangeResult.Fail)
@@ -33,7 +45,9 @@ private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, r
 
     private void OnBeforeUIOpen(Entity<MagicMirrorComponent> ent, ref BeforeActivatableUIOpenEvent args)
     {
-        ent.Comp.Target ??= args.User;
+        if (args.User != ent.Comp.Target && ent.Comp.Target != null)
+            return;
+
         UpdateInterface(ent, args.User, ent);
     }
 
@@ -41,6 +55,7 @@ protected void UpdateInterface(EntityUid mirrorUid, EntityUid targetUid, MagicMi
     {
         if (!TryComp<HumanoidAppearanceComponent>(targetUid, out var humanoid))
             return;
+        component.Target ??= targetUid;
 
         var hair = humanoid.MarkingSet.TryGetCategory(MarkingCategories.Hair, out var hairMarkings)
             ? new List<Marking>(hairMarkings)
@@ -59,7 +74,7 @@ protected void UpdateInterface(EntityUid mirrorUid, EntityUid targetUid, MagicMi
 
         // TODO: Component states
         component.Target = targetUid;
-        _uiSystem.SetUiState(mirrorUid, MagicMirrorUiKey.Key, state);
+        UISystem.SetUiState(mirrorUid, MagicMirrorUiKey.Key, state);
         Dirty(mirrorUid, component);
     }
 }

From af10de61d313ae539ce24933b2986ee63a8f6a07 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 26 May 2024 04:47:47 +0000
Subject: [PATCH 062/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 36276ccfcef1..0f5bddbcdbed 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Lank
-  changes:
-  - message: The detective is no longer independent, and again works under Security.
-    type: Tweak
-  id: 6122
-  time: '2024-03-11T03:33:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25986
 - author: pigeonpeas
   changes:
   - message: added new expedition ambience
@@ -3871,3 +3864,10 @@
   id: 6621
   time: '2024-05-26T02:11:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28291
+- author: EmoGarbage404
+  changes:
+  - message: Properly fix magic mirrors
+    type: Fix
+  id: 6622
+  time: '2024-05-26T04:46:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28282

From 492ccc93d01647b586755da27f88f4cbb62e7ccc Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 26 May 2024 05:14:29 +0000
Subject: [PATCH 063/568] fix antag selection being evil (#28197)

* fix antag selection being evil

* fix test

* untroll the other tests

* remove role timer troll

* Allow tests to modify antag preferences

* Fix antag selection

* Misc test fixes

* Add AntagPreferenceTest

* Fix lazy mistakes

* Test cleanup

* Try stop players in lobbies from being assigned mid-round antags

* ranting

* I am going insane

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
---
 .../Pair/TestPair.Helpers.cs                  | 28 +++++++
 Content.IntegrationTests/PoolManager.cs       |  4 +-
 .../Tests/GameRules/AntagPreferenceTest.cs    | 76 +++++++++++++++++++
 .../Tests/GameRules/NukeOpsTest.cs            |  4 +
 .../Click/InteractionSystemTests.cs           |  1 -
 .../Tests/ResettingEntitySystemTests.cs       |  3 -
 .../Antag/AntagSelectionSystem.API.cs         |  9 +++
 Content.Server/Antag/AntagSelectionSystem.cs  | 72 +++++++++---------
 .../GameTicking/GameTicker.RoundFlow.cs       |  2 +-
 .../Managers/IServerPreferencesManager.cs     |  2 +
 .../Managers/ServerPreferencesManager.cs      | 30 ++++----
 Content.Shared/Antag/AntagAcceptability.cs    |  8 ++
 Content.Shared/Roles/Jobs/SharedJobSystem.cs  |  4 +-
 13 files changed, 182 insertions(+), 61 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs

diff --git a/Content.IntegrationTests/Pair/TestPair.Helpers.cs b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
index 0ea6d3e2dcc0..cc83232a0663 100644
--- a/Content.IntegrationTests/Pair/TestPair.Helpers.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
@@ -2,6 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Preferences.Managers;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
@@ -128,4 +131,29 @@ public List<EntityPrototype> GetPrototypesWithComponent<T>(
 
         return list;
     }
+
+    /// <summary>
+    /// Helper method for enabling or disabling a antag role
+    /// </summary>
+    public async Task SetAntagPref(ProtoId<AntagPrototype> id, bool value)
+    {
+        var prefMan = Server.ResolveDependency<IServerPreferencesManager>();
+
+        var prefs = prefMan.GetPreferences(Client.User!.Value);
+        // what even is the point of ICharacterProfile if we always cast it to HumanoidCharacterProfile to make it usable?
+        var profile = (HumanoidCharacterProfile) prefs.SelectedCharacter;
+
+        Assert.That(profile.AntagPreferences.Contains(id), Is.EqualTo(!value));
+        var newProfile = profile.WithAntagPreference(id, value);
+
+        await Server.WaitPost(() =>
+        {
+            prefMan.SetProfile(Client.User.Value, prefs.SelectedCharacterIndex, newProfile).Wait();
+        });
+
+        // And why the fuck does it always create a new preference and profile object instead of just reusing them?
+        var newPrefs = prefMan.GetPreferences(Client.User.Value);
+        var newProf = (HumanoidCharacterProfile) newPrefs.SelectedCharacter;
+        Assert.That(newProf.AntagPreferences.Contains(id), Is.EqualTo(value));
+    }
 }
diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 25e6c7ef26f5..3b49ffcf8477 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -65,11 +65,11 @@ public static partial class PoolManager
 
         options.BeforeStart += () =>
         {
+            // Server-only systems (i.e., systems that subscribe to events with server-only components)
             var entSysMan = IoCManager.Resolve<IEntitySystemManager>();
-            entSysMan.LoadExtraSystemType<ResettingEntitySystemTests.TestRoundRestartCleanupEvent>();
-            entSysMan.LoadExtraSystemType<InteractionSystemTests.TestInteractionSystem>();
             entSysMan.LoadExtraSystemType<DeviceNetworkTestSystem>();
             entSysMan.LoadExtraSystemType<TestDestructibleListenerSystem>();
+
             IoCManager.Resolve<ILogManager>().GetSawmill("loc").Level = LogLevel.Error;
             IoCManager.Resolve<IConfigurationManager>()
                 .OnValueChanged(RTCVars.FailureLogLevel, value => logHandler.FailureLevel = value, true);
diff --git a/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
new file mode 100644
index 000000000000..662ea3b97470
--- /dev/null
+++ b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
@@ -0,0 +1,76 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Antag;
+using Content.Server.Antag.Components;
+using Content.Server.GameTicking;
+using Content.Shared.GameTicking;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+
+namespace Content.IntegrationTests.Tests.GameRules;
+
+// Once upon a time, players in the lobby weren't ever considered eligible for antag roles.
+// Lets not let that happen again.
+[TestFixture]
+public sealed class AntagPreferenceTest
+{
+    [Test]
+    public async Task TestLobbyPlayersValid()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            DummyTicker = false,
+            Connected = true,
+            InLobby = true
+        });
+
+        var server = pair.Server;
+        var client = pair.Client;
+        var ticker = server.System<GameTicker>();
+        var sys = server.System<AntagSelectionSystem>();
+
+        // Initially in the lobby
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        Assert.That(client.AttachedEntity, Is.Null);
+        Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay));
+
+        EntityUid uid = default;
+        await server.WaitPost(() => uid = server.EntMan.Spawn("Traitor"));
+        var rule = new Entity<AntagSelectionComponent>(uid, server.EntMan.GetComponent<AntagSelectionComponent>(uid));
+        var def = rule.Comp.Definitions.Single();
+
+        // IsSessionValid & IsEntityValid are preference agnostic and should always be true for players in the lobby.
+        // Though maybe that will change in the future, but then GetPlayerPool() needs to be updated to reflect that.
+        Assert.That(sys.IsSessionValid(rule, pair.Player, def), Is.True);
+        Assert.That(sys.IsEntityValid(client.AttachedEntity, def), Is.True);
+
+        // By default, traitor/antag preferences are disabled, so the pool should be empty.
+        var sessions = new List<ICommonSession>{pair.Player!};
+        var pool = sys.GetPlayerPool(rule, sessions, def);
+        Assert.That(pool.Count, Is.EqualTo(0));
+
+        // Opt into the traitor role.
+        await pair.SetAntagPref("Traitor", true);
+
+        Assert.That(sys.IsSessionValid(rule, pair.Player, def), Is.True);
+        Assert.That(sys.IsEntityValid(client.AttachedEntity, def), Is.True);
+        pool = sys.GetPlayerPool(rule, sessions, def);
+        Assert.That(pool.Count, Is.EqualTo(1));
+        pool.TryPickAndTake(pair.Server.ResolveDependency<IRobustRandom>(), out var picked);
+        Assert.That(picked, Is.EqualTo(pair.Player));
+        Assert.That(sessions.Count, Is.EqualTo(1));
+
+        // opt back out
+        await pair.SetAntagPref("Traitor", false);
+
+        Assert.That(sys.IsSessionValid(rule, pair.Player, def), Is.True);
+        Assert.That(sys.IsEntityValid(client.AttachedEntity, def), Is.True);
+        pool = sys.GetPlayerPool(rule, sessions, def);
+        Assert.That(pool.Count, Is.EqualTo(0));
+
+        await server.WaitPost(() => server.EntMan.DeleteEntity(uid));
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index 5bada98a3aa5..3a77834b7259 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -58,6 +58,9 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(client.AttachedEntity, Is.Null);
         Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay));
 
+        // Opt into the nukies role.
+        await pair.SetAntagPref("NukeopsCommander", true);
+
         // There are no grids or maps
         Assert.That(entMan.Count<MapComponent>(), Is.Zero);
         Assert.That(entMan.Count<MapGridComponent>(), Is.Zero);
@@ -198,6 +201,7 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
 
         ticker.SetGamePreset((GamePresetPrototype?)null);
         server.CfgMan.SetCVar(CCVars.GridFill, false);
+        await pair.SetAntagPref("NukeopsCommander", false);
         await pair.CleanReturnAsync();
     }
 }
diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
index 317aa10400b9..4415eddf376d 100644
--- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
@@ -407,7 +407,6 @@ await server.WaitAssertion(() =>
             await pair.CleanReturnAsync();
         }
 
-        [Reflect(false)]
         public sealed class TestInteractionSystem : EntitySystem
         {
             public EntityEventHandler<InteractUsingEvent>? InteractUsingEvent;
diff --git a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
index d5c2a9124dd9..40457f548835 100644
--- a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
+++ b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
@@ -9,7 +9,6 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(RoundRestartCleanupEvent))]
     public sealed class ResettingEntitySystemTests
     {
-        [Reflect(false)]
         public sealed class TestRoundRestartCleanupEvent : EntitySystem
         {
             public bool HasBeenReset { get; set; }
@@ -49,8 +48,6 @@ await server.WaitAssertion(() =>
 
                 system.HasBeenReset = false;
 
-                Assert.That(system.HasBeenReset, Is.False);
-
                 gameTicker.RestartRound();
 
                 Assert.That(system.HasBeenReset);
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index d8554e3fb22a..3b5855cdf95c 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -27,6 +27,11 @@ public bool TryGetNextAvailableDefinition(Entity<AntagSelectionComponent> ent,
         if (mindCount >= totalTargetCount)
             return false;
 
+        // TODO ANTAG fix this
+        // If here are two definitions with 1/10 and 10/10 slots filled, this will always return the second definition
+        // even though it has already met its target
+        // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA I fucking hate game ticker code.
+        // It needs to track selected minds for each definition independently.
         foreach (var def in ent.Comp.Definitions)
         {
             var target = GetTargetAntagCount(ent, null, def);
@@ -64,6 +69,10 @@ public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, AntagSelecti
     /// </summary>
     public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, AntagSelectionPlayerPool? pool, AntagSelectionDefinition def)
     {
+        // TODO ANTAG
+        // make pool non-nullable
+        // Review uses and ensure that people are INTENTIONALLY including players in the lobby if this is a mid-round
+        // antag selection.
         var poolSize = pool?.Count ?? _playerManager.Sessions
             .Count(s => s.State.Status is not SessionStatus.Disconnected and not SessionStatus.Zombie);
 
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 1d1783ed8756..5b6c891ddfc5 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -14,6 +14,7 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Antag;
+using Content.Shared.GameTicking;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
@@ -25,6 +26,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Antag;
 
@@ -85,10 +87,9 @@ private void OnPlayerSpawning(RulePlayerSpawningEvent args)
                 continue;
 
             if (comp.SelectionsComplete)
-                return;
+                continue;
 
             ChooseAntags((uid, comp), pool);
-            comp.SelectionsComplete = true;
 
             foreach (var session in comp.SelectedSessions)
             {
@@ -106,11 +107,7 @@ private void OnJobsAssigned(RulePlayerJobsAssignedEvent args)
             if (comp.SelectionTime != AntagSelectionTime.PostPlayerSpawn)
                 continue;
 
-            if (comp.SelectionsComplete)
-                continue;
-
-            ChooseAntags((uid, comp));
-            comp.SelectionsComplete = true;
+            ChooseAntags((uid, comp), args.Players);
         }
     }
 
@@ -126,12 +123,18 @@ private void OnSpawnComplete(PlayerSpawnCompleteEvent args)
         var query = QueryActiveRules();
         while (query.MoveNext(out var uid, out _, out var antag, out _))
         {
+            // TODO ANTAG
+            // what why aasdiuhasdopiuasdfhksad
+            // stop this insanity please
+            // probability of antag assignment shouldn't depend on the order in which rules are returned by the query.
             if (!RobustRandom.Prob(LateJoinRandomChance))
                 continue;
 
             if (!antag.Definitions.Any(p => p.LateJoinAdditional))
                 continue;
 
+            DebugTools.AssertEqual(antag.SelectionTime, AntagSelectionTime.PostPlayerSpawn);
+
             if (!TryGetNextAvailableDefinition((uid, antag), out var def))
                 continue;
 
@@ -164,43 +167,40 @@ protected override void Started(EntityUid uid, AntagSelectionComponent component
     {
         base.Started(uid, component, gameRule, args);
 
-        if (component.SelectionsComplete)
-            return;
-
+        // If the round has not yet started, we defer antag selection until roundstart
         if (GameTicker.RunLevel != GameRunLevel.InRound)
             return;
 
-        if (GameTicker.RunLevel == GameRunLevel.InRound && component.SelectionTime == AntagSelectionTime.PrePlayerSpawn)
+        if (component.SelectionsComplete)
             return;
 
-        ChooseAntags((uid, component));
-        component.SelectionsComplete = true;
-    }
+        var players = _playerManager.Sessions
+            .Where(x => GameTicker.PlayerGameStatuses[x.UserId] == PlayerGameStatus.JoinedGame)
+            .ToList();
 
-    /// <summary>
-    /// Chooses antagonists from the current selection of players
-    /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent)
-    {
-        var sessions = _playerManager.Sessions.ToList();
-        ChooseAntags(ent, sessions);
+        ChooseAntags((uid, component), players);
     }
 
     /// <summary>
     /// Chooses antagonists from the given selection of players
     /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, List<ICommonSession> pool)
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool)
     {
+        if (ent.Comp.SelectionsComplete)
+            return;
+
         foreach (var def in ent.Comp.Definitions)
         {
             ChooseAntags(ent, pool, def);
         }
+
+        ent.Comp.SelectionsComplete = true;
     }
 
     /// <summary>
     /// Chooses antagonists from the given selection of players for the given antag definition.
     /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, List<ICommonSession> pool, AntagSelectionDefinition def)
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, AntagSelectionDefinition def)
     {
         var playerPool = GetPlayerPool(ent, pool, def);
         var count = GetTargetAntagCount(ent, playerPool, def);
@@ -324,20 +324,15 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
     /// <summary>
     /// Gets an ordered player pool based on player preferences and the antagonist definition.
     /// </summary>
-    public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> ent, List<ICommonSession> sessions, AntagSelectionDefinition def)
+    public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> ent, IList<ICommonSession> sessions, AntagSelectionDefinition def)
     {
         var preferredList = new List<ICommonSession>();
         var fallbackList = new List<ICommonSession>();
-        var unwantedList = new List<ICommonSession>();
-        var invalidList = new List<ICommonSession>();
         foreach (var session in sessions)
         {
             if (!IsSessionValid(ent, session, def) ||
                 !IsEntityValid(session.AttachedEntity, def))
-            {
-                invalidList.Add(session);
                 continue;
-            }
 
             var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
             if (def.PrefRoles.Count != 0 && pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p)))
@@ -348,13 +343,9 @@ public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> en
             {
                 fallbackList.Add(session);
             }
-            else
-            {
-                unwantedList.Add(session);
-            }
         }
 
-        return new AntagSelectionPlayerPool(new() { preferredList, fallbackList, unwantedList, invalidList });
+        return new AntagSelectionPlayerPool(new() { preferredList, fallbackList });
     }
 
     /// <summary>
@@ -365,14 +356,18 @@ public bool IsSessionValid(Entity<AntagSelectionComponent> ent, ICommonSession?
         if (session == null)
             return true;
 
-        mind ??= session.GetMind();
-
         if (session.Status is SessionStatus.Disconnected or SessionStatus.Zombie)
             return false;
 
         if (ent.Comp.SelectedSessions.Contains(session))
             return false;
 
+        mind ??= session.GetMind();
+
+        // If the player has not spawned in as any entity (e.g., in the lobby), they can be given an antag role/entity.
+        if (mind == null)
+            return true;
+
         //todo: we need some way to check that we're not getting the same role twice. (double picking thieves or zombies through midrounds)
 
         switch (def.MultiAntagSetting)
@@ -401,10 +396,11 @@ public bool IsSessionValid(Entity<AntagSelectionComponent> ent, ICommonSession?
     /// <summary>
     /// Checks if a given entity (mind/session not included) is valid for a given antagonist.
     /// </summary>
-    private bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
+    public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
     {
+        // If the player has not spawned in as any entity (e.g., in the lobby), they can be given an antag role/entity.
         if (entity == null)
-            return false;
+            return true;
 
         if (HasComp<PendingClockInComponent>(entity))
             return false;
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index df597e69b2fa..6eb42b65c03a 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -795,7 +795,7 @@ public RulePlayerSpawningEvent(List<ICommonSession> playerPool, IReadOnlyDiction
     }
 
     /// <summary>
-    ///     Event raised after players were assigned jobs by the GameTicker.
+    ///     Event raised after players were assigned jobs by the GameTicker and have been spawned in.
     ///     You can give on-station people special roles by listening to this event.
     /// </summary>
     public sealed class RulePlayerJobsAssignedEvent
diff --git a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
index 63c267f154ac..cdb53bb4be77 100644
--- a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
@@ -20,5 +20,7 @@ public interface IServerPreferencesManager
         PlayerPreferences? GetPreferencesOrNull(NetUserId? userId);
         IEnumerable<KeyValuePair<NetUserId, ICharacterProfile>> GetSelectedProfilesForPlayers(List<NetUserId> userIds);
         bool HavePreferencesLoaded(ICommonSession session);
+
+        Task SetProfile(NetUserId userId, int slot, ICharacterProfile profile);
     }
 }
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index 1aad61715bb7..e32af589e958 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -29,11 +29,14 @@ public sealed class ServerPreferencesManager : IServerPreferencesManager
         [Dependency] private readonly IServerDbManager _db = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IDependencyCollection _dependencies = default!;
+        [Dependency] private readonly ILogManager _log = 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 =
             new();
 
+        private ISawmill _sawmill = default!;
+
         private int MaxCharacterSlots => _cfg.GetCVar(CCVars.GameMaxCharacterSlots);
 
         public void Init()
@@ -42,6 +45,7 @@ public void Init()
             _netManager.RegisterNetMessage<MsgSelectCharacter>(HandleSelectCharacterMessage);
             _netManager.RegisterNetMessage<MsgUpdateCharacter>(HandleUpdateCharacterMessage);
             _netManager.RegisterNetMessage<MsgDeleteCharacter>(HandleDeleteCharacterMessage);
+            _sawmill = _log.GetSawmill("prefs");
         }
 
         private async void HandleSelectCharacterMessage(MsgSelectCharacter message)
@@ -78,27 +82,25 @@ private async void HandleSelectCharacterMessage(MsgSelectCharacter message)
 
         private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message)
         {
-            var slot = message.Slot;
-            var profile = message.Profile;
             var userId = message.MsgChannel.UserId;
 
-            if (profile == null)
-            {
-                Logger.WarningS("prefs",
-                    $"User {userId} sent a {nameof(MsgUpdateCharacter)} with a null profile in slot {slot}.");
-                return;
-            }
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+            if (message.Profile == null)
+                _sawmill.Error($"User {userId} sent a {nameof(MsgUpdateCharacter)} with a null profile in slot {message.Slot}.");
+            else
+                await SetProfile(userId, message.Slot, message.Profile);
+        }
 
+        public async Task SetProfile(NetUserId userId, int slot, ICharacterProfile profile)
+        {
             if (!_cachedPlayerPrefs.TryGetValue(userId, out var prefsData) || !prefsData.PrefsLoaded)
             {
-                Logger.WarningS("prefs", $"User {userId} tried to modify preferences before they loaded.");
+                _sawmill.Error($"Tried to modify user {userId} preferences before they loaded.");
                 return;
             }
 
             if (slot < 0 || slot >= MaxCharacterSlots)
-            {
                 return;
-            }
 
             var curPrefs = prefsData.Prefs!;
             var session = _playerManager.GetSessionById(userId);
@@ -112,10 +114,8 @@ private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message)
 
             prefsData.Prefs = new PlayerPreferences(profiles, slot, curPrefs.AdminOOCColor);
 
-            if (ShouldStorePrefs(message.MsgChannel.AuthType))
-            {
-                await _db.SaveCharacterSlotAsync(message.MsgChannel.UserId, message.Profile, message.Slot);
-            }
+            if (ShouldStorePrefs(session.Channel.AuthType))
+                await _db.SaveCharacterSlotAsync(userId, profile, slot);
         }
 
         private async void HandleDeleteCharacterMessage(MsgDeleteCharacter message)
diff --git a/Content.Shared/Antag/AntagAcceptability.cs b/Content.Shared/Antag/AntagAcceptability.cs
index 02d0b5f58fee..f56be9750335 100644
--- a/Content.Shared/Antag/AntagAcceptability.cs
+++ b/Content.Shared/Antag/AntagAcceptability.cs
@@ -22,6 +22,14 @@ public enum AntagAcceptability
 
 public enum AntagSelectionTime : byte
 {
+    /// <summary>
+    /// Antag roles are assigned before players are assigned jobs and spawned in.
+    /// This prevents antag selection from happening if the round is on-going.
+    /// </summary>
     PrePlayerSpawn,
+
+    /// <summary>
+    /// Antag roles get assigned after players have been assigned jobs and have spawned in.
+    /// </summary>
     PostPlayerSpawn
 }
diff --git a/Content.Shared/Roles/Jobs/SharedJobSystem.cs b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
index 04ac45c4c5f4..fcf76052785e 100644
--- a/Content.Shared/Roles/Jobs/SharedJobSystem.cs
+++ b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
@@ -146,8 +146,10 @@ public string MindTryGetJobName([NotNullWhen(true)] EntityUid? mindId)
 
     public bool CanBeAntag(ICommonSession player)
     {
+        // If the player does not have any mind associated with them (e.g., has not spawned in or is in the lobby), then
+        // they are eligible to be given an antag role/entity.
         if (_playerSystem.ContentData(player) is not { Mind: { } mindId })
-            return false;
+            return true;
 
         if (!MindTryGetJob(mindId, out _, out var prototype))
             return true;

From 0be71c400d9e5585a9f3572788479df1bf9c4fcd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 26 May 2024 05:15:35 +0000
Subject: [PATCH 064/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0f5bddbcdbed..a26b705a35f0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: pigeonpeas
-  changes:
-  - message: added new expedition ambience
-    type: Add
-  id: 6123
-  time: '2024-03-11T06:56:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25983
 - author: Ilya246
   changes:
   - message: The biomass reclaimer may now reclaim plants, and inserting smaller entities
@@ -3871,3 +3864,10 @@
   id: 6622
   time: '2024-05-26T04:46:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28282
+- author: deltanedas
+  changes:
+  - message: Fixed being picked for antag roles while in the lobby or not opted in.
+    type: Fix
+  id: 6623
+  time: '2024-05-26T05:14:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28197

From 2586427c5211323ae49b387b51edc5a56255b169 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Sun, 26 May 2024 10:48:34 -0400
Subject: [PATCH 065/568] Fix hypodarts not injecting with people that have ANY
 outerclothing (#28301)

Update darts.yml
---
 Resources/Prototypes/Entities/Objects/Fun/darts.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 4c7ae68420b9..36c841995e5c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -126,6 +126,7 @@
         maxVol: 7
   - type: SolutionInjectOnEmbed
     transferAmount: 7
+    blockSlots: NONE
     solution: melee
   - type: SolutionTransfer
     maxTransferAmount: 7

From fed072ee202512b6010a315cbe1ff260fddf5709 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 26 May 2024 14:49:40 +0000
Subject: [PATCH 066/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a26b705a35f0..80f1972d5601 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Ilya246
-  changes:
-  - message: The biomass reclaimer may now reclaim plants, and inserting smaller entities
-      into it is now faster.
-    type: Tweak
-  id: 6124
-  time: '2024-03-11T21:59:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/23731
 - author: SlamBamActionman
   changes:
   - message: Moths eating lizard plushies will now start to Weh!
@@ -3871,3 +3863,10 @@
   id: 6623
   time: '2024-05-26T05:14:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28197
+- author: Dutch-VanDerLinde
+  changes:
+  - message: Fix hypodarts not injecting into people with outerclothing equipped.
+    type: Fix
+  id: 6624
+  time: '2024-05-26T14:48:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28301

From cba23487d3df52fbd14aec5a30d3ac90ca942f88 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 26 May 2024 16:07:16 -0400
Subject: [PATCH 067/568] fix borg ui mispredict opening (#28305)

move borg ui junk to shared
---
 .../ActivatableUIRequiresLockSystem.cs        | 43 -------------------
 Content.Server/Silicons/Borgs/BorgSystem.cs   |  9 ----
 Content.Server/Wires/WiresSystem.cs           | 23 ----------
 .../ActivatableUIRequiresLockComponent.cs     | 10 +++--
 Content.Shared/Lock/LockSystem.cs             | 26 +++++++++++
 .../Silicons/Borgs/SharedBorgSystem.cs        | 11 ++++-
 .../ActivatableUIRequiresPanelComponent.cs    |  8 ++--
 Content.Shared/Wires/SharedWiresSystem.cs     | 22 ++++++++++
 8 files changed, 69 insertions(+), 83 deletions(-)
 delete mode 100644 Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs
 rename {Content.Server/Lock/Components => Content.Shared/Lock}/ActivatableUIRequiresLockComponent.cs (66%)
 rename {Content.Server => Content.Shared}/Wires/ActivatableUIRequiresPanelComponent.cs (71%)

diff --git a/Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs b/Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs
deleted file mode 100644
index 04f8e2eb54cf..000000000000
--- a/Content.Server/Lock/EntitySystems/ActivatableUIRequiresLockSystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.Lock.Components;
-using Content.Server.Popups;
-using Content.Shared.UserInterface;
-using Content.Shared.Lock;
-using Content.Server.UserInterface;
-using ActivatableUISystem = Content.Shared.UserInterface.ActivatableUISystem;
-
-namespace Content.Server.Lock.EntitySystems;
-public sealed class ActivatableUIRequiresLockSystem : EntitySystem
-{
-    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
-        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
-    }
-
-    private void OnUIOpenAttempt(EntityUid uid, ActivatableUIRequiresLockComponent component, ActivatableUIOpenAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.requireLocked)
-        {
-            args.Cancel();
-            if (lockComp.Locked)
-                _popupSystem.PopupEntity(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
-        }
-    }
-
-    private void LockToggled(EntityUid uid, ActivatableUIRequiresLockComponent component, LockToggledEvent args)
-    {
-        if (!TryComp<LockComponent>(uid, out var lockComp) || lockComp.Locked == component.requireLocked)
-            return;
-
-        _activatableUI.CloseAll(uid);
-    }
-}
-
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 97adfd00eb4c..082e38921a2c 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Hands.Systems;
 using Content.Server.PowerCell;
-using Content.Shared.UserInterface;
 using Content.Shared.Access.Systems;
 using Content.Shared.Alert;
 using Content.Shared.Database;
@@ -70,7 +69,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<BorgBrainComponent, MindAddedMessage>(OnBrainMindAdded);
@@ -214,13 +212,6 @@ private void OnPowerCellSlotEmpty(EntityUid uid, BorgChassisComponent component,
         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;
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index c643759f504b..944b0a0e2500 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -4,27 +4,23 @@
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
 using Content.Server.Power.Components;
-using Content.Server.UserInterface;
 using Content.Shared.DoAfter;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Tools.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using ActivatableUISystem = Content.Shared.UserInterface.ActivatableUISystem;
 
 namespace Content.Server.Wires;
 
 public sealed class WiresSystem : SharedWiresSystem
 {
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
-    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
@@ -52,8 +48,6 @@ public override void Initialize()
         SubscribeLocalEvent<WiresComponent, TimedWireEvent>(OnTimedWire);
         SubscribeLocalEvent<WiresComponent, PowerChangedEvent>(OnWiresPowered);
         SubscribeLocalEvent<WiresComponent, WireDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenActivatableUI);
-        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, PanelChangedEvent>(OnActivatableUIPanelChanged);
         SubscribeLocalEvent<WiresPanelSecurityComponent, WiresPanelSecurityEvent>(SetWiresPanelSecurity);
     }
 
@@ -473,23 +467,6 @@ private void OnPanelChanged(Entity<WiresComponent> ent, ref PanelChangedEvent ar
         _uiSystem.CloseUi(ent.Owner, WiresUiKey.Key);
     }
 
-    private void OnAttemptOpenActivatableUI(EntityUid uid, ActivatableUIRequiresPanelComponent component, ActivatableUIOpenAttemptEvent args)
-    {
-        if (args.Cancelled || !TryComp<WiresPanelComponent>(uid, out var wires))
-            return;
-
-        if (component.RequireOpen != wires.Open)
-            args.Cancel();
-    }
-
-    private void OnActivatableUIPanelChanged(EntityUid uid, ActivatableUIRequiresPanelComponent component, ref PanelChangedEvent args)
-    {
-        if (args.Open == component.RequireOpen)
-            return;
-
-        _activatableUI.CloseAll(uid);
-    }
-
     private void OnMapInit(EntityUid uid, WiresComponent component, MapInitEvent args)
     {
         if (!string.IsNullOrEmpty(component.LayoutId))
diff --git a/Content.Server/Lock/Components/ActivatableUIRequiresLockComponent.cs b/Content.Shared/Lock/ActivatableUIRequiresLockComponent.cs
similarity index 66%
rename from Content.Server/Lock/Components/ActivatableUIRequiresLockComponent.cs
rename to Content.Shared/Lock/ActivatableUIRequiresLockComponent.cs
index dac677c1c276..7d701ffd8741 100644
--- a/Content.Server/Lock/Components/ActivatableUIRequiresLockComponent.cs
+++ b/Content.Shared/Lock/ActivatableUIRequiresLockComponent.cs
@@ -1,15 +1,17 @@
-namespace Content.Server.Lock.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Lock;
 
 /// <summary>
 /// This is used for activatable UIs that require the entity to have a lock in a certain state.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(LockSystem))]
 public sealed partial class ActivatableUIRequiresLockComponent : Component
 {
     /// <summary>
     /// TRUE: the lock must be locked to access the UI.
     /// FALSE: the lock must be unlocked to access the UI.
     /// </summary>
-    [DataField("requireLocked"), ViewVariables(VVAccess.ReadWrite)]
-    public bool requireLocked = false;
+    [DataField]
+    public bool RequireLocked;
 }
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 4115358d9d78..36ac5f025b1a 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
+using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
 using JetBrains.Annotations;
@@ -25,6 +26,7 @@ namespace Content.Shared.Lock;
 public sealed class LockSystem : EntitySystem
 {
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _sharedPopupSystem = default!;
@@ -48,6 +50,9 @@ public override void Initialize()
         SubscribeLocalEvent<LockedWiresPanelComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
         SubscribeLocalEvent<LockedWiresPanelComponent, AttemptChangePanelEvent>(OnAttemptChangePanel);
         SubscribeLocalEvent<LockedAnchorableComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
+
+        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
+        SubscribeLocalEvent<ActivatableUIRequiresLockComponent, LockToggledEvent>(LockToggled);
     }
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
@@ -349,5 +354,26 @@ private void OnUnanchorAttempt(Entity<LockedAnchorableComponent> ent, ref Unanch
             args.User);
         args.Cancel();
     }
+
+    private void OnUIOpenAttempt(EntityUid uid, ActivatableUIRequiresLockComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.RequireLocked)
+        {
+            args.Cancel();
+            if (lockComp.Locked)
+                _sharedPopupSystem.PopupEntity(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
+        }
+    }
+
+    private void LockToggled(EntityUid uid, ActivatableUIRequiresLockComponent component, LockToggledEvent args)
+    {
+        if (!TryComp<LockComponent>(uid, out var lockComp) || lockComp.Locked == component.RequireLocked)
+            return;
+
+        _activatableUI.CloseAll(uid);
+    }
 }
 
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
index 0431d95a42f8..2983c0d642f2 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs
@@ -5,6 +5,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;
 
@@ -30,7 +31,8 @@ public override void Initialize()
         SubscribeLocalEvent<BorgChassisComponent, EntInsertedIntoContainerMessage>(OnInserted);
         SubscribeLocalEvent<BorgChassisComponent, EntRemovedFromContainerMessage>(OnRemoved);
         SubscribeLocalEvent<BorgChassisComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
-
+        SubscribeLocalEvent<BorgChassisComponent, ActivatableUIOpenAttemptEvent>(OnUIOpenAttempt);
+        
         InitializeRelay();
     }
 
@@ -75,6 +77,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)
     {
 
diff --git a/Content.Server/Wires/ActivatableUIRequiresPanelComponent.cs b/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
similarity index 71%
rename from Content.Server/Wires/ActivatableUIRequiresPanelComponent.cs
rename to Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
index f92df3d3d59a..6e8fff6e49ca 100644
--- a/Content.Server/Wires/ActivatableUIRequiresPanelComponent.cs
+++ b/Content.Shared/Wires/ActivatableUIRequiresPanelComponent.cs
@@ -1,15 +1,17 @@
-namespace Content.Server.Wires;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Wires;
 
 /// <summary>
 /// This is used for activatable UIs that require the entity to have a panel in a certain state.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedWiresSystem))]
 public sealed partial class ActivatableUIRequiresPanelComponent : Component
 {
     /// <summary>
     /// TRUE: the panel must be open to access the UI.
     /// FALSE: the panel must be closed to access the UI.
     /// </summary>
-    [DataField("requireOpen"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool RequireOpen = true;
 }
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index b4b0768e0f77..d84766a5fc66 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Tools.Systems;
+using Content.Shared.UserInterface;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Wires;
@@ -10,6 +11,7 @@ namespace Content.Shared.Wires;
 public abstract class SharedWiresSystem : EntitySystem
 {
     [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+    [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedToolSystem Tool = default!;
@@ -21,6 +23,9 @@ public override void Initialize()
         SubscribeLocalEvent<WiresPanelComponent, WirePanelDoAfterEvent>(OnPanelDoAfter);
         SubscribeLocalEvent<WiresPanelComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<WiresPanelComponent, ExaminedEvent>(OnExamine);
+
+        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenActivatableUI);
+        SubscribeLocalEvent<ActivatableUIRequiresPanelComponent, PanelChangedEvent>(OnActivatableUIPanelChanged);
     }
 
     private void OnPanelDoAfter(EntityUid uid, WiresPanelComponent panel, WirePanelDoAfterEvent args)
@@ -132,4 +137,21 @@ public bool IsPanelOpen(Entity<WiresPanelComponent?> entity)
 
         return entity.Comp.Open;
     }
+
+    private void OnAttemptOpenActivatableUI(EntityUid uid, ActivatableUIRequiresPanelComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (args.Cancelled || !TryComp<WiresPanelComponent>(uid, out var wires))
+            return;
+
+        if (component.RequireOpen != wires.Open)
+            args.Cancel();
+    }
+
+    private void OnActivatableUIPanelChanged(EntityUid uid, ActivatableUIRequiresPanelComponent component, ref PanelChangedEvent args)
+    {
+        if (args.Open == component.RequireOpen)
+            return;
+
+        _activatableUI.CloseAll(uid);
+    }
 }

From af70b9a3c78046f7f680e5c35a298ebc1747eadd Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 27 May 2024 10:11:17 +1000
Subject: [PATCH 068/568] Selectively revert PullController (#28126)

I am leaving the issues open and have updated #26547 with more info on what we should do long-term. This is just to bandaid the short-term complaining.
---
 .../Movement/Components/PullMoverComponent.cs |  13 +
 .../Components/PullMovingComponent.cs         |  14 +
 .../Movement/Systems/PullController.cs        | 318 ++++++++++++++++++
 .../Pulling/Components/PullerComponent.cs     |   2 +-
 .../Movement/Pulling/Systems/PullingSystem.cs |  44 ---
 5 files changed, 346 insertions(+), 45 deletions(-)
 create mode 100644 Content.Server/Movement/Components/PullMoverComponent.cs
 create mode 100644 Content.Server/Movement/Components/PullMovingComponent.cs
 create mode 100644 Content.Server/Movement/Systems/PullController.cs

diff --git a/Content.Server/Movement/Components/PullMoverComponent.cs b/Content.Server/Movement/Components/PullMoverComponent.cs
new file mode 100644
index 000000000000..19a01c6b17db
--- /dev/null
+++ b/Content.Server/Movement/Components/PullMoverComponent.cs
@@ -0,0 +1,13 @@
+namespace Content.Server.Movement.Components;
+
+/// <summary>
+/// Added to an entity that is ctrl-click moving their pulled object.
+/// </summary>
+/// <remarks>
+/// This just exists so we don't have MoveEvent subs going off for every single mob constantly.
+/// </remarks>
+[RegisterComponent]
+public sealed partial class PullMoverComponent : Component
+{
+
+}
diff --git a/Content.Server/Movement/Components/PullMovingComponent.cs b/Content.Server/Movement/Components/PullMovingComponent.cs
new file mode 100644
index 000000000000..32c50d657ade
--- /dev/null
+++ b/Content.Server/Movement/Components/PullMovingComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Map;
+
+namespace Content.Server.Movement.Components;
+
+/// <summary>
+/// Added when an entity is being ctrl-click moved when pulled.
+/// </summary>
+[RegisterComponent]
+public sealed partial class PullMovingComponent : Component
+{
+    // Not serialized to indicate THIS CODE SUCKS, fix pullcontroller first
+    [ViewVariables]
+    public EntityCoordinates MovingTo;
+}
diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs
new file mode 100644
index 000000000000..72110ff67d24
--- /dev/null
+++ b/Content.Server/Movement/Systems/PullController.cs
@@ -0,0 +1,318 @@
+using System.Numerics;
+using Content.Server.Movement.Components;
+using Content.Server.Physics.Controllers;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Gravity;
+using Content.Shared.Input;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Events;
+using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Rotatable;
+using Robust.Server.Physics;
+using Robust.Shared.Containers;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Controllers;
+using Robust.Shared.Physics.Dynamics.Joints;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Movement.Systems;
+
+public sealed class PullController : VirtualController
+{
+    /*
+     * This code is awful. If you try to tweak this without refactoring it I'm gonna revert it.
+     */
+
+    // Parameterization for pulling:
+    // Speeds. Note that the speed is mass-independent (multiplied by mass).
+    // Instead, tuning to mass is done via the mass values below.
+    // Note that setting the speed too high results in overshoots (stabilized by drag, but bad)
+    private const float AccelModifierHigh = 15f;
+    private const float AccelModifierLow = 60.0f;
+    // High/low-mass marks. Curve is constant-lerp-constant, i.e. if you can even pull an item,
+    // you'll always get at least AccelModifierLow and no more than AccelModifierHigh.
+    private const float AccelModifierHighMass = 70.0f; // roundstart saltern emergency closet
+    private const float AccelModifierLowMass = 5.0f; // roundstart saltern emergency crowbar
+    // Used to control settling (turns off pulling).
+    private const float MaximumSettleVelocity = 0.1f;
+    private const float MaximumSettleDistance = 0.1f;
+    // Settle shutdown control.
+    // Mustn't be too massive, as that causes severe mispredicts *and can prevent it ever resolving*.
+    // Exists to bleed off "I pulled my crowbar" overshoots.
+    // Minimum velocity for shutdown to be necessary. This prevents stuff getting stuck b/c too much shutdown.
+    private const float SettleMinimumShutdownVelocity = 0.25f;
+    // Distance in which settle shutdown multiplier is at 0. It then scales upwards linearly with closer distances.
+    private const float SettleShutdownDistance = 1.0f;
+    // Velocity change of -LinearVelocity * frameTime * this
+    private const float SettleShutdownMultiplier = 20.0f;
+
+    // How much you must move for the puller movement check to actually hit.
+    private const float MinimumMovementDistance = 0.005f;
+
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+
+    /// <summary>
+    ///     If distance between puller and pulled entity lower that this threshold,
+    ///     pulled entity will not change its rotation.
+    ///     Helps with small distance jittering
+    /// </summary>
+    private const float ThresholdRotDistance = 1;
+
+    /// <summary>
+    ///     If difference between puller and pulled angle  lower that this threshold,
+    ///     pulled entity will not change its rotation.
+    ///     Helps with diagonal movement jittering
+    ///     As of further adjustments, should divide cleanly into 90 degrees
+    /// </summary>
+    private const float ThresholdRotAngle = 22.5f;
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private EntityQuery<PullableComponent> _pullableQuery;
+    private EntityQuery<PullerComponent> _pullerQuery;
+    private EntityQuery<TransformComponent> _xformQuery;
+
+    public override void Initialize()
+    {
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
+            .Register<PullingSystem>();
+
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        _pullableQuery = GetEntityQuery<PullableComponent>();
+        _pullerQuery = GetEntityQuery<PullerComponent>();
+        _xformQuery = GetEntityQuery<TransformComponent>();
+
+        UpdatesAfter.Add(typeof(MoverController));
+        SubscribeLocalEvent<PullMovingComponent, PullStoppedMessage>(OnPullStop);
+        SubscribeLocalEvent<PullMoverComponent, MoveEvent>(OnPullerMove);
+
+        base.Initialize();
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        CommandBinds.Unregister<PullController>();
+    }
+
+    private void OnPullStop(Entity<PullMovingComponent> ent, ref PullStoppedMessage args)
+    {
+        RemCompDeferred<PullMovingComponent>(ent);
+    }
+
+    private bool OnRequestMovePulledObject(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+    {
+        if (session?.AttachedEntity is not { } player ||
+            !player.IsValid())
+        {
+            return false;
+        }
+
+        if (!_pullerQuery.TryComp(player, out var pullerComp))
+            return false;
+
+        var pulled = pullerComp.Pulling;
+
+        if (!_pullableQuery.TryComp(pulled, out var pullable))
+            return false;
+
+        if (_container.IsEntityInContainer(player))
+            return false;
+
+        // Cooldown buddy
+        if (_timing.CurTime < pullerComp.NextThrow)
+            return false;
+
+        pullerComp.NextThrow = _timing.CurTime + pullerComp.ThrowCooldown;
+
+        // Cap the distance
+        var range = 2f;
+        var fromUserCoords = coords.WithEntityId(player, EntityManager);
+        var userCoords = new EntityCoordinates(player, Vector2.Zero);
+
+        if (!coords.InRange(EntityManager, TransformSystem, userCoords, range))
+        {
+            var direction = fromUserCoords.Position - userCoords.Position;
+
+            // TODO: Joint API not ass
+            // with that being said I think throwing is the way to go but.
+            if (pullable.PullJointId != null &&
+                TryComp(player, out JointComponent? joint) &&
+                joint.GetJoints.TryGetValue(pullable.PullJointId, out var pullJoint) &&
+                pullJoint is DistanceJoint distance)
+            {
+                range = MathF.Max(0.01f, distance.MaxLength - 0.01f);
+            }
+
+            fromUserCoords = new EntityCoordinates(player, direction.Normalized() * (range - 0.01f));
+            coords = fromUserCoords.WithEntityId(coords.EntityId);
+        }
+
+        EnsureComp<PullMoverComponent>(player);
+        var moving = EnsureComp<PullMovingComponent>(pulled!.Value);
+        moving.MovingTo = coords;
+        return false;
+    }
+
+    private void OnPullerMove(EntityUid uid, PullMoverComponent component, ref MoveEvent args)
+    {
+        if (!_pullerQuery.TryComp(uid, out var puller))
+            return;
+
+        if (puller.Pulling is not { } pullable)
+            return;
+
+        UpdatePulledRotation(uid, pullable);
+
+        // WHY
+        if (args.NewPosition.EntityId == args.OldPosition.EntityId &&
+            (args.NewPosition.Position - args.OldPosition.Position).LengthSquared() <
+            MinimumMovementDistance * MinimumMovementDistance)
+        {
+            return;
+        }
+
+        if (_physicsQuery.TryComp(uid, out var physics))
+            PhysicsSystem.WakeBody(uid, body: physics);
+
+        StopMove(uid, pullable);
+    }
+
+    private void StopMove(Entity<PullMoverComponent?> mover, Entity<PullMovingComponent?> moving)
+    {
+        RemCompDeferred<PullMoverComponent>(mover.Owner);
+        RemCompDeferred<PullMovingComponent>(moving.Owner);
+    }
+
+    private void UpdatePulledRotation(EntityUid puller, EntityUid pulled)
+    {
+        // TODO: update once ComponentReference works with directed event bus.
+        if (!TryComp(pulled, out RotatableComponent? rotatable))
+            return;
+
+        if (!rotatable.RotateWhilePulling)
+            return;
+
+        var pulledXform = _xformQuery.GetComponent(pulled);
+        var pullerXform = _xformQuery.GetComponent(puller);
+
+        var pullerData = TransformSystem.GetWorldPositionRotation(pullerXform);
+        var pulledData = TransformSystem.GetWorldPositionRotation(pulledXform);
+
+        var dir = pullerData.WorldPosition - pulledData.WorldPosition;
+        if (dir.LengthSquared() > ThresholdRotDistance * ThresholdRotDistance)
+        {
+            var oldAngle = pulledData.WorldRotation;
+            var newAngle = Angle.FromWorldVec(dir);
+
+            var diff = newAngle - oldAngle;
+            if (Math.Abs(diff.Degrees) > ThresholdRotAngle / 2f)
+            {
+                // Ok, so this bit is difficult because ideally it would look like it's snapping to sane angles.
+                // Otherwise PIANO DOOR STUCK! happens.
+                // But it also needs to work with station rotation / align to the local parent.
+                // So...
+                var baseRotation = pulledData.WorldRotation - pulledXform.LocalRotation;
+                var localRotation = newAngle - baseRotation;
+                var localRotationSnapped = Angle.FromDegrees(Math.Floor((localRotation.Degrees / ThresholdRotAngle) + 0.5f) * ThresholdRotAngle);
+                TransformSystem.SetLocalRotation(pulled, localRotationSnapped, pulledXform);
+            }
+        }
+    }
+
+    public override void UpdateBeforeSolve(bool prediction, float frameTime)
+    {
+        base.UpdateBeforeSolve(prediction, frameTime);
+        var movingQuery = EntityQueryEnumerator<PullMovingComponent, PullableComponent, TransformComponent>();
+
+        while (movingQuery.MoveNext(out var pullableEnt, out var mover, out var pullable, out var pullableXform))
+        {
+            if (!mover.MovingTo.IsValid(EntityManager))
+            {
+                RemCompDeferred<PullMovingComponent>(pullableEnt);
+                continue;
+            }
+
+            if (pullable.Puller is not {Valid: true} puller)
+                continue;
+
+            var pullerXform = _xformQuery.Get(puller);
+            var pullerPosition = TransformSystem.GetMapCoordinates(pullerXform);
+
+            var movingTo = mover.MovingTo.ToMap(EntityManager, TransformSystem);
+
+            if (movingTo.MapId != pullerPosition.MapId)
+            {
+                RemCompDeferred<PullMovingComponent>(pullableEnt);
+                continue;
+            }
+
+            if (!TryComp<PhysicsComponent>(pullableEnt, out var physics) ||
+                physics.BodyType == BodyType.Static ||
+                movingTo.MapId != pullableXform.MapID)
+            {
+                RemCompDeferred<PullMovingComponent>(pullableEnt);
+                continue;
+            }
+
+            var movingPosition = movingTo.Position;
+            var ownerPosition = TransformSystem.GetWorldPosition(pullableXform);
+
+            var diff = movingPosition - ownerPosition;
+            var diffLength = diff.Length();
+
+            if (diffLength < MaximumSettleDistance && physics.LinearVelocity.Length() < MaximumSettleVelocity)
+            {
+                PhysicsSystem.SetLinearVelocity(pullableEnt, Vector2.Zero, body: physics);
+                RemCompDeferred<PullMovingComponent>(pullableEnt);
+                continue;
+            }
+
+            var impulseModifierLerp = Math.Min(1.0f, Math.Max(0.0f, (physics.Mass - AccelModifierLowMass) / (AccelModifierHighMass - AccelModifierLowMass)));
+            var impulseModifier = MathHelper.Lerp(AccelModifierLow, AccelModifierHigh, impulseModifierLerp);
+            var multiplier = diffLength < 1 ? impulseModifier * diffLength : impulseModifier;
+            // Note the implication that the real rules of physics don't apply to pulling control.
+            var accel = diff.Normalized() * multiplier;
+            // Now for the part where velocity gets shutdown...
+            if (diffLength < SettleShutdownDistance && physics.LinearVelocity.Length() >= SettleMinimumShutdownVelocity)
+            {
+                // Shutdown velocity increases as we get closer to centre
+                var scaling = (SettleShutdownDistance - diffLength) / SettleShutdownDistance;
+                accel -= physics.LinearVelocity * SettleShutdownMultiplier * scaling;
+            }
+
+            PhysicsSystem.WakeBody(pullableEnt, body: physics);
+
+            var impulse = accel * physics.Mass * frameTime;
+            PhysicsSystem.ApplyLinearImpulse(pullableEnt, impulse, body: physics);
+
+            // if the puller is weightless or can't move, then we apply the inverse impulse (Newton's third law).
+            // doing it under gravity produces an unsatisfying wiggling when pulling.
+            // If player can't move, assume they are on a chair and we need to prevent pull-moving.
+            if (_gravity.IsWeightless(puller) && pullerXform.Comp.GridUid == null || !_actionBlockerSystem.CanMove(puller))
+            {
+                PhysicsSystem.WakeBody(puller);
+                PhysicsSystem.ApplyLinearImpulse(puller, -impulse);
+            }
+        }
+
+        // Cleanup PullMover
+        var moverQuery = EntityQueryEnumerator<PullMoverComponent, PullerComponent>();
+
+        while (moverQuery.MoveNext(out var uid, out _, out var puller))
+        {
+            if (!HasComp<PullMovingComponent>(puller.Pulling))
+            {
+                RemCompDeferred<PullMoverComponent>(uid);
+                continue;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
index 061ec13ed2ab..f47ae32f90bf 100644
--- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
+++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs
@@ -18,7 +18,7 @@ public sealed partial class PullerComponent : Component
     /// Next time the puller can throw what is being pulled.
     /// Used to avoid spamming it for infinite spin + velocity.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, Access(Other = AccessPermissions.ReadWriteExecute)]
     public TimeSpan NextThrow;
 
     [DataField]
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 3de71172c72f..225810daed2f 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -43,8 +43,6 @@ public sealed class PullingSystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSys = default!;
-    [Dependency] private readonly ThrowingSystem _throwing = default!;
 
     public override void Initialize()
     {
@@ -66,7 +64,6 @@ public override void Initialize()
         SubscribeLocalEvent<PullerComponent, DropHandItemsEvent>(OnDropHandItems);
 
         CommandBinds.Builder
-            .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
             .Bind(ContentKeyFunctions.ReleasePulledObject, InputCmdHandler.FromDelegate(OnReleasePulledObject, handle: false))
             .Register<PullingSystem>();
     }
@@ -245,47 +242,6 @@ public bool IsPulled(EntityUid uid, PullableComponent? component = null)
         return Resolve(uid, ref component, false) && component.BeingPulled;
     }
 
-    private bool OnRequestMovePulledObject(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
-    {
-        if (session?.AttachedEntity is not { } player ||
-            !player.IsValid())
-        {
-            return false;
-        }
-
-        if (!TryComp<PullerComponent>(player, out var pullerComp))
-            return false;
-
-        var pulled = pullerComp.Pulling;
-
-        if (!HasComp<PullableComponent>(pulled))
-            return false;
-
-        if (_containerSystem.IsEntityInContainer(player))
-            return false;
-
-        // Cooldown buddy
-        if (_timing.CurTime < pullerComp.NextThrow)
-            return false;
-
-        pullerComp.NextThrow = _timing.CurTime + pullerComp.ThrowCooldown;
-
-        // Cap the distance
-        const float range = 2f;
-        var fromUserCoords = coords.WithEntityId(player, EntityManager);
-        var userCoords = new EntityCoordinates(player, Vector2.Zero);
-
-        if (!userCoords.InRange(EntityManager, _xformSys, fromUserCoords, range))
-        {
-            var userDirection = fromUserCoords.Position - userCoords.Position;
-            fromUserCoords = userCoords.Offset(userDirection.Normalized() * range);
-        }
-
-        Dirty(player, pullerComp);
-        _throwing.TryThrow(pulled.Value, fromUserCoords, user: player, strength: 4f, animated: false, recoil: false, playSound: false, doSpin: false);
-        return false;
-    }
-
     public bool IsPulling(EntityUid puller, PullerComponent? component = null)
     {
         return Resolve(puller, ref component, false) && component.Pulling != null;

From 642bcffbaf7a25a95454b2052282cb7980fd0491 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 27 May 2024 00:12:24 +0000
Subject: [PATCH 069/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 80f1972d5601..31c41b9ed5b9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Moths eating lizard plushies will now start to Weh!
-    type: Tweak
-  id: 6125
-  time: '2024-03-11T23:05:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26003
 - author: Ubaser
   changes:
   - message: Unpressurized areas now deal heat damage along with blunt.
@@ -3870,3 +3863,10 @@
   id: 6624
   time: '2024-05-26T14:48:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28301
+- author: metalgearsloth
+  changes:
+  - message: Selectively revert pulling throwing for the short-term.
+    type: Tweak
+  id: 6625
+  time: '2024-05-27T00:11:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28126

From 5a59c6f262eaaf4fd5da12dbef4f88f89898fe45 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 27 May 2024 18:04:34 +1000
Subject: [PATCH 070/568] Add loadout group check (#28311)

Forgot to add it back in one of the rewrites.
---
 Content.Shared/Preferences/Loadouts/RoleLoadout.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index 40e13f0edfa4..479974893ceb 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -78,12 +78,20 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
             {
                 var loadout = loadouts[i];
 
+                // Old prototype or otherwise invalid.
                 if (!protoManager.TryIndex(loadout.Prototype, out var loadoutProto))
                 {
                     loadouts.RemoveAt(i);
                     continue;
                 }
 
+                // Malicious client maybe, check the group even has it.
+                if (!groupProto.Loadouts.Contains(loadout.Prototype))
+                {
+                    loadouts.RemoveAt(i);
+                    continue;
+                }
+
                 // Validate the loadout can be applied (e.g. points).
                 if (!IsValid(profile, session, loadout.Prototype, collection, out _))
                 {

From 224af2af0eefce38d2ab1c3e87b01fbe6d913b20 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 27 May 2024 11:50:05 -0400
Subject: [PATCH 071/568] fix mirror server crashes (#28318)

---
 .../MagicMirror/SharedMagicMirrorSystem.cs    | 25 +++++++++++++------
 .../Entities/Structures/Wallmounts/mirror.yml |  1 +
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
index ea96d504c6e6..789b484cfd3e 100644
--- a/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/SharedMagicMirrorSystem.cs
@@ -4,7 +4,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.UserInterface;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.MagicMirror;
 
@@ -18,6 +17,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<MagicMirrorComponent, AfterInteractEvent>(OnMagicMirrorInteract);
         SubscribeLocalEvent<MagicMirrorComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpen);
+        SubscribeLocalEvent<MagicMirrorComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenUI);
         SubscribeLocalEvent<MagicMirrorComponent, BoundUserInterfaceCheckRangeEvent>(OnMirrorRangeCheck);
     }
 
@@ -26,10 +26,8 @@ private void OnMagicMirrorInteract(Entity<MagicMirrorComponent> mirror, ref Afte
         if (!args.CanReach || args.Target == null)
             return;
 
-        if (!UISystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User))
-            return;
-
         UpdateInterface(mirror, args.Target.Value, mirror);
+        UISystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User);
     }
 
     private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, ref BoundUserInterfaceCheckRangeEvent args)
@@ -37,17 +35,27 @@ private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, r
         if (args.Result == BoundUserInterfaceRangeResult.Fail)
             return;
 
-        DebugTools.Assert(component.Target != null && Exists(component.Target));
+        if (component.Target == null || !Exists(component.Target))
+        {
+            component.Target = null;
+            args.Result = BoundUserInterfaceRangeResult.Fail;
+            return;
+        }
 
         if (!_interaction.InRangeUnobstructed(uid, component.Target.Value))
             args.Result = BoundUserInterfaceRangeResult.Fail;
     }
 
-    private void OnBeforeUIOpen(Entity<MagicMirrorComponent> ent, ref BeforeActivatableUIOpenEvent args)
+    private void OnAttemptOpenUI(EntityUid uid, MagicMirrorComponent component, ref ActivatableUIOpenAttemptEvent args)
     {
-        if (args.User != ent.Comp.Target && ent.Comp.Target != null)
-            return;
+        var user = component.Target ?? args.User;
 
+        if (!HasComp<HumanoidAppearanceComponent>(user))
+            args.Cancel();
+    }
+
+    private void OnBeforeUIOpen(Entity<MagicMirrorComponent> ent, ref BeforeActivatableUIOpenEvent args)
+    {
         UpdateInterface(ent, args.User, ent);
     }
 
@@ -55,6 +63,7 @@ protected void UpdateInterface(EntityUid mirrorUid, EntityUid targetUid, MagicMi
     {
         if (!TryComp<HumanoidAppearanceComponent>(targetUid, out var humanoid))
             return;
+
         component.Target ??= targetUid;
 
         var hair = humanoid.MarkingSet.TryGetCategory(MarkingCategories.Hair, out var hairMarkings)
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
index 1fe3318ef558..27b8390add29 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
@@ -19,6 +19,7 @@
     changeSlotTime: 0
   - type: ActivatableUI
     key: enum.MagicMirrorUiKey.Key
+    singleUser: true
   - type: UserInterface
     interfaces:
       enum.MagicMirrorUiKey.Key:

From cf8fcb170a185c06c966c1a1dcf7eec7ada52745 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 27 May 2024 23:52:23 +0200
Subject: [PATCH 072/568] Remove bogus C# finalizers (#28315)

Begging people to learn how this programming language works before throwing random syntax into a file.

None of these finalizers ever worked. I also checked whether they were memory leaks and needed *proper* shutdown logic, but they're all instantiated-once UI controls that last for the entire lifetime of the program so it's probably fine.
---
 Content.Client/Interaction/DragDropHelper.cs                 | 5 -----
 .../Systems/Actions/Controls/ActionButtonContainer.cs        | 5 -----
 .../Systems/Inventory/Controls/ItemSlotButtonContainer.cs    | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/Content.Client/Interaction/DragDropHelper.cs b/Content.Client/Interaction/DragDropHelper.cs
index abe35bf6d9a8..e453dfd74bff 100644
--- a/Content.Client/Interaction/DragDropHelper.cs
+++ b/Content.Client/Interaction/DragDropHelper.cs
@@ -73,11 +73,6 @@ public DragDropHelper(OnBeginDrag onBeginDrag, OnContinueDrag onContinueDrag, On
         _cfg.OnValueChanged(CCVars.DragDropDeadZone, SetDeadZone, true);
     }
 
-    ~DragDropHelper()
-    {
-        _cfg.UnsubValueChanged(CCVars.DragDropDeadZone, SetDeadZone);
-    }
-
     /// <summary>
     /// Tell the helper that the mouse button was pressed down on
     /// a target, thus a drag has the possibility to begin for this target.
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
index c5f8adbdea3b..38c08dc47216 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
@@ -119,9 +119,4 @@ public IEnumerable<ActionButton> GetButtons()
                 yield return button;
         }
     }
-
-    ~ActionButtonContainer()
-    {
-        UserInterfaceManager.GetUIController<ActionUIController>().RemoveActionContainer();
-    }
 }
diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs
index 78c3b40adac8..7a027fc4f810 100644
--- a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs
@@ -22,9 +22,4 @@ public ItemSlotButtonContainer()
     {
         _inventoryController = UserInterfaceManager.GetUIController<InventoryUIController>();
     }
-
-    ~ItemSlotButtonContainer()
-    {
-        _inventoryController.RemoveSlotGroup(SlotGroup);
-    }
 }

From 7309704ace2017e701e1b566359d012067c4107a Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Mon, 27 May 2024 16:59:10 -0500
Subject: [PATCH 073/568] Cleans up some entity-related spawnmenu stuff
 (#28234)

* cleans up a lot of stuff in the spawnmenu

* skibidi dode

* spawners update

* Revert "spawners update"

This reverts commit bc27d9f556b29f6fb1f89cebbe0ac37e28319fd0.
---
 .../Prototypes/Entities/Effects/mobspawn.yml  |  4 +
 .../Prototypes/Entities/Effects/wallspawn.yml |  9 ++
 .../Devices/Circuitboards/Machine/cannons.yml | 92 +++++++++++++++++++
 .../Circuitboards/Machine/production.yml      | 86 -----------------
 .../Entities/Structures/Shuttles/cannons.yml  |  9 +-
 5 files changed, 113 insertions(+), 87 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml

diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml
index fb59aa3fc466..2fad68d7f2c8 100644
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -1,6 +1,7 @@
 - type: entity
   id: MobSpawnCrabQuartz
   name: mobspawner quartzcrab
+  noSpawn: True
   components:
   - type: Transform
     anchored: True
@@ -30,6 +31,7 @@
   id: MobSpawnCrabIron
   parent: MobSpawnCrabQuartz
   name: mobspawner ironcrab
+  noSpawn: True
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -41,6 +43,7 @@
   id: MobSpawnCrabSilver
   parent: MobSpawnCrabQuartz
   name: mobspawner silvercrab
+  noSpawn: True
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
@@ -52,6 +55,7 @@
   id: MobSpawnCrabUranium
   parent: MobSpawnCrabQuartz
   name: mobspawner uraniumcrab
+  noSpawn: True
   components:
   - type: Sprite
     sprite: /Textures/Effects/mobspawn.rsi
diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml
index f1bd236a8abc..7213763c4690 100644
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -1,5 +1,6 @@
 - type: entity
   id: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: Transform
     anchored: True
@@ -28,6 +29,7 @@
 - type: entity
   id: WallSpawnAsteroidUraniumCrab
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockUraniumCrab
@@ -35,6 +37,7 @@
 - type: entity
   id: WallSpawnAsteroidUranium
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockUranium
@@ -42,6 +45,7 @@
 - type: entity
   id: WallSpawnAsteroidQuartzCrab
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockQuartzCrab
@@ -49,6 +53,7 @@
 - type: entity
   id: WallSpawnAsteroidQuartz
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockQuartz
@@ -56,6 +61,7 @@
 - type: entity
   id: WallSpawnAsteroidSilverCrab
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilverCrab
@@ -63,6 +69,7 @@
 - type: entity
   id: WallSpawnAsteroidSilver
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilver
@@ -70,6 +77,7 @@
 - type: entity
   id: WallSpawnAsteroidIronCrab
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockTinCrab
@@ -77,6 +85,7 @@
 - type: entity
   id: WallSpawnAsteroidIron
   parent: WallSpawnAsteroid
+  noSpawn: True
   components:
   - type: SpawnOnDespawn
     prototype: AsteroidRockTin
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
new file mode 100644
index 000000000000..6db7f4b385ed
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
@@ -0,0 +1,92 @@
+# Most of these have DO NOT MAP, since stations are completely unequipped to deal with ship combat + these are basically placeholder.
+
+- type: entity
+  id: ShuttleGunSvalinnMachineGunCircuitboard
+  parent: BaseMachineCircuitboard
+  name: LSE-400c "Svalinn machine gun" machine board
+  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun"
+  suffix: DO NOT MAP, Machine Board
+  components:
+  - type: Sprite
+    state: security
+  - type: MachineBoard
+    prototype: ShuttleGunSvalinnMachineGun
+    requirements:
+      MatterBin: 2
+      Manipulator: 4
+    materialRequirements:
+      Steel: 5
+      CableHV: 5
+
+- type: entity
+  id: ShuttleGunPerforatorCircuitboard
+  parent: BaseMachineCircuitboard
+  name: LSE-1200c "Perforator" machine board
+  description: A machine printed circuit board for an LSE-1200c "Perforator"
+  suffix: DO NOT MAP, Machine Board
+  components:
+  - type: Sprite
+    state: security
+  - type: MachineBoard
+    prototype: ShuttleGunPerforator
+    requirements:
+      MatterBin: 4
+      Manipulator: 6
+    materialRequirements:
+      Steel: 10
+      CableHV: 5
+
+- type: entity
+  id: ShuttleGunFriendshipCircuitboard
+  parent: BaseMachineCircuitboard
+  name: EXP-320g "Friendship" machine board
+  description: A machine printed circuit board for an EXP-320g "Friendship"
+  suffix: DO NOT MAP, Machine Board
+  components:
+  - type: Sprite
+    state: security
+  - type: MachineBoard
+    prototype: ShuttleGunFriendship
+    requirements:
+      MatterBin: 3
+      Manipulator: 2
+    materialRequirements:
+      Steel: 7
+      CableHV: 5
+
+- type: entity
+  id: ShuttleGunDusterCircuitboard
+  parent: BaseMachineCircuitboard
+  name: EXP-2100g "Duster" machine board
+  description: A machine printed circuit board for an EXP-2100g "Duster"
+  suffix: DO NOT MAP, Machine Board
+  components:
+  - type: Sprite
+    state: security
+  - type: MachineBoard
+    prototype: ShuttleGunDuster
+    requirements:
+      MatterBin: 6
+      Manipulator: 4
+    materialRequirements:
+      Steel: 10
+      CableHV: 5
+      Uranium: 2
+
+- type: entity
+  id: ShuttleGunKineticCircuitboard
+  parent: BaseMachineCircuitboard
+  name: PTK-800 "Matter Dematerializer" machine board
+  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer"
+  suffix: DO NOT MAP, Machine Board
+  components:
+  - type: Sprite
+    state: security
+  - type: MachineBoard
+    prototype: ShuttleGunKinetic
+    requirements:
+      MatterBin: 2
+      Manipulator: 3
+    materialRequirements:
+      Steel: 5
+      CableHV: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 7f25d00a05f4..587e56865b4d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1277,92 +1277,6 @@
       CableHV: 5
       Uranium: 2
 
-- type: entity
-  id: ShuttleGunSvalinnMachineGunCircuitboard
-  parent: BaseMachineCircuitboard
-  name: LSE-400c "Svalinn machine gun" machine board
-  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunSvalinnMachineGun
-    requirements:
-      MatterBin: 2
-      Manipulator: 4
-    materialRequirements:
-      Steel: 5
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunPerforatorCircuitboard
-  parent: BaseMachineCircuitboard
-  name: LSE-1200c "Perforator" machine board
-  description: A machine printed circuit board for an LSE-1200c "Perforator"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunPerforator
-    requirements:
-      MatterBin: 4
-      Manipulator: 6
-    materialRequirements:
-      Steel: 10
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunFriendshipCircuitboard
-  parent: BaseMachineCircuitboard
-  name: EXP-320g "Friendship" machine board
-  description: A machine printed circuit board for an EXP-320g "Friendship"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunFriendship
-    requirements:
-      MatterBin: 3
-      Manipulator: 2
-    materialRequirements:
-      Steel: 7
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunDusterCircuitboard
-  parent: BaseMachineCircuitboard
-  name: EXP-2100g "Duster" machine board
-  description: A machine printed circuit board for an EXP-2100g "Duster"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunDuster
-    requirements:
-      MatterBin: 6
-      Manipulator: 4
-    materialRequirements:
-      Steel: 10
-      CableHV: 5
-      Uranium: 2
-
-- type: entity
-  id: ShuttleGunKineticCircuitboard
-  parent: BaseMachineCircuitboard
-  name: PTK-800 "Matter Dematerializer" machine board
-  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunKinetic
-    requirements:
-      MatterBin: 2
-      Manipulator: 3
-    materialRequirements:
-      Steel: 5
-      CableHV: 2
-
 - type: entity
   parent: BaseMachineCircuitboard
   id: ReagentGrinderIndustrialMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
index 3368e2d7ee0b..08eff29c81b8 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -1,3 +1,5 @@
+# Most of these have DO NOT MAP, since stations are completely unequipped to deal with ship combat + these are basically placeholder.
+
 - type: entity
   id: ShuttleGunBase
   name: shittle gun
@@ -58,7 +60,8 @@
   id: ShuttleGunSvalinnMachineGun
   parent: [ ShuttleGunBase, ConstructibleMachine]
   name: LSE-400c "Svalinn machine gun"
-  description: Basic stationary laser unit. Effective against live targets and electronics. Uses regular power cells to fire, and has an extremely high rate of fire
+  description: Basic stationary laser unit. Effective against live targets and electronics. Uses regular power cells to fire, and has an extremely high rate of fire.
+  suffix: DO NOT MAP
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shuttles/laser.rsi
@@ -112,6 +115,7 @@
   parent: [ ShuttleGunBase, ConstructibleMachine]
   name: LSE-1200c "Perforator"
   description: Advanced stationary laser unit. Annihilates electronics and is extremely dangerous to health! Uses the power cage to fire.
+  suffix: DO NOT MAP
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shuttles/laser.rsi
@@ -167,6 +171,7 @@
   parent: [ShuttleGunBase, ConstructibleMachine]
   name: EXP-320g "Friendship"
   description: A small stationary grenade launcher that holds 2 grenades.
+  suffix: DO NOT MAP
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shuttles/launcher.rsi
@@ -220,6 +225,7 @@
   parent: [ShuttleGunBase, ConstructibleMachine]
   name: EXP-2100g "Duster"
   description: A powerful stationary grenade launcher. A cartridge is required for use.
+  suffix: DO NOT MAP
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shuttles/launcher.rsi
@@ -317,6 +323,7 @@
   parent: [ ShuttleGunBase, ConstructibleMachine]
   name: PTK-800 "Matter Dematerializer"
   description: Salvage stationary mining turret. Gradually accumulates charges on its own, extremely effective for asteroid excavation.
+  suffix: DO NOT MAP
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shuttles/kinetic.rsi

From 984af3584f3c54037c0571db6fe35098884a5b00 Mon Sep 17 00:00:00 2001
From: alex-georgeff <54858069+taurie@users.noreply.github.com>
Date: Mon, 27 May 2024 18:00:19 -0400
Subject: [PATCH 074/568] Rewords plant/effect descriptions for clarity
 (#28156) (#28169)

* Rewords plant/effect descriptions for clarity (#28156)

* Forgot Robust Harvest.

* Update Resources/Locale/en-US/guidebook/chemistry/effects.ftl

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---
 Resources/Locale/en-US/guidebook/chemistry/effects.ftl | 6 +++---
 Resources/Locale/en-US/reagents/meta/botany.ftl        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 5579c95e9df6..1dacebd1349e 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -365,9 +365,9 @@ reagent-effect-guidebook-plant-cryoxadone =
 
 reagent-effect-guidebook-plant-phalanximine =
     { $chance ->
-        [1] Makes
-        *[other] make
-    } a plant not viable due to mutation viable again
+        [1] Restores
+        *[other] restore
+    } viability to a plant rendered nonviable by a mutation
 
 reagent-effect-guidebook-plant-diethylamine =
     { $chance ->
diff --git a/Resources/Locale/en-US/reagents/meta/botany.ftl b/Resources/Locale/en-US/reagents/meta/botany.ftl
index 912ded5cf292..c7101c232795 100644
--- a/Resources/Locale/en-US/reagents/meta/botany.ftl
+++ b/Resources/Locale/en-US/reagents/meta/botany.ftl
@@ -11,7 +11,7 @@ reagent-name-plant-b-gone = plant-B-gone
 reagent-desc-plant-b-gone = A harmful toxic mixture to kill plantlife. Very effective against kudzu.
 
 reagent-name-robust-harvest = robust harvest
-reagent-desc-robust-harvest = A highly effective fertilizer, with a limited potency-boosting effect on plants. Be careful with it's usage since using too much has a chance to reduce the plant yield. It has a positive effect on dionas.
+reagent-desc-robust-harvest = A highly effective fertilizer with a limited potency-boosting effect on plants. Use it cautiously, as excessive application can reduce plant yield. It has a particularly beneficial effect on dionas.
 
 reagent-name-weed-killer = weed killer
 reagent-desc-weed-killer = A mixture that targets weeds. Very effective against kudzu. While useful it slowly poisons plants with toxins, be careful when using it.

From 44b93e68ee0d6eb98933b4c8520e7e8e966cce35 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 27 May 2024 18:37:27 -0400
Subject: [PATCH 075/568] Prevent stacking pipes (#28308)

* prevent stacking pipes

* access

* notafet review

* notafet review pt. 2

* not the actual fix
---
 .../PipeRestrictOverlapComponent.cs           |   9 ++
 .../PipeRestrictOverlapSystem.cs              | 123 ++++++++++++++++++
 .../ConstructionSystem.Initial.cs             |  39 +++---
 .../NodeContainer/Nodes/PipeNode.cs           |  16 +--
 .../conditions/no-unstackable-in-tile.ftl     |   1 +
 .../Structures/Piping/Atmospherics/binary.yml |   1 +
 .../Structures/Piping/Atmospherics/pipes.yml  |   1 +
 .../Structures/Piping/Atmospherics/unary.yml  |   2 +
 .../Structures/Power/Generation/teg.yml       |   1 +
 9 files changed, 170 insertions(+), 23 deletions(-)
 create mode 100644 Content.Server/Atmos/Components/PipeRestrictOverlapComponent.cs
 create mode 100644 Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs

diff --git a/Content.Server/Atmos/Components/PipeRestrictOverlapComponent.cs b/Content.Server/Atmos/Components/PipeRestrictOverlapComponent.cs
new file mode 100644
index 000000000000..49e1a8c94d38
--- /dev/null
+++ b/Content.Server/Atmos/Components/PipeRestrictOverlapComponent.cs
@@ -0,0 +1,9 @@
+using Content.Server.Atmos.EntitySystems;
+
+namespace Content.Server.Atmos.Components;
+
+/// <summary>
+/// This is used for restricting anchoring pipes so that they do not overlap.
+/// </summary>
+[RegisterComponent, Access(typeof(PipeRestrictOverlapSystem))]
+public sealed partial class PipeRestrictOverlapComponent : Component;
diff --git a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
new file mode 100644
index 000000000000..c2ff87ca79c3
--- /dev/null
+++ b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
@@ -0,0 +1,123 @@
+using System.Linq;
+using Content.Server.Atmos.Components;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
+using Content.Server.Popups;
+using Content.Shared.Atmos;
+using Content.Shared.Construction.Components;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map.Components;
+
+namespace Content.Server.Atmos.EntitySystems;
+
+/// <summary>
+/// This handles restricting pipe-based entities from overlapping outlets/inlets with other entities.
+/// </summary>
+public sealed class PipeRestrictOverlapSystem : EntitySystem
+{
+    [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly TransformSystem _xform = default!;
+
+    private readonly List<EntityUid> _anchoredEntities = new();
+    private EntityQuery<NodeContainerComponent> _nodeContainerQuery;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PipeRestrictOverlapComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
+        SubscribeLocalEvent<PipeRestrictOverlapComponent, AnchorAttemptEvent>(OnAnchorAttempt);
+
+        _nodeContainerQuery = GetEntityQuery<NodeContainerComponent>();
+    }
+
+    private void OnAnchorStateChanged(Entity<PipeRestrictOverlapComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        if (!args.Anchored)
+            return;
+
+        if (HasComp<AnchorableComponent>(ent) && CheckOverlap(ent))
+        {
+            _popup.PopupEntity(Loc.GetString("pipe-restrict-overlap-popup-blocked", ("pipe", ent.Owner)), ent);
+            _xform.Unanchor(ent, Transform(ent));
+        }
+    }
+
+    private void OnAnchorAttempt(Entity<PipeRestrictOverlapComponent> ent, ref AnchorAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!_nodeContainerQuery.TryComp(ent, out var node))
+            return;
+
+        var xform = Transform(ent);
+        if (CheckOverlap((ent, node, xform)))
+        {
+            _popup.PopupEntity(Loc.GetString("pipe-restrict-overlap-popup-blocked", ("pipe", ent.Owner)), ent, args.User);
+            args.Cancel();
+        }
+    }
+
+    [PublicAPI]
+    public bool CheckOverlap(EntityUid uid)
+    {
+        if (!_nodeContainerQuery.TryComp(uid, out var node))
+            return false;
+
+        return CheckOverlap((uid, node, Transform(uid)));
+    }
+
+    public bool CheckOverlap(Entity<NodeContainerComponent, TransformComponent> ent)
+    {
+        if (ent.Comp2.GridUid is not { } grid || !TryComp<MapGridComponent>(grid, out var gridComp))
+            return false;
+
+        var indices = _map.TileIndicesFor(grid, gridComp, ent.Comp2.Coordinates);
+        _anchoredEntities.Clear();
+        _map.GetAnchoredEntities((grid, gridComp), indices, _anchoredEntities);
+
+        foreach (var otherEnt in _anchoredEntities)
+        {
+            // this should never actually happen but just for safety
+            if (otherEnt == ent.Owner)
+                continue;
+
+            if (!_nodeContainerQuery.TryComp(otherEnt, out var otherComp))
+                continue;
+
+            if (PipeNodesOverlap(ent, (otherEnt, otherComp, Transform(otherEnt))))
+                return true;
+        }
+
+        return false;
+    }
+
+    public bool PipeNodesOverlap(Entity<NodeContainerComponent, TransformComponent> ent, Entity<NodeContainerComponent, TransformComponent> other)
+    {
+        var entDirs = GetAllDirections(ent).ToList();
+        var otherDirs = GetAllDirections(other).ToList();
+
+        foreach (var dir in entDirs)
+        {
+            foreach (var otherDir in otherDirs)
+            {
+                if ((dir & otherDir) != 0)
+                    return true;
+            }
+        }
+
+        return false;
+
+        IEnumerable<PipeDirection> GetAllDirections(Entity<NodeContainerComponent, TransformComponent> pipe)
+        {
+            foreach (var node in pipe.Comp1.Nodes.Values)
+            {
+                // we need to rotate the pipe manually like this because the rotation doesn't update for pipes that are unanchored.
+                if (node is PipeNode pipeNode)
+                    yield return pipeNode.OriginalPipeDirection.RotatePipeDirection(pipe.Comp2.LocalRotation);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 17ed5c90f4d4..04d3722c66cb 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
+using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
@@ -91,7 +92,14 @@ private IEnumerable<EntityUid> EnumerateNearby(EntityUid user)
         }
 
         // LEGACY CODE. See warning at the top of the file!
-        private async Task<EntityUid?> Construct(EntityUid user, string materialContainer, ConstructionGraphPrototype graph, ConstructionGraphEdge edge, ConstructionGraphNode targetNode)
+        private async Task<EntityUid?> Construct(
+            EntityUid user,
+            string materialContainer,
+            ConstructionGraphPrototype graph,
+            ConstructionGraphEdge edge,
+            ConstructionGraphNode targetNode,
+            EntityCoordinates coords,
+            Angle angle = default)
         {
             // We need a place to hold our construction items!
             var container = _container.EnsureContainer<Container>(user, materialContainer, out var existed);
@@ -261,7 +269,7 @@ void ShutdownContainers()
             }
 
             var newEntityProto = graph.Nodes[edge.Target].Entity.GetId(null, user, new(EntityManager));
-            var newEntity = EntityManager.SpawnEntity(newEntityProto, EntityManager.GetComponent<TransformComponent>(user).Coordinates);
+            var newEntity = Spawn(newEntityProto, _transformSystem.ToMapCoordinates(coords), rotation: angle);
 
             if (!TryComp(newEntity, out ConstructionComponent? construction))
             {
@@ -376,7 +384,13 @@ public async Task<bool> TryStartItemConstruction(string prototype, EntityUid use
                 }
             }
 
-            if (await Construct(user, "item_construction", constructionGraph, edge, targetNode) is not { Valid: true } item)
+            if (await Construct(
+                    user,
+                    "item_construction",
+                    constructionGraph,
+                    edge,
+                    targetNode,
+                    Transform(user).Coordinates) is not { Valid: true } item)
                 return false;
 
             // Just in case this is a stack, attempt to merge it. If it isn't a stack, this will just normally pick up
@@ -511,23 +525,18 @@ void Cleanup()
                 return;
             }
 
-            if (await Construct(user, (ev.Ack + constructionPrototype.GetHashCode()).ToString(), constructionGraph,
-                    edge, targetNode) is not {Valid: true} structure)
+            if (await Construct(user,
+                    (ev.Ack + constructionPrototype.GetHashCode()).ToString(),
+                    constructionGraph,
+                    edge,
+                    targetNode,
+                    GetCoordinates(ev.Location),
+                    constructionPrototype.CanRotate ? ev.Angle : Angle.Zero) is not {Valid: true} structure)
             {
                 Cleanup();
                 return;
             }
 
-            // We do this to be able to move the construction to its proper position in case it's anchored...
-            // Oh wow transform anchoring is amazing wow I love it!!!!
-            // ikr
-            var xform = Transform(structure);
-            var wasAnchored = xform.Anchored;
-            xform.Anchored = false;
-            xform.Coordinates = GetCoordinates(ev.Location);
-            xform.LocalRotation = constructionPrototype.CanRotate ? ev.Angle : Angle.Zero;
-            xform.Anchored = wasAnchored;
-
             RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack, GetNetEntity(structure)));
             _adminLogger.Add(LogType.Construction, LogImpact.Low, $"{ToPrettyString(user):player} has turned a {ev.PrototypeName} construction ghost into {ToPrettyString(structure)} at {Transform(structure).Coordinates}");
             Cleanup();
diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs
index 861f3eea98d2..31ee5712493d 100644
--- a/Content.Server/NodeContainer/Nodes/PipeNode.cs
+++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs
@@ -20,7 +20,7 @@ public partial class PipeNode : Node, IGasMixtureHolder, IRotatableNode
         ///     The directions in which this pipe can connect to other pipes around it.
         /// </summary>
         [DataField("pipeDirection")]
-        private PipeDirection _originalPipeDirection;
+        public PipeDirection OriginalPipeDirection;
 
         /// <summary>
         ///     The *current* pipe directions (accounting for rotation)
@@ -110,26 +110,26 @@ public override void Initialize(EntityUid owner, IEntityManager entMan)
                 return;
 
             var xform = entMan.GetComponent<TransformComponent>(owner);
-            CurrentPipeDirection = _originalPipeDirection.RotatePipeDirection(xform.LocalRotation);
+            CurrentPipeDirection = OriginalPipeDirection.RotatePipeDirection(xform.LocalRotation);
         }
 
         bool IRotatableNode.RotateNode(in MoveEvent ev)
         {
-            if (_originalPipeDirection == PipeDirection.Fourway)
+            if (OriginalPipeDirection == PipeDirection.Fourway)
                 return false;
 
             // update valid pipe direction
             if (!RotationsEnabled)
             {
-                if (CurrentPipeDirection == _originalPipeDirection)
+                if (CurrentPipeDirection == OriginalPipeDirection)
                     return false;
 
-                CurrentPipeDirection = _originalPipeDirection;
+                CurrentPipeDirection = OriginalPipeDirection;
                 return true;
             }
 
             var oldDirection = CurrentPipeDirection;
-            CurrentPipeDirection = _originalPipeDirection.RotatePipeDirection(ev.NewRotation);
+            CurrentPipeDirection = OriginalPipeDirection.RotatePipeDirection(ev.NewRotation);
             return oldDirection != CurrentPipeDirection;
         }
 
@@ -142,12 +142,12 @@ public override void OnAnchorStateChanged(IEntityManager entityManager, bool anc
 
             if (!RotationsEnabled)
             {
-                CurrentPipeDirection = _originalPipeDirection;
+                CurrentPipeDirection = OriginalPipeDirection;
                 return;
             }
 
             var xform = entityManager.GetComponent<TransformComponent>(Owner);
-            CurrentPipeDirection = _originalPipeDirection.RotatePipeDirection(xform.LocalRotation);
+            CurrentPipeDirection = OriginalPipeDirection.RotatePipeDirection(xform.LocalRotation);
         }
 
         public override IEnumerable<Node> GetReachableNodes(TransformComponent xform,
diff --git a/Resources/Locale/en-US/construction/conditions/no-unstackable-in-tile.ftl b/Resources/Locale/en-US/construction/conditions/no-unstackable-in-tile.ftl
index 37ce0de9e8e7..715825e801c8 100644
--- a/Resources/Locale/en-US/construction/conditions/no-unstackable-in-tile.ftl
+++ b/Resources/Locale/en-US/construction/conditions/no-unstackable-in-tile.ftl
@@ -1 +1,2 @@
 construction-step-condition-no-unstackable-in-tile = You cannot make a stack of similar devices.
+pipe-restrict-overlap-popup-blocked = { CAPITALIZE(THE($pipe))} doesn't fit over the other pipes!
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index fa5804c64525..213b0b893d94 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -358,6 +358,7 @@
   - type: PipeColorVisuals
   - type: Rotatable
   - type: GasRecycler
+  - type: PipeRestrictOverlap
   - type: NodeContainer
     nodes:
       inlet:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 0025fc5ae1b3..c2fc4e0565b0 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -51,6 +51,7 @@
   - type: Appearance
   - type: PipeColorVisuals
   - type: NodeContainer
+  - type: PipeRestrictOverlap
   - type: AtmosUnsafeUnanchor
   - type: AtmosPipeColor
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index c0664602b498..d301f43c7887 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -246,6 +246,7 @@
       key: enum.ThermomachineUiKey.Key
     - type: WiresPanel
     - type: WiresVisuals
+    - type: PipeRestrictOverlap
     - type: NodeContainer
       nodes:
         pipe:
@@ -420,6 +421,7 @@
   - type: GasCondenser
   - type: AtmosPipeColor
   - type: AtmosDevice
+  - type: PipeRestrictOverlap
   - type: ApcPowerReceiver
     powerLoad: 10000
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
index 9a378c26a449..78d979ab8eba 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
@@ -176,6 +176,7 @@
           nodeGroupID: Teg
 
     - type: AtmosUnsafeUnanchor
+    - type: PipeRestrictOverlap
     - type: TegCirculator
     - type: StealTarget
       stealGroup: Teg

From ab3abfde17c22b507f6d28c40206b832b89185db Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 27 May 2024 22:38:34 +0000
Subject: [PATCH 076/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 31c41b9ed5b9..e45f9d83ccfe 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Ubaser
-  changes:
-  - message: Unpressurized areas now deal heat damage along with blunt.
-    type: Tweak
-  id: 6126
-  time: '2024-03-12T02:38:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25770
 - author: nikthechampiongr
   changes:
   - message: Recyclers now leave logs when they gib people.
@@ -3870,3 +3863,12 @@
   id: 6625
   time: '2024-05-27T00:11:17.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28126
+- author: EmoGarbage404
+  changes:
+  - message: Multiple pipes facing the same direction can no longer be placed on the
+      same tile. You can still have overlapping straight pipes or corners going in
+      opposite directions.
+    type: Fix
+  id: 6626
+  time: '2024-05-27T22:37:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28308

From 0805637807776872ec39dec47f51b278b55dde0c Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Mon, 27 May 2024 16:40:00 -0600
Subject: [PATCH 077/568] derotate train atm until i redo its atmos  (#28328)

webedit webedit webedit
---
 Resources/Prototypes/Maps/Pools/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml
index 245ccce4b7bb..5c6b0eee0d70 100644
--- a/Resources/Prototypes/Maps/Pools/default.yml
+++ b/Resources/Prototypes/Maps/Pools/default.yml
@@ -15,4 +15,4 @@
   - Saltern
   - Packed
   - Reach
-  - Train
+  #- Train

From 5f533e8753a81a543fba843b83e96b505f7e9f2e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 27 May 2024 22:41:06 +0000
Subject: [PATCH 078/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e45f9d83ccfe..4dbcc6de133d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: Recyclers now leave logs when they gib people.
-    type: Add
-  - message: People sending a broadcast in the communications console now leave logs.
-    type: Add
-  id: 6127
-  time: '2024-03-12T10:57:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26008
 - author: ShadowCommander
   changes:
   - message: Fixed arrivals shuttle not docking with the station when it was slowly
@@ -3872,3 +3863,10 @@
   id: 6626
   time: '2024-05-27T22:37:27.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28308
+- author: Emisse
+  changes:
+  - message: Derotate Train temporarily
+    type: Tweak
+  id: 6627
+  time: '2024-05-27T22:40:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28328

From 217d081b29f7c15dccfa43d43d5f83121b75370b Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 27 May 2024 18:43:17 -0400
Subject: [PATCH 079/568] Fix under-selecting antags (#28327)

Fix under selecting antags
---
 .../Antag/AntagSelectionSystem.API.cs         | 23 +++++++++++++++----
 Content.Server/Antag/AntagSelectionSystem.cs  |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index 3b5855cdf95c..16d83c4f3fc4 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -52,12 +52,26 @@ public bool TryGetNextAvailableDefinition(Entity<AntagSelectionComponent> ent,
     /// Gets the number of antagonists that should be present for a given rule based on the provided pool.
     /// A null pool will simply use the player count.
     /// </summary>
-    public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, AntagSelectionPlayerPool? pool = null)
+    public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, int? playerCount = null)
     {
         var count = 0;
         foreach (var def in ent.Comp.Definitions)
         {
-            count += GetTargetAntagCount(ent, pool, def);
+            count += GetTargetAntagCount(ent, playerCount, def);
+        }
+
+        return count;
+    }
+
+    public int GetTotalPlayerCount(IList<ICommonSession> pool)
+    {
+        var count = 0;
+        foreach (var session in pool)
+        {
+            if (session.Status is SessionStatus.Disconnected or SessionStatus.Zombie)
+                continue;
+
+            count++;
         }
 
         return count;
@@ -67,14 +81,13 @@ public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, AntagSelecti
     /// Gets the number of antagonists that should be present for a given antag definition based on the provided pool.
     /// A null pool will simply use the player count.
     /// </summary>
-    public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, AntagSelectionPlayerPool? pool, AntagSelectionDefinition def)
+    public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, int? playerCount, AntagSelectionDefinition def)
     {
         // TODO ANTAG
         // make pool non-nullable
         // Review uses and ensure that people are INTENTIONALLY including players in the lobby if this is a mid-round
         // antag selection.
-        var poolSize = pool?.Count ?? _playerManager.Sessions
-            .Count(s => s.State.Status is not SessionStatus.Disconnected and not SessionStatus.Zombie);
+        var poolSize = playerCount ?? GetTotalPlayerCount(_playerManager.Sessions);
 
         // factor in other definitions' affect on the count.
         var countOffset = 0;
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 5b6c891ddfc5..a86611bedb39 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -203,7 +203,7 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
     public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, AntagSelectionDefinition def)
     {
         var playerPool = GetPlayerPool(ent, pool, def);
-        var count = GetTargetAntagCount(ent, playerPool, def);
+        var count = GetTargetAntagCount(ent, GetTotalPlayerCount(pool), def);
 
         for (var i = 0; i < count; i++)
         {

From 056097e4815001f6f39e18c0de8ec05df3b23d77 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 27 May 2024 22:44:23 +0000
Subject: [PATCH 080/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4dbcc6de133d..98ec517a5024 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ShadowCommander
-  changes:
-  - message: Fixed arrivals shuttle not docking with the station when it was slowly
-      spinning.
-    type: Fix
-  id: 6128
-  time: '2024-03-12T12:57:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26033
 - author: liltenhead
   changes:
   - message: Buffed the zombie virus to do purely poison damage, and more likely to
@@ -3870,3 +3862,10 @@
   id: 6627
   time: '2024-05-27T22:40:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28328
+- author: EmoGarbage404
+  changes:
+  - message: Fixed not enough antags being selected for gamemodes.
+    type: Fix
+  id: 6628
+  time: '2024-05-27T22:43:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28327

From 5ac66306711e5e3424f84946482b33e20f9936ae Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Mon, 27 May 2024 16:09:40 -0700
Subject: [PATCH 081/568] Update engine to 223.2.0 (#28329)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 796abe123055..721408bb3731 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 796abe1230554c31daffbfa6559a0a4bcf50b1af
+Subproject commit 721408bb37317e7a66cd34655e068369c47912ac

From 4e09743d44d2d81d6f34d11cefcbacb39b6aa9d0 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 27 May 2024 20:04:32 -0400
Subject: [PATCH 082/568] remove firefighting remote and bolting firelocks
 (#28330)

remove firefighting remote
---
 Resources/Prototypes/Access/engineering.yml    |  6 ------
 .../Catalog/Fills/Lockers/engineer.yml         |  2 --
 .../Entities/Objects/Devices/door_remote.yml   | 18 ------------------
 .../Structures/Doors/Firelocks/firelock.yml    |  3 ---
 Resources/migration.yml                        |  3 +++
 5 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Resources/Prototypes/Access/engineering.yml b/Resources/Prototypes/Access/engineering.yml
index 94901fdf7afe..f2f79fa805f2 100644
--- a/Resources/Prototypes/Access/engineering.yml
+++ b/Resources/Prototypes/Access/engineering.yml
@@ -16,9 +16,3 @@
   - ChiefEngineer
   - Engineering
   - Atmospherics
-
-- type: accessGroup
-  id: FireFight
-  tags:
-    - Engineering
-    - Atmospherics
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index d9d9071d444a..1bf7a9443b5e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -94,7 +94,6 @@
       - id: GasAnalyzer
       - id: MedkitOxygenFilled
       - id: HolofanProjector
-      - id: DoorRemoteFirefight
       - id: RCD
       - id: RCDAmmo
 
@@ -111,7 +110,6 @@
       - id: GasAnalyzer
       - id: MedkitOxygenFilled
       - id: HolofanProjector
-      - id: DoorRemoteFirefight
       - id: RCD
       - id: RCDAmmo
 
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index 25ac56a6daba..a368ec2b65d3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -142,24 +142,6 @@
     groups:
     - Engineering
 
-- type: entity
-  parent: DoorRemoteDefault
-  id: DoorRemoteFirefight
-  name: fire-fighting door remote
-  description: A gadget which can open and bolt FireDoors remotely.
-  components:
-    - type: Sprite
-      layers:
-        - state: door_remotebase
-        - state: door_remotelightscolour
-          color: "#ff9900"
-        - state: door_remotescreencolour
-          color: "#e02020"
-
-    - type: Access
-      groups:
-        - FireFight
-
 - type: entity
   parent: DoorRemoteDefault
   id: DoorRemoteAll
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 860db862aeef..c098409f3aa3 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -105,9 +105,6 @@
       arc: 360
     - type: StaticPrice
       price: 150
-    - type: DoorBolt
-    - type: AccessReader
-      access: [ [ "Engineering" ] ]
     - type: PryUnpowered
       pryModifier: 0.5
 
diff --git a/Resources/migration.yml b/Resources/migration.yml
index c19f1408707c..cf1a0f7a6023 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -342,3 +342,6 @@ chem_master: ChemMaster
 
 # 2024-05-21
 CrateJanitorExplosive: ClosetJanitorBombFilled
+
+# 2024-05-27
+DoorRemoteFirefight: null

From a57b4ff520bef91365dba5912f5a996c4dd1ac7c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 00:05:38 +0000
Subject: [PATCH 083/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 98ec517a5024..7fa7746b62e7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: liltenhead
-  changes:
-  - message: Buffed the zombie virus to do purely poison damage, and more likely to
-      spread the infection per bite.
-    type: Tweak
-  id: 6129
-  time: '2024-03-12T18:44:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25954
 - author: UnicornOnLSD
   changes:
   - message: brought back the classic crew cut as an alternative to the current one
@@ -3869,3 +3861,10 @@
   id: 6628
   time: '2024-05-27T22:43:17.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28327
+- author: EmoGarbage404
+  changes:
+  - message: Removed the fire-fighting remote.
+    type: Remove
+  id: 6629
+  time: '2024-05-28T00:04:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28330

From 0a0c0f37a1d331f26dd2c709ab02da6af3a6c48c Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 28 May 2024 02:46:54 +0200
Subject: [PATCH 084/568] Add popup for owner when inserting item in hand
 (#28032)

---
 Content.Server/Strip/StrippableSystem.cs              | 3 +++
 Resources/Locale/en-US/strip/strippable-component.ftl | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 397396de5016..ded9eab3eb28 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -413,6 +413,9 @@ private void StartStripInsertHand(
 
             var (time, stealth) = GetStripTimeModifiers(user, target, targetStrippable.HandStripDelay);
 
+            if (!stealth)
+                _popupSystem.PopupEntity(Loc.GetString("strippable-component-alert-owner-insert-hand", ("user", Identity.Entity(user, EntityManager)), ("item", user.Comp.ActiveHandEntity!.Value)), target, target, PopupType.Large);
+
             var prefix = stealth ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):actor} is trying to {prefix}place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
 
diff --git a/Resources/Locale/en-US/strip/strippable-component.ftl b/Resources/Locale/en-US/strip/strippable-component.ftl
index 7654b20b03f3..ee37a5e90c12 100644
--- a/Resources/Locale/en-US/strip/strippable-component.ftl
+++ b/Resources/Locale/en-US/strip/strippable-component.ftl
@@ -9,6 +9,7 @@ strippable-component-cannot-drop-message = {$owner} cannot drop that!
 strippable-component-alert-owner = {$user} is removing your {$item}!
 strippable-component-alert-owner-hidden = You feel someone fumbling in your {$slot}!
 strippable-component-alert-owner-insert = {$user} is putting {$item} on you!
+strippable-component-alert-owner-insert-hand = {$user} is putting {$item} in your hand!
 
 # generic warning for when a user interacts with your equipped items.
 strippable-component-alert-owner-interact = {$user} is fumbling around with your {$item}!
@@ -19,4 +20,4 @@ strip-verb-get-data-text = Strip
 ## UI
 
 strippable-bound-user-interface-stripping-menu-title = {$ownerName}'s inventory
-strippable-bound-user-interface-stripping-menu-ensnare-button = Remove Leg Restraints
\ No newline at end of file
+strippable-bound-user-interface-stripping-menu-ensnare-button = Remove Leg Restraints

From b95df6530dec1a5b62f340d5717587e9ca8332df Mon Sep 17 00:00:00 2001
From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Date: Mon, 27 May 2024 20:51:30 -0400
Subject: [PATCH 085/568] Update Antagonists Guidebook Sections (#27931)

* Update MinorAntagonists.xml

Flesh out the Rat King and Space Dragon sections of MinorAntagonists.xml in the guidebook.

* Rope the rest of the Guidebook Antag Entries into this (except Zombies they were fine) - Also fix two typos I discovered during research

* oops missed a hyphen

* Sydnicate :despair:

* AUTOTELL ON -> OPERATIVES
---
 .../Entities/Objects/Misc/implanters.yml      |  2 +-
 .../Objects/Misc/subdermal_implants.yml       |  2 +-
 Resources/Prototypes/Objectives/ninja.yml     |  2 +-
 .../Guidebook/Antagonist/MinorAntagonists.xml | 28 ++++++----
 .../Antagonist/Nuclear Operatives.xml         | 41 +++++++-------
 .../Guidebook/Antagonist/Revolutionaries.xml  | 17 +++---
 .../Guidebook/Antagonist/SpaceNinja.xml       | 29 +++++-----
 .../Guidebook/Antagonist/Traitors.xml         | 54 ++++++++++---------
 8 files changed, 96 insertions(+), 79 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index c09deb130717..532bcadeb538 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -246,7 +246,7 @@
 
 - type: entity
   id: MindShieldImplanter
-  name: mind-shield implanter
+  name: mindshield implanter
   parent: BaseImplantOnlyImplanter
   components:
     - type: Implanter
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index a0f5e254d5f6..c92985c2cbae 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -317,7 +317,7 @@
 - type: entity
   parent: BaseSubdermalImplant
   id: MindShieldImplant
-  name: mind-shield implant
+  name: mindshield implant
   description: This implant will ensure loyalty to Nanotrasen and prevent mind control devices.
   noSpawn: true
   components:
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index 0203059c2c45..bc17992e90df 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -4,7 +4,7 @@
   id: BaseNinjaObjective
   components:
   - type: Objective
-    # difficulty isn't used all since objectives are picked
+    # difficulty isn't used since all objectives are picked
     difficulty: 1.5
     issuer: spiderclan
   - type: RoleRequirement
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
index 8d96573a3d0b..1a3486b301bd 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -27,22 +27,21 @@
   # Rat King
 
   <Box>
-    <GuideEntityEmbed Entity="MobRatKing" Scale="2.4" Caption="Normal Rat King"/>
-    <GuideEntityEmbed Entity="MobRatKingBuff" Caption="Buff Rat King"/>
+    <GuideEntityEmbed Entity="MobRatKing" Scale="2.4" Caption="The Rat King"/>
   </Box>
 
-  A Rat King is a giant rat capable of setting a nest and creating rats to do their bidding (usually to get food).
+ A Rat King is a gigantic rat capable of eating an enormous amount of food, scampering under doors and tables, and raising an army of rats to defend them and do their bidding.
 
   ## Abilities
 
-  Abilities come at a cost to the Rat King's hunger. Simply eating replenishes it.
+  Abilities come at the cost of some of the Rat King's hunger. Eat to replenish it.
 
   <Box>
    <GuideEntityEmbed Entity="MobMouse" Caption="Normal Mouse"/>
    <GuideEntityEmbed Entity="MobRatServant" Caption="Rat Servant"/>
   </Box>
-  - Raise an Army of [color=#a4885c]Rat Servants[/color].
-  - Conjure a cloud of ammonia.
+  - Raise an Army of [color=#a4885c]Rat Servants[/color]. You may command these [color=#a4885c]Rat Servants[/color] to stay in place, follow you, attack a target of your choice, or attack indiscriminately.
+  - Conjure a cloud of [color=#77b58e]ammonia[/color]. Note that [color=#77b58e]ammonia[/color] is mildly poisonous to others, but heals rats.
 
   # Space Dragon
 
@@ -50,11 +49,13 @@
     <GuideEntityEmbed Entity="MobDragon" Caption=""/>
   </Box>
 
-  A Space Dragon is a giant dragon that creates space carp rifts and eats the crew.
+  A Space Dragon is a giant extradimensional dragon that creates space carp rifts and eats the crew.
 
   ## Abilities
 
-  - Devour critical or dead victims.
+  - Devour critical or dead victims to heal slightly, or devour infrastructure such as doors, windows, and walls.
+
+  - Breathe out a powerful flaming sphere which will explode periodically along a straight flight path and explode when it hits something, igniting things along the way. Be careful, your carps are not immune to the Dragon's Breath!
 
   <Box>
     <GuideEntityEmbed Entity="MobCarp" Caption=""/>
@@ -62,6 +63,15 @@
     <GuideEntityEmbed Entity="MobCarp" Caption=""/>
   </Box>
 
-  - Summon a Carp Rift that periodically spawns [color=#a4885c]Space Carp[/color].
+  - Summon a Carp Rift that periodically spawns [color=#a4885c]Space Carp[/color]. 
+
+  ## Carp Rifts
+
+  - Space Dragons may have up to three Carp Rifts active at any given time.
+  - Carp Rifts spawn a [color=#a4885c]Space Carp[/color] every thirty seconds while active.
+  - Rifts charge with extradimensional energy over a period of five minutes and are vulnerable during this time. Protect them! The space dragon will suffer a temporary debilitating feedback effect in the event that its rifts are destroyed before they are done charging.
+  - You may only charge one rift at any given time.
+  - After the rifts are done charging, they are invulnerable and will continue to spawn [color=#a4885c]Space Carp[/color] so long as the Dragon lives. 
+  - If a period of five minutes passes since the appearance of the Space Dragon or the last time a Carp Rift was charging and unless the Space Dragon already controls the maximum of three Carp Rifts, the Space Dragon will disappear. 
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
index f3ced7eeda37..f6b917457108 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml	
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml	
@@ -1,24 +1,24 @@
 <Document>
   # Nuclear Operatives
 
-  AUTOTELL ON STANDBY. YOUR OBJECTIVES ARE SIMPLE. DELIVER THE PAYLOAD AND GET OUT BEFORE THE PAYLOAD DETONATES. BEGIN MISSION.
+  OPERATIVES STANDBY. YOUR OBJECTIVES ARE SIMPLE. DELIVER THE PAYLOAD AND GET OUT BEFORE THE PAYLOAD DETONATES. BEGIN MISSION.
 
   If you hear this message then congratulations! You have just been chosen to be a nuclear operative for the syndicate. You have one goal, to blow up the space station with a nuclear fission explosive.
 
   ## Operatives
 
   Your team may contain varying amounts of three different roles:
-  - The [color=#a4885c]Nukie Commander[/color] wears the unique commander’s hardsuit, and will create or approve of the battle plan.
+  - The [color=#a4885c]Syndicate Commander[/color] wears the unique commander’s hardsuit and will create or approve of the battle plan.
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieCommander" Caption="Commander Hardsuit"/>
   </Box>
 
-  - The [color=#a4885c]Nukie Agent[/color] wears the blood-red medic hardsuit, and can act as a combat medic for the mission.
+  - The [color=#a4885c]Syndicate Agent[/color] wears the blood-red medic hardsuit and can act as a combat medic for the mission.
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndieMedic" Caption="Blood-Red Medic Hardsuit"/>
   </Box>
 
-  - Regular [color=#a4885c]Nuclear Operatives[/color], who have the normal blood red hardsuit.
+  - Regular [color=#a4885c]Nuclear Operatives[/color] who have the normal blood red hardsuit.
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndie" Caption="Blood Red Hardsuit"/>
   </Box>
@@ -27,7 +27,7 @@
 
   ## Preparation
 
-  Taking on a whole station in a fight is a difficult job, luckily you are well prepared for the job. Every operative has an [color=#a4885c]Uplink[/color]. It comes with 40 [color=#a4885c]Telecrystals[/color], which you can use to purchase gear. What you get depends on the strategy picked by your commander or voted for by the team. Only your commander and agent will have passenger access, but no external airlock access. This means you will need something to hack or blast your way onto the station.  In general you should need some weapons, something to breach doors, and utility/healing.
+  Taking on a whole station in a fight is a difficult job, luckily you are well prepared for the job. Every operative has an [color=#a4885c]Uplink[/color]. It comes with 40 [color=#a4885c]Telecrystals[/color], which you can use to purchase gear. What you get depends on the strategy picked by your commander or voted for by the team. Only your commander and agent will have passenger access, but no external airlock access. This means you will need something to hack or blast your way onto the station.  In general, you will need some weapons to protect yourself and kill the crew, something to breach doors to get where you need to go, utility items to make your job easier, and healing to not die.
 
   <Box>
     <GuideEntityEmbed Entity="BaseUplinkRadio40TC" Caption="The Uplink"/>
@@ -35,9 +35,14 @@
 
   ## Getting to the Station
 
-  After gearing up and creating a plan, grab a jetpack from your armory and go with your other operatives to the [color=#a4885c]Nukie Shuttle[/color]. Here you will find some extra explosives and tools, as well as your nuke and nuke codes.
+  After gearing up and creating a plan, grab a jetpack from your armory and go with your other operatives to the [color=#a4885c]Syndicate Shuttle[/color]. Here you will find some extra explosives and tools, as well as your nuke and nuke codes.
   You will find an [color=#a4885c]IFF Console[/color] on the shuttle, it allows you to hide from other ships and mass scanners. Make sure that [color=#a4885c]Show IFF[/color] and [color=#a4885c]Show Vessel[/color] are toggled off to hide your shuttle from the crew. When everyone is ready, FTL to the station and fly to it with a jetpack. Don't forget the nuclear fission explosive on your ship if you are going to use it, and definitely don't forget the nuke codes or pinpointer.
 
+  <Box>
+    <GuideEntityEmbed Entity="JetpackBlack" Caption="A Jetpack"/>
+    <GuideEntityEmbed Entity="ComputerIFFSyndicate" Caption="The IFF Console"/>
+  </Box>
+
   ## The Disk
 
   You will notice that each operative starts with a [color=#a4885c]Pinpointer[/color]. This device is one of the most important items to the mission, and you should keep it with you at all times. Turn on the pinpointer when you arrive at the station and it will always point to the [color=#a4885c]Nuke Disk[/color], your next objective.
@@ -51,7 +56,7 @@
 
   ## The Nuke
 
-  On your shuttle you will find one of two [color=#a4885c]Nuclear Fission Explosives[/color] and a paper with the nuke codes. The paper will tell you which explosive it corresponds to. If the ID is the same as the one on your nuke, the codes will only work for it. If it is not, then they will only work for the explosive in the station's vault.
+  On your shuttle, you will find one of two [color=#a4885c]Nuclear Fission Explosives[/color] and a paper with the nuke codes. The paper will tell you which explosive it corresponds to. If the ID is the same as the one on your nuke, the codes will only work for it. If it is not, then they will only work for the explosive in the station's vault.
 
   Once you acquire the nuke disk, put it into the nuke and use the code to arm it. It takes 30 seconds for a crewmember to disarm it, and it will count down from 300. Be prepared to defend the nuke for as long as possible, remember that escaping alive isn't necessary, but recommended.
 
@@ -61,28 +66,26 @@
 
   ## Victories
 
-  The “victor” of the round is announced on the round end screen, as well as how much they won by. The scale of the victory depends on circumstances at the end of the round.
+  The “victor” of the round is announced on the round end screen, as well as by how much they won by. The scale of the victory depends on the circumstances at the end of the round.
 
   [color=#a4885c]Syndicate Major Victory[/color]
-  - The nuke detonates on station
-  - The crew escapes on the evac shuttle, but the nuke was armed
-  - The nuke was armed and delivered to central command on the evac shuttle
+  - The nuke detonates on the station
+  - The crew escapes on the evac shuttle, but the nuke is still armed
+  - The nuke is armed and delivered to central command on the evac shuttle
 
   [color=#a4885c]Syndicate Minor Victory[/color]
-  - The crew escapes on evac, but every nukie survives
-  - The crew escapes and some nukies die, but the crew loses the disk
+  - The crew escapes on evac, but every nuclear operative survives
+  - The crew escapes and some nuclear operatives die, but the crew loses the disk
 
   [color=#a4885c]Neutral Victory[/color]
-  - The nuke detonates off station
+  - The nuke detonates off the station
 
   [color=#a4885c]Crew Minor Victory[/color]
-  - The crew escapes on evac and some nukies die, but the crew keeps the disk
+  - The crew escapes on evac and some nuclear operatives die, but the crew keeps the disk
 
   [color=#a4885c]Crew Major Victory[/color]
   - All nuclear operatives die
-  - The crew blow up the nukie outpost with the nuke
+  - The crew blow up the nuclear operative outpost with the nuke
 
-  If you feel that you won't be able to completely win as crew or nukie, consider these options for a compromise.
+  If you feel that you won't be able to completely win as Crew or Nuclear Operatives, consider these options for a compromise.
 </Document>
-
-
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
index 4b1c2e67d6bb..343a1c37bf5c 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
@@ -1,7 +1,7 @@
 <Document>
   # Revolutionaries
 
-  - Revolutionaries are antagonists that are sponsored by the Syndicate to take over the station.
+  - Revolutionaries are antagonists who are sponsored by the Syndicate to take over the station.
 
   ## Head Revolutionaries
 
@@ -10,7 +10,7 @@
   <GuideEntityEmbed Entity="ClothingEyesGlassesSunglasses" Caption="Sunglasses"/>
 </Box>
 
-  [color=#5e9cff]Head Revolutionaries[/color] are chosen at the start of the shift and are tasked with taking over the station by killing, exiling or cuffing all of the Command staff. Head Revolutionaries will be given a [color=#a4885c]Flash[/color] and a pair of [color=#a4885c]Sunglasses[/color] to aid them.
+  [color=#5e9cff]Head Revolutionaries[/color] are chosen at the start of the shift and are tasked with taking over the station by killing, exiling, or cuffing all of the Command staff. Head Revolutionaries will be given a [color=#a4885c]Flash[/color] and a pair of [color=#a4885c]Sunglasses[/color] to aid them.
 
   ## Conversion
 
@@ -18,7 +18,7 @@
   <GuideEntityEmbed Entity="Flash" Caption="Flash"/>
 </Box>
 
-  You can convert crew members by using a [color=#a4885c]Flash[/color] in [color=#ff0000]harm mode[/color] and attacking someone with it. Any flash can be used for conversion, but remember that flashes have limited charges.
+  You can convert crew members to [color=#ff0000]Revolutionaries[/color] by using a [color=#a4885c]Flash[/color] in [color=#ff0000]harm mode[/color] and attacking someone with it. Any flash can be used for conversion, but remember that flashes have limited charges.
 
 <Box>
   <GuideEntityEmbed Entity="ClothingEyesGlassesSunglasses" Caption="Sunglasses"/>
@@ -26,22 +26,23 @@
   <GuideEntityEmbed Entity="ClothingHeadHatWelding" Caption="Welding Mask"/>
 </Box>
 
-  However, things such as [color=#a4885c]Sunglasses[/color] and [color=#a4885c]Welding Masks[/color] offer flash protection and people wearing these will not be able to be converted.
+  However, gear providing flash protection such as [color=#a4885c]Sunglasses[/color] and [color=#a4885c]Welding Masks[/color] will also block your flashes, and crew wearing these will not be able to be converted.
 
 <Box>
   <GuideEntityEmbed Entity="MindShieldImplanter" Caption="MindShield Implanter"/>
 </Box>
 
-  While not flash protection, a [color=#a4885c]MindShield Implant[/color] will prevent the implanted person from being converted into a revolutionary. Assume all of [color=#a4885c]Security[/color] and [color=#a4885c]Command[/color] are implanted already.
+  While not flash protection, a [color=#a4885c]MindShield Implant[/color] will prevent the implanted person from being converted into a revolutionary. Assume all of [color=#a4885c]Security[/color] and [color=#a4885c]Command[/color] are implanted already. 
+  Additionally, a [color=#a4885c]MindShield Implanter[/color] used on a [color=#ff0000]Revolutionary[/color] will de-convert them and they will no longer be loyal to your cause. If a [color=#a4885c]MindShield Implanter[/color] is used on a [color=#5e9cff]Head Revolutionary[/color], it will be destroyed but this will reveal you so be careful!
 
   ## Revolutionary
 
-  A [color=#ff0000]Revolutionary[/color] is the result of being converted by a [color=#5e9cff]Head Revolutionary[/color]. Revolutionaries are underlings of the Head Revolutionaries and should follow orders given by them and prioritize their well-being over anything else because if they die you will lose.
+  A [color=#ff0000]Revolutionary[/color] is the result of being converted by a [color=#5e9cff]Head Revolutionary[/color]. Revolutionaries are underlings of the Head Revolutionaries and should follow orders given by them and prioritize their well-being over anything else because if the [color=#5e9cff]Head Revolutionaries[/color] die the Revolution will fail.
   Keep in mind that you can't convert others as a regular revolutionary, only your boss can do that.
 
   ## Objectives
 
-  You must eliminate, exile or arrest all of the following Command staff on station in no particular order.
+  You must eliminate, exile, or arrest all of the following Command staff on station in no particular order.
   - Captain
   - Head of Personnel
   - Chief Engineer
@@ -51,4 +52,4 @@
   - Chief Medical Officer
 
   Remember, your objective is to take over the station and not to destroy it so try to minimize damage where possible. Viva la revolución!
-</Document>
+</Document>
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
index f088b9f27b1e..496c00e6c331 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
@@ -1,15 +1,15 @@
 <Document>
   # Space Ninja
 
-  The [color=#66FF00]Space Ninja[/color] is a ghost role randomly available mid-late game. If you pick it you will be given your gear, your objectives and the greeting.
+  The [color=#66FF00]Space Ninja[/color] is a ghost role randomly available mid-late game. If you pick it you will be given your gear, your objectives, and the greeting.
 
   You are a ninja, but in space. [color=#66FF00]The Spider Clan[/color] has sent you to the station to wreak all kinds of havoc, and you are equipped to keep it silent-but-deadly.
 
-  Whether you mercilessly pick off the station's crew one by one, or assassinate the clown over and over, your discipline has taught you that [color=#66FF00]your objectives must be at least attempted[/color]. For honor!
+  Whether you mercilessly pick off the station's crew one by one or assassinate the clown over and over, your discipline has taught you that [color=#66FF00]your objectives must be at least attempted[/color]. For honor!
 
   # Equipment
 
-  You begin implanted with a [color=#a4885c]death acidifier[/color], so if you are KIA or decide to commit seppuku you will leave behind one final gift to the janitor and all your precious equipment is kept out of enemy hands.
+  You begin implanted with a [color=#a4885c]death acidifier[/color], so if you are KIA or decide to commit seppuku you will leave behind one final gift to the janitor, and all your precious equipment is kept out of enemy hands.
 
   Your bag is full of tools for more subtle sabotage, along with a survival box if you need a snack.
 
@@ -25,7 +25,7 @@
   Your suit requires power to function. Its [color=#a4885c]internal battery[/color] can be replaced by clicking on it with another one, and [color=#a4885c]higher capacity batteries[/color] mean a [color=#a4885c]highly effective ninja[/color].
   You can see the current charge by examining the suit or in a sweet battery alert at the top right of your screen.
 
-  If you run out of power and need to recharge your battery, just use your gloves to drain an APC, substation or a SMES.
+  If you run out of power and need to recharge your battery, just use your gloves to drain an APC, substation, or SMES.
 
   ## Ninja Gloves
 
@@ -33,16 +33,16 @@
 
   [color=#66FF00]These bad boys are your bread and butter.[/color]
 
-  They are made from [color=#a4885c]insulated nanomachines[/color] to assist you in gracefully breaking and entering into your destination without leaving behind fingerprints.
+  They are made from [color=#a4885c]insulated nanomachines[/color] to assist you in gracefully breaking into destinations without leaving behind fingerprints.
 
   You have an action to toggle gloves. When the gloves are turned on, they allow you to use [color=#a4885c]special abilities[/color], which are triggered by interacting with things with an empty hand and with combat mode disabled.
 
   Your glove abilities include:
   - Emagging an unlimited number of doors.
-  - Draining power from transformers such as APCs, substations or SMESes. The higher the voltage, the more efficient the draining is.
+  - Draining power from transformers such as APCs, substations, or SMESes. The higher the voltage, the more efficient the draining is.
   - You can shock any mob, stunning and slightly damaging them.
-  - You can download technologies from a R&D server for one of your objectives.
-  - You can hack a communications console to call in a threat.
+  - You can download technologies from an R&D server for one of your objectives.
+  - You can hack a communications console to call in a [textlink="threat" link="MinorAntagonists"].
 
   ## Energy Katana
 
@@ -52,7 +52,7 @@
   Deals a lot of damage and can be recalled at will, costing suit power proportional to the distance teleported.
   
   While in hand you can [color=#a4885c]teleport[/color] to anywhere that you can see, meaning most doors and windows, but not past solid walls.
-  This has a limited number of charges which regenerate slowly, so keep a charge or two spare incase you need a quick getaway.
+  This has a limited number of charges which regenerate slowly, so keep a charge or two spare in case you need a quick getaway.
 
   ## Spider Clan Charge
 
@@ -71,10 +71,11 @@
 
   # Objectives
 
-  - Download X research nodes: Use your gloves on an R&D server with a number of unlocked technologies
-  - Doorjack X doors on the station: Use your gloves to emag a number of doors.
-  - Detonate the spider clan charge: Plant your spider clan charge at a random location and watch it go boom.
-  - Call in a threat: Use your gloves on a communications console.
+  - Download \[9-13\] research nodes: Use your gloves on an R&D server with a number of unlocked technologies
+  - Doorjack \[15-40\] doors on the station: Use your gloves to emag a number of doors.
+  - Detonate the spider clan charge: Plant your spider clan charge at the specified location and watch it go boom!
+  - Call in a [textlink="threat" link="MinorAntagonists"]: Use your gloves on a communications console.
+  - Set everyone to wanted: Use your gloves on a criminal records console.
   - Survive: Don't die.
 
-</Document>
+</Document>
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index 002ee56d115a..a8fe4cef1805 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -10,7 +10,7 @@
   <Box>
     <GuideEntityEmbed Entity="BaseUplinkRadio40TC" Caption="Uplink"/>
   </Box>
-  - The [color=#a4885c]Uplink[/color] is the most important tool as a Traitor, as it can purchase tools and weapons with [color=#a4885c]telecrystals[/color](TC).
+  - The [color=#a4885c]Uplink[/color] is the most important tool for a Traitor, as it can purchase tools and weapons with [color=#a4885c]telecrystals[/color](TC).
   <Box>
     <GuideEntityEmbed Entity="Telecrystal" Caption="Telecrystals"/>
   </Box>
@@ -22,16 +22,23 @@
   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"/>
+    <GuideEntityEmbed Entity="WeaponPistolCobra" Caption="Weaponry"/>
+    <GuideEntityEmbed Entity="MagazineBoxLightRifle" State="icon" Caption="Ammo"/>
+    <GuideEntityEmbed Entity="C4" Caption="Explosives"/>
+    <GuideEntityEmbed Entity="ClothingOuterHardsuitSyndie" Caption="Wearables"/>
+    <GuideEntityEmbed Entity="Stimpack" Caption="Chemicals"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ChameleonProjector" Caption="Deception"/>
+    <GuideEntityEmbed Entity="Emag" Caption="Disruption"/>
+    <GuideEntityEmbed Entity="StorageImplanter" Caption="Implants"/>
+    <GuideEntityEmbed Entity="MobMonkeySyndicateAgentNukeops" Caption="Allies"/>
+    <GuideEntityEmbed Entity="ClothingEyesGlassesOutlawGlasses" Caption="Pointless"/>
   </Box>
 
   ## Objectives
 
-  - 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.
+  - When becoming a Traitor, you will have a list of objectives, ranging from escaping alive, stealing something, and killing someone. Using the [color=#a4885c]Uplink[/color] will help you with most of these tasks.
 
   ## List of Possible Tasks
 
@@ -40,30 +47,25 @@
   - 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.
+  - Help a randomly selected traitor finish half of their objectives.
   - Die a glorious death.
-  - Steal the Captain's [color=#a4885c]ID Card[/color].
+  - Steal the Captain's [color=#a4885c]ID Card[/color], [color=#a4885c]Antique Laser Pistol[/color], [color=#a4885c]Jetpack[/color], or [color=#a4885c]Nuke Disk[/color].
   <Box>
     <GuideEntityEmbed Entity="CaptainIDCard" Caption="Captain's ID Card"/>
-  </Box>
-  - Steal the Captain's [color=#a4885c]Antique Laser Pistol[/color].
-  <Box>
-    <GuideEntityEmbed Entity="WeaponAntiqueLaser" Caption="Captain's Antique Laser Pistol"/>
-  </Box>
-  - Steal the Captain's [color=#a4885c]Jetpack[/color].
+    <GuideEntityEmbed Entity="WeaponAntiqueLaser" Caption="Antique Laser Pistol"/>
+ </Box>
   <Box>
     <GuideEntityEmbed Entity="JetpackCaptainFilled" Caption="Captain's Jetpack"/>
-  </Box>
-  - Steal the Chief Medical Officer's [color=#a4885c]Hypospray[/color].
+    <GuideEntityEmbed Entity="NukeDisk" Caption="The Nuke Disk"/> 
+ </Box>
+  - Steal the Chief Medical Officer's [color=#a4885c]Hypospray[/color] or [color=#a4885c]Handheld Crew Monitor[/color].
   <Box>
     <GuideEntityEmbed Entity="Hypospray" Caption="CMO's Hypospray"/>
+    <GuideEntityEmbed Entity="HandheldCrewMonitorEmpty" Caption="Handheld Crew Monitor"/>
   </Box>
-  - Steal the Research Director's [color=#a4885c]Hardsuit[/color].
+  - Steal the Research Director's [color=#a4885c]Hardsuit[/color] or [color=#a4885c]Hand Teleporter[/color].
   <Box>
     <GuideEntityEmbed Entity="ClothingOuterHardsuitRd" Caption="RD's Hardsuit"/>
-  </Box>
-  - Steal the Research Director's [color=#a4885c]Hand Teleporter[/color].
-  <Box>
     <GuideEntityEmbed Entity="HandTeleporter" Caption="Hand Teleporter"/>
   </Box>
   - Steal the Head of Security's [color=#a4885c]Secret Documents[/color].
@@ -74,14 +76,14 @@
   <Box>
     <GuideEntityEmbed Entity="ClothingShoesBootsMagAdv" Caption="Advanced Magboots"/>
   </Box>
-  - Steal the [color=#a4885c]Nuke Disk[/color].
+  - Steal the Quartermaster's [color=#a4885c]Requisition Digi-Board[/color].
   <Box>
-    <GuideEntityEmbed Entity="NukeDisk" Caption="Nuke Disk"/>
+    <GuideEntityEmbed Entity="BoxFolderQmClipboard" Caption="Requisition Digi-Board"/>
   </Box>
-  - Steal [color=#a4885c]Corgi Meat[/color].
+  - Steal the Head of Personnel's dog, Ian's [color=#a4885c]Corgi Meat[/color].
   <Box>
-  <GuideEntityEmbed Entity="MobCorgiIan" Caption="Corgi"/>
+  <GuideEntityEmbed Entity="MobCorgiIan" Caption="Ian the Corgi"/>
   <GuideEntityEmbed Entity="FoodMeatCorgi" Caption="Corgi Meat"/>
   </Box>
 
-</Document>
+</Document>
\ No newline at end of file

From c740fbc68c0fe8aa8519009fee72b88cb17188eb 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 086/568] Cargo bounty corrections (#28255)

cargo bounty corrections
---
 .../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   | 18 +++++++++++
 .../Objects/Consumable/Food/produce.yml       | 13 ++++++++
 Resources/Prototypes/tags.yml                 | 12 +++++--
 11 files changed, 138 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index e132e4f12a36..0fcfd160bb39 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 bf4907b0dd4b..b40b03672eff 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 3c1bd02fcfc4..bedfe442872e 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 7600882925a5..12a6e2a246b3 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 c939dec52c67..922d49388850 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 b1bbdfb53055..fde181d8b9b2 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 8cd1c5dfab67..f97d87a9c503 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -52,6 +52,10 @@
           Quantity: 1.2
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Pie
+    - Slice
 
 # Pie
 
@@ -94,6 +98,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, apple.
 
 - type: entity
@@ -182,6 +187,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, cream, banana.
 
 - type: entity
@@ -224,6 +230,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, blackberries.
 
 - type: entity
@@ -263,6 +270,7 @@
     tags:
     - Fruit
     - Pie
+    - Slice
 # Tastes like pie, cherries.
 
 - type: entity
@@ -302,6 +310,7 @@
     tags:
     - Meat
     - Pie
+    - Slice
 # Tastes like pie, meat.
 
 - type: entity
@@ -342,6 +351,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 bdce1d440861..154f34063c81 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 1df6615a9fbd..dcf2f3355ce7 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
@@ -503,6 +512,9 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: chèvre log
@@ -550,6 +562,9 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 0.2
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: tofu
@@ -595,6 +610,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 888e4e4e3530..a74e3450e940 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1065,6 +1065,9 @@
     state: slice
   - type: Extractable
     grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: pineapple slice
@@ -1085,6 +1088,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Slice
 
 - type: entity
   name: onion slice
@@ -1108,6 +1112,10 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Vegetable
+    - Slice
 
 - type: entity
   name: red onion slice
@@ -1131,6 +1139,10 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Vegetable
+    - Slice
 
 - type: entity
   name: chili pepper
@@ -1650,6 +1662,7 @@
   - type: Tag
     tags:
     - Fruit
+    - Slice
 
 - type: entity
   name: grapes
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 253aa485653e..439ad47c0f80 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -27,9 +27,6 @@
 - type: Tag
   id: ATVKeys
 
-- type: Tag
-  id: Baguette
-
 - type: Tag
   id: Balloon
 
@@ -258,6 +255,9 @@
 - type: Tag
   id: CableCoil
 
+- type: Tag
+  id: Cake
+
 - type: Tag
   id: CaneBlade
 
@@ -926,6 +926,9 @@
 - type: Tag
   id: NozzleBackTank
 
+- type: Tag
+  id: Nugget # for chicken nuggets
+
 - type: Tag
   id: NukeOpsUplink
 
@@ -1122,6 +1125,9 @@
 - type: Tag
   id: Skewer
 
+- type: Tag
+  id: Slice # sliced fruit, vegetables, pizza etc.
+
 - type: Tag
   id: SmallAIChip
 

From a269f9bb9e722b3eaad0689fab4ba1600aeb76f0 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 27 May 2024 20:52:56 -0400
Subject: [PATCH 087/568] Small anomaly behavior fix (#28290)

* Small anomaly behavior fix

* well put together code
---
 Content.Server/Anomaly/AnomalySystem.cs       | 25 ++++++++-----------
 .../Effects/ShuffleParticlesAnomalySystem.cs  | 20 +++++++--------
 .../Anomaly/Components/AnomalyComponent.cs    |  9 ++++---
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs
index 73658a0320ee..3e9760a056c0 100644
--- a/Content.Server/Anomaly/AnomalySystem.cs
+++ b/Content.Server/Anomaly/AnomalySystem.cs
@@ -18,8 +18,6 @@
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager;
-using System.Linq;
 
 namespace Content.Server.Anomaly;
 
@@ -69,20 +67,21 @@ private void OnMapInit(Entity<AnomalyComponent> anomaly, ref MapInitEvent args)
         ChangeAnomalyStability(anomaly, Random.NextFloat(anomaly.Comp.InitialStabilityRange.Item1 , anomaly.Comp.InitialStabilityRange.Item2), anomaly.Comp);
         ChangeAnomalySeverity(anomaly, Random.NextFloat(anomaly.Comp.InitialSeverityRange.Item1, anomaly.Comp.InitialSeverityRange.Item2), anomaly.Comp);
 
-        ShuffleParticlesEffect(anomaly.Comp);
+        ShuffleParticlesEffect(anomaly);
         anomaly.Comp.Continuity = _random.NextFloat(anomaly.Comp.MinContituty, anomaly.Comp.MaxContituty);
         SetBehavior(anomaly, GetRandomBehavior());
     }
 
-    public void ShuffleParticlesEffect(AnomalyComponent anomaly)
+    public void ShuffleParticlesEffect(Entity<AnomalyComponent> anomaly)
     {
         var particles = new List<AnomalousParticleType>
             { AnomalousParticleType.Delta, AnomalousParticleType.Epsilon, AnomalousParticleType.Zeta, AnomalousParticleType.Sigma };
 
-        anomaly.SeverityParticleType = Random.PickAndTake(particles);
-        anomaly.DestabilizingParticleType = Random.PickAndTake(particles);
-        anomaly.WeakeningParticleType = Random.PickAndTake(particles);
-        anomaly.TransformationParticleType = Random.PickAndTake(particles);
+        anomaly.Comp.SeverityParticleType = Random.PickAndTake(particles);
+        anomaly.Comp.DestabilizingParticleType = Random.PickAndTake(particles);
+        anomaly.Comp.WeakeningParticleType = Random.PickAndTake(particles);
+        anomaly.Comp.TransformationParticleType = Random.PickAndTake(particles);
+        Dirty(anomaly);
     }
 
     private void OnShutdown(Entity<AnomalyComponent> anomaly, ref ComponentShutdown args)
@@ -198,14 +197,12 @@ private void SetBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBehavi
         if (anomaly.Comp.CurrentBehavior != null)
             RemoveBehavior(anomaly, anomaly.Comp.CurrentBehavior.Value);
 
-        //event broadcast
-        var ev = new AnomalyBehaviorChangedEvent(anomaly, anomaly.Comp.CurrentBehavior, behaviorProto);
         anomaly.Comp.CurrentBehavior = behaviorProto;
-        RaiseLocalEvent(anomaly, ref ev, true);
-
         var behavior = _prototype.Index(behaviorProto);
-
         EntityManager.AddComponents(anomaly, behavior.Components);
+
+        var ev = new AnomalyBehaviorChangedEvent(anomaly, anomaly.Comp.CurrentBehavior, behaviorProto);
+        RaiseLocalEvent(anomaly, ref ev, true);
     }
 
     private void RemoveBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBehaviorPrototype> behaviorProto)
@@ -213,7 +210,7 @@ private void RemoveBehavior(Entity<AnomalyComponent> anomaly, ProtoId<AnomalyBeh
         if (anomaly.Comp.CurrentBehavior == null)
             return;
 
-        var behavior = _prototype.Index(anomaly.Comp.CurrentBehavior.Value);
+        var behavior = _prototype.Index(behaviorProto);
 
         EntityManager.RemoveComponents(anomaly, behavior.Components);
     }
diff --git a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
index 7d4d9a2ee5d0..925c826fb5a8 100644
--- a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
@@ -15,26 +15,26 @@ public override void Initialize()
         SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, StartCollideEvent>(OnStartCollide);
     }
 
-    private void OnStartCollide(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, StartCollideEvent args)
+    private void OnStartCollide(Entity<ShuffleParticlesAnomalyComponent> ent, ref StartCollideEvent args)
     {
-        if (!TryComp<AnomalyComponent>(uid, out var anomaly))
+        if (!TryComp<AnomalyComponent>(ent, out var anomaly))
             return;
 
-        if (shuffle.ShuffleOnParticleHit && _random.Prob(shuffle.Prob))
-            _anomaly.ShuffleParticlesEffect(anomaly);
-
-        if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
+        if (!HasComp<AnomalousParticleComponent>(args.OtherEntity))
             return;
+
+        if (ent.Comp.ShuffleOnParticleHit && _random.Prob(ent.Comp.Prob))
+            _anomaly.ShuffleParticlesEffect((ent, anomaly));
     }
 
-    private void OnPulse(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, AnomalyPulseEvent args)
+    private void OnPulse(Entity<ShuffleParticlesAnomalyComponent> ent, ref AnomalyPulseEvent args)
     {
-        if (!TryComp<AnomalyComponent>(uid, out var anomaly))
+        if (!TryComp<AnomalyComponent>(ent, out var anomaly))
             return;
 
-        if (shuffle.ShuffleOnPulse && _random.Prob(shuffle.Prob))
+        if (ent.Comp.ShuffleOnPulse && _random.Prob(ent.Comp.Prob))
         {
-            _anomaly.ShuffleParticlesEffect(anomaly);
+            _anomaly.ShuffleParticlesEffect((ent, anomaly));
         }
     }
 }
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index 3878aeb81cba..88e942ec5079 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -152,25 +152,25 @@ public sealed partial class AnomalyComponent : Component
     /// <summary>
     /// The particle type that increases the severity of the anomaly.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public AnomalousParticleType SeverityParticleType;
 
     /// <summary>
     /// The particle type that destabilizes the anomaly.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public AnomalousParticleType DestabilizingParticleType;
 
     /// <summary>
     /// The particle type that weakens the anomalys health.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public AnomalousParticleType WeakeningParticleType;
 
     /// <summary>
     /// The particle type that change anomaly behaviour.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public AnomalousParticleType TransformationParticleType;
 
     #region Points and Vessels
@@ -317,6 +317,7 @@ public sealed partial class AnomalyComponent : Component
 
 /// <summary>
 /// Event broadcast when an anomaly's behavior is changed.
+/// This is raised after the relevant components are applied
 /// </summary>
 [ByRefEvent]
 public readonly record struct AnomalyBehaviorChangedEvent(EntityUid Anomaly, ProtoId<AnomalyBehaviorPrototype>? Old, ProtoId<AnomalyBehaviorPrototype>? New);

From ac6c9bc47661b88091e7cecfa2c2112efe368975 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 00:52:57 +0000
Subject: [PATCH 088/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7fa7746b62e7..4291972e7750 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: UnicornOnLSD
-  changes:
-  - message: brought back the classic crew cut as an alternative to the current one
-      !
-    type: Add
-  id: 6130
-  time: '2024-03-12T18:47:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25935
 - author: FungiFellow
   changes:
   - message: Added Improvised Shotgun Shell Recipe
@@ -3868,3 +3860,10 @@
   id: 6629
   time: '2024-05-28T00:04:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28330
+- author: slarticodefast
+  changes:
+  - message: Corrected some cargo bounties.
+    type: Fix
+  id: 6630
+  time: '2024-05-28T00:51:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28255

From b0afbf6a3e15f1beaac9227e0ea11a571c9db7cb Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 28 May 2024 07:52:30 +0000
Subject: [PATCH 089/568] saltern cryo untroll (#28333)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/saltern.yml | 1792 +++++++++++++++++++-----------------
 1 file changed, 932 insertions(+), 860 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index b9690eb37d23..3f2bd76d4fc7 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -241,1071 +241,1144 @@ entities:
       data:
         tiles:
           -4,-4:
-            0: 65535
+            0: 61695
+          -4,-5:
+            0: 62457
+          -5,-4:
+            0: 61695
           -4,-3:
-            0: 65535
+            0: 47871
           -4,-2:
-            0: 16383
+            0: 12731
             1: 49152
+          -5,-2:
+            0: 47935
+          -5,-1:
+            0: 65528
           -4,-1:
-            0: 65523
+            0: 61056
             1: 12
+          -4,0:
+            0: 61695
           -3,-4:
-            0: 65535
+            0: 54527
           -3,-3:
-            0: 65535
+            0: 3581
           -3,-2:
-            0: 36863
+            0: 247
             1: 28672
           -3,-1:
             1: 7
-            0: 65528
+            0: 65280
+          -3,-5:
+            0: 61695
+          -3,0:
+            0: 61695
           -2,-4:
-            0: 65535
+            0: 53503
           -2,-3:
-            0: 65535
+            0: 65529
           -2,-2:
-            0: 65535
+            0: 65520
           -2,-1:
             0: 65535
+          -2,-5:
+            0: 64541
+          -2,0:
+            0: 63487
           -1,-4:
-            0: 65535
+            0: 53503
           -1,-3:
-            0: 65535
+            0: 48124
           -1,-2:
-            0: 65535
+            0: 65520
           -1,-1:
             0: 65535
-          -4,0:
-            0: 65535
+          -1,-5:
+            0: 65285
+          -1,0:
+            0: 61695
+          0,-4:
+            0: 52991
+          0,-3:
+            0: 56573
+          0,-2:
+            0: 56796
+          0,-1:
+            0: 65533
+          -5,0:
+            0: 63743
           -4,1:
-            0: 65535
+            0: 49407
+          -5,1:
+            0: 255
           -4,2:
-            0: 65535
+            0: 57245
+          -5,2:
+            0: 53247
           -4,3:
-            0: 65535
-          -3,0:
-            0: 65535
+            0: 61424
+          -5,3:
+            0: 16241
+          -4,4:
+            0: 61070
           -3,1:
-            0: 65535
+            0: 41215
           -3,2:
-            0: 65535
+            0: 65450
           -3,3:
-            0: 65535
-          -2,0:
-            0: 65535
+            0: 64988
+          -3,4:
+            0: 55757
           -2,1:
-            0: 65535
+            0: 56575
           -2,2:
-            0: 65535
+            0: 65485
           -2,3:
-            0: 65535
-          -1,0:
-            0: 65535
+            0: 32767
+          -2,4:
+            0: 4215
           -1,1:
-            0: 65535
+            0: 58623
           -1,2:
-            0: 65535
+            0: 16142
           -1,3:
-            0: 65535
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
-          0,-1:
-            0: 65535
+            0: 3003
+          -1,4:
+            0: 4095
+          0,0:
+            0: 64733
+          0,1:
+            0: 56575
+          0,2:
+            0: 56797
+          0,3:
+            0: 52701
+          0,-5:
+            0: 65263
           1,-4:
-            0: 65535
+            0: 7099
           1,-3:
-            0: 65535
+            0: 53725
           1,-2:
-            0: 65535
+            0: 56605
           1,-1:
-            0: 65535
+            0: 65533
+          1,-5:
+            0: 47935
+          1,0:
+            0: 61917
           2,-4:
-            0: 65535
+            0: 10231
           2,-3:
-            0: 65535
+            0: 65278
           2,-2:
-            0: 65535
+            0: 65390
           2,-1:
             0: 65535
+          2,-5:
+            0: 30511
+          2,0:
+            0: 61695
           3,-4:
-            0: 65535
+            0: 4095
           3,-3:
-            0: 65535
+            0: 57309
           3,-2:
-            0: 65535
+            0: 56781
           3,-1:
+            0: 64985
+          3,-5:
+            0: 65295
+          3,0:
+            0: 61661
+          4,-4:
+            0: 61007
+          4,-3:
             0: 65535
-          0,0:
-            0: 65535
-          0,1:
-            0: 65535
-          0,2:
-            0: 65535
-          0,3:
-            0: 65535
-          1,0:
+          4,-2:
             0: 65535
+          4,-1:
+            0: 65523
+          0,4:
+            0: 61166
           1,1:
-            0: 65535
+            0: 55807
           1,2:
-            0: 65535
+            0: 56797
           1,3:
-            0: 65535
-          2,0:
-            0: 65535
+            0: 7665
+          1,4:
+            0: 48123
           2,1:
-            0: 65535
+            0: 29439
           2,2:
-            0: 65535
+            0: 30583
           2,3:
-            0: 65535
-          3,0:
-            0: 65535
+            0: 3953
+          2,4:
+            0: 63351
           3,1:
             0: 65535
           3,2:
-            0: 65535
+            0: 65530
           3,3:
-            0: 65535
+            0: 65295
+          3,4:
+            0: 32767
           4,0:
-            0: 65535
+            0: 61695
           4,1:
-            0: 65535
+            0: 53759
           4,2:
-            0: 65535
+            0: 65500
           4,3:
-            0: 65535
+            0: 53709
+          4,4:
+            0: 4573
+            2: 16384
           5,0:
-            0: 65535
+            0: 62190
           5,1:
-            0: 65535
+            0: 61695
           5,2:
             0: 65535
           5,3:
-            0: 65535
+            0: 62463
+          5,4:
+            0: 30719
+          5,-1:
+            0: 61152
           6,0:
-            0: 65535
+            0: 63726
           6,1:
-            0: 65535
+            0: 3839
           6,2:
-            0: 65535
+            0: 7677
           6,3:
-            0: 65535
+            0: 54495
+          6,4:
+            0: 64767
           7,0:
-            0: 65535
+            0: 63547
           7,1:
-            0: 65535
+            0: 3067
           7,2:
-            0: 65535
+            0: 35771
           7,3:
+            0: 40159
+          7,4:
+            0: 55739
+          7,-1:
+            0: 36590
+          8,0:
+            0: 65327
+          8,1:
+            0: 12287
+          8,2:
             0: 65535
-          0,4:
+          8,3:
             0: 65535
           0,5:
-            0: 65535
+            0: 55535
+          -1,5:
+            0: 58623
           0,6:
-            0: 65535
+            0: 51711
+          -1,6:
+            0: 3822
           0,7:
-            0: 65535
-          1,4:
-            0: 65535
+            0: 65503
+          -1,7:
+            0: 61166
+          0,8:
+            0: 15
+            2: 3840
           1,5:
-            0: 65535
+            0: 53439
           1,6:
-            0: 65535
+            0: 7421
           1,7:
-            0: 65535
-          2,4:
-            0: 65535
+            0: 65503
+          1,8:
+            0: 15
+            2: 40704
           2,5:
-            0: 65535
+            0: 53367
           2,6:
-            0: 65535
+            0: 1405
           2,7:
-            0: 65535
-          3,4:
-            0: 65535
+            0: 4915
+            2: 34944
+          2,8:
+            2: 36
           3,5:
-            0: 32767
+            0: 4181
           3,6:
-            0: 30583
+            0: 4881
+          4,5:
+            0: 273
+            2: 17476
           -8,0:
-            0: 65535
+            0: 61678
+          -9,0:
+            0: 64413
           -8,1:
-            0: 65535
+            0: 53503
+          -9,1:
+            0: 46079
           -8,2:
-            0: 65535
+            0: 56796
+          -9,2:
+            0: 35835
           -8,3:
-            0: 65535
+            0: 4081
+          -9,3:
+            0: 16315
+          -8,4:
+            0: 477
+            2: 49152
           -7,0:
-            0: 65535
+            0: 64671
           -7,1:
-            0: 65535
+            0: 40191
           -7,2:
-            0: 65535
+            0: 49087
           -7,3:
-            0: 65535
+            0: 20472
+          -7,4:
+            0: 58983
+          -7,-1:
+            0: 52732
           -6,0:
-            0: 65535
+            0: 62363
           -6,1:
-            0: 65535
+            0: 5119
           -6,2:
-            0: 65535
+            0: 6007
           -6,3:
-            0: 65535
-          -5,0:
-            0: 65535
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,3:
-            0: 65535
-          4,-4:
-            0: 65535
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 65535
-          4,-1:
-            0: 65535
+            0: 4092
+          -6,-1:
+            0: 48051
+          -6,4:
+            0: 61567
+          -5,4:
+            0: 30527
+          4,-5:
+            0: 61152
           5,-4:
-            0: 65535
+            0: 3777
           5,-3:
-            0: 65535
+            0: 3823
           5,-2:
-            0: 65535
-          5,-1:
-            0: 65535
+            0: 61182
+          5,-5:
+            0: 56774
           6,-4:
-            0: 65535
+            0: 53230
           6,-3:
-            0: 65535
+            0: 35769
           6,-2:
-            0: 65535
+            0: 56797
           6,-1:
-            0: 65535
+            0: 4092
+          6,-5:
+            0: 65524
+          7,-2:
+            0: 57599
           7,-4:
-            0: 13107
+            2: 8738
           7,-3:
-            0: 65535
-          7,-2:
-            0: 65535
-          7,-1:
+            0: 3808
+          8,-3:
+            0: 4024
+          8,-2:
+            0: 62207
+          8,-1:
             0: 65535
           0,-8:
-            0: 65535
+            0: 64977
+          -1,-8:
+            0: 61166
           0,-7:
-            0: 65535
+            0: 56829
+          -1,-7:
+            0: 53247
           0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
+            0: 65532
+          0,-9:
+            0: 53192
+            2: 39
           1,-8:
-            0: 65535
+            0: 56784
           1,-7:
-            0: 65535
+            0: 57343
           1,-6:
-            0: 65535
-          1,-5:
-            0: 65535
+            0: 45981
+          1,-9:
+            0: 5937
           2,-8:
-            0: 65535
+            0: 15353
           2,-7:
             0: 65535
           2,-6:
-            0: 65535
-          2,-5:
-            0: 65535
+            0: 61695
+          2,-9:
+            0: 13107
+            2: 128
           3,-8:
-            0: 65535
+            0: 52637
           3,-7:
-            0: 65535
+            0: 64925
           3,-6:
-            0: 65535
-          3,-5:
-            0: 65535
+            0: 64733
+          4,-8:
+            0: 39299
+            2: 17484
           4,-7:
-            0: 65535
+            0: 65289
+            2: 4
           4,-6:
-            0: 65535
-          4,-5:
-            0: 65535
+            0: 61152
+          4,-9:
+            2: 17476
+            0: 34952
+          5,-8:
+            2: 21855
+            0: 43680
           5,-7:
-            0: 65535
+            2: 5
+            0: 63242
+          5,-9:
+            2: 21845
+            0: 43690
           5,-6:
-            0: 65535
-          5,-5:
-            0: 65535
-          6,-5:
-            0: 65535
+            0: 26214
+          6,-8:
+            2: 21855
+            0: 43680
+          6,-7:
+            2: 5
+            0: 56586
+          6,-6:
+            0: 61919
+          6,-9:
+            2: 21845
+            0: 43690
+          7,-8:
+            2: 4383
+            0: 8736
+          7,-7:
+            2: 8749
+            0: 2
           7,-5:
-            0: 65535
-          -4,4:
-            0: 65535
+            0: 3846
+          7,-9:
+            2: 4369
+            0: 8738
+          7,-6:
+            2: 1570
+          8,-8:
+            2: 1
+          8,-7:
+            2: 15
+            0: 65280
+          8,-6:
+            0: 13119
+            2: 2048
+          8,-5:
+            0: 3891
           -4,5:
-            0: 65535
+            0: 238
           -4,6:
-            0: 65535
-          -3,4:
-            0: 65535
+            0: 255
+            2: 61440
+          -5,6:
+            0: 238
+            2: 61440
+          -4,7:
+            2: 2289
+          -5,7:
+            2: 240
           -3,5:
-            0: 65535
+            0: 3295
           -3,6:
-            0: 49151
-          -2,4:
-            0: 65535
+            0: 255
+            2: 12288
+          -3,7:
+            2: 8816
+          -3,8:
+            2: 3086
           -2,5:
-            0: 65535
+            0: 52701
           -2,6:
-            0: 65535
-          -1,4:
-            0: 65535
-          -1,5:
-            0: 65535
-          -1,6:
-            0: 65535
-          -1,7:
-            0: 65535
-          -5,4:
-            0: 65535
-          -5,5:
-            0: 65535
-          -5,6:
-            0: 65535
+            0: 63743
+          -2,7:
+            0: 255
           -1,8:
-            0: 36847
-          4,4:
-            0: 65535
-          0,8:
-            0: 4095
-          1,8:
-            0: 40959
-          2,8:
-            0: 55
-          8,0:
-            0: 65535
-          8,1:
-            0: 65535
-          8,2:
-            0: 65535
-          8,3:
-            0: 65535
+            0: 8
+            2: 36640
+          -9,4:
+            0: 7400
+          -8,5:
+            2: 8879
+            0: 21840
+          -9,5:
+            2: 43692
+            0: 21840
+          -8,6:
+            2: 41519
+            0: 21840
+          -9,6:
+            2: 43695
+            0: 21840
+          -8,7:
+            2: 242
+          -9,7:
+            2: 240
+          -7,6:
+            2: 62465
+            0: 14
+          -7,7:
+            2: 16
+          -7,5:
+            0: 1038
+          -6,5:
+            0: 65319
+          -6,6:
+            0: 255
+          -6,7:
+            2: 240
+          -5,5:
+            0: 26215
+          -2,8:
+            2: 7967
+          -1,9:
+            2: 142
+          0,9:
+            2: 15
+          4,6:
+            2: 4
+            0: 34816
+          5,5:
+            0: 30583
+          5,6:
+            0: 65319
+          5,7:
+            0: 5
+          6,5:
+            0: 255
+            2: 53248
+          6,6:
+            2: 35049
+          7,5:
+            0: 36063
+            2: 4096
+          7,6:
+            2: 53196
+          7,7:
+            2: 12
+          8,4:
+            0: 4351
+            2: 57344
+          8,5:
+            0: 272
+            4: 17472
+          8,6:
+            2: 65345
+          8,7:
+            2: 61167
+          1,9:
+            2: 15
+          2,9:
+            2: 1
           9,0:
-            0: 65535
+            0: 65102
           9,1:
-            0: 65535
+            0: 3839
           9,2:
-            0: 65535
+            0: 61917
           9,3:
             0: 65535
+          9,4:
+            0: 255
+            2: 61440
+          9,-1:
+            0: 60942
           10,0:
-            0: 65535
+            0: 65481
           10,1:
-            0: 65535
+            0: 53247
           10,2:
-            0: 65535
+            0: 62717
           10,3:
             0: 65535
+          10,-1:
+            0: 48015
+          10,4:
+            0: 255
+            2: 61440
           11,0:
-            0: 65535
+            0: 65520
           11,1:
-            0: 65535
+            0: 53759
           11,2:
-            0: 16383
-            2: 49152
+            0: 4319
+            3: 49152
           11,3:
-            0: 65331
-            2: 204
+            0: 61457
+            3: 204
+          11,-1:
+            0: 30583
+          11,4:
+            0: 255
+            2: 61440
           12,0:
-            0: 65535
+            0: 65527
           12,1:
-            0: 65535
+            0: 28791
           12,2:
-            0: 4095
-            2: 61440
+            0: 119
+            3: 28672
           12,3:
-            2: 255
-            0: 65280
-          8,-3:
-            0: 65535
-          8,-2:
-            0: 65535
-          8,-1:
+            3: 119
+            0: 61440
+          12,-1:
+            0: 29311
+          12,4:
+            0: 255
+            2: 61440
+          13,0:
+            0: 49080
+          13,1:
+            0: 48058
+          13,2:
+            2: 13104
+            0: 34826
+          13,3:
+            2: 35059
+            0: 12288
+          13,-1:
+            0: 14119
+          13,4:
+            0: 51
+            2: 63624
+          14,0:
             0: 65535
+          14,1:
+            0: 64319
+          14,2:
+            0: 15235
+          14,3:
+            2: 248
+          15,0:
+            0: 7441
+          15,1:
+            0: 12545
+            2: 49344
+          15,2:
+            0: 272
+          15,3:
+            2: 9023
+          15,4:
+            2: 8754
+          16,0:
+            0: 256
+            2: 40601
+          16,1:
+            2: 40857
+          16,3:
+            2: 255
+          8,-4:
+            2: 8738
+            0: 34952
+          9,-4:
+            0: 56789
           9,-3:
-            0: 65535
+            0: 26485
           9,-2:
-            0: 65535
-          9,-1:
-            0: 65535
-          10,-2:
-            0: 65535
-          10,-1:
-            0: 65535
+            0: 58999
+          9,-5:
+            0: 18176
           10,-4:
-            0: 65521
+            0: 65024
           10,-3:
-            0: 65535
+            0: 65520
+          10,-2:
+            0: 63743
           11,-4:
-            0: 63472
+            0: 13056
+            2: 128
           11,-3:
-            0: 65535
+            0: 43946
           11,-2:
+            0: 30250
+          12,-4:
+            2: 1265
+          12,-3:
             0: 65535
-          11,-1:
-            0: 65535
+          12,-2:
+            0: 65359
+          -4,-8:
+            0: 4016
+          -4,-9:
+            2: 28672
+            0: 127
+          -5,-8:
+            0: 7091
           -4,-7:
-            0: 65535
+            0: 32631
+          -5,-7:
+            0: 7647
           -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
-          -4,-8:
-            0: 65535
+            0: 14193
+          -5,-6:
+            0: 56797
+          -5,-5:
+            0: 64729
           -3,-8:
             0: 65535
           -3,-7:
-            0: 65535
+            0: 16383
           -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
+            0: 65530
+          -3,-9:
+            0: 50519
           -2,-8:
-            0: 65535
+            0: 32767
           -2,-7:
-            0: 65535
+            0: 1919
           -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-8:
-            0: 65535
-          -1,-7:
-            0: 65535
+            0: 57309
+          -2,-9:
+            0: 61440
+            2: 47
           -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
+            0: 5489
+          -8,-8:
+            0: 3
+            2: 8
+          -8,-9:
+            0: 12288
+            2: 35056
+          -9,-8:
+            0: 65356
+            2: 1
+          -8,-7:
+            0: 240
+          -9,-7:
+            0: 13311
+            2: 32768
+          -8,-6:
+            2: 1520
+          -9,-6:
+            2: 29832
+            0: 3
+          -8,-5:
+            0: 48123
+          -9,-5:
+            0: 43008
+            2: 4
+          -8,-4:
+            0: 35771
+          -7,-7:
+            0: 33008
+            2: 8192
           -7,-5:
-            0: 65535
+            0: 61951
+          -7,-4:
+            0: 36317
+          -7,-6:
+            2: 546
+            0: 2184
+          -7,-8:
+            2: 68
+          -7,-9:
+            2: 17408
+            0: 32768
+          -6,-8:
+            0: 34955
+            2: 8704
+          -6,-7:
+            0: 47352
+          -6,-6:
+            0: 35835
           -6,-5:
-            0: 65535
-          -5,-5:
-            0: 65535
-          -5,-7:
-            0: 65535
-          -5,-6:
-            0: 65535
-          -8,-4:
-            0: 65535
+            0: 61691
+          -6,-9:
+            0: 61440
+            2: 34
+          -6,-4:
+            0: 62463
+          -5,-9:
+            0: 12799
+            2: 32768
+          -9,-4:
+            0: 34952
+            2: 800
           -8,-3:
-            0: 65535
+            0: 65039
+          -9,-3:
+            0: 56797
           -8,-2:
-            0: 65535
+            0: 60942
+          -9,-2:
+            0: 56829
+          -9,-1:
+            0: 56797
           -8,-1:
-            0: 65535
-          -7,-4:
-            0: 65535
+            0: 3808
           -7,-3:
-            0: 65535
+            0: 64907
           -7,-2:
-            0: 65535
-          -7,-1:
-            0: 65535
-          -6,-4:
-            0: 65535
+            0: 57293
           -6,-3:
-            0: 65535
+            0: 63291
           -6,-2:
-            0: 65535
-          -6,-1:
-            0: 65535
-          -5,-4:
-            0: 65535
+            0: 30583
           -5,-3:
-            0: 65535
-          -5,-2:
-            0: 65535
-          -5,-1:
-            0: 65535
+            0: 28791
+          -12,0:
+            0: 2056
           -11,0:
-            0: 65535
-          -11,1:
-            0: 65262
+            0: 3855
+          -12,1:
+            2: 2056
+          -12,2:
+            0: 2056
           -11,2:
-            0: 65535
+            0: 3855
+          -12,3:
+            2: 136
+          -11,1:
+            2: 546
+            0: 2184
+          -11,3:
+            2: 58030
+          -11,4:
+            2: 70
           -10,0:
             0: 65535
           -10,1:
             0: 65535
           -10,2:
-            0: 65535
-          -9,0:
-            0: 65535
-          -9,1:
-            0: 65535
-          -9,2:
-            0: 65535
-          -9,3:
-            0: 65535
-          -10,-2:
-            0: 65535
+            0: 36863
+          -10,3:
+            0: 61166
           -10,-1:
-            0: 65535
-          -10,-3:
-            0: 65535
-          -9,-3:
-            0: 65535
-          -9,-2:
-            0: 65535
-          -9,-1:
-            0: 65535
-          -9,-4:
-            0: 65519
-          12,-4:
-            0: 62705
-          12,-3:
-            0: 65535
-          12,-2:
-            0: 65535
-          12,-1:
-            0: 65535
-          13,-4:
-            0: 63720
+            0: 61134
+          -10,4:
+            0: 61154
+          -12,-3:
+            0: 4095
+          -13,-3:
+            0: 4095
+          -12,-4:
+            0: 32768
+          -11,-3:
+            0: 4095
+          -12,-2:
+            2: 136
+          -11,-2:
+            2: 15
+            0: 60928
+          -12,-1:
+            2: 2184
+          -11,-1:
+            0: 14
+            2: 3584
+          -10,-3:
+            0: 53247
+          -10,-2:
+            2: 1
+            0: 65228
+          -10,-4:
+            2: 3720
+          -10,-5:
+            2: 32776
+          12,-5:
+            2: 61440
+            0: 127
           13,-3:
-            0: 65535
+            0: 48059
           13,-2:
-            0: 65535
-          13,-1:
-            0: 65535
-          10,-8:
-            0: 34816
+            0: 63243
+          13,-4:
+            2: 2280
+          13,-5:
+            2: 35304
+          14,-4:
+            2: 1039
+          14,-3:
+            0: 13107
+            2: 128
+          14,-2:
+            0: 65283
+          14,-1:
+            0: 4095
+          14,-5:
+            2: 17476
+          15,-4:
+            2: 8739
+          15,-3:
+            2: 12914
+          15,-2:
+            0: 4352
+            2: 14
+          15,-1:
+            0: 273
+            2: 52224
+          15,-5:
+            2: 8704
+          16,-2:
+            2: 61455
+          16,-1:
+            2: 40857
+          9,-7:
+            2: 15
+            0: 65280
+          9,-6:
+            0: 15
+            2: 3840
           10,-7:
-            0: 65535
+            2: 7
+            0: 65280
           10,-6:
-            0: 36863
-          10,-5:
-            0: 8
-          11,-8:
-            0: 65532
+            0: 15
+            2: 34560
+          10,-8:
+            2: 34816
           11,-7:
-            0: 65535
+            0: 65534
           11,-6:
-            0: 65535
+            0: 61183
+          10,-5:
+            2: 8
+          11,-8:
+            2: 52
+            0: 59392
           11,-5:
-            0: 36095
+            2: 33840
+            0: 8
           12,-8:
-            0: 65535
+            0: 65392
           12,-7:
             0: 65535
           12,-6:
             0: 65535
-          12,-5:
-            0: 65535
+          20,-2:
+            2: 8739
+          19,-2:
+            2: 28687
+          20,-1:
+            2: 26146
+          20,0:
+            2: 8230
+          19,0:
+            2: 20292
+          20,1:
+            2: 9830
+          20,2:
+            2: 8738
+          20,3:
+            2: 3
+          19,3:
+            2: 127
           13,-8:
-            0: 65393
+            2: 34913
+            0: 12288
           13,-7:
-            0: 65535
+            0: 65395
           13,-6:
-            0: 65535
-          13,-5:
-            0: 35327
-          14,-8:
-            0: 17476
+            0: 13183
+            2: 32768
           14,-7:
-            0: 30581
+            2: 26213
           14,-6:
-            0: 17783
-          14,-5:
-            0: 17476
+            2: 17766
+          14,-8:
+            2: 17476
           14,-9:
-            0: 17476
-          6,-7:
-            0: 65535
-          6,-6:
-            0: 65535
-          7,-7:
-            0: 48063
-          7,-6:
-            0: 65467
-          -7,4:
-            0: 65535
-          -7,5:
-            0: 61183
-          -6,4:
-            0: 65535
-          -6,5:
-            0: 65535
-          4,5:
-            0: 53247
-          4,-8:
-            0: 65535
-          5,-8:
-            0: 65535
-          6,-8:
-            0: 65535
-          7,-8:
-            0: 13119
-          -8,4:
-            0: 65535
-          -8,5:
-            0: 30719
-          -8,6:
-            0: 63359
-          -7,6:
-            0: 64751
-          -6,6:
-            0: 4095
+            2: 17476
+          -11,5:
+            2: 35916
           -10,5:
-            0: 56799
+            2: 39296
+            0: 17488
+          -11,6:
+            2: 2184
           -10,6:
-            0: 56799
-          -9,5:
-            0: 65535
-          -9,6:
-            0: 65535
-          -9,4:
-            0: 65535
-          3,-9:
-            0: 62836
-          4,-9:
-            0: 64716
-          6,4:
-            0: 65535
-          7,4:
-            0: 65535
-          7,5:
-            0: 65535
-          7,6:
-            0: 53196
-          8,4:
-            0: 65535
-          8,5:
-            0: 48063
-            3: 17472
-          8,6:
-            0: 65359
-          9,4:
-            0: 65535
-          9,5:
-            0: 43695
-            4: 4368
-            2: 17472
-          9,6:
-            0: 7951
-          10,4:
-            0: 65535
-          10,5:
-            0: 43695
-            2: 4368
-            5: 17472
-          11,4:
-            0: 65535
-          11,5:
-            0: 43695
-            2: 21840
-          12,4:
-            0: 65535
-          12,5:
-            0: 13183
-          13,4:
-            0: 65535
-          13,5:
-            0: 1
-          -8,7:
-            0: 242
-          8,-8:
-            0: 1
-          8,-7:
-            0: 65535
-          8,-10:
-            0: 240
-          -10,4:
-            0: 65535
+            0: 21569
+            2: 35230
           -10,7:
-            0: 192
-          -9,7:
-            0: 240
+            2: 192
+          0,-12:
+            2: 79
+            0: 12288
+          -1,-12:
+            2: 79
+            0: 32768
+          0,-11:
+            0: 29107
+          -1,-11:
+            0: 2047
+          0,-10:
+            0: 247
+            2: 16384
+          -1,-10:
+            0: 255
+            2: 36864
+          -1,-9:
+            2: 313
+          1,-12:
+            2: 4375
+          1,-11:
+            0: 3536
+          1,-10:
+            0: 3831
+          2,-11:
+            0: 65520
+          2,-10:
+            0: 14196
+          2,-12:
+            2: 44800
+          3,-12:
+            2: 768
+          3,-10:
+            2: 18240
+          3,-9:
+            2: 1396
           5,-10:
-            0: 17648
-          5,-9:
-            0: 65535
+            2: 17648
           6,-10:
-            0: 240
-          6,-9:
-            0: 65535
+            2: 240
           7,-10:
-            0: 240
-          7,-9:
-            0: 13107
+            2: 240
+          8,-10:
+            2: 240
+          8,8:
+            2: 65534
+          9,5:
+            5: 4368
+            3: 17472
+          9,6:
+            2: 7936
+          10,5:
+            3: 4368
+            6: 17472
           10,6:
-            0: 3855
+            2: 3840
+          11,5:
+            3: 21840
           11,6:
-            0: 3871
+            2: 3856
+          12,5:
+            2: 65535
           12,6:
-            0: 15
-          6,5:
-            0: 57343
-          14,-4:
-            0: 29711
-          14,-3:
-            0: 30711
-          14,-2:
-            0: 65527
-          5,4:
-            0: 65535
-          5,5:
-            0: 65535
-          5,7:
-            0: 15
-          5,6:
-            0: 65535
-          6,7:
-            0: 1
-          6,6:
-            0: 39417
-          2,-9:
-            0: 63479
-          15,-4:
-            0: 8739
-          15,-5:
-            0: 8704
-          3,7:
-            0: 3
-          -4,7:
-            0: 2289
-          -3,7:
-            0: 11000
-          -2,7:
-            0: 4095
-          -7,7:
-            0: 16
-          -6,7:
-            0: 240
-          -5,7:
-            0: 240
-          -1,9:
-            0: 142
-          0,9:
-            0: 15
-          1,9:
-            0: 15
-          13,0:
-            0: 65535
-          13,1:
-            0: 65535
-          13,2:
-            0: 65535
-          13,3:
-            0: 65535
-          14,0:
-            0: 65535
-          14,2:
-            0: 65535
-          14,1:
-            0: 65535
-          14,3:
-            0: 255
-          -8,-5:
-            0: 65535
-          -5,-8:
-            0: 65535
-          -11,3:
-            0: 58030
-          -10,3:
-            0: 65535
-          14,-1:
-            0: 65535
-          15,-3:
-            0: 12914
-          -11,4:
-            0: 70
-          0,-9:
-            0: 65519
-          1,-9:
-            0: 65535
+            2: 15
+          13,5:
+            2: 39321
           13,6:
-            0: 15
-          14,6:
-            0: 7
+            2: 15
           14,4:
-            0: 28672
+            2: 28672
+          14,6:
+            2: 7
           14,5:
-            0: 17476
-          -1,-9:
-            0: 61753
-          15,0:
-            0: 16179
-          15,1:
-            0: 62451
-          15,2:
-            0: 62259
-          8,-4:
-            0: 61166
-          9,-4:
-            0: 65535
-          15,-2:
-            0: 13310
-          15,-1:
-            0: 65331
-          8,-6:
-            0: 32767
-          8,-5:
-            0: 65527
-          9,-7:
-            0: 65535
-          9,-6:
-            0: 4095
-          9,-5:
-            0: 65520
-          20,-2:
-            0: 13107
-          20,-1:
-            0: 30515
-          20,0:
-            0: 12599
-          20,1:
-            0: 14199
-          20,2:
-            0: 13107
-          2,-10:
-            0: 65535
-          3,-10:
-            0: 18241
+            2: 17484
+          15,5:
+            2: 35
+          -4,-10:
+            0: 6143
+          -5,-10:
+            0: 14472
+            2: 2
+          -3,-10:
+            0: 29949
+          -3,-11:
+            2: 304
+            0: 34944
           -2,-10:
-            0: 32767
-          -2,-9:
-            0: 65327
-          -1,-10:
-            0: 40959
-          16,-2:
-            0: 61695
-          16,-1:
-            0: 40857
+            0: 1019
+          -2,-11:
+            2: 544
+            0: 2176
+          16,-3:
+            2: 61440
           17,-2:
-            0: 63731
+            2: 63491
           17,-1:
-            0: 36744
+            2: 36744
           18,-2:
-            0: 61694
+            2: 61454
           18,-1:
-            0: 36744
-          19,-2:
-            0: 28927
+            2: 36744
+          17,0:
+            2: 36744
+          18,-3:
+            2: 32768
+          19,-3:
+            2: 28672
           19,-1:
-            0: 18244
-          16,0:
-            0: 40857
-          16,1:
-            0: 40857
+            2: 18244
+          18,0:
+            2: 36744
           16,2:
-            0: 61689
-          17,0:
-            0: 36744
+            2: 249
           17,1:
-            0: 36744
+            2: 36744
           17,2:
-            0: 63736
-          18,0:
-            0: 36744
+            2: 2296
+          17,3:
+            2: 3
           18,1:
-            0: 36744
+            2: 36744
           18,2:
-            0: 61688
-          19,0:
-            0: 20292
+            2: 248
+          18,3:
+            2: 142
           19,1:
-            0: 18244
+            2: 18244
           19,2:
-            0: 61556
+            2: 116
           14,-10:
-            0: 17520
+            2: 17520
           9,-10:
-            0: 16
-          -8,-8:
-            0: 4479
-          -8,-7:
-            0: 4095
-          -7,-7:
-            0: 61439
-          -6,-7:
-            0: 65535
-          -6,-8:
-            0: 61183
-          -6,-6:
-            0: 65535
+            2: 16
           -11,-8:
-            0: 60074
+            2: 60074
           -11,-7:
-            0: 2730
+            2: 2730
           -10,-8:
-            0: 65262
+            2: 12846
+            0: 34816
           -10,-7:
-            0: 61166
+            2: 8738
+            0: 34952
           -10,-6:
-            0: 58094
-          -9,-8:
-            0: 65535
-          -9,-7:
-            0: 65535
-          -9,-6:
-            0: 62719
-          -9,-10:
-            0: 63728
+            2: 57890
+            0: 8
           -9,-9:
-            0: 65528
+            2: 4600
+            0: 49152
+          -9,-10:
+            2: 63728
           -8,-10:
-            0: 28784
-          -8,-9:
-            0: 65520
-          -8,-6:
-            0: 62960
-          -6,-9:
-            0: 65450
-          -5,-9:
-            0: 65535
-          -7,-6:
-            0: 65262
-          -12,0:
-            0: 34952
-          -12,1:
-            0: 34824
-          -12,2:
-            0: 34952
-          -12,3:
-            0: 136
-          -12,-1:
-            0: 34952
-          -11,-1:
-            0: 65279
-          -11,-4:
-            0: 61440
-          -11,-3:
-            0: 65535
-          -11,-2:
-            0: 65535
-          -10,-4:
-            0: 65160
-          0,-10:
-            0: 20479
-          1,-10:
-            0: 65535
-          -5,-10:
-            0: 65486
-          -7,-8:
-            0: 204
-          -4,-9:
-            0: 65535
-          -3,-9:
-            0: 65535
-          -7,-9:
-            0: 52224
-          7,7:
-            0: 12
-          8,7:
-            0: 61167
-          8,8:
-            0: 65534
-          8,9:
-            0: 3839
-          4,6:
-            0: 52428
-          4,7:
-            0: 12
-          -3,8:
-            0: 3086
-          -2,8:
-            0: 7967
-          -11,5:
-            0: 35916
-          -11,6:
-            0: 2184
-          -12,-4:
-            0: 61440
-          -12,-3:
-            0: 65535
-          -12,-2:
-            0: 136
-          -10,-5:
-            0: 32776
-          -9,-5:
-            0: 65484
-          0,-12:
-            0: 30543
-          0,-11:
-            0: 65535
-          1,-12:
-            0: 4375
-          1,-11:
-            0: 65535
-          2,-12:
-            0: 44800
-          2,-11:
-            0: 65535
-          3,-12:
-            0: 768
-          3,-11:
-            0: 4369
-          -4,-11:
-            0: 61440
-          -4,-10:
-            0: 65535
-          -3,-11:
-            0: 65008
-          -3,-10:
-            0: 65535
-          -2,-12:
-            0: 32768
-          -2,-11:
-            0: 65532
-          -1,-12:
-            0: 64591
-          -1,-11:
-            0: 65535
+            2: 28784
           -6,-11:
-            0: 8192
+            2: 8192
           -6,-10:
-            0: 60078
-          -5,-11:
-            0: 49152
+            2: 25262
+          8,9:
+            2: 2815
           9,8:
-            0: 4368
+            2: 4368
           9,9:
-            0: 17
-          2,9:
-            0: 1
+            2: 17
           -14,-3:
-            0: 61166
-          -14,-4:
-            0: 49152
+            0: 3272
           -13,-4:
-            0: 61440
-          -13,-3:
-            0: 65535
-          15,3:
-            0: 31
-          20,3:
-            0: 3
-          16,-3:
-            0: 61440
-          18,-3:
-            0: 32768
-          19,-3:
-            0: 28672
-          16,3:
-            0: 255
-          17,3:
-            0: 3
-          18,3:
-            0: 142
-          19,3:
-            0: 127
+            0: 4096
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1337,6 +1410,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -26130,18 +26218,6 @@ entities:
     - type: Transform
       pos: -48.183727,-9.500211
       parent: 31
-- proto: chem_master
-  entities:
-  - uid: 606
-    components:
-    - type: Transform
-      pos: 19.5,-0.5
-      parent: 31
-  - uid: 5075
-    components:
-    - type: Transform
-      pos: 15.5,1.5
-      parent: 31
 - proto: ChemDispenser
   entities:
   - uid: 5076
@@ -26161,6 +26237,18 @@ entities:
     - type: Transform
       pos: 18.5,1.5
       parent: 31
+- proto: ChemMaster
+  entities:
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 19.5,-0.5
+      parent: 31
+  - uid: 5075
+    components:
+    - type: Transform
+      pos: 15.5,1.5
+      parent: 31
 - proto: ChessBoard
   entities:
   - uid: 841
@@ -27734,14 +27822,6 @@ entities:
     - type: Transform
       pos: 8.5,30.5
       parent: 31
-- proto: ComputerFrame
-  entities:
-  - uid: 7085
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-16.5
-      parent: 31
 - proto: ComputerId
   entities:
   - uid: 810
@@ -34314,12 +34394,6 @@ entities:
       parent: 31
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2227
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-17.5
-      parent: 31
   - uid: 2417
     components:
     - type: Transform
@@ -42265,6 +42339,12 @@ entities:
       parent: 31
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2227
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-17.5
+      parent: 31
   - uid: 2282
     components:
     - type: Transform
@@ -43171,11 +43251,15 @@ entities:
   - uid: 10912
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 53.5,-7.5
       parent: 31
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 10931
     components:
     - type: Transform
@@ -43473,9 +43557,11 @@ entities:
   - uid: 2215
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-17.5
       parent: 31
+    - type: GasThermoMachine
+      targetTemperature: 150
 - proto: GasThermoMachineHeater
   entities:
   - uid: 8861
@@ -49186,13 +49272,6 @@ entities:
     - type: Transform
       pos: 14.5,0.5
       parent: 31
-- proto: MachineFrame
-  entities:
-  - uid: 7464
-    components:
-    - type: Transform
-      pos: 10.5,-17.5
-      parent: 31
 - proto: MachineFrameDestroyed
   entities:
   - uid: 9667
@@ -57149,7 +57228,7 @@ entities:
     - type: Transform
       pos: -6.517076,-41.294003
       parent: 31
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 1418
     components:
@@ -60963,13 +61042,6 @@ entities:
     - type: Transform
       pos: 48.60447,5.4525433
       parent: 31
-- proto: UnfinishedMachineFrame
-  entities:
-  - uid: 7105
-    components:
-    - type: Transform
-      pos: 10.5,-15.5
-      parent: 31
 - proto: UniformPrinter
   entities:
   - uid: 8408

From dc895feab3a6f105be81c37a2a7ab9bf4f2d838b Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 28 May 2024 09:52:59 +0200
Subject: [PATCH 090/568] Fix unlocked locker on Omega (#28247)

---
 Resources/Maps/omega.yml | 6002 +-------------------------------------
 1 file changed, 57 insertions(+), 5945 deletions(-)

diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index bf3ee069976a..07ebb24b9da8 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -37,12 +37,13 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
   - uid: 4812
     components:
     - type: MetaData
@@ -3786,7 +3787,8 @@ entities:
           -9,2:
             0: 65535
           -9,3:
-            0: 65535
+            2: 1
+            0: 65534
           -8,0:
             0: 65535
           -8,-2:
@@ -4217,8 +4219,6 @@ entities:
       - 8806
       - 5025
       - 6554
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4982
     components:
     - type: Transform
@@ -4229,16 +4229,12 @@ entities:
       devices:
       - 4941
       - 4875
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 6692
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7234
     components:
     - type: Transform
@@ -4249,8 +4245,6 @@ entities:
       devices:
       - 4890
       - 4876
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7236
     components:
     - type: Transform
@@ -4261,8 +4255,6 @@ entities:
       devices:
       - 8838
       - 8836
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7241
     components:
     - type: Transform
@@ -4272,16 +4264,12 @@ entities:
       devices:
       - 6686
       - 7227
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7249
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7284
     components:
     - type: Transform
@@ -4292,8 +4280,6 @@ entities:
       - 12226
       - 1853
       - 1852
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12171
     components:
     - type: Transform
@@ -4305,8 +4291,6 @@ entities:
       - 12170
       - 12027
       - 12026
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12173
     components:
     - type: Transform
@@ -4318,8 +4302,6 @@ entities:
       - 12028
       - 12025
       - 12172
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12174
     components:
     - type: Transform
@@ -4331,8 +4313,6 @@ entities:
       - 12175
       - 12029
       - 12024
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12176
     components:
     - type: Transform
@@ -4343,8 +4323,6 @@ entities:
       - 12177
       - 12032
       - 12033
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12178
     components:
     - type: Transform
@@ -4361,8 +4339,6 @@ entities:
       - 10754
       - 10755
       - 10756
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12182
     components:
     - type: Transform
@@ -4371,8 +4347,6 @@ entities:
     - type: DeviceList
       devices:
       - 12181
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12183
     components:
     - type: Transform
@@ -4389,8 +4363,6 @@ entities:
       - 10754
       - 10755
       - 10756
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12186
     components:
     - type: Transform
@@ -4406,8 +4378,6 @@ entities:
       - 12185
       - 3708
       - 8787
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12190
     components:
     - type: Transform
@@ -4420,8 +4390,6 @@ entities:
       - 8691
       - 12034
       - 11962
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12193
     components:
     - type: Transform
@@ -4441,8 +4409,6 @@ entities:
       - 12189
       - 12197
       - 12196
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12198
     components:
     - type: Transform
@@ -4456,8 +4422,6 @@ entities:
       - 12197
       - 1685
       - 1686
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12202
     components:
     - type: Transform
@@ -4475,8 +4439,6 @@ entities:
       - 12204
       - 12039
       - 12040
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12206
     components:
     - type: Transform
@@ -4489,8 +4451,6 @@ entities:
       - 12205
       - 8562
       - 8563
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12209
     components:
     - type: Transform
@@ -4515,8 +4475,6 @@ entities:
       - 7873
       - 7887
       - 7886
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12213
     components:
     - type: Transform
@@ -4527,8 +4485,6 @@ entities:
       - 7905
       - 7907
       - 12214
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12215
     components:
     - type: Transform
@@ -4541,8 +4497,6 @@ entities:
       - 12212
       - 7906
       - 7908
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12219
     components:
     - type: Transform
@@ -4553,8 +4507,6 @@ entities:
       - 12218
       - 7858
       - 7856
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12220
     components:
     - type: Transform
@@ -4569,8 +4521,6 @@ entities:
       - 12222
       - 8307
       - 8306
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12223
     components:
     - type: Transform
@@ -4585,8 +4535,6 @@ entities:
       - 12225
       - 1817
       - 1816
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12228
     components:
     - type: Transform
@@ -4600,8 +4548,6 @@ entities:
       - 1928
       - 2474
       - 2441
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12232
     components:
     - type: Transform
@@ -4615,8 +4561,6 @@ entities:
       - 2472
       - 2442
       - 2475
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12234
     components:
     - type: Transform
@@ -4635,8 +4579,6 @@ entities:
       - 2448
       - 2446
       - 2445
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12240
     components:
     - type: Transform
@@ -4651,8 +4593,6 @@ entities:
       - 2071
       - 2072
       - 2073
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12245
     components:
     - type: Transform
@@ -4669,8 +4609,6 @@ entities:
       - 2782
       - 1770
       - 3782
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12249
     components:
     - type: Transform
@@ -4688,8 +4626,6 @@ entities:
       - 2786
       - 4439
       - 4440
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12252
     components:
     - type: Transform
@@ -4702,8 +4638,6 @@ entities:
       - 12254
       - 3021
       - 3024
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12256
     components:
     - type: Transform
@@ -4717,8 +4651,6 @@ entities:
       - 3017
       - 3019
       - 12257
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12258
     components:
     - type: Transform
@@ -4730,8 +4662,6 @@ entities:
       - 12259
       - 3001
       - 2983
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12260
     components:
     - type: Transform
@@ -4742,8 +4672,6 @@ entities:
       - 3814
       - 12261
       - 3944
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12262
     components:
     - type: Transform
@@ -4755,8 +4683,6 @@ entities:
       - 3816
       - 12263
       - 3841
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12265
     components:
     - type: Transform
@@ -4768,8 +4694,6 @@ entities:
       - 3813
       - 12264
       - 3835
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12266
     components:
     - type: Transform
@@ -4780,8 +4704,6 @@ entities:
       - 3815
       - 3838
       - 12267
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12272
     components:
     - type: Transform
@@ -4797,8 +4719,6 @@ entities:
       - 4117
       - 4442
       - 4441
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12275
     components:
     - type: Transform
@@ -4812,8 +4732,6 @@ entities:
       - 4425
       - 4380
       - 4381
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12278
     components:
     - type: Transform
@@ -4826,8 +4744,6 @@ entities:
       - 4424
       - 4444
       - 4443
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12282
     components:
     - type: Transform
@@ -4838,8 +4754,6 @@ entities:
       - 4226
       - 12281
       - 4231
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12283
     components:
     - type: Transform
@@ -4851,8 +4765,6 @@ entities:
       - 4205
       - 12284
       - 4203
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12285
     components:
     - type: Transform
@@ -4867,8 +4779,6 @@ entities:
       - 6414
       - 6417
       - 6416
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12289
     components:
     - type: Transform
@@ -4888,8 +4798,6 @@ entities:
       - 12288
       - 6420
       - 6419
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12293
     components:
     - type: Transform
@@ -4904,8 +4812,6 @@ entities:
       - 12295
       - 12038
       - 12037
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12296
     components:
     - type: Transform
@@ -4916,8 +4822,6 @@ entities:
       - 1511
       - 12297
       - 1512
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12299
     components:
     - type: Transform
@@ -4930,8 +4834,6 @@ entities:
       - 858
       - 857
       - 848
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12302
     components:
     - type: Transform
@@ -4958,8 +4860,6 @@ entities:
       - 817
       - 816
       - 864
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12304
     components:
     - type: Transform
@@ -4970,8 +4870,6 @@ entities:
       - 877
       - 885
       - 12303
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12307
     components:
     - type: Transform
@@ -4982,8 +4880,6 @@ entities:
       - 847
       - 846
       - 12306
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12308
     components:
     - type: Transform
@@ -4997,8 +4893,6 @@ entities:
       - 784
       - 835
       - 814
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12311
     components:
     - type: Transform
@@ -5013,8 +4907,6 @@ entities:
       - 1938
       - 710
       - 711
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12316
     components:
     - type: Transform
@@ -5044,8 +4936,6 @@ entities:
       - 328
       - 3582
       - 2759
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12319
     components:
     - type: Transform
@@ -5066,8 +4956,6 @@ entities:
       - 8591
       - 8758
       - 8770
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12322
     components:
     - type: Transform
@@ -5083,8 +4971,6 @@ entities:
       - 5222
       - 5224
       - 5225
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12325
     components:
     - type: Transform
@@ -5095,8 +4981,6 @@ entities:
       - 6842
       - 6839
       - 12326
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12327
     components:
     - type: Transform
@@ -5107,16 +4991,12 @@ entities:
       - 6841
       - 6840
       - 12328
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12330
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -9.5,-29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12341
     components:
     - type: Transform
@@ -5129,8 +5009,6 @@ entities:
       - 12343
       - 7380
       - 7382
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12344
     components:
     - type: Transform
@@ -5141,8 +5019,6 @@ entities:
       - 7088
       - 7087
       - 12345
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12346
     components:
     - type: Transform
@@ -5153,8 +5029,6 @@ entities:
       - 5700
       - 5697
       - 12347
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12350
     components:
     - type: Transform
@@ -5165,8 +5039,6 @@ entities:
       - 5699
       - 5698
       - 12349
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12352
     components:
     - type: Transform
@@ -5177,8 +5049,6 @@ entities:
       - 5715
       - 5716
       - 12351
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12353
     components:
     - type: Transform
@@ -5191,8 +5061,6 @@ entities:
       - 12355
       - 5718
       - 5719
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12356
     components:
     - type: Transform
@@ -5202,8 +5070,6 @@ entities:
     - type: DeviceList
       devices:
       - 12357
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12358
     components:
     - type: Transform
@@ -5214,8 +5080,6 @@ entities:
       - 5765
       - 5763
       - 12359
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12361
     components:
     - type: Transform
@@ -5226,8 +5090,6 @@ entities:
       - 5766
       - 5764
       - 12360
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12362
     components:
     - type: Transform
@@ -5238,8 +5100,6 @@ entities:
       - 12363
       - 9007
       - 8991
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: AirAlarmElectronics
   entities:
   - uid: 10719
@@ -5259,77 +5119,55 @@ entities:
     - type: Transform
       pos: 15.5,44.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9041
     components:
     - type: Transform
       pos: -34.5,-37.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9671
     components:
     - type: Transform
       pos: -31.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9672
     components:
     - type: Transform
       pos: -31.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12398
     components:
     - type: Transform
       pos: -34.5,-3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12399
     components:
     - type: Transform
       pos: -34.5,-2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: Airlock
   entities:
   - uid: 1531
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,0.5
       parent: 4812
   - uid: 1534
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,3.5
       parent: 4812
   - uid: 4116
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,7.5
       parent: 4812
   - uid: 6694
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-34.5
       parent: 4812
   - uid: 7025
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-34.5
       parent: 4812
@@ -5361,22 +5199,16 @@ entities:
   entities:
   - uid: 8862
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-36.5
       parent: 4812
   - uid: 9563
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-0.5
       parent: 4812
   - uid: 9566
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,2.5
       parent: 4812
@@ -5384,8 +5216,6 @@ entities:
   entities:
   - uid: 325
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,7.5
       parent: 4812
@@ -5427,15 +5257,11 @@ entities:
   entities:
   - uid: 2419
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,26.5
       parent: 4812
   - uid: 2463
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,28.5
       parent: 4812
@@ -5471,22 +5297,17 @@ entities:
   - uid: 329
     components:
     - type: MetaData
-      flags: PvsPriority
       name: Chaplain's Room
     - type: Transform
       pos: -25.5,-36.5
       parent: 4812
   - uid: 6792
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-36.5
       parent: 4812
   - uid: 6793
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-34.5
       parent: 4812
@@ -5494,8 +5315,6 @@ entities:
   entities:
   - uid: 6617
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-19.5
       parent: 4812
@@ -5576,15 +5395,11 @@ entities:
   entities:
   - uid: 5174
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,23.5
       parent: 4812
   - uid: 11928
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,18.5
       parent: 4812
@@ -5592,15 +5407,11 @@ entities:
   entities:
   - uid: 5358
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-13.5
       parent: 4812
   - uid: 5359
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-17.5
       parent: 4812
@@ -5630,106 +5441,76 @@ entities:
   entities:
   - uid: 901
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,9.5
       parent: 4812
   - uid: 3726
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,2.5
       parent: 4812
   - uid: 4370
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,0.5
       parent: 4812
   - uid: 4371
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,3.5
       parent: 4812
   - uid: 5912
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-32.5
       parent: 4812
   - uid: 6885
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-32.5
       parent: 4812
   - uid: 7956
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,7.5
       parent: 4812
   - uid: 9564
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-4.5
       parent: 4812
   - uid: 9663
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-8.5
       parent: 4812
   - uid: 9664
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-8.5
       parent: 4812
   - uid: 9888
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-12.5
       parent: 4812
   - uid: 9958
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-20.5
       parent: 4812
   - uid: 10165
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-23.5
       parent: 4812
   - uid: 11386
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 33.5,-37.5
       parent: 4812
   - uid: 11688
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,4.5
@@ -5919,50 +5700,36 @@ entities:
   entities:
   - uid: 2737
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,31.5
       parent: 4812
   - uid: 2814
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,33.5
       parent: 4812
   - uid: 3349
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,10.5
       parent: 4812
   - uid: 3350
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,10.5
       parent: 4812
   - uid: 3686
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,44.5
       parent: 4812
   - uid: 3687
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,45.5
       parent: 4812
   - uid: 10405
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-22.5
       parent: 4812
@@ -5970,8 +5737,6 @@ entities:
   entities:
   - uid: 3119
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,35.5
       parent: 4812
@@ -5979,8 +5744,6 @@ entities:
   entities:
   - uid: 716
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-4.5
       parent: 4812
@@ -6147,15 +5910,11 @@ entities:
   entities:
   - uid: 2461
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,27.5
       parent: 4812
   - uid: 2462
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,28.5
       parent: 4812
@@ -6170,22 +5929,16 @@ entities:
   entities:
   - uid: 7934
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,25.5
       parent: 4812
   - uid: 7936
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,21.5
       parent: 4812
   - uid: 8242
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,27.5
       parent: 4812
@@ -6205,8 +5958,6 @@ entities:
   entities:
   - uid: 720
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-10.5
       parent: 4812
@@ -6221,15 +5972,11 @@ entities:
   entities:
   - uid: 7949
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,6.5
       parent: 4812
   - uid: 8686
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,0.5
       parent: 4812
@@ -6237,8 +5984,6 @@ entities:
   entities:
   - uid: 324
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,7.5
       parent: 4812
@@ -6246,8 +5991,6 @@ entities:
   entities:
   - uid: 2418
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,24.5
       parent: 4812
@@ -6255,8 +5998,6 @@ entities:
   entities:
   - uid: 2741
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,24.5
       parent: 4812
@@ -6264,15 +6005,11 @@ entities:
   entities:
   - uid: 6790
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-31.5
       parent: 4812
   - uid: 6791
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-31.5
       parent: 4812
@@ -6280,8 +6017,6 @@ entities:
   entities:
   - uid: 7932
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,21.5
       parent: 4812
@@ -6289,29 +6024,21 @@ entities:
   entities:
   - uid: 8683
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,-10.5
       parent: 4812
   - uid: 8684
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,-10.5
       parent: 4812
   - uid: 8685
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,-6.5
       parent: 4812
   - uid: 9830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -44.5,-15.5
       parent: 4812
@@ -6331,8 +6058,6 @@ entities:
   entities:
   - uid: 309
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-4.5
       parent: 4812
@@ -6340,8 +6065,6 @@ entities:
   entities:
   - uid: 719
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-5.5
       parent: 4812
@@ -6349,15 +6072,11 @@ entities:
   entities:
   - uid: 717
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-1.5
       parent: 4812
   - uid: 718
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-6.5
       parent: 4812
@@ -6365,246 +6084,176 @@ entities:
   entities:
   - uid: 336
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-8.5
       parent: 4812
   - uid: 337
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-3.5
       parent: 4812
   - uid: 338
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,2.5
       parent: 4812
   - uid: 339
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,13.5
       parent: 4812
   - uid: 340
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,14.5
       parent: 4812
   - uid: 341
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,10.5
       parent: 4812
   - uid: 342
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-4.5
       parent: 4812
   - uid: 343
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-10.5
       parent: 4812
   - uid: 344
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,3.5
       parent: 4812
   - uid: 1252
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,2.5
       parent: 4812
   - uid: 2882
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,21.5
       parent: 4812
   - uid: 4372
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,3.5
       parent: 4812
   - uid: 4374
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,10.5
       parent: 4812
   - uid: 4375
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,0.5
       parent: 4812
   - uid: 4376
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-7.5
       parent: 4812
   - uid: 4377
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-7.5
       parent: 4812
   - uid: 5392
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-13.5
       parent: 4812
   - uid: 5399
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-27.5
       parent: 4812
   - uid: 5838
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-30.5
       parent: 4812
   - uid: 6982
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-33.5
       parent: 4812
   - uid: 7054
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-21.5
       parent: 4812
   - uid: 7954
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,8.5
       parent: 4812
   - uid: 8681
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-11.5
       parent: 4812
   - uid: 8848
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-31.5
       parent: 4812
   - uid: 8861
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-26.5
       parent: 4812
   - uid: 8866
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,-34.5
       parent: 4812
   - uid: 8867
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-39.5
       parent: 4812
   - uid: 10157
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-22.5
       parent: 4812
   - uid: 10487
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-26.5
       parent: 4812
   - uid: 11300
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-35.5
       parent: 4812
   - uid: 11326
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-34.5
       parent: 4812
   - uid: 11350
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-34.5
       parent: 4812
   - uid: 11434
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-35.5
       parent: 4812
   - uid: 11676
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-37.5
       parent: 4812
   - uid: 11802
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-2.5
       parent: 4812
@@ -6612,15 +6261,11 @@ entities:
   entities:
   - uid: 6788
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-23.5
       parent: 4812
   - uid: 7336
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-29.5
       parent: 4812
@@ -6628,29 +6273,21 @@ entities:
   entities:
   - uid: 5497
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-15.5
       parent: 4812
   - uid: 5498
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-29.5
       parent: 4812
   - uid: 5499
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-29.5
       parent: 4812
   - uid: 5787
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 33.5,-29.5
       parent: 4812
@@ -6658,8 +6295,6 @@ entities:
   entities:
   - uid: 7806
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,9.5
       parent: 4812
@@ -6667,8 +6302,6 @@ entities:
   entities:
   - uid: 714
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,10.5
       parent: 4812
@@ -6708,29 +6341,21 @@ entities:
   entities:
   - uid: 7410
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-26.5
       parent: 4812
   - uid: 7414
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-17.5
       parent: 4812
   - uid: 7415
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-19.5
       parent: 4812
   - uid: 7416
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-13.5
       parent: 4812
@@ -6745,8 +6370,6 @@ entities:
   entities:
   - uid: 2817
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,28.5
       parent: 4812
@@ -6766,8 +6389,6 @@ entities:
   entities:
   - uid: 2921
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,14.5
       parent: 4812
@@ -6832,36 +6453,26 @@ entities:
   entities:
   - uid: 5396
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-20.5
       parent: 4812
   - uid: 5484
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-21.5
       parent: 4812
   - uid: 5485
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-21.5
       parent: 4812
   - uid: 5486
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-20.5
       parent: 4812
   - uid: 5487
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-24.5
       parent: 4812
@@ -6916,8 +6527,6 @@ entities:
   entities:
   - uid: 6675
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-20.5
       parent: 4812
@@ -6925,15 +6534,11 @@ entities:
   entities:
   - uid: 713
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-0.5
       parent: 4812
   - uid: 886
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,2.5
       parent: 4812
@@ -6953,8 +6558,6 @@ entities:
   entities:
   - uid: 3771
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-33.5
       parent: 4812
@@ -7638,3046 +7241,2176 @@ entities:
   entities:
   - uid: 2840
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,34.5
       parent: 4812
   - uid: 3012
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,37.5
       parent: 4812
   - uid: 3044
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,38.5
       parent: 4812
   - uid: 3045
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,38.5
       parent: 4812
   - uid: 3295
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,36.5
       parent: 4812
   - uid: 3353
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,34.5
       parent: 4812
   - uid: 3372
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,33.5
       parent: 4812
   - uid: 3373
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,31.5
       parent: 4812
   - uid: 3374
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,37.5
       parent: 4812
   - uid: 3375
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,35.5
       parent: 4812
   - uid: 3376
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,33.5
       parent: 4812
   - uid: 3394
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,32.5
       parent: 4812
   - uid: 3395
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,32.5
       parent: 4812
   - uid: 3396
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,33.5
       parent: 4812
   - uid: 3397
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,35.5
       parent: 4812
   - uid: 3398
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,38.5
       parent: 4812
   - uid: 3399
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,36.5
       parent: 4812
   - uid: 3400
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,34.5
       parent: 4812
   - uid: 3427
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,32.5
       parent: 4812
   - uid: 3433
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,36.5
       parent: 4812
   - uid: 3440
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,32.5
       parent: 4812
   - uid: 3450
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,32.5
       parent: 4812
   - uid: 3459
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,37.5
       parent: 4812
   - uid: 3460
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,38.5
       parent: 4812
   - uid: 3461
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,35.5
       parent: 4812
   - uid: 3579
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,37.5
       parent: 4812
   - uid: 3583
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,42.5
       parent: 4812
   - uid: 3584
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,42.5
       parent: 4812
   - uid: 3585
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,42.5
       parent: 4812
   - uid: 3586
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,41.5
       parent: 4812
   - uid: 3587
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,42.5
       parent: 4812
   - uid: 3588
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,41.5
       parent: 4812
   - uid: 3589
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,42.5
       parent: 4812
   - uid: 3590
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,41.5
       parent: 4812
   - uid: 3591
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,41.5
       parent: 4812
   - uid: 3592
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,41.5
       parent: 4812
   - uid: 3593
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,41.5
       parent: 4812
   - uid: 3594
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,41.5
       parent: 4812
   - uid: 3595
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,40.5
       parent: 4812
   - uid: 3596
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,40.5
       parent: 4812
   - uid: 3597
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,40.5
       parent: 4812
   - uid: 3598
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,43.5
       parent: 4812
   - uid: 3599
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,44.5
       parent: 4812
   - uid: 3600
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,45.5
       parent: 4812
   - uid: 3601
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,47.5
       parent: 4812
   - uid: 3602
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,47.5
       parent: 4812
   - uid: 3603
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,48.5
       parent: 4812
   - uid: 3604
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,49.5
       parent: 4812
   - uid: 3605
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,49.5
       parent: 4812
   - uid: 3606
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,48.5
       parent: 4812
   - uid: 3607
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,48.5
       parent: 4812
   - uid: 3608
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,48.5
       parent: 4812
   - uid: 3609
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,49.5
       parent: 4812
   - uid: 3610
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,49.5
       parent: 4812
   - uid: 3612
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,49.5
       parent: 4812
   - uid: 3613
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,50.5
       parent: 4812
   - uid: 3614
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,50.5
       parent: 4812
   - uid: 3615
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,51.5
       parent: 4812
   - uid: 3616
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,50.5
       parent: 4812
   - uid: 3617
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,51.5
       parent: 4812
   - uid: 3618
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,51.5
       parent: 4812
   - uid: 3619
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,51.5
       parent: 4812
   - uid: 3620
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,53.5
       parent: 4812
   - uid: 3621
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,52.5
       parent: 4812
   - uid: 3622
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,52.5
       parent: 4812
   - uid: 3623
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,50.5
       parent: 4812
   - uid: 3624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,53.5
       parent: 4812
   - uid: 3625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,53.5
       parent: 4812
   - uid: 3626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,54.5
       parent: 4812
   - uid: 3627
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,54.5
       parent: 4812
   - uid: 3628
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,55.5
       parent: 4812
   - uid: 3629
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,56.5
       parent: 4812
   - uid: 3630
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,57.5
       parent: 4812
   - uid: 3631
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,57.5
       parent: 4812
   - uid: 3632
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,56.5
       parent: 4812
   - uid: 3633
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,57.5
       parent: 4812
   - uid: 3634
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,58.5
       parent: 4812
   - uid: 3635
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,58.5
       parent: 4812
   - uid: 3636
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,59.5
       parent: 4812
   - uid: 3637
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,59.5
       parent: 4812
   - uid: 3638
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,60.5
       parent: 4812
   - uid: 3639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,59.5
       parent: 4812
   - uid: 3640
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,60.5
       parent: 4812
   - uid: 3641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,59.5
       parent: 4812
   - uid: 3642
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,60.5
       parent: 4812
   - uid: 3643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,59.5
       parent: 4812
   - uid: 3644
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,60.5
       parent: 4812
   - uid: 3645
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,59.5
       parent: 4812
   - uid: 3646
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,58.5
       parent: 4812
   - uid: 3647
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,59.5
       parent: 4812
   - uid: 3648
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,58.5
       parent: 4812
   - uid: 3649
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,58.5
       parent: 4812
   - uid: 3650
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,57.5
       parent: 4812
   - uid: 3651
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,57.5
       parent: 4812
   - uid: 3652
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,56.5
       parent: 4812
   - uid: 3653
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,56.5
       parent: 4812
   - uid: 3654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,55.5
       parent: 4812
   - uid: 3655
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,54.5
       parent: 4812
   - uid: 3656
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,54.5
       parent: 4812
   - uid: 3657
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,53.5
       parent: 4812
   - uid: 3658
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,52.5
       parent: 4812
   - uid: 3659
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,52.5
       parent: 4812
   - uid: 3660
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,51.5
       parent: 4812
   - uid: 3661
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,50.5
       parent: 4812
   - uid: 3662
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,50.5
       parent: 4812
   - uid: 3663
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,49.5
       parent: 4812
   - uid: 3664
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,49.5
       parent: 4812
   - uid: 3665
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,48.5
       parent: 4812
   - uid: 3666
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,47.5
       parent: 4812
   - uid: 3667
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,47.5
       parent: 4812
   - uid: 3668
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,46.5
       parent: 4812
   - uid: 3669
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,48.5
       parent: 4812
   - uid: 3670
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,48.5
       parent: 4812
   - uid: 3671
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,48.5
       parent: 4812
   - uid: 3672
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,49.5
       parent: 4812
   - uid: 3673
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,51.5
       parent: 4812
   - uid: 3676
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,49.5
       parent: 4812
   - uid: 3679
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,52.5
       parent: 4812
   - uid: 3680
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,53.5
       parent: 4812
   - uid: 3681
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,54.5
       parent: 4812
   - uid: 3682
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,55.5
       parent: 4812
   - uid: 3683
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,55.5
       parent: 4812
   - uid: 3684
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,56.5
       parent: 4812
   - uid: 3685
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,57.5
       parent: 4812
   - uid: 3976
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,27.5
       parent: 4812
   - uid: 5032
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,32.5
       parent: 4812
   - uid: 5625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-18.5
       parent: 4812
   - uid: 5626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-20.5
       parent: 4812
   - uid: 5627
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-19.5
       parent: 4812
   - uid: 5808
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-20.5
       parent: 4812
   - uid: 5809
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-21.5
       parent: 4812
   - uid: 5810
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-21.5
       parent: 4812
   - uid: 5811
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-20.5
       parent: 4812
   - uid: 5812
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-21.5
       parent: 4812
   - uid: 5813
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-22.5
       parent: 4812
   - uid: 5814
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-23.5
       parent: 4812
   - uid: 5815
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-23.5
       parent: 4812
   - uid: 5816
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-24.5
       parent: 4812
   - uid: 5817
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 39.5,-24.5
       parent: 4812
   - uid: 5818
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-24.5
       parent: 4812
   - uid: 5819
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-29.5
       parent: 4812
   - uid: 5820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-28.5
       parent: 4812
   - uid: 5821
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-27.5
       parent: 4812
   - uid: 5822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-26.5
       parent: 4812
   - uid: 5823
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-25.5
       parent: 4812
   - uid: 5824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-28.5
       parent: 4812
   - uid: 5825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-27.5
       parent: 4812
   - uid: 5827
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-25.5
       parent: 4812
   - uid: 5828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 39.5,-25.5
       parent: 4812
   - uid: 5829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 39.5,-26.5
       parent: 4812
   - uid: 5830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 39.5,-27.5
       parent: 4812
   - uid: 5831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 40.5,-27.5
       parent: 4812
   - uid: 5832
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 40.5,-26.5
       parent: 4812
   - uid: 5839
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-17.5
       parent: 4812
   - uid: 6332
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-21.5
       parent: 4812
   - uid: 8458
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,36.5
       parent: 4812
   - uid: 8459
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,35.5
       parent: 4812
   - uid: 8460
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,34.5
       parent: 4812
   - uid: 8461
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,33.5
       parent: 4812
   - uid: 8462
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,32.5
       parent: 4812
   - uid: 8463
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,30.5
       parent: 4812
   - uid: 8464
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,31.5
       parent: 4812
   - uid: 8465
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,31.5
       parent: 4812
   - uid: 8466
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,31.5
       parent: 4812
   - uid: 8467
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,31.5
       parent: 4812
   - uid: 8468
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,31.5
       parent: 4812
   - uid: 8469
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,31.5
       parent: 4812
   - uid: 8470
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,31.5
       parent: 4812
   - uid: 8471
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,31.5
       parent: 4812
   - uid: 8472
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,31.5
       parent: 4812
   - uid: 8473
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,32.5
       parent: 4812
   - uid: 8474
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,32.5
       parent: 4812
   - uid: 8475
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,32.5
       parent: 4812
   - uid: 8476
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,32.5
       parent: 4812
   - uid: 8479
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,32.5
       parent: 4812
   - uid: 8480
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,33.5
       parent: 4812
   - uid: 8483
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,33.5
       parent: 4812
   - uid: 8484
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,33.5
       parent: 4812
   - uid: 8485
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,34.5
       parent: 4812
   - uid: 8486
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,34.5
       parent: 4812
   - uid: 8487
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,34.5
       parent: 4812
   - uid: 8488
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,34.5
       parent: 4812
   - uid: 8489
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,34.5
       parent: 4812
   - uid: 8490
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,35.5
       parent: 4812
   - uid: 8491
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,35.5
       parent: 4812
   - uid: 8492
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,35.5
       parent: 4812
   - uid: 8493
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,36.5
       parent: 4812
   - uid: 8494
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,36.5
       parent: 4812
   - uid: 8495
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,37.5
       parent: 4812
   - uid: 8496
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,38.5
       parent: 4812
   - uid: 8497
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,38.5
       parent: 4812
   - uid: 8498
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,30.5
       parent: 4812
   - uid: 8499
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,33.5
       parent: 4812
   - uid: 8500
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,34.5
       parent: 4812
   - uid: 8501
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,34.5
       parent: 4812
   - uid: 8502
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,34.5
       parent: 4812
   - uid: 8503
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,34.5
       parent: 4812
   - uid: 8504
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,35.5
       parent: 4812
   - uid: 8505
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,35.5
       parent: 4812
   - uid: 8506
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,37.5
       parent: 4812
   - uid: 8507
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,37.5
       parent: 4812
   - uid: 8508
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,38.5
       parent: 4812
   - uid: 8509
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,38.5
       parent: 4812
   - uid: 8510
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,38.5
       parent: 4812
   - uid: 8511
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,38.5
       parent: 4812
   - uid: 8512
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,39.5
       parent: 4812
   - uid: 8513
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,39.5
       parent: 4812
   - uid: 8514
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,39.5
       parent: 4812
   - uid: 8515
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,39.5
       parent: 4812
   - uid: 8516
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,34.5
       parent: 4812
   - uid: 8517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,34.5
       parent: 4812
   - uid: 8518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,34.5
       parent: 4812
   - uid: 8519
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,34.5
       parent: 4812
   - uid: 8520
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,34.5
       parent: 4812
   - uid: 8521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,35.5
       parent: 4812
   - uid: 8522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,36.5
       parent: 4812
   - uid: 8523
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,36.5
       parent: 4812
   - uid: 8524
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,35.5
       parent: 4812
   - uid: 8525
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,35.5
       parent: 4812
   - uid: 9621
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-34.5
       parent: 4812
   - uid: 9622
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-33.5
       parent: 4812
   - uid: 9623
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-33.5
       parent: 4812
   - uid: 9624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-32.5
       parent: 4812
   - uid: 9630
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-29.5
       parent: 4812
   - uid: 9631
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-30.5
       parent: 4812
   - uid: 9632
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-29.5
       parent: 4812
   - uid: 9633
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-28.5
       parent: 4812
   - uid: 9637
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-26.5
       parent: 4812
   - uid: 9638
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-38.5
       parent: 4812
   - uid: 9639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-39.5
       parent: 4812
   - uid: 9640
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-39.5
       parent: 4812
   - uid: 9641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-39.5
       parent: 4812
   - uid: 9642
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-39.5
       parent: 4812
   - uid: 9643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-40.5
       parent: 4812
   - uid: 10417
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,-20.5
       parent: 4812
   - uid: 10418
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,-20.5
       parent: 4812
   - uid: 10419
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-20.5
       parent: 4812
   - uid: 10420
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-20.5
       parent: 4812
   - uid: 10421
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,-19.5
       parent: 4812
   - uid: 10422
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-19.5
       parent: 4812
   - uid: 10423
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-19.5
       parent: 4812
   - uid: 10424
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-18.5
       parent: 4812
   - uid: 10425
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-18.5
       parent: 4812
   - uid: 10426
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-18.5
       parent: 4812
   - uid: 10427
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-17.5
       parent: 4812
   - uid: 10428
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-16.5
       parent: 4812
   - uid: 10429
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-15.5
       parent: 4812
   - uid: 10430
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-15.5
       parent: 4812
   - uid: 10431
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-15.5
       parent: 4812
   - uid: 10432
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,-15.5
       parent: 4812
   - uid: 10433
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,-15.5
       parent: 4812
   - uid: 10434
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-15.5
       parent: 4812
   - uid: 10435
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-15.5
       parent: 4812
   - uid: 10436
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-15.5
       parent: 4812
   - uid: 10437
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-15.5
       parent: 4812
   - uid: 10438
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-15.5
       parent: 4812
   - uid: 10439
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-16.5
       parent: 4812
   - uid: 10443
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-16.5
       parent: 4812
   - uid: 10444
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,-16.5
       parent: 4812
   - uid: 10447
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-16.5
       parent: 4812
   - uid: 10448
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-17.5
       parent: 4812
   - uid: 10449
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-17.5
       parent: 4812
   - uid: 10452
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-17.5
       parent: 4812
   - uid: 10453
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-17.5
       parent: 4812
   - uid: 10454
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-17.5
       parent: 4812
   - uid: 10455
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-17.5
       parent: 4812
   - uid: 10456
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-17.5
       parent: 4812
   - uid: 10457
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-18.5
       parent: 4812
   - uid: 10458
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-18.5
       parent: 4812
   - uid: 10460
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,29.5
       parent: 4812
   - uid: 10461
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-19.5
       parent: 4812
   - uid: 10462
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-19.5
       parent: 4812
   - uid: 10463
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,28.5
       parent: 4812
   - uid: 10464
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-14.5
       parent: 4812
   - uid: 10465
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-13.5
       parent: 4812
   - uid: 10466
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-12.5
       parent: 4812
   - uid: 10467
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-11.5
       parent: 4812
   - uid: 10468
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-10.5
       parent: 4812
   - uid: 10469
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-9.5
       parent: 4812
   - uid: 10470
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-8.5
       parent: 4812
   - uid: 10472
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -57.5,-10.5
       parent: 4812
   - uid: 10473
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -57.5,-11.5
       parent: 4812
   - uid: 10474
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,28.5
       parent: 4812
   - uid: 10475
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -57.5,-13.5
       parent: 4812
   - uid: 10476
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -57.5,-14.5
       parent: 4812
   - uid: 10477
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -57.5,-15.5
       parent: 4812
   - uid: 10478
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -58.5,-13.5
       parent: 4812
   - uid: 10479
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -58.5,-12.5
       parent: 4812
   - uid: 10480
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -58.5,-11.5
       parent: 4812
   - uid: 10481
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -58.5,-10.5
       parent: 4812
   - uid: 10482
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -58.5,-9.5
       parent: 4812
   - uid: 10483
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-7.5
       parent: 4812
   - uid: 10484
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -57.5,-8.5
       parent: 4812
   - uid: 10485
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -58.5,-8.5
       parent: 4812
   - uid: 10486
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-2.5
       parent: 4812
   - uid: 10926
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,14.5
       parent: 4812
   - uid: 10927
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,15.5
       parent: 4812
   - uid: 10928
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,16.5
       parent: 4812
   - uid: 10929
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,17.5
       parent: 4812
   - uid: 10941
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,24.5
       parent: 4812
   - uid: 10942
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,25.5
       parent: 4812
   - uid: 10943
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,26.5
       parent: 4812
   - uid: 10944
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,27.5
       parent: 4812
   - uid: 10945
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,24.5
       parent: 4812
   - uid: 10947
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,26.5
       parent: 4812
   - uid: 10948
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,27.5
       parent: 4812
   - uid: 10949
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,28.5
       parent: 4812
   - uid: 10950
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,29.5
       parent: 4812
   - uid: 10951
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,30.5
       parent: 4812
   - uid: 10952
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,31.5
       parent: 4812
   - uid: 10953
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,32.5
       parent: 4812
   - uid: 10954
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,33.5
       parent: 4812
   - uid: 10955
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,32.5
       parent: 4812
   - uid: 10956
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,31.5
       parent: 4812
   - uid: 10957
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,30.5
       parent: 4812
   - uid: 10963
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,24.5
       parent: 4812
   - uid: 10965
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,15.5
       parent: 4812
   - uid: 10966
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,16.5
       parent: 4812
   - uid: 10967
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,17.5
       parent: 4812
   - uid: 10969
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,19.5
       parent: 4812
   - uid: 10970
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,20.5
       parent: 4812
   - uid: 10971
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,21.5
       parent: 4812
   - uid: 10972
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,22.5
       parent: 4812
   - uid: 10973
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,23.5
       parent: 4812
   - uid: 10974
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,24.5
       parent: 4812
   - uid: 10975
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,24.5
       parent: 4812
   - uid: 10977
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,24.5
       parent: 4812
   - uid: 10982
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,23.5
       parent: 4812
   - uid: 10983
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,18.5
       parent: 4812
   - uid: 10984
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,31.5
       parent: 4812
   - uid: 10986
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,33.5
       parent: 4812
   - uid: 10987
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,33.5
       parent: 4812
   - uid: 10988
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,33.5
       parent: 4812
   - uid: 10990
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,32.5
       parent: 4812
   - uid: 10991
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,31.5
       parent: 4812
   - uid: 10992
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,30.5
       parent: 4812
   - uid: 10993
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,29.5
       parent: 4812
   - uid: 10994
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,28.5
       parent: 4812
   - uid: 10995
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,27.5
       parent: 4812
   - uid: 10999
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,26.5
       parent: 4812
   - uid: 11000
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,27.5
       parent: 4812
   - uid: 11001
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,28.5
       parent: 4812
   - uid: 11002
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,29.5
       parent: 4812
   - uid: 11003
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,30.5
       parent: 4812
   - uid: 11004
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,31.5
       parent: 4812
   - uid: 11005
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,32.5
       parent: 4812
   - uid: 11009
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,17.5
       parent: 4812
   - uid: 11010
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,18.5
       parent: 4812
   - uid: 11011
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,19.5
       parent: 4812
   - uid: 11012
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,20.5
       parent: 4812
   - uid: 11013
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,21.5
       parent: 4812
   - uid: 11014
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,24.5
       parent: 4812
   - uid: 11016
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,24.5
       parent: 4812
   - uid: 11017
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,25.5
       parent: 4812
   - uid: 11018
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,26.5
       parent: 4812
   - uid: 11019
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,21.5
       parent: 4812
   - uid: 11020
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,22.5
       parent: 4812
   - uid: 11021
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,23.5
       parent: 4812
   - uid: 11022
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,24.5
       parent: 4812
   - uid: 11023
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,25.5
       parent: 4812
   - uid: 11024
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,26.5
       parent: 4812
   - uid: 11025
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,25.5
       parent: 4812
   - uid: 11026
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,26.5
       parent: 4812
   - uid: 11027
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,27.5
       parent: 4812
   - uid: 11028
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,28.5
       parent: 4812
   - uid: 11029
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,29.5
       parent: 4812
   - uid: 11616
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-30.5
       parent: 4812
   - uid: 11621
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-39.5
       parent: 4812
   - uid: 11622
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-41.5
       parent: 4812
   - uid: 11623
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 33.5,-41.5
       parent: 4812
   - uid: 11624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,-41.5
       parent: 4812
   - uid: 11625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-41.5
       parent: 4812
   - uid: 11626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-39.5
       parent: 4812
   - uid: 11627
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-39.5
       parent: 4812
   - uid: 11628
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-40.5
       parent: 4812
   - uid: 11629
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-40.5
       parent: 4812
   - uid: 11630
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-41.5
       parent: 4812
   - uid: 11631
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-42.5
       parent: 4812
   - uid: 11632
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-40.5
       parent: 4812
   - uid: 11633
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-41.5
       parent: 4812
   - uid: 11634
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-40.5
       parent: 4812
   - uid: 11635
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-42.5
       parent: 4812
   - uid: 11636
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-42.5
       parent: 4812
   - uid: 11637
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-43.5
       parent: 4812
   - uid: 11638
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-43.5
       parent: 4812
   - uid: 11639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-43.5
       parent: 4812
   - uid: 11640
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-44.5
       parent: 4812
   - uid: 11641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-44.5
       parent: 4812
   - uid: 11643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-44.5
       parent: 4812
   - uid: 11644
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-44.5
       parent: 4812
   - uid: 11645
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-44.5
       parent: 4812
   - uid: 11647
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-45.5
       parent: 4812
   - uid: 11648
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-45.5
       parent: 4812
   - uid: 11649
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-45.5
       parent: 4812
   - uid: 11650
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-45.5
       parent: 4812
   - uid: 11651
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-45.5
       parent: 4812
   - uid: 11652
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-45.5
       parent: 4812
   - uid: 11653
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-46.5
       parent: 4812
   - uid: 11654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-46.5
       parent: 4812
   - uid: 11655
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-46.5
       parent: 4812
   - uid: 11656
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,-46.5
       parent: 4812
   - uid: 11657
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-46.5
       parent: 4812
   - uid: 11658
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-46.5
       parent: 4812
   - uid: 11659
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-44.5
       parent: 4812
   - uid: 11660
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-43.5
       parent: 4812
   - uid: 11663
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-38.5
       parent: 4812
   - uid: 11664
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-41.5
       parent: 4812
   - uid: 11665
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-42.5
       parent: 4812
   - uid: 11666
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-43.5
       parent: 4812
   - uid: 11667
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-44.5
       parent: 4812
   - uid: 11668
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-44.5
       parent: 4812
   - uid: 11669
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-43.5
       parent: 4812
   - uid: 11670
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-42.5
       parent: 4812
   - uid: 11679
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-38.5
       parent: 4812
   - uid: 11680
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-43.5
       parent: 4812
   - uid: 11681
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-44.5
       parent: 4812
   - uid: 11682
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-44.5
       parent: 4812
   - uid: 11683
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-43.5
       parent: 4812
   - uid: 11684
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-38.5
       parent: 4812
   - uid: 11686
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-38.5
       parent: 4812
   - uid: 11689
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-43.5
       parent: 4812
   - uid: 11690
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-42.5
       parent: 4812
   - uid: 11691
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-40.5
       parent: 4812
   - uid: 11695
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-42.5
       parent: 4812
   - uid: 11696
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-42.5
       parent: 4812
   - uid: 11697
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-43.5
       parent: 4812
   - uid: 11698
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-43.5
       parent: 4812
   - uid: 11699
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-42.5
       parent: 4812
   - uid: 11700
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,-42.5
       parent: 4812
   - uid: 11701
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 33.5,-42.5
       parent: 4812
   - uid: 11702
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-40.5
       parent: 4812
   - uid: 11703
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-39.5
       parent: 4812
   - uid: 11704
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-38.5
       parent: 4812
   - uid: 11705
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-41.5
       parent: 4812
   - uid: 12144
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-25.5
       parent: 4812
@@ -10685,8 +9418,6 @@ entities:
   entities:
   - uid: 12146
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,-3.5
       parent: 4812
@@ -11056,8 +9787,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -29.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: Beaker
   entities:
   - uid: 9030
@@ -11293,22 +10022,16 @@ entities:
   entities:
   - uid: 729
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,18.5
       parent: 4812
   - uid: 771
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,18.5
       parent: 4812
   - uid: 2864
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,24.5
       parent: 4812
@@ -11317,8 +10040,6 @@ entities:
       - 2938
   - uid: 2866
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,28.5
       parent: 4812
@@ -11327,8 +10048,6 @@ entities:
       - 2938
   - uid: 5573
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-30.5
       parent: 4812
@@ -11337,8 +10056,6 @@ entities:
       - 6690
   - uid: 5574
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-29.5
       parent: 4812
@@ -11347,8 +10064,6 @@ entities:
       - 6690
   - uid: 5575
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-28.5
       parent: 4812
@@ -11357,8 +10072,6 @@ entities:
       - 6690
   - uid: 5794
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-27.5
       parent: 4812
@@ -11367,8 +10080,6 @@ entities:
       - 6218
   - uid: 5795
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-26.5
       parent: 4812
@@ -11377,8 +10088,6 @@ entities:
       - 6218
   - uid: 5796
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-25.5
       parent: 4812
@@ -11387,8 +10096,6 @@ entities:
       - 6218
   - uid: 9496
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -44.5,18.5
       parent: 4812
@@ -11402,22 +10109,30 @@ entities:
     - type: Transform
       pos: 27.5,-0.5
       parent: 4812
+    - type: SpamEmitSound
+      enabled: False
   - uid: 5026
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -9.5,-47.5
       parent: 4812
+    - type: SpamEmitSound
+      enabled: False
   - uid: 8399
     components:
     - type: Transform
       pos: -26.5,32.5
       parent: 4812
+    - type: SpamEmitSound
+      enabled: False
   - uid: 10853
     components:
     - type: Transform
       pos: -22.5,5.5
       parent: 4812
+    - type: SpamEmitSound
+      enabled: False
 - proto: BookAtmosAirAlarms
   entities:
   - uid: 865
@@ -11446,33 +10161,29 @@ entities:
     - type: Transform
       pos: -25.436514,-18.48842
       parent: 4812
-- proto: BookDetective
+- proto: BookRandom
   entities:
-  - uid: 5387
+  - uid: 7161
     components:
     - type: Transform
-      pos: 17.568647,-11.417019
+      pos: -30.557493,-18.387486
       parent: 4812
-- proto: BookEscalation
+- proto: BookRandomStory
   entities:
-  - uid: 12421
+  - uid: 5387
     components:
     - type: Transform
-      pos: -30.59653,-19.308746
+      pos: 17.568647,-11.417019
       parent: 4812
-- proto: BookEscalationSecurity
-  entities:
   - uid: 10446
     components:
     - type: Transform
       pos: -30.424656,-19.480621
       parent: 4812
-- proto: BookRandom
-  entities:
-  - uid: 7161
+  - uid: 12421
     components:
     - type: Transform
-      pos: -30.557493,-18.387486
+      pos: -30.59653,-19.308746
       parent: 4812
 - proto: BooksBag
   entities:
@@ -11485,78 +10196,56 @@ entities:
   entities:
   - uid: 1952
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,25.5
       parent: 4812
   - uid: 5374
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-18.5
       parent: 4812
   - uid: 7000
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-32.5
       parent: 4812
   - uid: 7001
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-36.5
       parent: 4812
   - uid: 7005
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-38.5
       parent: 4812
   - uid: 7130
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-22.5
       parent: 4812
   - uid: 7131
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-21.5
       parent: 4812
   - uid: 7172
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-39.5
       parent: 4812
   - uid: 8391
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,32.5
       parent: 4812
   - uid: 8392
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,29.5
       parent: 4812
   - uid: 11352
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-32.5
       parent: 4812
@@ -11564,113 +10253,81 @@ entities:
   entities:
   - uid: 4816
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-20.5
       parent: 4812
   - uid: 4817
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-18.5
       parent: 4812
   - uid: 4818
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-18.5
       parent: 4812
   - uid: 4819
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-20.5
       parent: 4812
   - uid: 4820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-20.5
       parent: 4812
   - uid: 4821
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-20.5
       parent: 4812
   - uid: 4822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-18.5
       parent: 4812
   - uid: 4823
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-20.5
       parent: 4812
   - uid: 4824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-18.5
       parent: 4812
   - uid: 4825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-18.5
       parent: 4812
   - uid: 4835
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-14.5
       parent: 4812
   - uid: 4836
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-14.5
       parent: 4812
   - uid: 4837
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-16.5
       parent: 4812
   - uid: 4839
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-19.5
       parent: 4812
   - uid: 4840
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-18.5
       parent: 4812
   - uid: 4841
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-17.5
       parent: 4812
@@ -26916,8 +25573,6 @@ entities:
     - type: Transform
       pos: -53.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: Carpet
   entities:
   - uid: 1739
@@ -29683,18 +28338,6 @@ entities:
     - type: Transform
       pos: -17.5785,-25.512428
       parent: 4812
-- proto: chem_master
-  entities:
-  - uid: 6606
-    components:
-    - type: Transform
-      pos: -8.5,-15.5
-      parent: 4812
-  - uid: 6607
-    components:
-    - type: Transform
-      pos: -12.5,-17.5
-      parent: 4812
 - proto: ChemDispenser
   entities:
   - uid: 6604
@@ -29726,6 +28369,18 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 4812
+- proto: ChemMaster
+  entities:
+  - uid: 6606
+    components:
+    - type: Transform
+      pos: -8.5,-15.5
+      parent: 4812
+  - uid: 6607
+    components:
+    - type: Transform
+      pos: -12.5,-17.5
+      parent: 4812
 - proto: ChessBoard
   entities:
   - uid: 11880
@@ -31862,25 +30517,13 @@ entities:
     - type: Transform
       pos: -44.4085,-23.673323
       parent: 4812
-- proto: ClothingHeadHatFlowerCrown
+- proto: ClothingHeadHatFlowerWreath
   entities:
   - uid: 7254
     components:
     - type: Transform
       pos: -24.594517,-34.532703
       parent: 4812
-- proto: ClothingHeadHatHairflower
-  entities:
-  - uid: 2716
-    components:
-    - type: Transform
-      pos: -5.180887,24.379204
-      parent: 4812
-  - uid: 12475
-    components:
-    - type: Transform
-      pos: -24.401733,-34.40146
-      parent: 4812
 - proto: ClothingHeadHatHardhatOrange
   entities:
   - uid: 12119
@@ -31920,8 +30563,6 @@ entities:
   entities:
   - uid: 10924
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 10921
     - type: Physics
@@ -32159,8 +30800,6 @@ entities:
   entities:
   - uid: 10922
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 10921
     - type: Physics
@@ -32283,8 +30922,6 @@ entities:
   entities:
   - uid: 6765
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 3441
     - type: Physics
@@ -32481,8 +31118,6 @@ entities:
   entities:
   - uid: 10923
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 10921
     - type: Physics
@@ -33904,6 +32539,9 @@ entities:
     - type: Transform
       pos: -3.5,26.5
       parent: 4812
+    - type: SingletonDeviceNetServer
+      active: False
+      available: False
 - proto: Crowbar
   entities:
   - uid: 3469
@@ -33966,15 +32604,11 @@ entities:
     - type: Transform
       pos: -15.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7219
     components:
     - type: Transform
       pos: -13.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: CryoxadoneBeakerSmall
   entities:
   - uid: 3269
@@ -37321,8 +35955,6 @@ entities:
   entities:
   - uid: 4992
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 4991
     - type: Physics
@@ -37331,8 +35963,6 @@ entities:
   entities:
   - uid: 6663
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 6662
     - type: Physics
@@ -37341,8 +35971,6 @@ entities:
   entities:
   - uid: 7268
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 7267
     - type: Physics
@@ -37351,8 +35979,6 @@ entities:
   entities:
   - uid: 7291
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 7290
     - type: Physics
@@ -37361,8 +35987,6 @@ entities:
   entities:
   - uid: 331
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 330
     - type: Physics
@@ -37371,8 +35995,6 @@ entities:
   entities:
   - uid: 7248
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 7247
     - type: Physics
@@ -37381,8 +36003,6 @@ entities:
   entities:
   - uid: 7269
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 7267
     - type: Physics
@@ -37613,8 +36233,6 @@ entities:
     - type: DeviceList
       devices:
       - 5039
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4979
     components:
     - type: Transform
@@ -37627,16 +36245,12 @@ entities:
       - 5047
       - 6553
       - 8806
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 6781
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8804
     components:
     - type: Transform
@@ -37650,8 +36264,6 @@ entities:
       - 4920
       - 8838
       - 8836
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 10750
     components:
     - type: Transform
@@ -37666,8 +36278,6 @@ entities:
       - 10754
       - 10755
       - 10756
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12180
     components:
     - type: Transform
@@ -37682,8 +36292,6 @@ entities:
       - 10754
       - 10755
       - 10756
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12187
     components:
     - type: Transform
@@ -37697,8 +36305,6 @@ entities:
       - 12189
       - 12188
       - 12185
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12191
     components:
     - type: Transform
@@ -37709,8 +36315,6 @@ entities:
       devices:
       - 12192
       - 8691
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12194
     components:
     - type: Transform
@@ -37728,8 +36332,6 @@ entities:
       - 12189
       - 12197
       - 12196
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12199
     components:
     - type: Transform
@@ -37741,8 +36343,6 @@ entities:
       - 12200
       - 12196
       - 12197
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12203
     components:
     - type: Transform
@@ -37759,8 +36359,6 @@ entities:
       - 8155
       - 12205
       - 12204
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12207
     components:
     - type: Transform
@@ -37771,8 +36369,6 @@ entities:
       - 12208
       - 12204
       - 12205
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12210
     components:
     - type: Transform
@@ -37785,8 +36381,6 @@ entities:
       - 12212
       - 7782
       - 7783
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12217
     components:
     - type: Transform
@@ -37797,8 +36391,6 @@ entities:
       devices:
       - 12216
       - 12212
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12221
     components:
     - type: Transform
@@ -37811,8 +36403,6 @@ entities:
       - 2693
       - 2695
       - 12222
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12224
     components:
     - type: Transform
@@ -37825,8 +36415,6 @@ entities:
       - 2782
       - 2783
       - 12225
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12229
     components:
     - type: Transform
@@ -37838,8 +36426,6 @@ entities:
       - 12230
       - 2231
       - 1928
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12233
     components:
     - type: Transform
@@ -37851,8 +36437,6 @@ entities:
       - 12231
       - 2473
       - 2472
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12235
     components:
     - type: Transform
@@ -37866,8 +36450,6 @@ entities:
       - 2472
       - 2231
       - 1928
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12236
     components:
     - type: Transform
@@ -37881,8 +36463,6 @@ entities:
       - 2472
       - 2231
       - 1928
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12238
     components:
     - type: Transform
@@ -37894,8 +36474,6 @@ entities:
       - 2476
       - 963
       - 12239
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12241
     components:
     - type: Transform
@@ -37905,8 +36483,6 @@ entities:
       devices:
       - 12242
       - 1927
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12244
     components:
     - type: Transform
@@ -37921,8 +36497,6 @@ entities:
       - 963
       - 2783
       - 2782
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12246
     components:
     - type: Transform
@@ -37935,8 +36509,6 @@ entities:
       - 2853
       - 12247
       - 3257
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12250
     components:
     - type: Transform
@@ -37952,8 +36524,6 @@ entities:
       - 2853
       - 2787
       - 2786
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12253
     components:
     - type: Transform
@@ -37964,8 +36534,6 @@ entities:
       devices:
       - 3257
       - 12254
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12273
     components:
     - type: Transform
@@ -37979,8 +36547,6 @@ entities:
       - 12274
       - 4122
       - 4117
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12276
     components:
     - type: Transform
@@ -37991,8 +36557,6 @@ entities:
       - 12277
       - 4424
       - 4425
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12280
     components:
     - type: Transform
@@ -38004,8 +36568,6 @@ entities:
       - 12279
       - 4425
       - 4424
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12286
     components:
     - type: Transform
@@ -38019,8 +36581,6 @@ entities:
       - 4426
       - 6415
       - 6414
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12290
     components:
     - type: Transform
@@ -38038,8 +36598,6 @@ entities:
       - 6414
       - 6415
       - 12288
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12291
     components:
     - type: Transform
@@ -38052,8 +36610,6 @@ entities:
       - 12292
       - 6494
       - 6495
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12294
     components:
     - type: Transform
@@ -38067,8 +36623,6 @@ entities:
       - 6500
       - 6499
       - 12295
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12301
     components:
     - type: Transform
@@ -38090,8 +36644,6 @@ entities:
       - 353
       - 352
       - 350
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12305
     components:
     - type: Transform
@@ -38108,8 +36660,6 @@ entities:
       - 352
       - 350
       - 12306
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12310
     components:
     - type: Transform
@@ -38121,8 +36671,6 @@ entities:
       - 782
       - 783
       - 784
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12312
     components:
     - type: Transform
@@ -38135,8 +36683,6 @@ entities:
       - 1940
       - 1939
       - 1938
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12314
     components:
     - type: Transform
@@ -38168,8 +36714,6 @@ entities:
       - 6655
       - 4980
       - 7198
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12317
     components:
     - type: Transform
@@ -38188,8 +36732,6 @@ entities:
       - 8591
       - 8758
       - 8770
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12320
     components:
     - type: Transform
@@ -38201,8 +36743,6 @@ entities:
       - 12321
       - 5072
       - 5071
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12342
     components:
     - type: Transform
@@ -38214,8 +36754,6 @@ entities:
       - 6585
       - 6584
       - 12343
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12348
     components:
     - type: Transform
@@ -38227,8 +36765,6 @@ entities:
       - 12347
       - 5791
       - 5792
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12354
     components:
     - type: Transform
@@ -38240,8 +36776,6 @@ entities:
       - 5600
       - 5599
       - 12355
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 6784
@@ -39705,6 +38239,18 @@ entities:
     - type: Transform
       pos: 9.469537,-39.368214
       parent: 4812
+- proto: FoodPoppy
+  entities:
+  - uid: 2716
+    components:
+    - type: Transform
+      pos: -5.180887,24.379204
+      parent: 4812
+  - uid: 12475
+    components:
+    - type: Transform
+      pos: -24.401733,-34.40146
+      parent: 4812
 - proto: FoodSnackCheesie
   entities:
   - uid: 1775
@@ -39763,8 +38309,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GasFilterFlipped
@@ -39774,8 +38318,6 @@ entities:
     - type: Transform
       pos: -47.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9170
@@ -39783,36 +38325,26 @@ entities:
     - type: Transform
       pos: -47.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9171
     components:
     - type: Transform
       pos: -47.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9172
     components:
     - type: Transform
       pos: -47.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9173
     components:
     - type: Transform
       pos: -47.5,9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9174
     components:
     - type: Transform
       pos: -47.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 9452
@@ -39820,8 +38352,6 @@ entities:
     - type: Transform
       pos: -52.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasMinerNitrogen
   entities:
   - uid: 9449
@@ -39829,8 +38359,6 @@ entities:
     - type: Transform
       pos: -52.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasMinerOxygen
   entities:
   - uid: 9451
@@ -39838,8 +38366,6 @@ entities:
     - type: Transform
       pos: -52.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasMinerWaterVapor
   entities:
   - uid: 9454
@@ -39847,8 +38373,6 @@ entities:
     - type: Transform
       pos: -52.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasMixerFlipped
   entities:
   - uid: 8550
@@ -39856,8 +38380,6 @@ entities:
     - type: Transform
       pos: -45.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8552
     components:
     - type: Transform
@@ -39867,8 +38389,6 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.22000003
       inletOneConcentration: 0.78
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#03FDC3FF'
   - uid: 9236
@@ -39876,29 +38396,21 @@ entities:
     - type: Transform
       pos: -45.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9237
     components:
     - type: Transform
       pos: -45.5,10.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9247
     components:
     - type: Transform
       pos: -45.5,6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9261
     components:
     - type: Transform
       pos: -45.5,12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasOutletInjector
   entities:
   - uid: 4002
@@ -39907,56 +38419,42 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-30.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4445
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4446
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4478
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4479
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4497
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4826
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -51.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasPassiveGate
   entities:
   - uid: 5801
@@ -39965,8 +38463,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-19.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8979
@@ -39975,8 +38471,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -31.5,-33.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasPassiveVent
@@ -39987,47 +38481,35 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 863
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 3817
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 17.5,46.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 5596
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 23.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9005
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -40.5,-37.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9168
     components:
     - type: Transform
       pos: -49.5,-0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9199
@@ -40036,69 +38518,51 @@ entities:
       rot: 3.141592653589793 rad
       pos: -53.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9200
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9201
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9202
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9203
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9204
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -53.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9264
     components:
     - type: Transform
       pos: -47.5,14.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9494
     components:
     - type: Transform
       pos: -45.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9495
     components:
     - type: Transform
       pos: -43.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasPipeBend
   entities:
   - uid: 560
@@ -52101,16 +50565,12 @@ entities:
     - type: Transform
       pos: -29.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 3467
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -34.5,-2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3710
@@ -52119,8 +50579,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3711
@@ -52129,8 +50587,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3712
@@ -52139,8 +50595,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3839
@@ -52149,8 +50603,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,44.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5593
@@ -52159,40 +50611,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 5594
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 29.5,-30.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8839
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9037
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -33.5,-37.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9548
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 9549
@@ -52201,8 +50643,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -41.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 9550
@@ -52211,8 +50651,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -41.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#947507FF'
 - proto: GasPressurePump
@@ -52223,8 +50661,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,46.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4929
@@ -52234,8 +50670,6 @@ entities:
     - type: Transform
       pos: -12.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5583
@@ -52244,24 +50678,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-30.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 5584
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 25.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8773
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -39.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9115
@@ -52270,16 +50698,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9131
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -39.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9206
@@ -52288,47 +50712,35 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9212
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9218
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9224
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,10.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9230
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -47.5,12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9513
     components:
     - type: Transform
       pos: -43.5,12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#947507FF'
   - uid: 9543
@@ -52336,8 +50748,6 @@ entities:
     - type: Transform
       pos: -42.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GasThermoMachineFreezer
@@ -52347,30 +50757,22 @@ entities:
     - type: Transform
       pos: 7.5,-5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 5803
     components:
     - type: Transform
       pos: 12.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 7245
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9551
     components:
     - type: Transform
       pos: -41.5,12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasThermoMachineHeater
   entities:
   - uid: 9552
@@ -52378,8 +50780,6 @@ entities:
     - type: Transform
       pos: -41.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: GasValve
   entities:
   - uid: 5591
@@ -52388,16 +50788,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-30.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 5592
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 28.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9039
     components:
     - type: Transform
@@ -52406,8 +50802,6 @@ entities:
       parent: 4812
     - type: GasValve
       open: False
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9164
     components:
     - type: Transform
@@ -52416,8 +50810,6 @@ entities:
       parent: 4812
     - type: GasValve
       open: False
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9544
@@ -52428,8 +50820,6 @@ entities:
       parent: 4812
     - type: GasValve
       open: False
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#947507FF'
 - proto: GasVentPump
@@ -52440,8 +50830,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -27.5,-12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 710
@@ -52450,8 +50838,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 817
@@ -52460,8 +50846,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,10.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 818
@@ -52470,8 +50854,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 835
@@ -52479,8 +50861,6 @@ entities:
     - type: Transform
       pos: 5.5,-1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 838
@@ -52489,8 +50869,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 846
@@ -52499,8 +50877,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 847
@@ -52509,8 +50885,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 848
@@ -52518,8 +50892,6 @@ entities:
     - type: Transform
       pos: -17.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 849
@@ -52527,8 +50899,6 @@ entities:
     - type: Transform
       pos: -10.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 864
@@ -52537,8 +50907,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 871
@@ -52547,8 +50915,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 877
@@ -52557,8 +50923,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1511
@@ -52566,8 +50930,6 @@ entities:
     - type: Transform
       pos: -22.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1685
@@ -52575,8 +50937,6 @@ entities:
     - type: Transform
       pos: -21.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1770
@@ -52585,8 +50945,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,19.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1814
@@ -52595,8 +50953,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1817
@@ -52605,8 +50961,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1852
@@ -52614,8 +50968,6 @@ entities:
     - type: Transform
       pos: -3.5,23.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2071
@@ -52624,8 +50976,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,24.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2072
@@ -52633,8 +50983,6 @@ entities:
     - type: Transform
       pos: 8.5,29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2429
@@ -52643,8 +50991,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,23.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2430
@@ -52652,8 +50998,6 @@ entities:
     - type: Transform
       pos: -13.5,28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2443
@@ -52662,8 +51006,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2444
@@ -52672,8 +51014,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2445
@@ -52681,8 +51021,6 @@ entities:
     - type: Transform
       pos: -5.5,34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2446
@@ -52690,8 +51028,6 @@ entities:
     - type: Transform
       pos: 0.5,34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2474
@@ -52700,8 +51036,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2475
@@ -52710,8 +51044,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2842
@@ -52720,8 +51052,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2966
@@ -52730,8 +51060,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,14.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2969
@@ -52740,8 +51068,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,14.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2983
@@ -52749,8 +51075,6 @@ entities:
     - type: Transform
       pos: 15.5,29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3019
@@ -52759,8 +51083,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3020
@@ -52769,8 +51091,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3023
@@ -52779,8 +51099,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3024
@@ -52789,8 +51107,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3026
@@ -52799,8 +51115,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3206
@@ -52809,8 +51123,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3708
@@ -52819,8 +51131,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -31.5,-3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3781
@@ -52828,8 +51138,6 @@ entities:
     - type: Transform
       pos: -1.5,-34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3834
@@ -52838,8 +51146,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,45.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3835
@@ -52848,8 +51154,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,44.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3838
@@ -52857,8 +51161,6 @@ entities:
     - type: Transform
       pos: 8.5,51.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3841
@@ -52867,8 +51169,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,45.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3944
@@ -52877,8 +51177,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,43.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4196
@@ -52886,8 +51184,6 @@ entities:
     - type: Transform
       pos: 30.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4197
@@ -52896,8 +51192,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4198
@@ -52906,8 +51200,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4199
@@ -52916,8 +51208,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4200
@@ -52926,8 +51216,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4201
@@ -52936,8 +51224,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4203
@@ -52946,8 +51232,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4231
@@ -52956,8 +51240,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4380
@@ -52966,8 +51248,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4440
@@ -52976,8 +51256,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4441
@@ -52986,8 +51264,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4444
@@ -52996,8 +51272,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4464
@@ -53006,8 +51280,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4890
@@ -53016,8 +51288,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,-18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4941
@@ -53026,8 +51296,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5033
@@ -53036,8 +51304,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5222
@@ -53046,8 +51312,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-52.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5225
@@ -53056,8 +51320,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,-41.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5697
@@ -53065,8 +51327,6 @@ entities:
     - type: Transform
       pos: 4.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5698
@@ -53075,8 +51335,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-24.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5714
@@ -53085,8 +51343,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5715
@@ -53095,8 +51351,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5718
@@ -53105,8 +51359,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-19.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5734
@@ -53115,8 +51367,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5763
@@ -53124,8 +51374,6 @@ entities:
     - type: Transform
       pos: 27.5,-24.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5764
@@ -53134,8 +51382,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5802
@@ -53144,15 +51390,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,-18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 6416
     components:
     - type: Transform
       pos: 8.5,-11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6419
@@ -53161,8 +51403,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6461
@@ -53170,8 +51410,6 @@ entities:
     - type: Transform
       pos: -1.5,-31.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6471
@@ -53179,8 +51417,6 @@ entities:
     - type: Transform
       pos: -2.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6554
@@ -53188,8 +51424,6 @@ entities:
     - type: Transform
       pos: -16.5,-20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6686
@@ -53198,8 +51432,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6821
@@ -53208,8 +51440,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-35.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6840
@@ -53218,8 +51448,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,-36.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6842
@@ -53227,8 +51455,6 @@ entities:
     - type: Transform
       pos: -19.5,-34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7087
@@ -53237,8 +51463,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -25.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7323
@@ -53247,8 +51471,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7379
@@ -53257,8 +51479,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7380
@@ -53266,8 +51486,6 @@ entities:
     - type: Transform
       pos: -9.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7856
@@ -53275,8 +51493,6 @@ entities:
     - type: Transform
       pos: -26.5,30.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7857
@@ -53285,8 +51501,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,23.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7871
@@ -53295,8 +51509,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7872
@@ -53305,8 +51517,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7886
@@ -53315,8 +51525,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,10.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7905
@@ -53325,8 +51533,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,10.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7906
@@ -53334,8 +51540,6 @@ entities:
     - type: Transform
       pos: -35.5,15.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7910
@@ -53344,8 +51548,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,15.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7911
@@ -53354,8 +51556,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7912
@@ -53364,8 +51564,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8238
@@ -53373,8 +51571,6 @@ entities:
     - type: Transform
       pos: -23.5,27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8240
@@ -53383,8 +51579,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8300
@@ -53393,8 +51587,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8306
@@ -53403,8 +51595,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8318
@@ -53413,8 +51603,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -13.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8562
@@ -53422,8 +51610,6 @@ entities:
     - type: Transform
       pos: -18.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8838
@@ -53432,8 +51618,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -16.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8991
@@ -53442,31 +51626,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -39.5,-34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8992
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -36.5,-37.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8993
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -34.5,-34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 10757
     components:
     - type: Transform
       pos: -38.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 11962
@@ -53475,8 +51651,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12027
@@ -53485,8 +51659,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -42.5,-12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12028
@@ -53495,8 +51667,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -49.5,-13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12029
@@ -53505,8 +51675,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12030
@@ -53514,8 +51682,6 @@ entities:
     - type: Transform
       pos: -49.5,-9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12032
@@ -53523,8 +51689,6 @@ entities:
     - type: Transform
       pos: -44.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12035
@@ -53533,8 +51697,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -32.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12037
@@ -53542,8 +51704,6 @@ entities:
     - type: Transform
       pos: -16.5,-11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12039
@@ -53552,8 +51712,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12041
@@ -53562,8 +51720,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasVentScrubber
@@ -53574,8 +51730,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,14.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 814
@@ -53584,8 +51738,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 815
@@ -53594,8 +51746,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 816
@@ -53604,8 +51754,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 857
@@ -53614,8 +51762,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 858
@@ -53623,8 +51769,6 @@ entities:
     - type: Transform
       pos: -10.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 885
@@ -53633,8 +51777,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 1512
@@ -53643,8 +51785,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,-7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 1686
@@ -53653,8 +51793,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 1813
@@ -53663,8 +51801,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 1816
@@ -53673,8 +51809,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 1853
@@ -53682,8 +51816,6 @@ entities:
     - type: Transform
       pos: -1.5,23.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2073
@@ -53691,8 +51823,6 @@ entities:
     - type: Transform
       pos: 6.5,29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2074
@@ -53701,8 +51831,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,24.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2439
@@ -53711,8 +51839,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,23.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2440
@@ -53720,8 +51846,6 @@ entities:
     - type: Transform
       pos: -12.5,28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2441
@@ -53730,8 +51854,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2442
@@ -53740,8 +51862,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2447
@@ -53750,8 +51870,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,31.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2448
@@ -53760,8 +51878,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,31.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2963
@@ -53770,8 +51886,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,14.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3001
@@ -53779,8 +51893,6 @@ entities:
     - type: Transform
       pos: 16.5,29.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3016
@@ -53789,8 +51901,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3017
@@ -53799,8 +51909,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3021
@@ -53809,8 +51917,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3022
@@ -53819,8 +51925,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3027
@@ -53829,8 +51933,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3782
@@ -53838,8 +51940,6 @@ entities:
     - type: Transform
       pos: 10.5,20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3813
@@ -53848,8 +51948,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,44.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3814
@@ -53858,8 +51956,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,43.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3815
@@ -53867,8 +51963,6 @@ entities:
     - type: Transform
       pos: 12.5,51.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3816
@@ -53877,8 +51971,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,45.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4205
@@ -53887,8 +51979,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4214
@@ -53897,8 +51987,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4226
@@ -53906,8 +51994,6 @@ entities:
     - type: Transform
       pos: 24.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4381
@@ -53915,8 +52001,6 @@ entities:
     - type: Transform
       pos: 17.5,-2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4439
@@ -53925,8 +52009,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4442
@@ -53935,8 +52017,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4443
@@ -53945,8 +52025,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4465
@@ -53955,8 +52033,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4875
@@ -53964,8 +52040,6 @@ entities:
     - type: Transform
       pos: -15.5,-15.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 4876
@@ -53974,8 +52048,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,-16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5025
@@ -53983,8 +52055,6 @@ entities:
     - type: Transform
       pos: -18.5,-20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5223
@@ -53993,8 +52063,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,-51.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5224
@@ -54003,8 +52071,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -10.5,-42.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5699
@@ -54013,8 +52079,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-24.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5700
@@ -54022,8 +52086,6 @@ entities:
     - type: Transform
       pos: 3.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5716
@@ -54032,8 +52094,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5717
@@ -54042,8 +52102,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5719
@@ -54052,8 +52110,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5735
@@ -54061,8 +52117,6 @@ entities:
     - type: Transform
       pos: 27.5,-20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5765
@@ -54071,8 +52125,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 27.5,-27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5766
@@ -54081,8 +52133,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 33.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5805
@@ -54091,8 +52141,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 13.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6253
@@ -54101,8 +52149,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6417
@@ -54111,8 +52157,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6420
@@ -54121,8 +52165,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6455
@@ -54131,8 +52173,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-35.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6472
@@ -54141,8 +52181,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6687
@@ -54151,8 +52189,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-32.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6838
@@ -54161,8 +52197,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-36.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6839
@@ -54170,8 +52204,6 @@ entities:
     - type: Transform
       pos: -18.5,-33.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6841
@@ -54180,8 +52212,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -22.5,-37.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7088
@@ -54190,8 +52220,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7227
@@ -54200,8 +52228,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7325
@@ -54210,8 +52236,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,-26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7381
@@ -54220,8 +52244,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -12.5,-20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7382
@@ -54229,8 +52251,6 @@ entities:
     - type: Transform
       pos: -11.5,-17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7858
@@ -54238,8 +52258,6 @@ entities:
     - type: Transform
       pos: -30.5,30.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7873
@@ -54248,8 +52266,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7874
@@ -54258,8 +52274,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,19.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7887
@@ -54268,8 +52282,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7907
@@ -54278,8 +52290,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7908
@@ -54287,8 +52297,6 @@ entities:
     - type: Transform
       pos: -34.5,15.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7909
@@ -54297,8 +52305,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,15.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7913
@@ -54307,8 +52313,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,18.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7914
@@ -54317,8 +52321,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8239
@@ -54326,8 +52328,6 @@ entities:
     - type: Transform
       pos: -22.5,27.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8241
@@ -54336,8 +52336,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8307
@@ -54345,8 +52343,6 @@ entities:
     - type: Transform
       pos: -21.5,20.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8317
@@ -54355,8 +52351,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,16.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8563
@@ -54365,8 +52359,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8787
@@ -54375,8 +52367,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,-2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8836
@@ -54385,8 +52375,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,-25.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8994
@@ -54395,32 +52383,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,-34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9006
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-37.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9007
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -38.5,-34.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 10758
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -38.5,0.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12023
@@ -54428,8 +52408,6 @@ entities:
     - type: Transform
       pos: -48.5,-9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12024
@@ -54438,8 +52416,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12025
@@ -54448,8 +52424,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -48.5,-13.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12026
@@ -54458,8 +52432,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -42.5,-11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12033
@@ -54467,8 +52439,6 @@ entities:
     - type: Transform
       pos: -40.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12034
@@ -54477,8 +52447,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12036
@@ -54486,8 +52454,6 @@ entities:
     - type: Transform
       pos: -30.5,2.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12038
@@ -54496,8 +52462,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-12.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12040
@@ -54505,8 +52469,6 @@ entities:
     - type: Transform
       pos: -24.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12042
@@ -54515,8 +52477,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12044
@@ -54525,8 +52485,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12418
@@ -54535,8 +52493,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GeneratorBasic15kW
@@ -57741,43 +55697,31 @@ entities:
   entities:
   - uid: 1846
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,21.5
       parent: 4812
   - uid: 3287
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,6.5
       parent: 4812
   - uid: 3688
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,45.5
       parent: 4812
   - uid: 3689
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,45.5
       parent: 4812
   - uid: 3690
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,47.5
       parent: 4812
   - uid: 9886
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-12.5
       parent: 4812
@@ -59707,16 +57651,14 @@ entities:
     - type: Transform
       pos: -35.5,12.5
       parent: 4812
-    - type: Lock
-      locked: False
     - type: EntityStorage
       air:
         volume: 200
         immutable: False
         temperature: 293.14957
         moles:
-        - 1.6033952
-        - 6.031821
+        - 1.8742619
+        - 7.050795
         - 0
         - 0
         - 0
@@ -60156,8 +58098,6 @@ entities:
   entities:
   - uid: 12381
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 9099
     - type: Physics
@@ -60288,43 +58228,31 @@ entities:
     - type: Transform
       pos: 15.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 6327
     components:
     - type: Transform
       pos: 25.5,-22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9448
     components:
     - type: Transform
       pos: -53.5,1.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9667
     components:
     - type: Transform
       pos: -33.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9668
     components:
     - type: Transform
       pos: -33.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 11786
     components:
     - type: Transform
       pos: 21.5,-32.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: NuclearBomb
   entities:
   - uid: 1854
@@ -60390,80 +58318,63 @@ entities:
     - type: Transform
       pos: 9.5,17.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 4603
     components:
     - type: Transform
       pos: 14.5,11.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 6328
     components:
     - type: Transform
       pos: 26.5,-22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 8849
     components:
     - type: Transform
       pos: -13.5,-28.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9450
     components:
     - type: Transform
       pos: -53.5,3.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9669
     components:
     - type: Transform
       pos: -32.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9670
     components:
     - type: Transform
       pos: -32.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 10740
     components:
     - type: Transform
       pos: -46.5,-9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 10878
     components:
     - type: Transform
       pos: -34.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 10917
     components:
     - type: Transform
       pos: -47.5,-23.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 11787
     components:
     - type: Transform
       pos: 20.5,-32.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: OxygenTankFilled
   entities:
+  - uid: 11791
+    components:
+    - type: Transform
+      pos: 19.452671,-32.41012
+      parent: 4812
   - uid: 11792
     components:
     - type: Transform
@@ -60905,43 +58816,31 @@ entities:
   entities:
   - uid: 1767
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -2.5035148,7.4145155
       parent: 4812
   - uid: 3963
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 9.496426,48.542255
       parent: 4812
   - uid: 6307
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 26.432638,-19.383717
       parent: 4812
   - uid: 7142
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -28.490486,-14.614019
       parent: 4812
   - uid: 10864
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -22.475502,3.5391276
       parent: 4812
   - uid: 10865
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 6.426591,-28.501112
       parent: 4812
@@ -61037,8 +58936,6 @@ entities:
     - type: Transform
       pos: -53.5,9.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 2779
@@ -61932,8 +59829,6 @@ entities:
   entities:
   - uid: 1515
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-5.5
       parent: 4812
@@ -61941,8 +59836,6 @@ entities:
       powerLoad: 0
   - uid: 1516
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-5.5
       parent: 4812
@@ -61950,8 +59843,6 @@ entities:
       powerLoad: 0
   - uid: 1517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,-8.5
@@ -61960,8 +59851,6 @@ entities:
       powerLoad: 0
   - uid: 1518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -18.5,-8.5
@@ -61970,8 +59859,6 @@ entities:
       powerLoad: 0
   - uid: 1665
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,10.5
@@ -61980,8 +59867,6 @@ entities:
       powerLoad: 0
   - uid: 1666
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,10.5
@@ -61990,8 +59875,6 @@ entities:
       powerLoad: 0
   - uid: 1667
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,1.5
@@ -62000,8 +59883,6 @@ entities:
       powerLoad: 0
   - uid: 1668
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,1.5
@@ -62010,8 +59891,6 @@ entities:
       powerLoad: 0
   - uid: 1669
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,-4.5
@@ -62020,8 +59899,6 @@ entities:
       powerLoad: 0
   - uid: 1670
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,-4.5
@@ -62030,8 +59907,6 @@ entities:
       powerLoad: 0
   - uid: 1671
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,9.5
       parent: 4812
@@ -62039,8 +59914,6 @@ entities:
       powerLoad: 0
   - uid: 1672
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-3.5
@@ -62049,8 +59922,6 @@ entities:
       powerLoad: 0
   - uid: 1673
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,0.5
@@ -62059,8 +59930,6 @@ entities:
       powerLoad: 0
   - uid: 1975
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,15.5
@@ -62069,8 +59938,6 @@ entities:
       powerLoad: 0
   - uid: 1983
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,15.5
@@ -62079,8 +59946,6 @@ entities:
       powerLoad: 0
   - uid: 2541
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 10.5,29.5
@@ -62089,8 +59954,6 @@ entities:
       powerLoad: 0
   - uid: 2542
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,29.5
@@ -62099,8 +59962,6 @@ entities:
       powerLoad: 0
   - uid: 2543
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -15.5,27.5
@@ -62109,8 +59970,6 @@ entities:
       powerLoad: 0
   - uid: 2544
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,22.5
       parent: 4812
@@ -62118,8 +59977,6 @@ entities:
       powerLoad: 0
   - uid: 2545
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,26.5
       parent: 4812
@@ -62127,8 +59984,6 @@ entities:
       powerLoad: 0
   - uid: 2622
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -10.5,28.5
@@ -62137,8 +59992,6 @@ entities:
       powerLoad: 0
   - uid: 2623
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,24.5
       parent: 4812
@@ -62146,8 +59999,6 @@ entities:
       powerLoad: 0
   - uid: 2624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,28.5
@@ -62156,8 +60007,6 @@ entities:
       powerLoad: 0
   - uid: 2625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,28.5
@@ -62166,8 +60015,6 @@ entities:
       powerLoad: 0
   - uid: 2626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,23.5
@@ -62176,8 +60023,6 @@ entities:
       powerLoad: 0
   - uid: 2627
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,23.5
@@ -62186,8 +60031,6 @@ entities:
       powerLoad: 0
   - uid: 2628
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,34.5
       parent: 4812
@@ -62195,8 +60038,6 @@ entities:
       powerLoad: 0
   - uid: 2629
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,34.5
       parent: 4812
@@ -62204,8 +60045,6 @@ entities:
       powerLoad: 0
   - uid: 2630
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,35.5
       parent: 4812
@@ -62213,8 +60052,6 @@ entities:
       powerLoad: 0
   - uid: 2631
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,35.5
       parent: 4812
@@ -62222,8 +60059,6 @@ entities:
       powerLoad: 0
   - uid: 2687
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,31.5
@@ -62232,8 +60067,6 @@ entities:
       powerLoad: 0
   - uid: 2688
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,31.5
@@ -62242,8 +60075,6 @@ entities:
       powerLoad: 0
   - uid: 2689
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,18.5
@@ -62252,8 +60083,6 @@ entities:
       powerLoad: 0
   - uid: 2690
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,18.5
@@ -62262,8 +60091,6 @@ entities:
       powerLoad: 0
   - uid: 2691
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,13.5
@@ -62272,8 +60099,6 @@ entities:
       powerLoad: 0
   - uid: 2692
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,14.5
@@ -62282,8 +60107,6 @@ entities:
       powerLoad: 0
   - uid: 2694
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,20.5
       parent: 4812
@@ -62291,8 +60114,6 @@ entities:
       powerLoad: 0
   - uid: 2696
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,20.5
       parent: 4812
@@ -62300,8 +60121,6 @@ entities:
       powerLoad: 0
   - uid: 2733
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,24.5
@@ -62310,8 +60129,6 @@ entities:
       powerLoad: 0
   - uid: 2734
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,24.5
@@ -62320,8 +60137,6 @@ entities:
       powerLoad: 0
   - uid: 2776
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,31.5
@@ -62330,8 +60145,6 @@ entities:
       powerLoad: 0
   - uid: 2784
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,20.5
       parent: 4812
@@ -62339,8 +60152,6 @@ entities:
       powerLoad: 0
   - uid: 2785
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,20.5
       parent: 4812
@@ -62348,8 +60159,6 @@ entities:
       powerLoad: 0
   - uid: 3216
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,17.5
@@ -62358,8 +60167,6 @@ entities:
       powerLoad: 0
   - uid: 3217
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,13.5
@@ -62368,8 +60175,6 @@ entities:
       powerLoad: 0
   - uid: 3218
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,12.5
@@ -62378,8 +60183,6 @@ entities:
       powerLoad: 0
   - uid: 3219
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,21.5
       parent: 4812
@@ -62387,8 +60190,6 @@ entities:
       powerLoad: 0
   - uid: 3220
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,27.5
       parent: 4812
@@ -62396,8 +60197,6 @@ entities:
       powerLoad: 0
   - uid: 3221
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,23.5
@@ -62406,8 +60205,6 @@ entities:
       powerLoad: 0
   - uid: 3965
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,56.5
       parent: 4812
@@ -62415,8 +60212,6 @@ entities:
       powerLoad: 0
   - uid: 3966
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,50.5
       parent: 4812
@@ -62424,8 +60219,6 @@ entities:
       powerLoad: 0
   - uid: 3967
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,54.5
@@ -62434,8 +60227,6 @@ entities:
       powerLoad: 0
   - uid: 3968
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,50.5
@@ -62444,8 +60235,6 @@ entities:
       powerLoad: 0
   - uid: 3969
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,50.5
@@ -62454,8 +60243,6 @@ entities:
       powerLoad: 0
   - uid: 3970
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,54.5
@@ -62464,8 +60251,6 @@ entities:
       powerLoad: 0
   - uid: 3971
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,43.5
@@ -62474,8 +60259,6 @@ entities:
       powerLoad: 0
   - uid: 3972
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,47.5
       parent: 4812
@@ -62483,8 +60266,6 @@ entities:
       powerLoad: 0
   - uid: 3973
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,47.5
       parent: 4812
@@ -62492,8 +60273,6 @@ entities:
       powerLoad: 0
   - uid: 4468
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,12.5
@@ -62502,8 +60281,6 @@ entities:
       powerLoad: 0
   - uid: 4469
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,4.5
@@ -62512,8 +60289,6 @@ entities:
       powerLoad: 0
   - uid: 4470
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,-5.5
@@ -62522,8 +60297,6 @@ entities:
       powerLoad: 0
   - uid: 4471
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-2.5
       parent: 4812
@@ -62531,8 +60304,6 @@ entities:
       powerLoad: 0
   - uid: 4472
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-9.5
@@ -62541,8 +60312,6 @@ entities:
       powerLoad: 0
   - uid: 4473
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,4.5
       parent: 4812
@@ -62550,8 +60319,6 @@ entities:
       powerLoad: 0
   - uid: 4474
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,-5.5
@@ -62560,8 +60327,6 @@ entities:
       powerLoad: 0
   - uid: 4475
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,0.5
@@ -62570,8 +60335,6 @@ entities:
       powerLoad: 0
   - uid: 4476
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,-7.5
@@ -62580,39 +60343,29 @@ entities:
       powerLoad: 0
   - uid: 4952
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-25.5
       parent: 4812
   - uid: 4953
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -19.5,-23.5
       parent: 4812
   - uid: 4954
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,-27.5
       parent: 4812
   - uid: 4986
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -12.5,-27.5
       parent: 4812
   - uid: 5067
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -10.5,-53.5
@@ -62621,8 +60374,6 @@ entities:
       powerLoad: 0
   - uid: 5068
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -10.5,-40.5
@@ -62631,8 +60382,6 @@ entities:
       powerLoad: 0
   - uid: 5069
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-45.5
       parent: 4812
@@ -62640,8 +60389,6 @@ entities:
       powerLoad: 0
   - uid: 5070
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-45.5
       parent: 4812
@@ -62649,8 +60396,6 @@ entities:
       powerLoad: 0
   - uid: 5283
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-34.5
       parent: 4812
@@ -62658,8 +60403,6 @@ entities:
       powerLoad: 0
   - uid: 5284
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-34.5
       parent: 4812
@@ -62667,8 +60410,6 @@ entities:
       powerLoad: 0
   - uid: 6258
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-14.5
@@ -62677,8 +60418,6 @@ entities:
       powerLoad: 0
   - uid: 6259
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-18.5
@@ -62687,8 +60426,6 @@ entities:
       powerLoad: 0
   - uid: 6260
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-17.5
       parent: 4812
@@ -62696,8 +60433,6 @@ entities:
       powerLoad: 0
   - uid: 6261
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-28.5
@@ -62706,8 +60441,6 @@ entities:
       powerLoad: 0
   - uid: 6262
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-23.5
       parent: 4812
@@ -62715,8 +60448,6 @@ entities:
       powerLoad: 0
   - uid: 6263
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 11.5,-27.5
@@ -62725,8 +60456,6 @@ entities:
       powerLoad: 0
   - uid: 6264
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 16.5,-25.5
@@ -62735,8 +60464,6 @@ entities:
       powerLoad: 0
   - uid: 6265
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-27.5
@@ -62745,8 +60472,6 @@ entities:
       powerLoad: 0
   - uid: 6266
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-20.5
       parent: 4812
@@ -62754,8 +60479,6 @@ entities:
       powerLoad: 0
   - uid: 6267
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-20.5
       parent: 4812
@@ -62763,8 +60486,6 @@ entities:
       powerLoad: 0
   - uid: 6268
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 9.5,-16.5
@@ -62773,8 +60494,6 @@ entities:
       powerLoad: 0
   - uid: 6269
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 23.5,-28.5
@@ -62783,8 +60502,6 @@ entities:
       powerLoad: 0
   - uid: 6270
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,-30.5
@@ -62793,8 +60510,6 @@ entities:
       powerLoad: 0
   - uid: 6271
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-22.5
       parent: 4812
@@ -62802,8 +60517,6 @@ entities:
       powerLoad: 0
   - uid: 6272
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,-26.5
@@ -62812,8 +60525,6 @@ entities:
       powerLoad: 0
   - uid: 6273
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,-22.5
@@ -62822,8 +60533,6 @@ entities:
       powerLoad: 0
   - uid: 6274
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 24.5,-19.5
@@ -62832,8 +60541,6 @@ entities:
       powerLoad: 0
   - uid: 6275
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 28.5,-19.5
@@ -62842,8 +60549,6 @@ entities:
       powerLoad: 0
   - uid: 6276
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-23.5
       parent: 4812
@@ -62851,8 +60556,6 @@ entities:
       powerLoad: 0
   - uid: 6277
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 31.5,-28.5
@@ -62861,8 +60564,6 @@ entities:
       powerLoad: 0
   - uid: 6478
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,-26.5
@@ -62871,8 +60572,6 @@ entities:
       powerLoad: 0
   - uid: 7019
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -19.5,-34.5
@@ -62881,8 +60580,6 @@ entities:
       powerLoad: 0
   - uid: 7024
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,-32.5
@@ -62891,45 +60588,33 @@ entities:
       powerLoad: 0
   - uid: 7028
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-15.5
       parent: 4812
   - uid: 7053
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -22.5,-28.5
       parent: 4812
   - uid: 7288
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-20.5
       parent: 4812
   - uid: 7367
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -17.5,-25.5
       parent: 4812
   - uid: 7397
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-22.5
       parent: 4812
   - uid: 7582
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-20.5
       parent: 4812
@@ -62937,8 +60622,6 @@ entities:
       powerLoad: 0
   - uid: 7583
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-18.5
@@ -62947,8 +60630,6 @@ entities:
       powerLoad: 0
   - uid: 7621
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-21.5
       parent: 4812
@@ -62956,8 +60637,6 @@ entities:
       powerLoad: 0
   - uid: 7622
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-19.5
@@ -62966,8 +60645,6 @@ entities:
       powerLoad: 0
   - uid: 7623
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-11.5
       parent: 4812
@@ -62975,8 +60652,6 @@ entities:
       powerLoad: 0
   - uid: 7624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,-11.5
       parent: 4812
@@ -62984,8 +60659,6 @@ entities:
       powerLoad: 0
   - uid: 7625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-30.5
@@ -62994,8 +60667,6 @@ entities:
       powerLoad: 0
   - uid: 7626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-30.5
@@ -63004,8 +60675,6 @@ entities:
       powerLoad: 0
   - uid: 7627
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-23.5
@@ -63014,8 +60683,6 @@ entities:
       powerLoad: 0
   - uid: 7628
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-23.5
@@ -63024,8 +60691,6 @@ entities:
       powerLoad: 0
   - uid: 7629
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-11.5
       parent: 4812
@@ -63033,8 +60698,6 @@ entities:
       powerLoad: 0
   - uid: 7630
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-11.5
       parent: 4812
@@ -63042,8 +60705,6 @@ entities:
       powerLoad: 0
   - uid: 7631
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-11.5
       parent: 4812
@@ -63051,8 +60712,6 @@ entities:
       powerLoad: 0
   - uid: 7632
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-11.5
       parent: 4812
@@ -63060,8 +60719,6 @@ entities:
       powerLoad: 0
   - uid: 8141
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,12.5
       parent: 4812
@@ -63069,8 +60726,6 @@ entities:
       powerLoad: 0
   - uid: 8142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,16.5
@@ -63079,8 +60734,6 @@ entities:
       powerLoad: 0
   - uid: 8143
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -33.5,16.5
@@ -63089,8 +60742,6 @@ entities:
       powerLoad: 0
   - uid: 8144
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,12.5
@@ -63099,8 +60750,6 @@ entities:
       powerLoad: 0
   - uid: 8145
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -36.5,19.5
@@ -63109,8 +60758,6 @@ entities:
       powerLoad: 0
   - uid: 8247
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -19.5,28.5
@@ -63119,16 +60766,12 @@ entities:
       powerLoad: 0
   - uid: 8251
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -24.5,-27.5
       parent: 4812
   - uid: 8269
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,25.5
       parent: 4812
@@ -63136,8 +60779,6 @@ entities:
       powerLoad: 0
   - uid: 8304
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,18.5
@@ -63146,8 +60787,6 @@ entities:
       powerLoad: 0
   - uid: 8305
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -16.5,15.5
@@ -63156,8 +60795,6 @@ entities:
       powerLoad: 0
   - uid: 8603
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,12.5
       parent: 4812
@@ -63165,8 +60802,6 @@ entities:
       powerLoad: 0
   - uid: 8604
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -18.5,7.5
@@ -63175,8 +60810,6 @@ entities:
       powerLoad: 0
   - uid: 9017
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-33.5
       parent: 4812
@@ -63184,8 +60817,6 @@ entities:
       powerLoad: 0
   - uid: 9311
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,1.5
@@ -63194,8 +60825,6 @@ entities:
       powerLoad: 0
   - uid: 9312
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,3.5
@@ -63204,8 +60833,6 @@ entities:
       powerLoad: 0
   - uid: 9313
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,5.5
@@ -63214,8 +60841,6 @@ entities:
       powerLoad: 0
   - uid: 9314
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,7.5
@@ -63224,8 +60849,6 @@ entities:
       powerLoad: 0
   - uid: 9315
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,9.5
@@ -63234,8 +60857,6 @@ entities:
       powerLoad: 0
   - uid: 9316
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,11.5
@@ -63244,8 +60865,6 @@ entities:
       powerLoad: 0
   - uid: 9317
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,0.5
@@ -63254,8 +60873,6 @@ entities:
       powerLoad: 0
   - uid: 9318
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,4.5
@@ -63264,8 +60881,6 @@ entities:
       powerLoad: 0
   - uid: 9319
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,8.5
@@ -63274,8 +60889,6 @@ entities:
       powerLoad: 0
   - uid: 9320
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,12.5
@@ -63284,8 +60897,6 @@ entities:
       powerLoad: 0
   - uid: 9706
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,14.5
       parent: 4812
@@ -63293,8 +60904,6 @@ entities:
       powerLoad: 0
   - uid: 9707
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,14.5
       parent: 4812
@@ -63302,8 +60911,6 @@ entities:
       powerLoad: 0
   - uid: 9819
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,5.5
       parent: 4812
@@ -63311,8 +60918,6 @@ entities:
       powerLoad: 0
   - uid: 9820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,10.5
@@ -63321,8 +60926,6 @@ entities:
       powerLoad: 0
   - uid: 9821
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,0.5
@@ -63331,8 +60934,6 @@ entities:
       powerLoad: 0
   - uid: 9822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -28.5,1.5
@@ -63341,8 +60942,6 @@ entities:
       powerLoad: 0
   - uid: 9823
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -34.5,1.5
@@ -63351,8 +60950,6 @@ entities:
       powerLoad: 0
   - uid: 10660
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -52.5,-10.5
@@ -63361,8 +60958,6 @@ entities:
       powerLoad: 0
   - uid: 10661
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -54.5,-10.5
@@ -63371,8 +60966,6 @@ entities:
       powerLoad: 0
   - uid: 10680
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-6.5
       parent: 4812
@@ -63380,8 +60973,6 @@ entities:
       powerLoad: 0
   - uid: 10681
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-11.5
       parent: 4812
@@ -63389,8 +60980,6 @@ entities:
       powerLoad: 0
   - uid: 10682
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-10.5
       parent: 4812
@@ -63398,8 +60987,6 @@ entities:
       powerLoad: 0
   - uid: 10684
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -42.5,-18.5
@@ -63408,8 +60995,6 @@ entities:
       powerLoad: 0
   - uid: 10686
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,-5.5
@@ -63418,8 +61003,6 @@ entities:
       powerLoad: 0
   - uid: 10687
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,-9.5
@@ -63428,8 +61011,6 @@ entities:
       powerLoad: 0
   - uid: 10688
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,-2.5
@@ -63438,8 +61019,6 @@ entities:
       powerLoad: 0
   - uid: 10689
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-0.5
       parent: 4812
@@ -63447,8 +61026,6 @@ entities:
       powerLoad: 0
   - uid: 10690
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,8.5
       parent: 4812
@@ -63456,8 +61033,6 @@ entities:
       powerLoad: 0
   - uid: 10691
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,13.5
@@ -63466,8 +61041,6 @@ entities:
       powerLoad: 0
   - uid: 10692
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-1.5
       parent: 4812
@@ -63475,8 +61048,6 @@ entities:
       powerLoad: 0
   - uid: 10693
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-5.5
       parent: 4812
@@ -63484,8 +61055,6 @@ entities:
       powerLoad: 0
   - uid: 10694
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-6.5
       parent: 4812
@@ -63493,8 +61062,6 @@ entities:
       powerLoad: 0
   - uid: 10695
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -45.5,-14.5
@@ -63503,8 +61070,6 @@ entities:
       powerLoad: 0
   - uid: 10920
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,-9.5
@@ -63513,8 +61078,6 @@ entities:
       powerLoad: 0
   - uid: 11246
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-37.5
@@ -63523,8 +61086,6 @@ entities:
       powerLoad: 0
   - uid: 11247
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-41.5
@@ -63533,8 +61094,6 @@ entities:
       powerLoad: 0
   - uid: 11248
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 14.5,-37.5
@@ -63543,8 +61102,6 @@ entities:
       powerLoad: 0
   - uid: 11916
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -17.5,1.5
@@ -63553,8 +61110,6 @@ entities:
       powerLoad: 0
   - uid: 11917
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,5.5
       parent: 4812
@@ -63562,8 +61117,6 @@ entities:
       powerLoad: 0
   - uid: 11918
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -21.5,-1.5
@@ -63572,8 +61125,6 @@ entities:
       powerLoad: 0
   - uid: 11920
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -9.5,-35.5
@@ -63582,8 +61133,6 @@ entities:
       powerLoad: 0
   - uid: 11921
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-14.5
       parent: 4812
@@ -63591,8 +61140,6 @@ entities:
       powerLoad: 0
   - uid: 11923
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,5.5
       parent: 4812
@@ -63600,8 +61147,6 @@ entities:
       powerLoad: 0
   - uid: 11924
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -33.5,-7.5
@@ -63610,8 +61155,6 @@ entities:
       powerLoad: 0
   - uid: 11926
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -38.5,-7.5
@@ -63620,8 +61163,6 @@ entities:
       powerLoad: 0
   - uid: 11961
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,17.5
       parent: 4812
@@ -67594,8 +65135,6 @@ entities:
       parent: 4812
   - uid: 11812
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 11811
     - type: Physics
@@ -69099,29 +66638,21 @@ entities:
   entities:
   - uid: 933
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -6.5,-7.5
       parent: 4812
   - uid: 7186
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -18.5,-26.5
       parent: 4812
   - uid: 9020
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -40.5,-33.5
       parent: 4812
   - uid: 11100
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 10.5,-43.5
       parent: 4812
@@ -69190,7 +66721,7 @@ entities:
     - type: Transform
       pos: -15.503267,29.527489
       parent: 4812
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 364
     components:
@@ -69739,23 +67270,6 @@ entities:
     - type: Transform
       pos: -43.5,6.5
       parent: 4812
-- proto: SpawnMobDrone
-  entities:
-  - uid: 11933
-    components:
-    - type: Transform
-      pos: -13.5,16.5
-      parent: 4812
-  - uid: 11934
-    components:
-    - type: Transform
-      pos: -12.5,16.5
-      parent: 4812
-  - uid: 11935
-    components:
-    - type: Transform
-      pos: -11.5,16.5
-      parent: 4812
 - proto: SpawnMobFoxRenault
   entities:
   - uid: 2621
@@ -70208,20 +67722,6 @@ entities:
     - type: Transform
       pos: -34.5,15.5
       parent: 4812
-- proto: SpawnVehicleJanicart
-  entities:
-  - uid: 1481
-    components:
-    - type: Transform
-      pos: -22.5,-6.5
-      parent: 4812
-- proto: SpawnVehicleSecway
-  entities:
-  - uid: 8348
-    components:
-    - type: Transform
-      pos: -31.5,19.5
-      parent: 4812
 - proto: Spoon
   entities:
   - uid: 1774
@@ -70413,57 +67913,41 @@ entities:
     - type: Transform
       pos: 23.5,-22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 6326
     components:
     - type: Transform
       pos: 24.5,-22.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9553
     components:
     - type: Transform
       pos: -41.5,6.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9554
     components:
     - type: Transform
       pos: -41.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9555
     components:
     - type: Transform
       pos: -41.5,8.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9665
     components:
     - type: Transform
       pos: -34.5,4.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 9666
     components:
     - type: Transform
       pos: -34.5,5.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
   - uid: 12462
     components:
     - type: Transform
       pos: -36.5,26.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: SubstationBasic
   entities:
   - uid: 897
@@ -73157,57 +70641,41 @@ entities:
   entities:
   - uid: 4859
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-13.5
       parent: 4812
   - uid: 5015
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-13.5
       parent: 4812
   - uid: 6679
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-16.5
       parent: 4812
   - uid: 6693
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-35.5
       parent: 4812
   - uid: 6757
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-37.5
       parent: 4812
   - uid: 6758
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-35.5
       parent: 4812
   - uid: 7192
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-17.5
       parent: 4812
   - uid: 7193
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-15.5
       parent: 4812
@@ -73543,26 +71011,10 @@ entities:
     - type: Transform
       pos: -38.5,-33.5
       parent: 4812
-- proto: VehicleKeyJanicart
-  entities:
-  - uid: 1482
-    components:
-    - type: Transform
-      pos: -22.528929,-6.6977267
-      parent: 4812
-- proto: VehicleKeySecway
-  entities:
-  - uid: 8349
-    components:
-    - type: Transform
-      pos: -31.5,20.5
-      parent: 4812
 - proto: VendingBarDrobe
   entities:
   - uid: 1647
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 5.5,6.5
       parent: 4812
@@ -73570,8 +71022,6 @@ entities:
   entities:
   - uid: 9572
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -28.5,2.5
       parent: 4812
@@ -73579,22 +71029,16 @@ entities:
   entities:
   - uid: 12
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 4.5,6.5
       parent: 4812
   - uid: 2606
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -15.5,25.5
       parent: 4812
   - uid: 10494
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -38.5,-22.5
       parent: 4812
@@ -73602,8 +71046,6 @@ entities:
   entities:
   - uid: 3230
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 14.5,19.5
       parent: 4812
@@ -73611,8 +71053,6 @@ entities:
   entities:
   - uid: 2510
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 10.5,26.5
       parent: 4812
@@ -73620,22 +71060,16 @@ entities:
   entities:
   - uid: 923
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 0.5,-6.5
       parent: 4812
   - uid: 4538
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 23.5,-6.5
       parent: 4812
   - uid: 6422
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 2.5,-32.5
       parent: 4812
@@ -73643,8 +71077,6 @@ entities:
   entities:
   - uid: 7036
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -27.5,-35.5
       parent: 4812
@@ -73652,8 +71084,6 @@ entities:
   entities:
   - uid: 1539
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 7.5,-3.5
       parent: 4812
@@ -73661,8 +71091,6 @@ entities:
   entities:
   - uid: 1124
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 3.5,-3.5
       parent: 4812
@@ -73670,8 +71098,6 @@ entities:
   entities:
   - uid: 6608
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -12.5,-15.5
       parent: 4812
@@ -73679,8 +71105,6 @@ entities:
   entities:
   - uid: 741
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -10.5,-14.5
       parent: 4812
@@ -73689,7 +71113,6 @@ entities:
   - uid: 917
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: -6.5,9.5
@@ -73697,7 +71120,6 @@ entities:
   - uid: 2672
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: 0.5,28.5
@@ -73705,7 +71127,6 @@ entities:
   - uid: 4536
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: 21.5,-4.5
@@ -73713,7 +71134,6 @@ entities:
   - uid: 5372
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: 18.5,-18.5
@@ -73721,7 +71141,6 @@ entities:
   - uid: 8268
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: -23.5,25.5
@@ -73729,7 +71148,6 @@ entities:
   - uid: 9077
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: -30.5,-28.5
@@ -73737,7 +71155,6 @@ entities:
   - uid: 10873
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: cigarette machine
     - type: Transform
       pos: -27.5,7.5
@@ -73746,8 +71163,6 @@ entities:
   entities:
   - uid: 10850
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -23.5,-1.5
       parent: 4812
@@ -73756,7 +71171,6 @@ entities:
   - uid: 918
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: 0.5,10.5
@@ -73764,7 +71178,6 @@ entities:
   - uid: 1797
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: -5.5,16.5
@@ -73772,7 +71185,6 @@ entities:
   - uid: 2671
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: -5.5,28.5
@@ -73780,7 +71192,6 @@ entities:
   - uid: 4537
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: 23.5,-5.5
@@ -73788,7 +71199,6 @@ entities:
   - uid: 6356
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: 9.5,-28.5
@@ -73796,7 +71206,6 @@ entities:
   - uid: 10741
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: -45.5,-5.5
@@ -73804,7 +71213,6 @@ entities:
   - uid: 12150
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Hot drinks machine
     - type: Transform
       pos: -27.5,-12.5
@@ -73813,15 +71221,11 @@ entities:
   entities:
   - uid: 4533
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 13.5,2.5
       parent: 4812
   - uid: 5061
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -9.5,-46.5
       parent: 4812
@@ -73829,8 +71233,6 @@ entities:
   entities:
   - uid: 9584
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 0.5,-3.5
       parent: 4812
@@ -73845,8 +71247,6 @@ entities:
   entities:
   - uid: 5361
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 20.5,-14.5
       parent: 4812
@@ -73855,7 +71255,6 @@ entities:
   - uid: 1552
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Dinnerware
     - type: Transform
       pos: 2.5,-3.5
@@ -73864,8 +71263,6 @@ entities:
   entities:
   - uid: 919
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 0.5,11.5
       parent: 4812
@@ -73873,8 +71270,6 @@ entities:
   entities:
   - uid: 12516
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -38.5,-7.5
       parent: 4812
@@ -73882,8 +71277,6 @@ entities:
   entities:
   - uid: 9722
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -31.5,-5.5
       parent: 4812
@@ -73891,8 +71284,6 @@ entities:
   entities:
   - uid: 7070
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -30.5,-14.5
       parent: 4812
@@ -73900,8 +71291,6 @@ entities:
   entities:
   - uid: 2607
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -14.5,-18.5
       parent: 4812
@@ -73909,8 +71298,6 @@ entities:
   entities:
   - uid: 1565
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 6.5,-3.5
       parent: 4812
@@ -73918,8 +71305,6 @@ entities:
   entities:
   - uid: 1094
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -18.5,-7.5
       parent: 4812
@@ -73927,8 +71312,6 @@ entities:
   entities:
   - uid: 1480
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -20.5,-9.5
       parent: 4812
@@ -73936,8 +71319,6 @@ entities:
   entities:
   - uid: 8275
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -16.5,17.5
       parent: 4812
@@ -73945,8 +71326,6 @@ entities:
   entities:
   - uid: 7188
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -8.5,-28.5
       parent: 4812
@@ -73954,8 +71333,6 @@ entities:
   entities:
   - uid: 7399
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -8.5,-25.5
       parent: 4812
@@ -73963,15 +71340,11 @@ entities:
   entities:
   - uid: 1092
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -7.5,-5.5
       parent: 4812
   - uid: 11785
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 25.5,-32.5
       parent: 4812
@@ -73979,8 +71352,6 @@ entities:
   entities:
   - uid: 6223
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 11.5,-26.5
       parent: 4812
@@ -73988,8 +71359,6 @@ entities:
   entities:
   - uid: 737
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 4.5,-23.5
       parent: 4812
@@ -73998,7 +71367,6 @@ entities:
   - uid: 3434
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: Salvage Equipment
     - type: Transform
       pos: 23.5,16.5
@@ -74007,8 +71375,6 @@ entities:
   entities:
   - uid: 5513
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 25.5,-26.5
       parent: 4812
@@ -74016,15 +71382,11 @@ entities:
   entities:
   - uid: 8342
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -31.5,13.5
       parent: 4812
   - uid: 8420
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -36.5,12.5
       parent: 4812
@@ -74032,15 +71394,11 @@ entities:
   entities:
   - uid: 6439
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -3.5,-29.5
       parent: 4812
   - uid: 12506
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -34.5,10.5
       parent: 4812
@@ -74048,8 +71406,6 @@ entities:
   entities:
   - uid: 1091
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -8.5,-5.5
       parent: 4812
@@ -74057,8 +71413,6 @@ entities:
   entities:
   - uid: 6240
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -29.5,32.5
       parent: 4812
@@ -74066,22 +71420,16 @@ entities:
   entities:
   - uid: 920
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 0.5,-7.5
       parent: 4812
   - uid: 4530
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 13.5,1.5
       parent: 4812
   - uid: 5060
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -9.5,-45.5
       parent: 4812
@@ -74089,8 +71437,6 @@ entities:
   entities:
   - uid: 11780
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 29.5,-32.5
       parent: 4812
@@ -74098,8 +71444,6 @@ entities:
   entities:
   - uid: 6165
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -28.5,32.5
       parent: 4812
@@ -74108,7 +71452,6 @@ entities:
   - uid: 739
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: tank dispenser
     - type: Transform
       pos: 7.5,15.5
@@ -74116,7 +71459,6 @@ entities:
   - uid: 9577
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: tank dispenser
     - type: Transform
       pos: -31.5,1.5
@@ -74125,15 +71467,12 @@ entities:
   entities:
   - uid: 732
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: 9.5,14.5
       parent: 4812
   - uid: 6312
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: tank dispenser
     - type: Transform
       pos: 26.5,-26.5
@@ -74141,7 +71480,6 @@ entities:
   - uid: 10708
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: tank dispenser
     - type: Transform
       pos: -35.5,-9.5
@@ -74149,7 +71487,6 @@ entities:
   - uid: 12113
     components:
     - type: MetaData
-      flags: SessionSpecific
       name: tank dispenser
     - type: Transform
       pos: -42.5,-3.5
@@ -74158,15 +71495,11 @@ entities:
   entities:
   - uid: 1692
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -7.5,1.5
       parent: 4812
   - uid: 9045
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -26.5,-39.5
       parent: 4812
@@ -74174,8 +71507,6 @@ entities:
   entities:
   - uid: 8578
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -18.5,7.5
       parent: 4812
@@ -74183,8 +71514,6 @@ entities:
   entities:
   - uid: 8871
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -37.5,-33.5
       parent: 4812
@@ -74192,15 +71521,11 @@ entities:
   entities:
   - uid: 8577
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -19.5,7.5
       parent: 4812
   - uid: 9723
     components:
-    - type: MetaData
-      flags: SessionSpecific
     - type: Transform
       pos: -32.5,-5.5
       parent: 4812
@@ -74243,6848 +71568,4894 @@ entities:
   entities:
   - uid: 32
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,15.5
       parent: 4812
   - uid: 35
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,15.5
       parent: 4812
   - uid: 122
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,18.5
       parent: 4812
   - uid: 123
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,18.5
       parent: 4812
   - uid: 124
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,15.5
       parent: 4812
   - uid: 125
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,18.5
       parent: 4812
   - uid: 126
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,18.5
       parent: 4812
   - uid: 127
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,15.5
       parent: 4812
   - uid: 138
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,18.5
       parent: 4812
   - uid: 160
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,18.5
       parent: 4812
   - uid: 170
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,17.5
       parent: 4812
   - uid: 171
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,16.5
       parent: 4812
   - uid: 172
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,15.5
       parent: 4812
   - uid: 173
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,14.5
       parent: 4812
   - uid: 174
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,13.5
       parent: 4812
   - uid: 176
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,18.5
       parent: 4812
   - uid: 297
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,17.5
       parent: 4812
   - uid: 298
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,16.5
       parent: 4812
   - uid: 299
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,15.5
       parent: 4812
   - uid: 300
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,14.5
       parent: 4812
   - uid: 301
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,14.5
       parent: 4812
   - uid: 302
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,14.5
       parent: 4812
   - uid: 303
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,14.5
       parent: 4812
   - uid: 304
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,14.5
       parent: 4812
   - uid: 305
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,14.5
       parent: 4812
   - uid: 306
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,14.5
       parent: 4812
   - uid: 721
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,14.5
       parent: 4812
   - uid: 722
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,13.5
       parent: 4812
   - uid: 724
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,13.5
       parent: 4812
   - uid: 725
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,13.5
       parent: 4812
   - uid: 726
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,13.5
       parent: 4812
   - uid: 727
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,13.5
       parent: 4812
   - uid: 728
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,13.5
       parent: 4812
   - uid: 772
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,18.5
       parent: 4812
   - uid: 773
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,18.5
       parent: 4812
   - uid: 1819
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,21.5
       parent: 4812
   - uid: 1820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,21.5
       parent: 4812
   - uid: 1821
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,21.5
       parent: 4812
   - uid: 1822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,21.5
       parent: 4812
   - uid: 1823
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,22.5
       parent: 4812
   - uid: 1824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,23.5
       parent: 4812
   - uid: 1825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,24.5
       parent: 4812
   - uid: 1826
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,25.5
       parent: 4812
   - uid: 1827
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,26.5
       parent: 4812
   - uid: 1828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,27.5
       parent: 4812
   - uid: 1829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,21.5
       parent: 4812
   - uid: 1830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,21.5
       parent: 4812
   - uid: 1831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,21.5
       parent: 4812
   - uid: 1832
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,21.5
       parent: 4812
   - uid: 1833
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,22.5
       parent: 4812
   - uid: 1834
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,23.5
       parent: 4812
   - uid: 1836
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,25.5
       parent: 4812
   - uid: 1837
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,26.5
       parent: 4812
   - uid: 1838
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,27.5
       parent: 4812
   - uid: 1839
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,27.5
       parent: 4812
   - uid: 1840
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,27.5
       parent: 4812
   - uid: 1841
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,27.5
       parent: 4812
   - uid: 1842
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,27.5
       parent: 4812
   - uid: 1857
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,31.5
       parent: 4812
   - uid: 1859
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,31.5
       parent: 4812
   - uid: 1861
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,31.5
       parent: 4812
   - uid: 1862
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,31.5
       parent: 4812
   - uid: 1863
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,33.5
       parent: 4812
   - uid: 1864
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,33.5
       parent: 4812
   - uid: 1865
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,35.5
       parent: 4812
   - uid: 1866
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,35.5
       parent: 4812
   - uid: 1867
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,36.5
       parent: 4812
   - uid: 1868
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,36.5
       parent: 4812
   - uid: 1885
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,33.5
       parent: 4812
   - uid: 1886
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,33.5
       parent: 4812
   - uid: 1887
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,32.5
       parent: 4812
   - uid: 1888
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,31.5
       parent: 4812
   - uid: 1889
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,30.5
       parent: 4812
   - uid: 1890
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,30.5
       parent: 4812
   - uid: 1891
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,30.5
       parent: 4812
   - uid: 1892
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,30.5
       parent: 4812
   - uid: 1893
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,21.5
       parent: 4812
   - uid: 1894
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,22.5
       parent: 4812
   - uid: 1895
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,23.5
       parent: 4812
   - uid: 1896
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,21.5
       parent: 4812
   - uid: 1899
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,27.5
       parent: 4812
   - uid: 1900
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,28.5
       parent: 4812
   - uid: 1901
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,29.5
       parent: 4812
   - uid: 1903
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,22.5
       parent: 4812
   - uid: 1904
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,23.5
       parent: 4812
   - uid: 1905
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,24.5
       parent: 4812
   - uid: 1906
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,25.5
       parent: 4812
   - uid: 1907
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,26.5
       parent: 4812
   - uid: 1908
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,27.5
       parent: 4812
   - uid: 1909
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,28.5
       parent: 4812
   - uid: 1910
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,29.5
       parent: 4812
   - uid: 1911
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,30.5
       parent: 4812
   - uid: 1912
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,31.5
       parent: 4812
   - uid: 1913
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,31.5
       parent: 4812
   - uid: 1914
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,31.5
       parent: 4812
   - uid: 1915
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,30.5
       parent: 4812
   - uid: 1916
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,30.5
       parent: 4812
   - uid: 1920
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,23.5
       parent: 4812
   - uid: 1921
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,23.5
       parent: 4812
   - uid: 1922
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,23.5
       parent: 4812
   - uid: 1923
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,21.5
       parent: 4812
   - uid: 1946
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,25.5
       parent: 4812
   - uid: 1947
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,26.5
       parent: 4812
   - uid: 1948
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,21.5
       parent: 4812
   - uid: 1949
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,21.5
       parent: 4812
   - uid: 1950
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,21.5
       parent: 4812
   - uid: 1951
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,21.5
       parent: 4812
   - uid: 1954
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,21.5
       parent: 4812
   - uid: 1955
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,21.5
       parent: 4812
   - uid: 1956
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,30.5
       parent: 4812
   - uid: 1957
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,30.5
       parent: 4812
   - uid: 1958
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,30.5
       parent: 4812
   - uid: 1959
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,30.5
       parent: 4812
   - uid: 1960
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,30.5
       parent: 4812
   - uid: 1961
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,30.5
       parent: 4812
   - uid: 1967
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,27.5
       parent: 4812
   - uid: 1968
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,28.5
       parent: 4812
   - uid: 1969
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,29.5
       parent: 4812
   - uid: 1970
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,29.5
       parent: 4812
   - uid: 1971
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,28.5
       parent: 4812
   - uid: 1972
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,27.5
       parent: 4812
   - uid: 1973
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,26.5
       parent: 4812
   - uid: 1974
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,25.5
       parent: 4812
   - uid: 1976
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,23.5
       parent: 4812
   - uid: 1977
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,22.5
       parent: 4812
   - uid: 2075
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,24.5
       parent: 4812
   - uid: 2609
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,21.5
       parent: 4812
   - uid: 2612
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,21.5
       parent: 4812
   - uid: 2746
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,36.5
       parent: 4812
   - uid: 2747
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,28.5
       parent: 4812
   - uid: 2748
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,29.5
       parent: 4812
   - uid: 2749
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,30.5
       parent: 4812
   - uid: 2750
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,31.5
       parent: 4812
   - uid: 2753
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,33.5
       parent: 4812
   - uid: 2755
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,23.5
       parent: 4812
   - uid: 2756
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,36.5
       parent: 4812
   - uid: 2757
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,32.5
       parent: 4812
   - uid: 2758
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,33.5
       parent: 4812
   - uid: 2766
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,32.5
       parent: 4812
   - uid: 2767
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,35.5
       parent: 4812
   - uid: 2769
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,32.5
       parent: 4812
   - uid: 2774
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,29.5
       parent: 4812
   - uid: 2778
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,34.5
       parent: 4812
   - uid: 2820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,33.5
       parent: 4812
   - uid: 2822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,22.5
       parent: 4812
   - uid: 2824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,28.5
       parent: 4812
   - uid: 2825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,29.5
       parent: 4812
   - uid: 2828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,28.5
       parent: 4812
   - uid: 2829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,20.5
       parent: 4812
   - uid: 2830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,18.5
       parent: 4812
   - uid: 2831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,17.5
       parent: 4812
   - uid: 2841
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,35.5
       parent: 4812
   - uid: 2896
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,12.5
       parent: 4812
   - uid: 2897
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,11.5
       parent: 4812
   - uid: 2898
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,11.5
       parent: 4812
   - uid: 2899
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,11.5
       parent: 4812
   - uid: 2900
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,11.5
       parent: 4812
   - uid: 2901
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,11.5
       parent: 4812
   - uid: 2903
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,16.5
       parent: 4812
   - uid: 2904
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,17.5
       parent: 4812
   - uid: 2905
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,17.5
       parent: 4812
   - uid: 2906
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,17.5
       parent: 4812
   - uid: 2942
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,29.5
       parent: 4812
   - uid: 3006
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,22.5
       parent: 4812
   - uid: 3042
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,23.5
       parent: 4812
   - uid: 3118
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,34.5
       parent: 4812
   - uid: 3150
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,33.5
       parent: 4812
   - uid: 3189
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,36.5
       parent: 4812
   - uid: 3193
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,33.5
       parent: 4812
   - uid: 3212
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,9.5
       parent: 4812
   - uid: 3288
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,6.5
       parent: 4812
   - uid: 3352
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,9.5
       parent: 4812
   - uid: 3355
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,9.5
       parent: 4812
   - uid: 3356
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,9.5
       parent: 4812
   - uid: 3357
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,9.5
       parent: 4812
   - uid: 3391
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,6.5
       parent: 4812
   - uid: 3428
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,37.5
       parent: 4812
   - uid: 3429
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,37.5
       parent: 4812
   - uid: 3430
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,36.5
       parent: 4812
   - uid: 3431
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,36.5
       parent: 4812
   - uid: 3432
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,37.5
       parent: 4812
   - uid: 3436
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,33.5
       parent: 4812
   - uid: 3437
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,31.5
       parent: 4812
   - uid: 3486
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,43.5
       parent: 4812
   - uid: 3487
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,44.5
       parent: 4812
   - uid: 3488
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,45.5
       parent: 4812
   - uid: 3489
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,46.5
       parent: 4812
   - uid: 3490
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,47.5
       parent: 4812
   - uid: 3491
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,48.5
       parent: 4812
   - uid: 3492
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,43.5
       parent: 4812
   - uid: 3493
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,43.5
       parent: 4812
   - uid: 3494
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,43.5
       parent: 4812
   - uid: 3495
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,43.5
       parent: 4812
   - uid: 3496
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,42.5
       parent: 4812
   - uid: 3497
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,42.5
       parent: 4812
   - uid: 3498
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,42.5
       parent: 4812
   - uid: 3499
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,42.5
       parent: 4812
   - uid: 3500
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,42.5
       parent: 4812
   - uid: 3501
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,43.5
       parent: 4812
   - uid: 3502
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,43.5
       parent: 4812
   - uid: 3504
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,43.5
       parent: 4812
   - uid: 3505
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,43.5
       parent: 4812
   - uid: 3506
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,44.5
       parent: 4812
   - uid: 3507
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,46.5
       parent: 4812
   - uid: 3508
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,44.5
       parent: 4812
   - uid: 3509
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,45.5
       parent: 4812
   - uid: 3510
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,46.5
       parent: 4812
   - uid: 3511
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,47.5
       parent: 4812
   - uid: 3512
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,47.5
       parent: 4812
   - uid: 3513
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,47.5
       parent: 4812
   - uid: 3514
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,48.5
       parent: 4812
   - uid: 3515
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,48.5
       parent: 4812
   - uid: 3516
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,49.5
       parent: 4812
   - uid: 3517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,50.5
       parent: 4812
   - uid: 3518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,51.5
       parent: 4812
   - uid: 3519
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,52.5
       parent: 4812
   - uid: 3520
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,53.5
       parent: 4812
   - uid: 3521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,54.5
       parent: 4812
   - uid: 3522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,55.5
       parent: 4812
   - uid: 3523
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,55.5
       parent: 4812
   - uid: 3524
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,56.5
       parent: 4812
   - uid: 3525
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,56.5
       parent: 4812
   - uid: 3526
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,57.5
       parent: 4812
   - uid: 3527
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,57.5
       parent: 4812
   - uid: 3528
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,58.5
       parent: 4812
   - uid: 3529
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,58.5
       parent: 4812
   - uid: 3530
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,58.5
       parent: 4812
   - uid: 3531
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,58.5
       parent: 4812
   - uid: 3532
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,58.5
       parent: 4812
   - uid: 3533
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,57.5
       parent: 4812
   - uid: 3534
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,57.5
       parent: 4812
   - uid: 3535
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,56.5
       parent: 4812
   - uid: 3536
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,56.5
       parent: 4812
   - uid: 3537
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,55.5
       parent: 4812
   - uid: 3538
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,55.5
       parent: 4812
   - uid: 3539
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,55.5
       parent: 4812
   - uid: 3540
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,54.5
       parent: 4812
   - uid: 3541
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,53.5
       parent: 4812
   - uid: 3542
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,52.5
       parent: 4812
   - uid: 3543
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,51.5
       parent: 4812
   - uid: 3544
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,50.5
       parent: 4812
   - uid: 3545
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,49.5
       parent: 4812
   - uid: 3546
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,48.5
       parent: 4812
   - uid: 3547
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,57.5
       parent: 4812
   - uid: 3548
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,57.5
       parent: 4812
   - uid: 3549
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,57.5
       parent: 4812
   - uid: 3550
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,56.5
       parent: 4812
   - uid: 3551
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,56.5
       parent: 4812
   - uid: 3552
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,48.5
       parent: 4812
   - uid: 3553
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,48.5
       parent: 4812
   - uid: 3554
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,48.5
       parent: 4812
   - uid: 3555
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,48.5
       parent: 4812
   - uid: 3556
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,48.5
       parent: 4812
   - uid: 3557
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,48.5
       parent: 4812
   - uid: 3558
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,47.5
       parent: 4812
   - uid: 3559
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,47.5
       parent: 4812
   - uid: 3560
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,44.5
       parent: 4812
   - uid: 3561
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,46.5
       parent: 4812
   - uid: 3562
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,47.5
       parent: 4812
   - uid: 3563
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,46.5
       parent: 4812
   - uid: 3564
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,44.5
       parent: 4812
   - uid: 3565
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,47.5
       parent: 4812
   - uid: 3566
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,49.5
       parent: 4812
   - uid: 3567
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,50.5
       parent: 4812
   - uid: 3568
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,51.5
       parent: 4812
   - uid: 3569
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,52.5
       parent: 4812
   - uid: 3570
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,53.5
       parent: 4812
   - uid: 3571
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,54.5
       parent: 4812
   - uid: 3572
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,54.5
       parent: 4812
   - uid: 3573
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,53.5
       parent: 4812
   - uid: 3574
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,52.5
       parent: 4812
   - uid: 3575
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,51.5
       parent: 4812
   - uid: 3576
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,50.5
       parent: 4812
   - uid: 3577
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,49.5
       parent: 4812
   - uid: 3691
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,54.5
       parent: 4812
   - uid: 3692
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,54.5
       parent: 4812
   - uid: 3693
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,52.5
       parent: 4812
   - uid: 3694
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,51.5
       parent: 4812
   - uid: 3695
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,51.5
       parent: 4812
   - uid: 3696
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,51.5
       parent: 4812
   - uid: 3697
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,52.5
       parent: 4812
   - uid: 3717
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,3.5
       parent: 4812
   - uid: 3718
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,3.5
       parent: 4812
   - uid: 3719
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,4.5
       parent: 4812
   - uid: 3720
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,5.5
       parent: 4812
   - uid: 3721
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,2.5
       parent: 4812
   - uid: 3722
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,7.5
       parent: 4812
   - uid: 3723
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,2.5
       parent: 4812
   - uid: 3724
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,3.5
       parent: 4812
   - uid: 3725
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,4.5
       parent: 4812
   - uid: 3727
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,2.5
       parent: 4812
   - uid: 3728
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,8.5
       parent: 4812
   - uid: 3729
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,6.5
       parent: 4812
   - uid: 3730
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,2.5
       parent: 4812
   - uid: 3731
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,2.5
       parent: 4812
   - uid: 3990
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,8.5
       parent: 4812
   - uid: 3991
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,7.5
       parent: 4812
   - uid: 3992
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,6.5
       parent: 4812
   - uid: 3993
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,5.5
       parent: 4812
   - uid: 3994
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,5.5
       parent: 4812
   - uid: 3995
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,5.5
       parent: 4812
   - uid: 3996
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,5.5
       parent: 4812
   - uid: 3997
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,5.5
       parent: 4812
   - uid: 3998
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,5.5
       parent: 4812
   - uid: 3999
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,5.5
       parent: 4812
   - uid: 4000
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,5.5
       parent: 4812
   - uid: 4001
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,5.5
       parent: 4812
   - uid: 4081
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-4.5
       parent: 4812
   - uid: 4082
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-4.5
       parent: 4812
   - uid: 4083
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-4.5
       parent: 4812
   - uid: 4084
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-5.5
       parent: 4812
   - uid: 4085
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-5.5
       parent: 4812
   - uid: 4086
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-4.5
       parent: 4812
   - uid: 4087
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,-10.5
       parent: 4812
   - uid: 4088
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-10.5
       parent: 4812
   - uid: 4089
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-10.5
       parent: 4812
   - uid: 4090
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-10.5
       parent: 4812
   - uid: 4091
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-10.5
       parent: 4812
   - uid: 4092
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-10.5
       parent: 4812
   - uid: 4093
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-9.5
       parent: 4812
   - uid: 4094
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-8.5
       parent: 4812
   - uid: 4095
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-8.5
       parent: 4812
   - uid: 4096
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-8.5
       parent: 4812
   - uid: 4097
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-8.5
       parent: 4812
   - uid: 4098
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-8.5
       parent: 4812
   - uid: 4101
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-8.5
       parent: 4812
   - uid: 4102
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-8.5
       parent: 4812
   - uid: 4103
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-8.5
       parent: 4812
   - uid: 4104
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-8.5
       parent: 4812
   - uid: 4105
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-8.5
       parent: 4812
   - uid: 4106
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-9.5
       parent: 4812
   - uid: 4107
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-10.5
       parent: 4812
   - uid: 4108
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-6.5
       parent: 4812
   - uid: 4109
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-6.5
       parent: 4812
   - uid: 4638
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-36.5
       parent: 4812
   - uid: 4639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-36.5
       parent: 4812
   - uid: 4640
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-36.5
       parent: 4812
   - uid: 4641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-36.5
       parent: 4812
   - uid: 4642
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-36.5
       parent: 4812
   - uid: 4643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-36.5
       parent: 4812
   - uid: 4681
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-40.5
       parent: 4812
   - uid: 4685
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-53.5
       parent: 4812
   - uid: 4686
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-53.5
       parent: 4812
   - uid: 4693
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-39.5
       parent: 4812
   - uid: 4694
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-37.5
       parent: 4812
   - uid: 4696
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-40.5
       parent: 4812
   - uid: 4789
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-29.5
       parent: 4812
   - uid: 4790
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-29.5
       parent: 4812
   - uid: 4791
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-30.5
       parent: 4812
   - uid: 4792
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-31.5
       parent: 4812
   - uid: 4828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,23.5
       parent: 4812
   - uid: 4829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,23.5
       parent: 4812
   - uid: 4830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,23.5
       parent: 4812
   - uid: 4831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,23.5
       parent: 4812
   - uid: 4832
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,23.5
       parent: 4812
   - uid: 4886
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,23.5
       parent: 4812
   - uid: 4887
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,22.5
       parent: 4812
   - uid: 4898
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,21.5
       parent: 4812
   - uid: 4917
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-29.5
       parent: 4812
   - uid: 4936
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-27.5
       parent: 4812
   - uid: 5016
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-24.5
       parent: 4812
   - uid: 5027
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,19.5
       parent: 4812
   - uid: 5042
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-59.5
       parent: 4812
   - uid: 5126
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,20.5
       parent: 4812
   - uid: 5285
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-24.5
       parent: 4812
   - uid: 5286
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-23.5
       parent: 4812
   - uid: 5287
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-23.5
       parent: 4812
   - uid: 5288
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,-23.5
       parent: 4812
   - uid: 5289
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-23.5
       parent: 4812
   - uid: 5290
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-24.5
       parent: 4812
   - uid: 5291
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-25.5
       parent: 4812
   - uid: 5292
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-26.5
       parent: 4812
   - uid: 5293
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-30.5
       parent: 4812
   - uid: 5294
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-30.5
       parent: 4812
   - uid: 5295
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-29.5
       parent: 4812
   - uid: 5296
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,-30.5
       parent: 4812
   - uid: 5297
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-30.5
       parent: 4812
   - uid: 5298
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-29.5
       parent: 4812
   - uid: 5299
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-28.5
       parent: 4812
   - uid: 5312
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-13.5
       parent: 4812
   - uid: 5314
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-13.5
       parent: 4812
   - uid: 5316
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-13.5
       parent: 4812
   - uid: 5330
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-13.5
       parent: 4812
   - uid: 5331
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-19.5
       parent: 4812
   - uid: 5332
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-19.5
       parent: 4812
   - uid: 5336
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-19.5
       parent: 4812
   - uid: 5337
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-19.5
       parent: 4812
   - uid: 5395
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-22.5
       parent: 4812
   - uid: 5397
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-22.5
       parent: 4812
   - uid: 5398
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-18.5
       parent: 4812
   - uid: 5400
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-19.5
       parent: 4812
   - uid: 5401
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-17.5
       parent: 4812
   - uid: 5402
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-16.5
       parent: 4812
   - uid: 5403
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-16.5
       parent: 4812
   - uid: 5404
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-16.5
       parent: 4812
   - uid: 5405
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-16.5
       parent: 4812
   - uid: 5406
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-16.5
       parent: 4812
   - uid: 5407
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-13.5
       parent: 4812
   - uid: 5408
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-14.5
       parent: 4812
   - uid: 5409
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-13.5
       parent: 4812
   - uid: 5410
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-13.5
       parent: 4812
   - uid: 5411
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-13.5
       parent: 4812
   - uid: 5412
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-17.5
       parent: 4812
   - uid: 5413
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-19.5
       parent: 4812
   - uid: 5414
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-22.5
       parent: 4812
   - uid: 5432
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-24.5
       parent: 4812
   - uid: 5433
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-28.5
       parent: 4812
   - uid: 5434
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-29.5
       parent: 4812
   - uid: 5435
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-29.5
       parent: 4812
   - uid: 5436
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-29.5
       parent: 4812
   - uid: 5437
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-29.5
       parent: 4812
   - uid: 5438
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-29.5
       parent: 4812
   - uid: 5439
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-29.5
       parent: 4812
   - uid: 5440
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-29.5
       parent: 4812
   - uid: 5441
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-29.5
       parent: 4812
   - uid: 5442
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-29.5
       parent: 4812
   - uid: 5443
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-29.5
       parent: 4812
   - uid: 5444
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-29.5
       parent: 4812
   - uid: 5445
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-29.5
       parent: 4812
   - uid: 5446
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-29.5
       parent: 4812
   - uid: 5447
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-28.5
       parent: 4812
   - uid: 5448
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-27.5
       parent: 4812
   - uid: 5449
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-26.5
       parent: 4812
   - uid: 5450
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-25.5
       parent: 4812
   - uid: 5451
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-26.5
       parent: 4812
   - uid: 5452
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-23.5
       parent: 4812
   - uid: 5453
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-22.5
       parent: 4812
   - uid: 5454
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-22.5
       parent: 4812
   - uid: 5455
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-22.5
       parent: 4812
   - uid: 5456
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-22.5
       parent: 4812
   - uid: 5469
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-17.5
       parent: 4812
   - uid: 5470
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-18.5
       parent: 4812
   - uid: 5471
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-19.5
       parent: 4812
   - uid: 5473
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-22.5
       parent: 4812
   - uid: 5479
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-27.5
       parent: 4812
   - uid: 5480
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-27.5
       parent: 4812
   - uid: 5500
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,-29.5
       parent: 4812
   - uid: 5501
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-22.5
       parent: 4812
   - uid: 5502
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-22.5
       parent: 4812
   - uid: 5505
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-21.5
       parent: 4812
   - uid: 5506
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-21.5
       parent: 4812
   - uid: 5510
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-21.5
       parent: 4812
   - uid: 5511
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-19.5
       parent: 4812
   - uid: 5512
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-27.5
       parent: 4812
   - uid: 5515
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-27.5
       parent: 4812
   - uid: 5516
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-27.5
       parent: 4812
   - uid: 5517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-27.5
       parent: 4812
   - uid: 5518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-28.5
       parent: 4812
   - uid: 5519
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-28.5
       parent: 4812
   - uid: 5520
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-30.5
       parent: 4812
   - uid: 5521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-30.5
       parent: 4812
   - uid: 5522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-31.5
       parent: 4812
   - uid: 5523
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 25.5,-31.5
       parent: 4812
   - uid: 5524
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-31.5
       parent: 4812
   - uid: 5525
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-31.5
       parent: 4812
   - uid: 5526
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-31.5
       parent: 4812
   - uid: 5527
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-31.5
       parent: 4812
   - uid: 5528
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-31.5
       parent: 4812
   - uid: 5529
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-31.5
       parent: 4812
   - uid: 5530
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-21.5
       parent: 4812
   - uid: 5531
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-20.5
       parent: 4812
   - uid: 5532
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-19.5
       parent: 4812
   - uid: 5556
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-31.5
       parent: 4812
   - uid: 5557
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-31.5
       parent: 4812
   - uid: 5558
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-31.5
       parent: 4812
   - uid: 5559
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-31.5
       parent: 4812
   - uid: 5560
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-30.5
       parent: 4812
   - uid: 5561
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-29.5
       parent: 4812
   - uid: 5568
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-22.5
       parent: 4812
   - uid: 5569
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-21.5
       parent: 4812
   - uid: 5595
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,18.5
       parent: 4812
   - uid: 5769
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-29.5
       parent: 4812
   - uid: 5770
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,-29.5
       parent: 4812
   - uid: 5772
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-29.5
       parent: 4812
   - uid: 5773
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-29.5
       parent: 4812
   - uid: 5774
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-29.5
       parent: 4812
   - uid: 5775
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-28.5
       parent: 4812
   - uid: 5776
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-27.5
       parent: 4812
   - uid: 5777
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-26.5
       parent: 4812
   - uid: 5778
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-25.5
       parent: 4812
   - uid: 5779
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-24.5
       parent: 4812
   - uid: 5780
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-23.5
       parent: 4812
   - uid: 5781
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-22.5
       parent: 4812
   - uid: 5785
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-22.5
       parent: 4812
   - uid: 5786
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-22.5
       parent: 4812
   - uid: 5826
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-59.5
       parent: 4812
   - uid: 5904
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-30.5
       parent: 4812
   - uid: 5905
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-31.5
       parent: 4812
   - uid: 5906
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 17.5,-30.5
       parent: 4812
   - uid: 5907
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 17.5,-31.5
       parent: 4812
   - uid: 5908
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 17.5,-32.5
       parent: 4812
   - uid: 5909
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 16.5,-32.5
       parent: 4812
   - uid: 5910
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,-32.5
       parent: 4812
   - uid: 5911
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,-32.5
       parent: 4812
   - uid: 6546
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-26.5
       parent: 4812
   - uid: 6547
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-25.5
       parent: 4812
   - uid: 6559
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-13.5
       parent: 4812
   - uid: 6560
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-18.5
       parent: 4812
   - uid: 6561
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-16.5
       parent: 4812
   - uid: 6562
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-14.5
       parent: 4812
   - uid: 6563
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-13.5
       parent: 4812
   - uid: 6564
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-19.5
       parent: 4812
   - uid: 6565
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-19.5
       parent: 4812
   - uid: 6566
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-19.5
       parent: 4812
   - uid: 6567
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-17.5
       parent: 4812
   - uid: 6568
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-15.5
       parent: 4812
   - uid: 6569
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-13.5
       parent: 4812
   - uid: 6696
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-37.5
       parent: 4812
   - uid: 6697
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-37.5
       parent: 4812
   - uid: 6698
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-37.5
       parent: 4812
   - uid: 6699
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-38.5
       parent: 4812
   - uid: 6700
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-39.5
       parent: 4812
   - uid: 6701
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-40.5
       parent: 4812
   - uid: 6702
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-40.5
       parent: 4812
   - uid: 6704
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-40.5
       parent: 4812
   - uid: 6705
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-40.5
       parent: 4812
   - uid: 6706
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-40.5
       parent: 4812
   - uid: 6707
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-40.5
       parent: 4812
   - uid: 6759
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-29.5
       parent: 4812
   - uid: 6760
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-30.5
       parent: 4812
   - uid: 6761
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-31.5
       parent: 4812
   - uid: 6762
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-32.5
       parent: 4812
   - uid: 6763
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-33.5
       parent: 4812
   - uid: 6900
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-33.5
       parent: 4812
   - uid: 6901
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-33.5
       parent: 4812
   - uid: 7281
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-28.5
       parent: 4812
   - uid: 7289
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-29.5
       parent: 4812
   - uid: 7292
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-29.5
       parent: 4812
   - uid: 7293
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-29.5
       parent: 4812
   - uid: 7294
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-29.5
       parent: 4812
   - uid: 7337
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-24.5
       parent: 4812
   - uid: 7635
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,30.5
       parent: 4812
   - uid: 7636
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,29.5
       parent: 4812
   - uid: 7637
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,30.5
       parent: 4812
   - uid: 7638
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,30.5
       parent: 4812
   - uid: 7639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,30.5
       parent: 4812
   - uid: 7640
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,29.5
       parent: 4812
   - uid: 7641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,21.5
       parent: 4812
   - uid: 7642
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,22.5
       parent: 4812
   - uid: 7643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,23.5
       parent: 4812
   - uid: 7644
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,24.5
       parent: 4812
   - uid: 7645
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,26.5
       parent: 4812
   - uid: 7646
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,27.5
       parent: 4812
   - uid: 7647
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,28.5
       parent: 4812
   - uid: 7648
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,30.5
       parent: 4812
   - uid: 7649
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,29.5
       parent: 4812
   - uid: 7650
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,29.5
       parent: 4812
   - uid: 7651
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,29.5
       parent: 4812
   - uid: 7652
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,21.5
       parent: 4812
   - uid: 7653
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,21.5
       parent: 4812
   - uid: 7654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,22.5
       parent: 4812
   - uid: 7656
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,24.5
       parent: 4812
   - uid: 7657
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,25.5
       parent: 4812
   - uid: 7658
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,26.5
       parent: 4812
   - uid: 7659
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,27.5
       parent: 4812
   - uid: 7660
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,28.5
       parent: 4812
   - uid: 7661
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,32.5
       parent: 4812
   - uid: 7662
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,33.5
       parent: 4812
   - uid: 7663
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,33.5
       parent: 4812
   - uid: 7664
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,33.5
       parent: 4812
   - uid: 7670
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,33.5
       parent: 4812
   - uid: 7671
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,33.5
       parent: 4812
   - uid: 7672
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,33.5
       parent: 4812
   - uid: 7673
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,33.5
       parent: 4812
   - uid: 7674
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,28.5
       parent: 4812
   - uid: 7675
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,29.5
       parent: 4812
   - uid: 7676
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,30.5
       parent: 4812
   - uid: 7677
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,31.5
       parent: 4812
   - uid: 7678
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,32.5
       parent: 4812
   - uid: 7679
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,28.5
       parent: 4812
   - uid: 7680
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,21.5
       parent: 4812
   - uid: 7681
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,21.5
       parent: 4812
   - uid: 7686
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,21.5
       parent: 4812
   - uid: 7687
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,21.5
       parent: 4812
   - uid: 7688
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,21.5
       parent: 4812
   - uid: 7689
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,23.5
       parent: 4812
   - uid: 7690
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,25.5
       parent: 4812
   - uid: 7691
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,25.5
       parent: 4812
   - uid: 7692
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,22.5
       parent: 4812
   - uid: 7693
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,25.5
       parent: 4812
   - uid: 7694
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,25.5
       parent: 4812
   - uid: 7695
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,21.5
       parent: 4812
   - uid: 7696
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,27.5
       parent: 4812
   - uid: 7697
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,26.5
       parent: 4812
   - uid: 7698
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,25.5
       parent: 4812
   - uid: 7699
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,24.5
       parent: 4812
   - uid: 7700
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,25.5
       parent: 4812
   - uid: 7701
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,26.5
       parent: 4812
   - uid: 7702
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,27.5
       parent: 4812
   - uid: 7703
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,28.5
       parent: 4812
   - uid: 7704
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,28.5
       parent: 4812
   - uid: 7705
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,28.5
       parent: 4812
   - uid: 7706
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,28.5
       parent: 4812
   - uid: 7707
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,28.5
       parent: 4812
   - uid: 7712
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,9.5
       parent: 4812
   - uid: 7713
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,9.5
       parent: 4812
   - uid: 7714
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,9.5
       parent: 4812
   - uid: 7715
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,9.5
       parent: 4812
   - uid: 7718
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,18.5
       parent: 4812
   - uid: 7719
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,15.5
       parent: 4812
   - uid: 7720
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,15.5
       parent: 4812
   - uid: 7721
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,15.5
       parent: 4812
   - uid: 7722
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,15.5
       parent: 4812
   - uid: 7723
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,12.5
       parent: 4812
   - uid: 7724
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,12.5
       parent: 4812
   - uid: 7732
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,18.5
       parent: 4812
   - uid: 7733
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,22.5
       parent: 4812
   - uid: 7734
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,22.5
       parent: 4812
   - uid: 7735
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,22.5
       parent: 4812
   - uid: 7736
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,22.5
       parent: 4812
   - uid: 7737
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,18.5
       parent: 4812
   - uid: 7738
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,19.5
       parent: 4812
   - uid: 7739
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,20.5
       parent: 4812
   - uid: 7740
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,18.5
       parent: 4812
   - uid: 7743
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,16.5
       parent: 4812
   - uid: 7744
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,13.5
       parent: 4812
   - uid: 7749
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,9.5
       parent: 4812
   - uid: 7750
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,9.5
       parent: 4812
   - uid: 7751
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,9.5
       parent: 4812
   - uid: 7753
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,9.5
       parent: 4812
   - uid: 7754
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,9.5
       parent: 4812
   - uid: 7755
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,9.5
       parent: 4812
   - uid: 7756
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,21.5
       parent: 4812
   - uid: 7757
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,22.5
       parent: 4812
   - uid: 7758
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,17.5
       parent: 4812
   - uid: 7759
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,16.5
       parent: 4812
   - uid: 7760
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,15.5
       parent: 4812
   - uid: 7761
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,14.5
       parent: 4812
   - uid: 7762
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,13.5
       parent: 4812
   - uid: 7763
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,13.5
       parent: 4812
   - uid: 7765
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,13.5
       parent: 4812
   - uid: 7766
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,13.5
       parent: 4812
   - uid: 7767
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,13.5
       parent: 4812
   - uid: 7768
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,9.5
       parent: 4812
   - uid: 7769
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,9.5
       parent: 4812
   - uid: 7770
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,9.5
       parent: 4812
   - uid: 7771
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,9.5
       parent: 4812
   - uid: 7772
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,9.5
       parent: 4812
   - uid: 7773
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,9.5
       parent: 4812
   - uid: 7774
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,10.5
       parent: 4812
   - uid: 7775
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,11.5
       parent: 4812
   - uid: 7776
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,12.5
       parent: 4812
   - uid: 7937
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,6.5
       parent: 4812
   - uid: 7938
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,6.5
       parent: 4812
   - uid: 7939
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,6.5
       parent: 4812
   - uid: 7940
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,6.5
       parent: 4812
   - uid: 7941
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,6.5
       parent: 4812
   - uid: 7942
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,6.5
       parent: 4812
   - uid: 7943
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,6.5
       parent: 4812
   - uid: 7944
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,6.5
       parent: 4812
   - uid: 7945
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,6.5
       parent: 4812
   - uid: 7946
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,6.5
       parent: 4812
   - uid: 7947
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,6.5
       parent: 4812
   - uid: 7948
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,6.5
       parent: 4812
   - uid: 7950
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,6.5
       parent: 4812
   - uid: 7951
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,7.5
       parent: 4812
   - uid: 7952
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,8.5
       parent: 4812
   - uid: 7955
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,8.5
       parent: 4812
   - uid: 8621
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,0.5
       parent: 4812
   - uid: 8623
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,0.5
       parent: 4812
   - uid: 8624
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,0.5
       parent: 4812
   - uid: 8625
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,1.5
       parent: 4812
   - uid: 8626
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,5.5
       parent: 4812
   - uid: 8635
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,0.5
       parent: 4812
   - uid: 8639
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,4.5
       parent: 4812
   - uid: 8641
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-0.5
       parent: 4812
   - uid: 8642
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-1.5
       parent: 4812
   - uid: 8643
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-2.5
       parent: 4812
   - uid: 8644
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-3.5
       parent: 4812
   - uid: 8645
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-4.5
       parent: 4812
   - uid: 8646
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-5.5
       parent: 4812
   - uid: 8647
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-6.5
       parent: 4812
   - uid: 8648
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-4.5
       parent: 4812
   - uid: 8649
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-4.5
       parent: 4812
   - uid: 8650
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-4.5
       parent: 4812
   - uid: 8651
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-4.5
       parent: 4812
   - uid: 8652
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-5.5
       parent: 4812
   - uid: 8653
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-9.5
       parent: 4812
   - uid: 8654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-10.5
       parent: 4812
   - uid: 8655
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-10.5
       parent: 4812
   - uid: 8656
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-10.5
       parent: 4812
   - uid: 8657
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-10.5
       parent: 4812
   - uid: 8658
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-10.5
       parent: 4812
   - uid: 8659
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-10.5
       parent: 4812
   - uid: 8660
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-10.5
       parent: 4812
   - uid: 8661
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-9.5
       parent: 4812
   - uid: 8662
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-7.5
       parent: 4812
   - uid: 8663
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-6.5
       parent: 4812
   - uid: 8664
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-10.5
       parent: 4812
   - uid: 8665
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-10.5
       parent: 4812
   - uid: 8666
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-9.5
       parent: 4812
   - uid: 8667
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-7.5
       parent: 4812
   - uid: 8668
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-6.5
       parent: 4812
   - uid: 8669
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-5.5
       parent: 4812
   - uid: 8670
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-4.5
       parent: 4812
   - uid: 8671
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-3.5
       parent: 4812
   - uid: 8672
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-2.5
       parent: 4812
   - uid: 8673
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-1.5
       parent: 4812
   - uid: 8674
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-0.5
       parent: 4812
   - uid: 8675
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,0.5
       parent: 4812
   - uid: 8712
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-0.5
       parent: 4812
   - uid: 8713
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,-0.5
       parent: 4812
   - uid: 8714
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-0.5
       parent: 4812
   - uid: 8715
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-1.5
       parent: 4812
   - uid: 8716
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-2.5
       parent: 4812
   - uid: 8717
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-3.5
       parent: 4812
   - uid: 8718
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,-4.5
       parent: 4812
   - uid: 8719
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-4.5
       parent: 4812
   - uid: 8720
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-4.5
       parent: 4812
   - uid: 8724
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-4.5
       parent: 4812
   - uid: 8726
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-2.5
       parent: 4812
   - uid: 8727
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-1.5
       parent: 4812
   - uid: 8728
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-0.5
       parent: 4812
   - uid: 8729
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-0.5
       parent: 4812
   - uid: 8730
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -44.5,-0.5
       parent: 4812
   - uid: 8731
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-0.5
       parent: 4812
   - uid: 8732
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-0.5
       parent: 4812
   - uid: 8733
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-4.5
       parent: 4812
   - uid: 8751
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-3.5
       parent: 4812
   - uid: 8789
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-41.5
       parent: 4812
   - uid: 8790
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-41.5
       parent: 4812
   - uid: 8791
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-41.5
       parent: 4812
   - uid: 8793
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-41.5
       parent: 4812
   - uid: 8794
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,-41.5
       parent: 4812
   - uid: 8795
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-41.5
       parent: 4812
   - uid: 8796
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-41.5
       parent: 4812
   - uid: 8797
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-40.5
       parent: 4812
   - uid: 8798
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-39.5
       parent: 4812
   - uid: 8799
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-38.5
       parent: 4812
   - uid: 8800
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-38.5
       parent: 4812
   - uid: 8801
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-38.5
       parent: 4812
   - uid: 8802
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-38.5
       parent: 4812
   - uid: 8809
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-38.5
       parent: 4812
   - uid: 8811
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-36.5
       parent: 4812
   - uid: 8812
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-34.5
       parent: 4812
   - uid: 8813
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-33.5
       parent: 4812
   - uid: 8814
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-32.5
       parent: 4812
   - uid: 8815
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-35.5
       parent: 4812
   - uid: 8816
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-37.5
       parent: 4812
   - uid: 8817
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-36.5
       parent: 4812
   - uid: 8818
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-35.5
       parent: 4812
   - uid: 8819
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-34.5
       parent: 4812
   - uid: 8820
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-35.5
       parent: 4812
   - uid: 8821
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-35.5
       parent: 4812
   - uid: 8822
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-34.5
       parent: 4812
   - uid: 8823
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-32.5
       parent: 4812
   - uid: 8824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-32.5
       parent: 4812
   - uid: 8825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-32.5
       parent: 4812
   - uid: 8826
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-32.5
       parent: 4812
   - uid: 8827
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,-32.5
       parent: 4812
   - uid: 8828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-32.5
       parent: 4812
   - uid: 8829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-32.5
       parent: 4812
   - uid: 8830
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-32.5
       parent: 4812
   - uid: 8831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,-32.5
       parent: 4812
   - uid: 8873
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-11.5
       parent: 4812
   - uid: 8874
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-12.5
       parent: 4812
   - uid: 8875
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-13.5
       parent: 4812
   - uid: 8876
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-14.5
       parent: 4812
   - uid: 8877
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-15.5
       parent: 4812
   - uid: 9022
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,2.5
       parent: 4812
   - uid: 9091
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,12.5
       parent: 4812
   - uid: 9092
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,11.5
       parent: 4812
   - uid: 9093
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,10.5
       parent: 4812
   - uid: 9094
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,9.5
       parent: 4812
   - uid: 9095
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,8.5
       parent: 4812
   - uid: 9096
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,7.5
       parent: 4812
   - uid: 9097
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,6.5
       parent: 4812
   - uid: 9098
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,5.5
       parent: 4812
   - uid: 9100
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,3.5
       parent: 4812
   - uid: 9101
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,2.5
       parent: 4812
   - uid: 9102
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,1.5
       parent: 4812
   - uid: 9103
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,12.5
       parent: 4812
   - uid: 9104
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,11.5
       parent: 4812
   - uid: 9105
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,10.5
       parent: 4812
   - uid: 9106
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,9.5
       parent: 4812
   - uid: 9107
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,8.5
       parent: 4812
   - uid: 9108
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,7.5
       parent: 4812
   - uid: 9109
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,6.5
       parent: 4812
   - uid: 9110
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,5.5
       parent: 4812
   - uid: 9111
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,4.5
       parent: 4812
   - uid: 9112
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,3.5
       parent: 4812
   - uid: 9113
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,2.5
       parent: 4812
   - uid: 9114
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,1.5
       parent: 4812
   - uid: 9139
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,0.5
       parent: 4812
   - uid: 9140
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,0.5
       parent: 4812
   - uid: 9141
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,0.5
       parent: 4812
   - uid: 9142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,0.5
       parent: 4812
   - uid: 9143
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,0.5
       parent: 4812
   - uid: 9144
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,0.5
       parent: 4812
   - uid: 9239
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,6.5
       parent: 4812
   - uid: 9240
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,4.5
       parent: 4812
   - uid: 9242
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,2.5
       parent: 4812
   - uid: 9243
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,2.5
       parent: 4812
   - uid: 9244
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,6.5
       parent: 4812
   - uid: 9245
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,2.5
       parent: 4812
   - uid: 9248
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,6.5
       parent: 4812
   - uid: 9256
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,4.5
       parent: 4812
   - uid: 9258
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,4.5
       parent: 4812
   - uid: 9260
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,4.5
       parent: 4812
   - uid: 9265
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,6.5
       parent: 4812
   - uid: 9266
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,8.5
       parent: 4812
   - uid: 9267
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,8.5
       parent: 4812
   - uid: 9268
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,8.5
       parent: 4812
   - uid: 9269
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,8.5
       parent: 4812
   - uid: 9270
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,10.5
       parent: 4812
   - uid: 9271
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,10.5
       parent: 4812
   - uid: 9272
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,10.5
       parent: 4812
   - uid: 9273
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,10.5
       parent: 4812
   - uid: 9274
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,12.5
       parent: 4812
   - uid: 9275
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,12.5
       parent: 4812
   - uid: 9276
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,12.5
       parent: 4812
   - uid: 9277
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,12.5
       parent: 4812
   - uid: 9284
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-5.5
       parent: 4812
   - uid: 9285
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-3.5
       parent: 4812
   - uid: 9286
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-2.5
       parent: 4812
   - uid: 9469
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,18.5
       parent: 4812
   - uid: 9470
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,18.5
       parent: 4812
   - uid: 9471
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,18.5
       parent: 4812
   - uid: 9472
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,18.5
       parent: 4812
   - uid: 9473
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,15.5
       parent: 4812
   - uid: 9474
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,15.5
       parent: 4812
   - uid: 9511
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,13.5
       parent: 4812
   - uid: 9517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-5.5
       parent: 4812
   - uid: 9518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-5.5
       parent: 4812
   - uid: 9519
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-5.5
       parent: 4812
   - uid: 9520
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-3.5
       parent: 4812
   - uid: 9521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-5.5
       parent: 4812
   - uid: 9522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-3.5
       parent: 4812
   - uid: 9579
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-32.5
       parent: 4812
   - uid: 9590
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-25.5
       parent: 4812
   - uid: 9591
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-24.5
       parent: 4812
   - uid: 9592
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-24.5
       parent: 4812
   - uid: 9594
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-24.5
       parent: 4812
   - uid: 9595
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-25.5
       parent: 4812
   - uid: 9596
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-26.5
       parent: 4812
   - uid: 9597
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-26.5
       parent: 4812
   - uid: 9598
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-26.5
       parent: 4812
   - uid: 9604
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-24.5
       parent: 4812
   - uid: 9605
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-24.5
       parent: 4812
   - uid: 9606
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-24.5
       parent: 4812
   - uid: 9607
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -56.5,-21.5
       parent: 4812
   - uid: 9644
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-56.5
       parent: 4812
   - uid: 9645
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-56.5
       parent: 4812
   - uid: 9824
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-16.5
       parent: 4812
   - uid: 9825
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-17.5
       parent: 4812
   - uid: 9826
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-18.5
       parent: 4812
   - uid: 9827
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-19.5
       parent: 4812
   - uid: 9828
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-19.5
       parent: 4812
   - uid: 9829
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-15.5
       parent: 4812
   - uid: 9831
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-15.5
       parent: 4812
   - uid: 9836
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-10.5
       parent: 4812
   - uid: 9837
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-5.5
       parent: 4812
   - uid: 9840
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-14.5
       parent: 4812
   - uid: 9841
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-15.5
       parent: 4812
   - uid: 9842
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-5.5
       parent: 4812
   - uid: 9844
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-6.5
       parent: 4812
   - uid: 9845
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-7.5
       parent: 4812
   - uid: 9846
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-14.5
       parent: 4812
   - uid: 9847
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-13.5
       parent: 4812
   - uid: 9848
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-12.5
       parent: 4812
   - uid: 9849
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-11.5
       parent: 4812
   - uid: 9850
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-10.5
       parent: 4812
   - uid: 9851
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-9.5
       parent: 4812
   - uid: 9852
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-8.5
       parent: 4812
   - uid: 9853
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-14.5
       parent: 4812
   - uid: 9854
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,-14.5
       parent: 4812
   - uid: 9855
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,-14.5
       parent: 4812
   - uid: 9856
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-14.5
       parent: 4812
   - uid: 9857
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-14.5
       parent: 4812
   - uid: 9858
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-14.5
       parent: 4812
   - uid: 9859
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-14.5
       parent: 4812
   - uid: 9860
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-14.5
       parent: 4812
   - uid: 9864
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-10.5
       parent: 4812
   - uid: 9865
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-9.5
       parent: 4812
   - uid: 9866
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-8.5
       parent: 4812
   - uid: 9867
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-7.5
       parent: 4812
   - uid: 9868
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-6.5
       parent: 4812
   - uid: 9873
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-9.5
       parent: 4812
   - uid: 9876
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-10.5
       parent: 4812
   - uid: 9890
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-9.5
       parent: 4812
   - uid: 9891
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-10.5
       parent: 4812
   - uid: 9895
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-14.5
       parent: 4812
   - uid: 9896
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-9.5
       parent: 4812
   - uid: 9900
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-9.5
       parent: 4812
   - uid: 9901
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-19.5
       parent: 4812
   - uid: 9902
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -40.5,-19.5
       parent: 4812
   - uid: 9903
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-19.5
       parent: 4812
   - uid: 9904
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-19.5
       parent: 4812
   - uid: 9905
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-19.5
       parent: 4812
   - uid: 9906
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-18.5
       parent: 4812
   - uid: 9907
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-17.5
       parent: 4812
   - uid: 9908
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-16.5
       parent: 4812
   - uid: 9939
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -55.5,-21.5
       parent: 4812
   - uid: 9940
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-21.5
       parent: 4812
   - uid: 9941
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -53.5,-21.5
       parent: 4812
   - uid: 9942
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -52.5,-21.5
       parent: 4812
   - uid: 9943
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -51.5,-21.5
       parent: 4812
   - uid: 9944
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-21.5
       parent: 4812
   - uid: 9945
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-21.5
       parent: 4812
   - uid: 9946
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-21.5
       parent: 4812
   - uid: 9947
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-21.5
       parent: 4812
   - uid: 9948
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-21.5
       parent: 4812
   - uid: 9949
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-16.5
       parent: 4812
   - uid: 9950
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-17.5
       parent: 4812
   - uid: 9951
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-18.5
       parent: 4812
   - uid: 9952
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-18.5
       parent: 4812
   - uid: 9953
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -48.5,-18.5
       parent: 4812
   - uid: 9954
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-18.5
       parent: 4812
   - uid: 9955
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-19.5
       parent: 4812
   - uid: 9956
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-20.5
       parent: 4812
   - uid: 9957
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -46.5,-19.5
       parent: 4812
   - uid: 10635
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-10.5
       parent: 4812
   - uid: 10964
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-37.5
       parent: 4812
   - uid: 10989
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-41.5
       parent: 4812
   - uid: 11006
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-40.5
       parent: 4812
   - uid: 11007
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-39.5
       parent: 4812
   - uid: 11008
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-38.5
       parent: 4812
   - uid: 11030
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-42.5
       parent: 4812
   - uid: 11031
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-43.5
       parent: 4812
   - uid: 11032
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-43.5
       parent: 4812
   - uid: 11033
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-43.5
       parent: 4812
   - uid: 11034
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-43.5
       parent: 4812
   - uid: 11035
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-44.5
       parent: 4812
   - uid: 11036
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-45.5
       parent: 4812
   - uid: 11037
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-45.5
       parent: 4812
   - uid: 11038
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-45.5
       parent: 4812
   - uid: 11039
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,-45.5
       parent: 4812
   - uid: 11040
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-45.5
       parent: 4812
   - uid: 11041
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-45.5
       parent: 4812
   - uid: 11042
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-43.5
       parent: 4812
   - uid: 11043
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-44.5
       parent: 4812
   - uid: 11044
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-43.5
       parent: 4812
   - uid: 11045
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-43.5
       parent: 4812
   - uid: 11046
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-43.5
       parent: 4812
   - uid: 11110
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-43.5
       parent: 4812
   - uid: 11111
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-42.5
       parent: 4812
   - uid: 11112
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-41.5
       parent: 4812
   - uid: 11113
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-40.5
       parent: 4812
   - uid: 11114
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-39.5
       parent: 4812
   - uid: 11115
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-38.5
       parent: 4812
   - uid: 11116
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-37.5
       parent: 4812
   - uid: 11117
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-36.5
       parent: 4812
   - uid: 11118
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-35.5
       parent: 4812
   - uid: 11119
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-30.5
       parent: 4812
   - uid: 11120
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-31.5
       parent: 4812
   - uid: 11125
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-39.5
       parent: 4812
   - uid: 11128
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-39.5
       parent: 4812
   - uid: 11131
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-39.5
       parent: 4812
   - uid: 11132
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-37.5
       parent: 4812
   - uid: 11133
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-37.5
       parent: 4812
   - uid: 11134
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-38.5
       parent: 4812
   - uid: 11135
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-35.5
       parent: 4812
   - uid: 11136
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-38.5
       parent: 4812
   - uid: 11137
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-38.5
       parent: 4812
   - uid: 11138
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-37.5
       parent: 4812
   - uid: 11140
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-37.5
       parent: 4812
   - uid: 11142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-39.5
       parent: 4812
   - uid: 11263
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-37.5
       parent: 4812
   - uid: 11264
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-37.5
       parent: 4812
   - uid: 11265
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-36.5
       parent: 4812
   - uid: 11340
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-35.5
       parent: 4812
   - uid: 11341
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-34.5
       parent: 4812
   - uid: 11342
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 38.5,-33.5
       parent: 4812
   - uid: 11344
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-31.5
       parent: 4812
   - uid: 11345
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-31.5
       parent: 4812
   - uid: 11371
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-39.5
       parent: 4812
   - uid: 11372
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-40.5
       parent: 4812
   - uid: 11373
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-40.5
       parent: 4812
   - uid: 11374
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 33.5,-40.5
       parent: 4812
   - uid: 11375
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,-40.5
       parent: 4812
   - uid: 11376
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 31.5,-40.5
       parent: 4812
   - uid: 11377
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-40.5
       parent: 4812
   - uid: 11378
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-40.5
       parent: 4812
   - uid: 11379
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-39.5
       parent: 4812
   - uid: 11380
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-38.5
       parent: 4812
   - uid: 11381
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-37.5
       parent: 4812
   - uid: 11382
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 28.5,-37.5
       parent: 4812
@@ -81092,4217 +76463,3013 @@ entities:
   entities:
   - uid: 1
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,-9.5
       parent: 4812
   - uid: 2
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,-10.5
       parent: 4812
   - uid: 3
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-4.5
       parent: 4812
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-3.5
       parent: 4812
   - uid: 5
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,0.5
       parent: 4812
   - uid: 6
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,1.5
       parent: 4812
   - uid: 7
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,1.5
       parent: 4812
   - uid: 8
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,3.5
       parent: 4812
   - uid: 9
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,9.5
       parent: 4812
   - uid: 10
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,8.5
       parent: 4812
   - uid: 11
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,4.5
       parent: 4812
   - uid: 13
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,5.5
       parent: 4812
   - uid: 14
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,5.5
       parent: 4812
   - uid: 15
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,5.5
       parent: 4812
   - uid: 16
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,5.5
       parent: 4812
   - uid: 17
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,5.5
       parent: 4812
   - uid: 18
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,6.5
       parent: 4812
   - uid: 19
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,8.5
       parent: 4812
   - uid: 20
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,9.5
       parent: 4812
   - uid: 21
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,10.5
       parent: 4812
   - uid: 22
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,10.5
       parent: 4812
   - uid: 23
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,10.5
       parent: 4812
   - uid: 24
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,10.5
       parent: 4812
   - uid: 25
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,10.5
       parent: 4812
   - uid: 26
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,10.5
       parent: 4812
   - uid: 27
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,10.5
       parent: 4812
   - uid: 28
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,10.5
       parent: 4812
   - uid: 29
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,11.5
       parent: 4812
   - uid: 30
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,12.5
       parent: 4812
   - uid: 31
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,12.5
       parent: 4812
   - uid: 33
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,15.5
       parent: 4812
   - uid: 34
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,14.5
       parent: 4812
   - uid: 36
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,15.5
       parent: 4812
   - uid: 37
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,13.5
       parent: 4812
   - uid: 38
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,12.5
       parent: 4812
   - uid: 39
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,12.5
       parent: 4812
   - uid: 40
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,11.5
       parent: 4812
   - uid: 41
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,10.5
       parent: 4812
   - uid: 42
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-9.5
       parent: 4812
   - uid: 43
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-9.5
       parent: 4812
   - uid: 44
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-10.5
       parent: 4812
   - uid: 45
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-7.5
       parent: 4812
   - uid: 46
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-6.5
       parent: 4812
   - uid: 47
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-5.5
       parent: 4812
   - uid: 48
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-10.5
       parent: 4812
   - uid: 49
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-9.5
       parent: 4812
   - uid: 50
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-8.5
       parent: 4812
   - uid: 51
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-8.5
       parent: 4812
   - uid: 52
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-4.5
       parent: 4812
   - uid: 53
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-2.5
       parent: 4812
   - uid: 54
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-1.5
       parent: 4812
   - uid: 55
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,0.5
       parent: 4812
   - uid: 56
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,1.5
       parent: 4812
   - uid: 57
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,2.5
       parent: 4812
   - uid: 58
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,2.5
       parent: 4812
   - uid: 59
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,10.5
       parent: 4812
   - uid: 60
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,10.5
       parent: 4812
   - uid: 61
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,10.5
       parent: 4812
   - uid: 62
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,10.5
       parent: 4812
   - uid: 63
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,9.5
       parent: 4812
   - uid: 64
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,8.5
       parent: 4812
   - uid: 65
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,7.5
       parent: 4812
   - uid: 66
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,6.5
       parent: 4812
   - uid: 67
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,5.5
       parent: 4812
   - uid: 68
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,4.5
       parent: 4812
   - uid: 69
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,3.5
       parent: 4812
   - uid: 70
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,2.5
       parent: 4812
   - uid: 71
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,1.5
       parent: 4812
   - uid: 72
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,0.5
       parent: 4812
   - uid: 73
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-0.5
       parent: 4812
   - uid: 74
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-1.5
       parent: 4812
   - uid: 75
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-2.5
       parent: 4812
   - uid: 76
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-2.5
       parent: 4812
   - uid: 77
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-2.5
       parent: 4812
   - uid: 78
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-2.5
       parent: 4812
   - uid: 79
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,-2.5
       parent: 4812
   - uid: 80
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,2.5
       parent: 4812
   - uid: 81
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -10.5,2.5
       parent: 4812
   - uid: 82
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-0.5
       parent: 4812
   - uid: 83
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,0.5
       parent: 4812
   - uid: 84
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,1.5
       parent: 4812
   - uid: 85
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,1.5
       parent: 4812
   - uid: 86
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,1.5
       parent: 4812
   - uid: 87
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,1.5
       parent: 4812
   - uid: 88
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-2.5
       parent: 4812
   - uid: 89
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-3.5
       parent: 4812
   - uid: 90
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-4.5
       parent: 4812
   - uid: 91
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-4.5
       parent: 4812
   - uid: 92
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-4.5
       parent: 4812
   - uid: 93
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-4.5
       parent: 4812
   - uid: 94
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-4.5
       parent: 4812
   - uid: 95
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-4.5
       parent: 4812
   - uid: 96
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-7.5
       parent: 4812
   - uid: 97
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-7.5
       parent: 4812
   - uid: 98
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-7.5
       parent: 4812
   - uid: 99
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-8.5
       parent: 4812
   - uid: 100
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-8.5
       parent: 4812
   - uid: 101
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-8.5
       parent: 4812
   - uid: 102
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-8.5
       parent: 4812
   - uid: 103
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-8.5
       parent: 4812
   - uid: 104
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-7.5
       parent: 4812
   - uid: 105
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-5.5
       parent: 4812
   - uid: 139
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-10.5
       parent: 4812
   - uid: 140
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-10.5
       parent: 4812
   - uid: 141
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-10.5
       parent: 4812
   - uid: 142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-10.5
       parent: 4812
   - uid: 143
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-10.5
       parent: 4812
   - uid: 145
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,-10.5
       parent: 4812
   - uid: 146
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-10.5
       parent: 4812
   - uid: 147
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-9.5
       parent: 4812
   - uid: 148
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-8.5
       parent: 4812
   - uid: 149
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-7.5
       parent: 4812
   - uid: 150
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-6.5
       parent: 4812
   - uid: 151
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-5.5
       parent: 4812
   - uid: 152
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-4.5
       parent: 4812
   - uid: 153
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-3.5
       parent: 4812
   - uid: 154
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-2.5
       parent: 4812
   - uid: 155
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-1.5
       parent: 4812
   - uid: 156
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-0.5
       parent: 4812
   - uid: 157
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,0.5
       parent: 4812
   - uid: 158
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,1.5
       parent: 4812
   - uid: 159
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,2.5
       parent: 4812
   - uid: 161
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,4.5
       parent: 4812
   - uid: 162
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,5.5
       parent: 4812
   - uid: 163
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,6.5
       parent: 4812
   - uid: 164
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,7.5
       parent: 4812
   - uid: 165
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,8.5
       parent: 4812
   - uid: 166
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,9.5
       parent: 4812
   - uid: 167
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,10.5
       parent: 4812
   - uid: 168
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,11.5
       parent: 4812
   - uid: 169
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,12.5
       parent: 4812
   - uid: 177
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,13.5
       parent: 4812
   - uid: 180
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,15.5
       parent: 4812
   - uid: 181
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,18.5
       parent: 4812
   - uid: 182
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,17.5
       parent: 4812
   - uid: 183
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,18.5
       parent: 4812
   - uid: 185
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,18.5
       parent: 4812
   - uid: 186
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,12.5
       parent: 4812
   - uid: 189
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,7.5
       parent: 4812
   - uid: 190
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,6.5
       parent: 4812
   - uid: 191
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,6.5
       parent: 4812
   - uid: 192
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,6.5
       parent: 4812
   - uid: 193
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,6.5
       parent: 4812
   - uid: 194
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,5.5
       parent: 4812
   - uid: 195
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-1.5
       parent: 4812
   - uid: 196
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-2.5
       parent: 4812
   - uid: 197
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-2.5
       parent: 4812
   - uid: 198
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-3.5
       parent: 4812
   - uid: 199
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-5.5
       parent: 4812
   - uid: 200
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-6.5
       parent: 4812
   - uid: 201
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-5.5
       parent: 4812
   - uid: 202
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-7.5
       parent: 4812
   - uid: 203
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-8.5
       parent: 4812
   - uid: 204
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-9.5
       parent: 4812
   - uid: 205
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-10.5
       parent: 4812
   - uid: 206
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-10.5
       parent: 4812
   - uid: 207
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-10.5
       parent: 4812
   - uid: 208
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-10.5
       parent: 4812
   - uid: 209
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-10.5
       parent: 4812
   - uid: 210
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-10.5
       parent: 4812
   - uid: 211
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-10.5
       parent: 4812
   - uid: 212
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-10.5
       parent: 4812
   - uid: 213
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-10.5
       parent: 4812
   - uid: 214
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-10.5
       parent: 4812
   - uid: 225
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-9.5
       parent: 4812
   - uid: 226
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-8.5
       parent: 4812
   - uid: 227
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-7.5
       parent: 4812
   - uid: 228
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-6.5
       parent: 4812
   - uid: 229
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-5.5
       parent: 4812
   - uid: 230
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-5.5
       parent: 4812
   - uid: 231
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-5.5
       parent: 4812
   - uid: 232
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-4.5
       parent: 4812
   - uid: 233
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -8.5,-4.5
       parent: 4812
   - uid: 234
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -9.5,-4.5
       parent: 4812
   - uid: 235
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-4.5
       parent: 4812
   - uid: 236
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-4.5
       parent: 4812
   - uid: 237
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-4.5
       parent: 4812
   - uid: 238
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-4.5
       parent: 4812
   - uid: 239
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-4.5
       parent: 4812
   - uid: 240
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-4.5
       parent: 4812
   - uid: 241
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-4.5
       parent: 4812
   - uid: 242
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-4.5
       parent: 4812
   - uid: 243
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-4.5
       parent: 4812
   - uid: 244
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-2.5
       parent: 4812
   - uid: 245
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-2.5
       parent: 4812
   - uid: 246
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-2.5
       parent: 4812
   - uid: 247
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-2.5
       parent: 4812
   - uid: 248
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-2.5
       parent: 4812
   - uid: 249
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-2.5
       parent: 4812
   - uid: 250
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-2.5
       parent: 4812
   - uid: 262
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,6.5
       parent: 4812
   - uid: 263
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,6.5
       parent: 4812
   - uid: 264
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,6.5
       parent: 4812
   - uid: 265
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,6.5
       parent: 4812
   - uid: 266
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,6.5
       parent: 4812
   - uid: 267
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,6.5
       parent: 4812
   - uid: 268
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,6.5
       parent: 4812
   - uid: 269
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,6.5
       parent: 4812
   - uid: 270
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,3.5
       parent: 4812
   - uid: 271
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,4.5
       parent: 4812
   - uid: 272
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,5.5
       parent: 4812
   - uid: 273
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,3.5
       parent: 4812
   - uid: 274
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,3.5
       parent: 4812
   - uid: 275
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,4.5
       parent: 4812
   - uid: 276
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,5.5
       parent: 4812
   - uid: 279
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-1.5
       parent: 4812
   - uid: 280
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-0.5
       parent: 4812
   - uid: 281
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,0.5
       parent: 4812
   - uid: 282
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,0.5
       parent: 4812
   - uid: 283
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-1.5
       parent: 4812
   - uid: 284
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-0.5
       parent: 4812
   - uid: 285
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,0.5
       parent: 4812
   - uid: 286
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,7.5
       parent: 4812
   - uid: 287
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,8.5
       parent: 4812
   - uid: 288
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,9.5
       parent: 4812
   - uid: 289
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,11.5
       parent: 4812
   - uid: 290
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,12.5
       parent: 4812
   - uid: 291
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,13.5
       parent: 4812
   - uid: 292
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,13.5
       parent: 4812
   - uid: 293
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,13.5
       parent: 4812
   - uid: 294
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,13.5
       parent: 4812
   - uid: 295
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,13.5
       parent: 4812
   - uid: 296
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,13.5
       parent: 4812
   - uid: 318
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,4.5
       parent: 4812
   - uid: 429
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,9.5
       parent: 4812
   - uid: 898
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,7.5
       parent: 4812
   - uid: 899
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,8.5
       parent: 4812
   - uid: 900
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,9.5
       parent: 4812
   - uid: 1253
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,1.5
       parent: 4812
   - uid: 1917
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,29.5
       parent: 4812
   - uid: 1918
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 9.5,27.5
       parent: 4812
   - uid: 1919
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,27.5
       parent: 4812
   - uid: 1978
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,26.5
       parent: 4812
   - uid: 1979
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,26.5
       parent: 4812
   - uid: 1980
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,25.5
       parent: 4812
   - uid: 1981
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,27.5
       parent: 4812
   - uid: 1982
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,29.5
       parent: 4812
   - uid: 2738
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,21.5
       parent: 4812
   - uid: 2739
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,22.5
       parent: 4812
   - uid: 2740
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,23.5
       parent: 4812
   - uid: 2742
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,25.5
       parent: 4812
   - uid: 2743
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,26.5
       parent: 4812
   - uid: 2744
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,27.5
       parent: 4812
   - uid: 2745
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,28.5
       parent: 4812
   - uid: 2788
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,16.5
       parent: 4812
   - uid: 2789
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,18.5
       parent: 4812
   - uid: 2790
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,16.5
       parent: 4812
   - uid: 2791
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,16.5
       parent: 4812
   - uid: 2792
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,12.5
       parent: 4812
   - uid: 2793
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,12.5
       parent: 4812
   - uid: 2794
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,12.5
       parent: 4812
   - uid: 2795
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,12.5
       parent: 4812
   - uid: 2796
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,12.5
       parent: 4812
   - uid: 2797
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,12.5
       parent: 4812
   - uid: 2798
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,12.5
       parent: 4812
   - uid: 2799
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,12.5
       parent: 4812
   - uid: 2800
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,12.5
       parent: 4812
   - uid: 2851
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,22.5
       parent: 4812
   - uid: 3348
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,11.5
       parent: 4812
   - uid: 3351
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,11.5
       parent: 4812
   - uid: 3354
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,9.5
       parent: 4812
   - uid: 3435
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,33.5
       parent: 4812
   - uid: 3462
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,34.5
       parent: 4812
   - uid: 3463
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,33.5
       parent: 4812
   - uid: 3474
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,44.5
       parent: 4812
   - uid: 3475
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,41.5
       parent: 4812
   - uid: 3476
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,40.5
       parent: 4812
   - uid: 3980
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,37.5
       parent: 4812
   - uid: 3981
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,33.5
       parent: 4812
   - uid: 3983
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,8.5
       parent: 4812
   - uid: 3984
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,6.5
       parent: 4812
   - uid: 3985
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,5.5
       parent: 4812
   - uid: 3986
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,9.5
       parent: 4812
   - uid: 3987
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,9.5
       parent: 4812
   - uid: 3988
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,9.5
       parent: 4812
   - uid: 3989
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,9.5
       parent: 4812
   - uid: 4006
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,5.5
       parent: 4812
   - uid: 4013
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -44.5,-31.5
       parent: 4812
   - uid: 4014
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -43.5,-31.5
       parent: 4812
   - uid: 4015
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,3.5
       parent: 4812
   - uid: 4016
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,1.5
       parent: 4812
   - uid: 4017
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,1.5
       parent: 4812
   - uid: 4018
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,0.5
       parent: 4812
   - uid: 4019
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,0.5
       parent: 4812
   - uid: 4020
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,0.5
       parent: 4812
   - uid: 4021
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,0.5
       parent: 4812
   - uid: 4022
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,1.5
       parent: 4812
   - uid: 4023
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,2.5
       parent: 4812
   - uid: 4024
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,3.5
       parent: 4812
   - uid: 4025
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,4.5
       parent: 4812
   - uid: 4026
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,5.5
       parent: 4812
   - uid: 4027
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,5.5
       parent: 4812
   - uid: 4028
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,5.5
       parent: 4812
   - uid: 4029
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,5.5
       parent: 4812
   - uid: 4030
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,6.5
       parent: 4812
   - uid: 4031
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,7.5
       parent: 4812
   - uid: 4032
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,8.5
       parent: 4812
   - uid: 4033
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,2.5
       parent: 4812
   - uid: 4034
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,1.5
       parent: 4812
   - uid: 4035
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,0.5
       parent: 4812
   - uid: 4036
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-0.5
       parent: 4812
   - uid: 4037
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-1.5
       parent: 4812
   - uid: 4038
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-0.5
       parent: 4812
   - uid: 4039
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-1.5
       parent: 4812
   - uid: 4040
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-1.5
       parent: 4812
   - uid: 4041
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-1.5
       parent: 4812
   - uid: 4042
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-1.5
       parent: 4812
   - uid: 4043
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 19.5,-1.5
       parent: 4812
   - uid: 4044
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-1.5
       parent: 4812
   - uid: 4045
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-1.5
       parent: 4812
   - uid: 4046
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-1.5
       parent: 4812
   - uid: 4047
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-1.5
       parent: 4812
   - uid: 4049
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,0.5
       parent: 4812
   - uid: 4118
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-6.5
       parent: 4812
   - uid: 4119
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-5.5
       parent: 4812
   - uid: 4120
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,0.5
       parent: 4812
   - uid: 4121
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,1.5
       parent: 4812
   - uid: 4123
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-4.5
       parent: 4812
   - uid: 4124
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-4.5
       parent: 4812
   - uid: 4125
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-5.5
       parent: 4812
   - uid: 4126
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-5.5
       parent: 4812
   - uid: 4127
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-6.5
       parent: 4812
   - uid: 4128
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-5.5
       parent: 4812
   - uid: 4129
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-5.5
       parent: 4812
   - uid: 4130
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-4.5
       parent: 4812
   - uid: 4131
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 15.5,-4.5
       parent: 4812
   - uid: 4132
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-6.5
       parent: 4812
   - uid: 4133
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-10.5
       parent: 4812
   - uid: 4649
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-14.5
       parent: 4812
   - uid: 4650
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-14.5
       parent: 4812
   - uid: 4651
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-20.5
       parent: 4812
   - uid: 4652
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,-20.5
       parent: 4812
   - uid: 4653
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,-20.5
       parent: 4812
   - uid: 4654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,-20.5
       parent: 4812
   - uid: 4655
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-20.5
       parent: 4812
   - uid: 4717
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-26.5
       parent: 4812
   - uid: 4756
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-28.5
       parent: 4812
   - uid: 4757
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-29.5
       parent: 4812
   - uid: 4783
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-35.5
       parent: 4812
   - uid: 4784
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-34.5
       parent: 4812
   - uid: 4785
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-33.5
       parent: 4812
   - uid: 4786
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-33.5
       parent: 4812
   - uid: 4787
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-33.5
       parent: 4812
   - uid: 4788
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-33.5
       parent: 4812
   - uid: 4793
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-33.5
       parent: 4812
   - uid: 4794
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-33.5
       parent: 4812
   - uid: 4795
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-36.5
       parent: 4812
   - uid: 4797
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -44.5,-29.5
       parent: 4812
   - uid: 4814
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-28.5
       parent: 4812
   - uid: 4916
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-24.5
       parent: 4812
   - uid: 4918
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-25.5
       parent: 4812
   - uid: 4919
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-26.5
       parent: 4812
   - uid: 4922
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-28.5
       parent: 4812
   - uid: 4937
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-29.5
       parent: 4812
   - uid: 5024
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-19.5
       parent: 4812
   - uid: 5050
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-25.5
       parent: 4812
   - uid: 5333
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-13.5
       parent: 4812
   - uid: 5334
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-14.5
       parent: 4812
   - uid: 5335
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-13.5
       parent: 4812
   - uid: 5338
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-19.5
       parent: 4812
   - uid: 5339
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-19.5
       parent: 4812
   - uid: 5340
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-18.5
       parent: 4812
   - uid: 5341
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-16.5
       parent: 4812
   - uid: 5342
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-15.5
       parent: 4812
   - uid: 5390
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-13.5
       parent: 4812
   - uid: 5425
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-19.5
       parent: 4812
   - uid: 5426
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-19.5
       parent: 4812
   - uid: 5427
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-19.5
       parent: 4812
   - uid: 5430
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-14.5
       parent: 4812
   - uid: 5457
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-27.5
       parent: 4812
   - uid: 5465
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-22.5
       parent: 4812
   - uid: 5466
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-22.5
       parent: 4812
   - uid: 5467
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-22.5
       parent: 4812
   - uid: 5468
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-27.5
       parent: 4812
   - uid: 5562
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-23.5
       parent: 4812
   - uid: 5563
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-27.5
       parent: 4812
   - uid: 5567
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-28.5
       parent: 4812
   - uid: 5619
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-16.5
       parent: 4812
   - uid: 5620
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 8.5,-18.5
       parent: 4812
   - uid: 5836
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-32.5
       parent: 4812
   - uid: 5837
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-31.5
       parent: 4812
   - uid: 6498
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-12.5
       parent: 4812
   - uid: 6501
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-13.5
       parent: 4812
   - uid: 6502
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-13.5
       parent: 4812
   - uid: 6503
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-13.5
       parent: 4812
   - uid: 6504
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-13.5
       parent: 4812
   - uid: 6505
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-14.5
       parent: 4812
   - uid: 6506
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-15.5
       parent: 4812
   - uid: 6507
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-16.5
       parent: 4812
   - uid: 6508
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-17.5
       parent: 4812
   - uid: 6509
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-18.5
       parent: 4812
   - uid: 6510
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-19.5
       parent: 4812
   - uid: 6511
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-20.5
       parent: 4812
   - uid: 6512
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-21.5
       parent: 4812
   - uid: 6513
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-21.5
       parent: 4812
   - uid: 6514
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-21.5
       parent: 4812
   - uid: 6515
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-21.5
       parent: 4812
   - uid: 6516
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-21.5
       parent: 4812
   - uid: 6517
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-21.5
       parent: 4812
   - uid: 6518
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-21.5
       parent: 4812
   - uid: 6520
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-21.5
       parent: 4812
   - uid: 6521
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-20.5
       parent: 4812
   - uid: 6522
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,-20.5
       parent: 4812
   - uid: 6523
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-22.5
       parent: 4812
   - uid: 6524
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-23.5
       parent: 4812
   - uid: 6525
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-24.5
       parent: 4812
   - uid: 6526
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,-24.5
       parent: 4812
   - uid: 6527
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-24.5
       parent: 4812
   - uid: 6528
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-24.5
       parent: 4812
   - uid: 6529
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-24.5
       parent: 4812
   - uid: 6530
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-23.5
       parent: 4812
   - uid: 6531
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-22.5
       parent: 4812
   - uid: 6532
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-21.5
       parent: 4812
   - uid: 6533
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-20.5
       parent: 4812
   - uid: 6534
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-19.5
       parent: 4812
   - uid: 6535
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-18.5
       parent: 4812
   - uid: 6536
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-17.5
       parent: 4812
   - uid: 6537
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-16.5
       parent: 4812
   - uid: 6538
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-15.5
       parent: 4812
   - uid: 6539
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-14.5
       parent: 4812
   - uid: 6540
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-13.5
       parent: 4812
   - uid: 6541
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-13.5
       parent: 4812
   - uid: 6542
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-13.5
       parent: 4812
   - uid: 6543
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -30.5,-13.5
       parent: 4812
   - uid: 6544
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-13.5
       parent: 4812
   - uid: 6545
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-20.5
       parent: 4812
   - uid: 6549
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-13.5
       parent: 4812
   - uid: 6654
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-24.5
       parent: 4812
   - uid: 6683
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-24.5
       parent: 4812
   - uid: 6711
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-37.5
       parent: 4812
   - uid: 6712
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-37.5
       parent: 4812
   - uid: 6713
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-38.5
       parent: 4812
   - uid: 6714
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-39.5
       parent: 4812
   - uid: 6715
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-38.5
       parent: 4812
   - uid: 6716
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-38.5
       parent: 4812
   - uid: 6717
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-38.5
       parent: 4812
   - uid: 6718
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-38.5
       parent: 4812
   - uid: 6719
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-37.5
       parent: 4812
   - uid: 6720
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-36.5
       parent: 4812
   - uid: 6721
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-35.5
       parent: 4812
   - uid: 6722
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-34.5
       parent: 4812
   - uid: 6723
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-35.5
       parent: 4812
   - uid: 6724
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-34.5
       parent: 4812
   - uid: 6725
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-33.5
       parent: 4812
   - uid: 6726
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-32.5
       parent: 4812
   - uid: 6727
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-34.5
       parent: 4812
   - uid: 6728
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-34.5
       parent: 4812
   - uid: 6729
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -24.5,-33.5
       parent: 4812
   - uid: 6730
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-34.5
       parent: 4812
   - uid: 6731
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-34.5
       parent: 4812
   - uid: 6732
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-33.5
       parent: 4812
   - uid: 6733
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-32.5
       parent: 4812
   - uid: 6734
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-31.5
       parent: 4812
   - uid: 6739
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-32.5
       parent: 4812
   - uid: 6740
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-33.5
       parent: 4812
   - uid: 6741
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-33.5
       parent: 4812
   - uid: 6742
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-32.5
       parent: 4812
   - uid: 6743
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-31.5
       parent: 4812
   - uid: 6744
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-31.5
       parent: 4812
   - uid: 6745
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-31.5
       parent: 4812
   - uid: 6746
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-31.5
       parent: 4812
   - uid: 6747
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-32.5
       parent: 4812
   - uid: 6748
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-31.5
       parent: 4812
   - uid: 6749
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-31.5
       parent: 4812
   - uid: 6750
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-31.5
       parent: 4812
   - uid: 6751
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-31.5
       parent: 4812
   - uid: 6752
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-31.5
       parent: 4812
   - uid: 6753
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-31.5
       parent: 4812
   - uid: 6766
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -12.5,-29.5
       parent: 4812
   - uid: 6767
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-29.5
       parent: 4812
   - uid: 6768
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-29.5
       parent: 4812
   - uid: 6769
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-29.5
       parent: 4812
   - uid: 6770
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-29.5
       parent: 4812
   - uid: 6771
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-29.5
       parent: 4812
   - uid: 6772
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-29.5
       parent: 4812
   - uid: 6773
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-29.5
       parent: 4812
   - uid: 6774
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-29.5
       parent: 4812
   - uid: 6775
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-29.5
       parent: 4812
   - uid: 6776
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -22.5,-29.5
       parent: 4812
   - uid: 6789
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,-22.5
       parent: 4812
   - uid: 7060
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,-19.5
       parent: 4812
   - uid: 7063
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-15.5
       parent: 4812
   - uid: 7184
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-23.5
       parent: 4812
   - uid: 7185
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-24.5
       parent: 4812
   - uid: 7187
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,-31.5
       parent: 4812
   - uid: 7194
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -23.5,-27.5
       parent: 4812
   - uid: 7195
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -7.5,-28.5
       parent: 4812
   - uid: 7212
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-24.5
       parent: 4812
   - uid: 7213
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-24.5
       parent: 4812
   - uid: 7215
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-25.5
       parent: 4812
   - uid: 7217
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-27.5
       parent: 4812
   - uid: 7218
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -11.5,-28.5
       parent: 4812
   - uid: 7235
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -18.5,-19.5
       parent: 4812
   - uid: 7246
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-18.5
       parent: 4812
   - uid: 7314
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-25.5
       parent: 4812
   - uid: 7315
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -44.5,-25.5
       parent: 4812
   - uid: 7317
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-29.5
       parent: 4812
   - uid: 7318
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-31.5
       parent: 4812
   - uid: 7319
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -17.5,-14.5
       parent: 4812
   - uid: 7320
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -16.5,-14.5
       parent: 4812
   - uid: 7321
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-14.5
       parent: 4812
   - uid: 7322
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,-14.5
       parent: 4812
   - uid: 7727
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,18.5
       parent: 4812
   - uid: 7728
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,18.5
       parent: 4812
   - uid: 7729
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -27.5,18.5
       parent: 4812
   - uid: 7953
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,7.5
       parent: 4812
   - uid: 8162
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,26.5
       parent: 4812
   - uid: 8163
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,26.5
       parent: 4812
   - uid: 8164
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -20.5,28.5
       parent: 4812
   - uid: 8456
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,37.5
       parent: 4812
   - uid: 8457
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -26.5,37.5
       parent: 4812
   - uid: 8833
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-37.5
       parent: 4812
   - uid: 8834
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-34.5
       parent: 4812
   - uid: 8835
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-34.5
       parent: 4812
   - uid: 8837
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-32.5
       parent: 4812
   - uid: 8840
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-40.5
       parent: 4812
   - uid: 8852
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-28.5
       parent: 4812
   - uid: 8854
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-26.5
       parent: 4812
   - uid: 8855
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-26.5
       parent: 4812
   - uid: 8856
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-26.5
       parent: 4812
   - uid: 8857
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-26.5
       parent: 4812
   - uid: 8903
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-26.5
       parent: 4812
   - uid: 8904
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-27.5
       parent: 4812
   - uid: 8905
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-25.5
       parent: 4812
   - uid: 8907
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-23.5
       parent: 4812
   - uid: 9968
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-29.5
       parent: 4812
   - uid: 9969
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-30.5
       parent: 4812
   - uid: 9970
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-30.5
       parent: 4812
   - uid: 9973
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-30.5
       parent: 4812
   - uid: 9985
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-22.5
       parent: 4812
   - uid: 9986
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-21.5
       parent: 4812
   - uid: 9987
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-25.5
       parent: 4812
   - uid: 9988
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-24.5
       parent: 4812
   - uid: 9989
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-23.5
       parent: 4812
   - uid: 9994
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -38.5,-21.5
       parent: 4812
   - uid: 10153
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -54.5,-23.5
       parent: 4812
   - uid: 10155
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -49.5,-23.5
       parent: 4812
   - uid: 10156
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -50.5,-23.5
       parent: 4812
   - uid: 10224
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-22.5
       parent: 4812
   - uid: 10404
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -47.5,-28.5
       parent: 4812
   - uid: 10613
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-24.5
       parent: 4812
   - uid: 10614
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-23.5
       parent: 4812
   - uid: 11049
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-39.5
       parent: 4812
   - uid: 11050
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-39.5
       parent: 4812
   - uid: 11051
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-39.5
       parent: 4812
   - uid: 11052
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-39.5
       parent: 4812
   - uid: 11053
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-35.5
       parent: 4812
   - uid: 11054
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-35.5
       parent: 4812
   - uid: 11055
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-35.5
       parent: 4812
   - uid: 11056
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-35.5
       parent: 4812
   - uid: 11057
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-31.5
       parent: 4812
   - uid: 11058
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-31.5
       parent: 4812
   - uid: 11059
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-31.5
       parent: 4812
   - uid: 11060
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,-31.5
       parent: 4812
   - uid: 11061
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-35.5
       parent: 4812
   - uid: 11062
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-35.5
       parent: 4812
   - uid: 11063
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-35.5
       parent: 4812
   - uid: 11064
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-35.5
       parent: 4812
   - uid: 11066
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 10.5,-39.5
       parent: 4812
   - uid: 11067
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 11.5,-39.5
       parent: 4812
   - uid: 11068
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 12.5,-39.5
       parent: 4812
   - uid: 11069
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 13.5,-39.5
       parent: 4812
   - uid: 11070
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 14.5,-39.5
       parent: 4812
   - uid: 11121
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-35.5
       parent: 4812
   - uid: 11122
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 36.5,-35.5
       parent: 4812
   - uid: 11123
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-35.5
       parent: 4812
   - uid: 11124
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-35.5
       parent: 4812
   - uid: 11266
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-36.5
       parent: 4812
   - uid: 11267
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-35.5
       parent: 4812
   - uid: 11268
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 22.5,-35.5
       parent: 4812
   - uid: 11269
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 21.5,-35.5
       parent: 4812
   - uid: 11270
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 20.5,-35.5
       parent: 4812
   - uid: 11271
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 18.5,-35.5
       parent: 4812
   - uid: 11272
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 17.5,-35.5
       parent: 4812
   - uid: 11273
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 16.5,-35.5
       parent: 4812
   - uid: 11302
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 27.5,-34.5
       parent: 4812
   - uid: 11303
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 26.5,-34.5
       parent: 4812
   - uid: 11304
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 23.5,-34.5
       parent: 4812
   - uid: 11305
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 24.5,-34.5
       parent: 4812
   - uid: 11348
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-33.5
       parent: 4812
   - uid: 11349
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-32.5
       parent: 4812
   - uid: 11366
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-38.5
       parent: 4812
   - uid: 11367
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 35.5,-37.5
       parent: 4812
   - uid: 11368
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 33.5,-35.5
       parent: 4812
   - uid: 11369
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 32.5,-35.5
       parent: 4812
   - uid: 11370
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-36.5
       parent: 4812
   - uid: 11383
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 29.5,-35.5
       parent: 4812
   - uid: 11384
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-35.5
       parent: 4812
   - uid: 11385
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 34.5,-37.5
       parent: 4812
   - uid: 11389
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 30.5,-37.5
       parent: 4812
   - uid: 11475
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,3.5
       parent: 4812
   - uid: 11646
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,3.5
       parent: 4812
   - uid: 11706
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 37.5,-42.5
       parent: 4812
   - uid: 11794
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -15.5,1.5
       parent: 4812
   - uid: 11795
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,1.5
       parent: 4812
   - uid: 11796
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,1.5
       parent: 4812
   - uid: 11797
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,0.5
       parent: 4812
   - uid: 11798
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-0.5
       parent: 4812
   - uid: 11799
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-1.5
       parent: 4812
   - uid: 11800
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,-2.5
       parent: 4812
   - uid: 11801
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -14.5,-2.5
       parent: 4812
   - uid: 11848
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -13.5,12.5
       parent: 4812
@@ -85310,148 +79477,106 @@ entities:
   entities:
   - uid: 7302
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-29.5
       parent: 4812
   - uid: 7305
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -41.5,-26.5
       parent: 4812
   - uid: 7312
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-25.5
       parent: 4812
   - uid: 7313
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -42.5,-30.5
       parent: 4812
   - uid: 7316
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -45.5,-25.5
       parent: 4812
   - uid: 7335
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -25.5,-31.5
       parent: 4812
   - uid: 7350
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -29.5,-33.5
       parent: 4812
   - uid: 7351
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -28.5,-32.5
       parent: 4812
   - uid: 7353
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -33.5,-30.5
       parent: 4812
   - uid: 7354
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -32.5,-30.5
       parent: 4812
   - uid: 7355
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-29.5
       parent: 4812
   - uid: 7356
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -31.5,-27.5
       parent: 4812
   - uid: 7357
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-30.5
       parent: 4812
   - uid: 7358
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-28.5
       parent: 4812
   - uid: 7359
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -39.5,-24.5
       parent: 4812
   - uid: 7360
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-30.5
       parent: 4812
   - uid: 7361
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,-30.5
       parent: 4812
   - uid: 7362
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -35.5,-22.5
       parent: 4812
   - uid: 7363
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -36.5,-21.5
       parent: 4812
   - uid: 7364
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -37.5,-21.5
       parent: 4812
   - uid: 7365
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -34.5,-13.5
       parent: 4812
@@ -85880,8 +80005,6 @@ entities:
     - type: Transform
       pos: -53.5,7.5
       parent: 4812
-    - type: AtmosDevice
-      joinedGrid: 4812
 - proto: WeaponCapacitorRecharger
   entities:
   - uid: 2515
@@ -86820,15 +80943,11 @@ entities:
   entities:
   - uid: 6795
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -19.5,-37.5
       parent: 4812
   - uid: 6796
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -21.5,-39.5
       parent: 4812
@@ -86874,11 +80993,4 @@ entities:
     - type: Transform
       pos: 26.494213,-35.426273
       parent: 4812
-- proto: YellowOxygenTankFilled
-  entities:
-  - uid: 11791
-    components:
-    - type: Transform
-      pos: 19.452671,-32.41012
-      parent: 4812
 ...

From 4cec8110b0112b37971d6bac2da3593dd014b61c Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Wed, 29 May 2024 02:02:15 +1200
Subject: [PATCH 091/568] Fix wall vending machines spawning items in walls.
 (#28279)

* Find spawning of wall vending machines.

* Review fixes
---
 .../VendingMachines/VendingMachineSystem.cs    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 723b9de6267c..63ec8f2c24bb 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Throwing;
 using Content.Shared.UserInterface;
 using Content.Shared.VendingMachines;
+using Content.Shared.Wall;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -39,6 +40,8 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
 
+        private const float WallVendEjectDistanceFromWall = 1f;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -384,7 +387,20 @@ private void EjectItem(EntityUid uid, VendingMachineComponent? vendComponent = n
                 return;
             }
 
-            var ent = Spawn(vendComponent.NextItemToEject, Transform(uid).Coordinates);
+            // Default spawn coordinates
+            var spawnCoordinates = Transform(uid).Coordinates;
+
+            //Make sure the wallvends spawn outside of the wall.
+
+            if (TryComp<WallMountComponent>(uid, out var wallMountComponent))
+            {
+
+                var offset = wallMountComponent.Direction.ToWorldVec() * WallVendEjectDistanceFromWall;
+                spawnCoordinates = spawnCoordinates.Offset(offset);
+            }
+
+            var ent = Spawn(vendComponent.NextItemToEject, spawnCoordinates);
+
             if (vendComponent.ThrowNextItem)
             {
                 var range = vendComponent.NonLimitedEjectRange;

From 691450974d16d4a723a1640dfcc2b33ac21d0bdb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 14:03:22 +0000
Subject: [PATCH 092/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4291972e7750..1dcd23155758 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: FungiFellow
-  changes:
-  - message: Added Improvised Shotgun Shell Recipe
-    type: Add
-  id: 6131
-  time: '2024-03-12T23:52:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25545
 - author: NakataRin
   changes:
   - message: Skeletons can only spawn with 10 people on the server now.
@@ -3867,3 +3860,10 @@
   id: 6630
   time: '2024-05-28T00:51:50.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28255
+- author: Repo
+  changes:
+  - message: NanoMed, wall vends will spawn items the correct direction.
+    type: Fix
+  id: 6631
+  time: '2024-05-28T14:02:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28279

From 5172114dbbe4ca95ad54c57a2d7be3fa3700838c Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Tue, 28 May 2024 17:23:05 +0300
Subject: [PATCH 093/568] Localize emergency shuttle's direction for
 announcements (#28340)

Localize emergency shuttle direction
---
 Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index e2b1ad32cd7a..45397ede088e 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -22,6 +22,7 @@
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.GameTicking;
+using Content.Shared.Localizations;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Tag;
@@ -287,8 +288,9 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
             if (TryComp(targetGrid.Value, out TransformComponent? targetXform))
             {
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
+                var direction = ContentLocalizationManager.FormatDirection(angle.GetDir());
                 var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir()), ("location", location)), playDefaultSound: false);
+                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playDefaultSound: false);
             }
 
             // shuttle timers
@@ -317,8 +319,9 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
             if (TryComp<TransformComponent>(targetGrid.Value, out var targetXform))
             {
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
+                var direction = ContentLocalizationManager.FormatDirection(angle.GetDir());
                 var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("time", $"{_consoleAccumulator:0}"), ("direction", angle.GetDir()), ("location", location)), playDefaultSound: false);
+                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playDefaultSound: false);
             }
 
             _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle {ToPrettyString(stationUid)} unable to find a valid docking port for {ToPrettyString(stationUid)}");

From 5141a95ed2ba53a0e91131dd1654f5f6cb3b8515 Mon Sep 17 00:00:00 2001
From: S1rFl0 <49481675+S1rFl0@users.noreply.github.com>
Date: Tue, 28 May 2024 16:43:12 +0200
Subject: [PATCH 094/568] Fix some grammar and spelling mistakes (#28350)

Fix some wacky grammar and spelling mistakes
---
 .../Locale/en-US/interaction/interaction-popup-component.ftl    | 2 +-
 .../Prototypes/Entities/Clothing/OuterClothing/softsuits.yml    | 2 +-
 .../Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 4929b11b1cd7..7db99c3d0aea 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -51,7 +51,7 @@ petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you d
 petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
 petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost bites your fingers!
-petting-failure-nymph = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} moves their branches away.
+petting-failure-nymph = You reach out to pet {THE($target)}, but {SUBJECT($target)} move their branches away.
 petting-failure-shadow = You're trying to pet {THE($target)}, but your hand passes through the cold darkness of his body.
 
 ## Petting silicons
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 58faf2684709..9db1ea2216c1 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -37,7 +37,7 @@
   parent: ClothingOuterEVASuitBase
   id: ClothingOuterSuitEmergency
   name: emergency EVA suit
-  description: An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to bide you time from the harsh vaccuum of space.
+  description: An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vaccuum of space.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Suits/eva_emergency.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index a19ed1951e43..b8cd6b8b25e6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -201,7 +201,7 @@
     deconstructionTarget: null
 
 - type: entity
-  name: sawn-off shogun
+  name: sawn-off shotgun
   parent: WeaponShotgunSawn
   id: WeaponShotgunSawnEmpty
   description: Groovy! Uses .50 shotgun shells.

From e4f1201b4c7869611f09e8e98b3fb94112b6c685 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Tue, 28 May 2024 07:59:13 -0700
Subject: [PATCH 095/568] Add pressure and temperature warning text to
 firelocks (#28341)

---
 Content.Server/Doors/Systems/FirelockSystem.cs     |  2 +-
 .../Doors/Systems/SharedFirelockSystem.cs          | 14 ++++++++++++++
 .../Locale/en-US/atmos/firelock-component.ftl      |  4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index e2b8b5829d18..c7da404fe880 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -69,7 +69,7 @@ public override void Update(float frameTime)
                     && xformQuery.TryGetComponent(uid, out var xform)
                     && appearanceQuery.TryGetComponent(uid, out var appearance))
                 {
-                    var (fire, pressure) = CheckPressureAndFire(uid, firelock, xform, airtight, airtightQuery);
+                    var (pressure, fire) = CheckPressureAndFire(uid, firelock, xform, airtight, airtightQuery);
                     _appearance.SetData(uid, DoorVisuals.ClosedLights, fire || pressure, appearance);
                     firelock.Temperature = fire;
                     firelock.Pressure = pressure;
diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
index 47a29a4ba803..4afe26039ba4 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.Doors.Components;
+using Content.Shared.Examine;
 using Content.Shared.Popups;
 using Content.Shared.Prying.Components;
 using Robust.Shared.Timing;
@@ -26,6 +27,8 @@ public override void Initialize()
         // Visuals
         SubscribeLocalEvent<FirelockComponent, MapInitEvent>(UpdateVisuals);
         SubscribeLocalEvent<FirelockComponent, ComponentStartup>(UpdateVisuals);
+
+        SubscribeLocalEvent<FirelockComponent, ExaminedEvent>(OnExamined);
     }
 
     public bool EmergencyPressureStop(EntityUid uid, FirelockComponent? firelock = null, DoorComponent? door = null)
@@ -107,4 +110,15 @@ private void UpdateVisuals(EntityUid uid,
     }
 
     #endregion
+
+    private void OnExamined(Entity<FirelockComponent> ent, ref ExaminedEvent args)
+    {
+        using (args.PushGroup(nameof(FirelockComponent)))
+        {
+            if (ent.Comp.Pressure)
+                args.PushMarkup(Loc.GetString("firelock-component-examine-pressure-warning"));
+            if (ent.Comp.Temperature)
+                args.PushMarkup(Loc.GetString("firelock-component-examine-temperature-warning"));
+        }
+    }
 }
diff --git a/Resources/Locale/en-US/atmos/firelock-component.ftl b/Resources/Locale/en-US/atmos/firelock-component.ftl
index fc375183e975..81f7e58462aa 100644
--- a/Resources/Locale/en-US/atmos/firelock-component.ftl
+++ b/Resources/Locale/en-US/atmos/firelock-component.ftl
@@ -1,2 +1,4 @@
 firelock-component-is-holding-pressure-message = A gush of air blows in your face... Maybe you should reconsider.
-firelock-component-is-holding-fire-message = A gush of warm air blows in your face... Maybe you should reconsider.
\ No newline at end of file
+firelock-component-is-holding-fire-message = A gush of warm air blows in your face... Maybe you should reconsider.
+firelock-component-examine-pressure-warning = The [color=red]extreme pressure[/color] differential warning is active.
+firelock-component-examine-temperature-warning = The [color=red]extreme temperature[/color] warning is active.

From 4f14d9698b815c0e0b4816558d9f78057a46a04c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 15:00:19 +0000
Subject: [PATCH 096/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1dcd23155758..60412578e47b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: NakataRin
-  changes:
-  - message: Skeletons can only spawn with 10 people on the server now.
-    type: Tweak
-  id: 6132
-  time: '2024-03-13T01:00:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26050
 - author: SlamBamActionman
   changes:
   - message: Syndicate implanters can no longer be recycled.
@@ -3867,3 +3860,10 @@
   id: 6631
   time: '2024-05-28T14:02:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28279
+- author: ShadowCommander
+  changes:
+  - message: Added pressure and temperature warnings to firelock examine text.
+    type: Add
+  id: 6632
+  time: '2024-05-28T14:59:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28341

From bec21d443ffd6737fecf8612391466a7c38a0b4f Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 28 May 2024 17:01:19 +0200
Subject: [PATCH 097/568] Fix paper scrap layers + cleanup paper.yml (#28299)

Fix paper scrap + cleanup paper.yml
---
 .../Entities/Objects/Misc/paper.yml           | 46 ++++---------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 05a0b9d34551..1c8d8754884f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -79,9 +79,14 @@
   description: 'A crumpled up piece of white paper.'
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: scrap
+    - state: paper_words
+      map: ["enum.PaperVisualLayers.Writing"]
+      visible: false
+    - state: paper_stamp-generic
+      map: ["enum.PaperVisualLayers.Stamp"]
+      visible: false
 
 - type: entity
   name: office paper
@@ -102,7 +107,6 @@
   description: 'The readout of a device forgotten to time'
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: paper_dotmatrix
     - state: paper_dotmatrix_words
@@ -133,7 +137,6 @@
   description: "A page of the captain's journal. In luxurious lavender."
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: paper
       color: "#e6e6fa"
@@ -160,7 +163,6 @@
   description: 'A single unit of bureaucracy.'
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: paper
       color: "#9ef5ff"
@@ -190,7 +192,6 @@
   description: A paper label designating a crate as containing a bounty. Selling a crate with this label will fulfill the bounty.
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: paper
       color: "#f7e574"
@@ -230,7 +231,6 @@
     escapeFormatting: false
     content: book-cnc-sheet
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
       - state: paper
         color: "#cccccc"
@@ -254,18 +254,11 @@
   id: PaperWritten
   noSpawn: true
   components:
-  - type: Paper
   - type: Sprite
     layers:
     # Changing it here is fine - if the PaperStatus key is actually added,
     #  something happened, so that ought to override this either way.
     - state: paper_words
-  - type: ActivatableUI
-    key: enum.PaperUiKey.Key
-  - type: UserInterface
-    interfaces:
-      enum.PaperUiKey.Key:
-        type: PaperBoundUserInterface
 
 - type: entity
   parent: Paper
@@ -274,7 +267,6 @@
   components:
   - type: NukeCodePaper
     allNukesAvailable: true
-  - type: Paper
 
 - type: entity
   parent: NukeCodePaper
@@ -346,7 +338,6 @@
   suffix: Red
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-colormap
       color: "#cc2323"
@@ -358,7 +349,6 @@
   suffix: Blue
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-colormap
       color: "#355d99"
@@ -370,7 +360,6 @@
   suffix: Yellow
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-colormap
       color: "#b38e3c"
@@ -382,7 +371,6 @@
   suffix: White
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-white
     - state: folder-base
@@ -393,7 +381,6 @@
   suffix: Grey
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-colormap
       color: "#999999"
@@ -405,7 +392,6 @@
   suffix: Black
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-colormap
       color: "#3f3f3f"
@@ -417,7 +403,6 @@
   suffix: Green
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-colormap
       color: "#43bc38"
@@ -431,7 +416,6 @@
   description: CentCom's miserable little pile of secrets!
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
     layers:
     - state: folder-centcom
     - state: folder-base
@@ -514,15 +498,12 @@
     - state: clipboard_over
   - type: Item
     sprite: Objects/Misc/cc-clipboard.rsi
-    size: Small
   - type: Clothing
-    slots: [belt]
-    quickEquip: false
     sprite: Objects/Misc/cc-clipboard.rsi
 
 - type: entity
   id: BoxFolderQmClipboard
-  parent: BoxFolderBase
+  parent: BoxFolderClipboard
   name: requisition digi-board
   description: A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe.
   components:
@@ -537,11 +518,6 @@
       map: ["qm_clipboard_pen"]
       visible: false
     - state: qm_clipboard_over
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: []
-      pen_slot: !type:ContainerSlot {}
   - type: ItemSlots
     slots:
       pen_slot:
@@ -554,18 +530,13 @@
     sprite: Objects/Misc/qm_clipboard.rsi
     size: Normal
   - type: Clothing
-    slots: [belt]
-    quickEquip: false
     sprite: Objects/Misc/qm_clipboard.rsi
   - type: Storage
     grid:
     - 0,0,4,3
     quickInsert: true
-    whitelist:
-      tags:
-        - Document
   - type: StorageFill
-    contents: [] #to override base folder fill
+    contents: [] #to override base clipboard fill
   - type: ItemMapper
     mapLayers:
       qm_clipboard_paper:
@@ -587,7 +558,6 @@
       enum.StorageUiKey.Key:
         type: StorageBoundUserInterface
   - type: MeleeWeapon
-    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 10

From 229c3cd729e1e928961d6130f54e139f12a50b75 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 28 May 2024 15:35:08 +0000
Subject: [PATCH 098/568] missing nukies can be filled in by ghost roles
 (#28316)

---
 Content.Server/Antag/AntagSelectionSystem.cs  | 12 +++++++--
 .../Components/AntagSelectionComponent.cs     |  1 +
 .../Entities/Markers/Spawners/ghost_roles.yml | 27 +++++++++++++++++++
 Resources/Prototypes/GameRules/roundstart.yml |  8 +++---
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index a86611bedb39..b42831cbde81 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -205,16 +205,24 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
         var playerPool = GetPlayerPool(ent, pool, def);
         var count = GetTargetAntagCount(ent, GetTotalPlayerCount(pool), def);
 
+        // if there is both a spawner and players getting picked, let it fall back to a spawner.
+        var noSpawner = def.SpawnerPrototype == null;
         for (var i = 0; i < count; i++)
         {
             var session = (ICommonSession?) null;
             if (def.PickPlayer)
             {
-                if (!playerPool.TryPickAndTake(RobustRandom, out session))
+                if (!playerPool.TryPickAndTake(RobustRandom, out session) && noSpawner)
+                {
+                    Log.Warning($"Couldn't pick a player for {ToPrettyString(ent):rule}, no longer choosing antags for this definition");
                     break;
+                }
 
-                if (ent.Comp.SelectedSessions.Contains(session))
+                if (session != null && ent.Comp.SelectedSessions.Contains(session))
+                {
+                    Log.Warning($"Somehow picked {session} for an antag when this rule already selected them previously");
                     continue;
+                }
             }
 
             MakeAntag(ent, session, def);
diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Server/Antag/Components/AntagSelectionComponent.cs
index 3464ee56662a..f70c27d12f28 100644
--- a/Content.Server/Antag/Components/AntagSelectionComponent.cs
+++ b/Content.Server/Antag/Components/AntagSelectionComponent.cs
@@ -104,6 +104,7 @@ public partial struct AntagSelectionDefinition()
 
     /// <summary>
     /// Whether or not players should be picked to inhabit this antag or not.
+    /// If no players are left and <see cref="SpawnerPrototype"/> is set, it will make a ghost role.
     /// </summary>
     [DataField]
     public bool PickPlayer = true;
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 25d1330d06b9..7942d26f3212 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -102,6 +102,33 @@
       - sprite: Structures/Wallmounts/signs.rsi
         state: radiation
 
+- type: entity
+  noSpawn: true
+  parent: SpawnPointLoneNukeOperative
+  id: SpawnPointNukeopsCommander
+  components:
+  - type: GhostRole
+    name: roles-antag-nuclear-operative-commander-name
+    description: roles-antag-nuclear-operative-commander-objective
+
+- type: entity
+  noSpawn: true
+  parent: SpawnPointLoneNukeOperative
+  id: SpawnPointNukeopsMedic
+  components:
+  - type: GhostRole
+    name: roles-antag-nuclear-operative-agent-name
+    description: roles-antag-nuclear-operative-agent-objective
+
+- type: entity
+  noSpawn: true
+  parent: SpawnPointLoneNukeOperative
+  id: SpawnPointNukeopsOperative
+  components:
+  - type: GhostRole
+    name: roles-antag-nuclear-operative-name
+    description: roles-antag-nuclear-operative-objective
+
 - type: entity
   parent: MarkerBase
   id: SpawnPointGhostDragon
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 57e59f10e213..93350163f68f 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -90,8 +90,7 @@
     definitions:
     - prefRoles: [ NukeopsCommander ]
       fallbackRoles: [ Nukeops, NukeopsMedic ]
-      max: 1
-      playerRatio: 10
+      spawnerPrototype: SpawnPointNukeopsCommander
       startingGear: SyndicateCommanderGearFull
       components:
       - type: NukeOperative
@@ -107,8 +106,7 @@
         prototype: NukeopsCommander
     - prefRoles: [ NukeopsMedic ]
       fallbackRoles: [ Nukeops, NukeopsCommander ]
-      max: 1
-      playerRatio: 10
+      spawnerPrototype: SpawnPointNukeopsMedic
       startingGear: SyndicateOperativeMedicFull
       components:
       - type: NukeOperative
@@ -124,7 +122,7 @@
         prototype: NukeopsMedic
     - prefRoles: [ Nukeops ]
       fallbackRoles: [ NukeopsCommander, NukeopsMedic ]
-      min: 0
+      spawnerPrototype: SpawnPointNukeopsOperative
       max: 3
       playerRatio: 10
       startingGear: SyndicateOperativeGearFull

From 1777eea9a42a8bdbc4a865327bb9ef3e10fe57de Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 15:36:14 +0000
Subject: [PATCH 099/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 60412578e47b..91fd512c01cb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Syndicate implanters can no longer be recycled.
-    type: Tweak
-  id: 6133
-  time: '2024-03-13T02:02:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26047
 - author: Gyrandola
   changes:
   - message: Adding Sky Blue carpets to tables no longer results in red carpet ones.
@@ -3867,3 +3860,10 @@
   id: 6632
   time: '2024-05-28T14:59:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28341
+- author: deltanedas
+  changes:
+  - message: Nukies will have ghost roles opened if not enough people can be picked.
+    type: Tweak
+  id: 6633
+  time: '2024-05-28T15:35:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28316

From eb3f27526bc8748a45c3f56de97a982747e51842 Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Wed, 29 May 2024 06:00:42 +1200
Subject: [PATCH 100/568] Fix late join & observe to de-admin admins. (#28319)

---
 Content.Client/Lobby/UI/ObserveWarningWindow.xaml   |  5 +++--
 .../Lobby/UI/ObserveWarningWindow.xaml.cs           | 13 +++++++++++++
 .../GameTicking/Commands/JoinGameCommand.cs         | 11 +++++++++++
 .../GameTicking/Commands/ObserveCommand.cs          |  9 +++++++++
 .../en-US/lobby/ui/observe-warning-window.ftl       |  2 ++
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
index 3fe8e83f57df..2feac5792a1e 100644
--- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
@@ -4,10 +4,11 @@
     <BoxContainer Orientation="Vertical">
         <Label Text="{Loc 'observe-warning-1'}"/>
         <Label Text="{Loc 'observe-warning-2'}"/>
-        <BoxContainer Orientation="Horizontal" >
+        <BoxContainer Orientation="Horizontal">
             <Button Name="NevermindButton" Text="{Loc 'observe-nevermind'}" SizeFlagsStretchRatio="1"/>
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="2" />
-            <cc:CommandButton  Command="observe" Name="ObserveButton" StyleClasses="Caution" Text="{Loc 'observe-confirm'}" SizeFlagsStretchRatio="1"/>
+            <cc:CommandButton Command="observe" Name="ObserveButton" StyleClasses="Caution" Text="{Loc 'observe-confirm'}" SizeFlagsStretchRatio="1"/>
+            <cc:CommandButton Command="observe admin" Name="ObserveAsAdminButton" Text="{Loc 'observe-as-admin'}" SizeFlagsStretchRatio="1" Visible="False"/>
         </BoxContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
index 718f40b2aa06..a002043ab114 100644
--- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
@@ -1,5 +1,7 @@
+using Content.Shared.Administration.Managers;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
@@ -9,11 +11,22 @@ namespace Content.Client.Lobby.UI;
 [UsedImplicitly]
 public sealed partial class ObserveWarningWindow : DefaultWindow
 {
+    [Dependency] private readonly ISharedAdminManager _adminManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
     public ObserveWarningWindow()
     {
         Title = Loc.GetString("observe-warning-window-title");
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+        var player = _playerManager.LocalSession;
+
+        if (player != null && _adminManager.IsAdmin(player))
+        {
+            ObserveButton.Text = Loc.GetString("observe-as-player");
+            ObserveAsAdminButton.Visible = true;
+            ObserveAsAdminButton.OnPressed += _ => { this.Close(); };
+        }
 
         ObserveButton.OnPressed += _ => { this.Close(); };
         NevermindButton.OnPressed += _ => { this.Close(); };
diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
index 3276b9120032..a32a2f94955b 100644
--- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -1,7 +1,10 @@
+using Content.Server.Administration.Managers;
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
+using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Roles;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -12,6 +15,8 @@ sealed class JoinGameCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IAdminManager _adminManager = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         public string Command => "joingame";
         public string Description => "";
@@ -67,6 +72,12 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                     shell.WriteLine($"{jobPrototype.LocalizedName} has no available slots.");
                     return;
                 }
+
+                if (_adminManager.IsAdmin(player) && _cfg.GetCVar(CCVars.AdminDeadminOnJoin))
+                {
+                    _adminManager.DeAdmin(player);
+                }
+
                 ticker.MakeJoinGame(player, station, id);
                 return;
             }
diff --git a/Content.Server/GameTicking/Commands/ObserveCommand.cs b/Content.Server/GameTicking/Commands/ObserveCommand.cs
index 16c2c3261dea..5a035033179b 100644
--- a/Content.Server/GameTicking/Commands/ObserveCommand.cs
+++ b/Content.Server/GameTicking/Commands/ObserveCommand.cs
@@ -1,3 +1,4 @@
+using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
 using Content.Shared.GameTicking;
 using Robust.Shared.Console;
@@ -8,6 +9,7 @@ namespace Content.Server.GameTicking.Commands
     sealed class ObserveCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _e = default!;
+        [Dependency] private readonly IAdminManager _adminManager = default!;
 
         public string Command => "observe";
         public string Description => "";
@@ -28,6 +30,13 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
+            var isAdminCommand = args.Length > 0 && args[0].ToLower() == "admin";
+
+            if (!isAdminCommand && _adminManager.IsAdmin(player))
+            {
+                _adminManager.DeAdmin(player);
+            }
+
             if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) &&
                 status != PlayerGameStatus.JoinedGame)
             {
diff --git a/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl b/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl
index 4f1c87f16a7a..be07604c734f 100644
--- a/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl
+++ b/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl
@@ -3,3 +3,5 @@ observe-confirm = Observe
 observe-warning-1 = Are you sure you want to observe?
 observe-warning-2 = You cannot play in the round if you do so.
 observe-warning-window-title = Warning
+observe-as-admin = Admin Observe
+observe-as-player = Player Observe

From 7c4ac79a549c270ed291a90167977afa5daa4c5e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 18:01:48 +0000
Subject: [PATCH 101/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 879eaff2329f..0c0c7aece812 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -246,5 +246,14 @@ Entries:
   id: 30
   time: '2024-05-25T20:18:05.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28178
+- author: Repo
+  changes:
+  - message: Option to admin or play on observe for admins
+    type: Tweak
+  - message: de-admin on late join
+    type: Fix
+  id: 31
+  time: '2024-05-28T18:00:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28319
 Name: Admin
 Order: 1

From 51515c730abd126735981d7354eb16fbdc35ed39 Mon Sep 17 00:00:00 2001
From: WarMechanic <69510347+WarMechanic@users.noreply.github.com>
Date: Wed, 29 May 2024 04:17:33 +1000
Subject: [PATCH 102/568] Allow wieldable guns to cycle in hand (#28002)

---
 .../Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
index cf858e173741..690658d0c70f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
@@ -4,6 +4,7 @@
   abstract: true
   components:
   - type: Wieldable
+    unwieldOnUse: false
   - type: GunWieldBonus
     minAngle: -20
     maxAngle: -30

From 7b93b0cff930fc4020bef3fde9f63f89e55cb49b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 18:18:39 +0000
Subject: [PATCH 103/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 91fd512c01cb..12446dfd1574 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Gyrandola
-  changes:
-  - message: Adding Sky Blue carpets to tables no longer results in red carpet ones.
-    type: Fix
-  id: 6134
-  time: '2024-03-13T02:03:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26049
 - author: Gyrandola
   changes:
   - message: Clicking yourself with a knife no longer triggers a butchering popup
@@ -3867,3 +3860,10 @@
   id: 6633
   time: '2024-05-28T15:35:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28316
+- author: WarMechanic
+  changes:
+  - message: Guns will now cycle when interacting with them in-hand after wielding.
+    type: Tweak
+  id: 6634
+  time: '2024-05-28T18:17:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28002

From 0bca934c9da163271115ef70d89a9e6f9b6ef9a1 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 28 May 2024 14:41:41 -0400
Subject: [PATCH 104/568] Add LocalizedDatasetPrototype (#28310)

---
 .../Dataset/LocalizedDatasetPrototype.cs      | 94 +++++++++++++++++++
 .../Random/Helpers/SharedRandomExtensions.cs  |  5 +
 .../Shared/LocalizedDatasetPrototypeTest.cs   | 59 ++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 Content.Shared/Dataset/LocalizedDatasetPrototype.cs
 create mode 100644 Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs

diff --git a/Content.Shared/Dataset/LocalizedDatasetPrototype.cs b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
new file mode 100644
index 000000000000..8be9967e309d
--- /dev/null
+++ b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
@@ -0,0 +1,94 @@
+using System.Collections;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Dataset;
+
+/// <summary>
+/// A variant of <see cref="DatasetPrototype"/> intended to specify a sequence of LocId strings
+/// without having to copy-paste a ton of LocId strings into the YAML.
+/// </summary>
+[Prototype]
+public sealed partial class LocalizedDatasetPrototype : IPrototype
+{
+    /// <summary>
+    /// Identifier for this prototype.
+    /// </summary>
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// Collection of LocId strings.
+    /// </summary>
+    [DataField]
+    public LocalizedDatasetValues Values { get; private set; } = [];
+}
+
+[Serializable, NetSerializable]
+[DataDefinition]
+public sealed partial class LocalizedDatasetValues : IReadOnlyList<string>
+{
+    /// <summary>
+    /// String prepended to the index number to generate each LocId string.
+    /// For example, a prefix of <c>tips-dataset-</c> will generate <c>tips-dataset-1</c>,
+    /// <c>tips-dataset-2</c>, etc.
+    /// </summary>
+    [DataField(required: true)]
+    public string Prefix { get; private set; } = default!;
+
+    /// <summary>
+    /// How many values are in the dataset.
+    /// </summary>
+    [DataField(required: true)]
+    public int Count { get; private set; }
+
+    public string this[int index]
+    {
+        get
+        {
+            if (index > Count || index < 0)
+                throw new IndexOutOfRangeException();
+            return Prefix + index;
+        }
+    }
+
+    public IEnumerator<string> GetEnumerator()
+    {
+        return new Enumerator(this);
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    public sealed class Enumerator : IEnumerator<string>
+    {
+        private int _index = 0; // Whee, 1-indexing
+
+        private readonly LocalizedDatasetValues _values;
+
+        public Enumerator(LocalizedDatasetValues values)
+        {
+            _values = values;
+        }
+
+        public string Current => _values.Prefix + _index;
+
+        object IEnumerator.Current => Current;
+
+        public void Dispose() { }
+
+        public bool MoveNext()
+        {
+            _index++;
+            return _index <= _values.Count;
+        }
+
+        public void Reset()
+        {
+            _index = 0;
+        }
+    }
+}
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index 20e57e942128..f5fbc1bd24e8 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -12,6 +12,11 @@ public static string Pick(this IRobustRandom random, DatasetPrototype prototype)
             return random.Pick(prototype.Values);
         }
 
+        public static string Pick(this IRobustRandom random, LocalizedDatasetPrototype prototype)
+        {
+            return random.Pick(prototype.Values);
+        }
+
         public static string Pick(this IWeightedRandomPrototype prototype, System.Random random)
         {
             var picks = prototype.Weights;
diff --git a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
new file mode 100644
index 000000000000..0ec4c076f5b4
--- /dev/null
+++ b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
@@ -0,0 +1,59 @@
+using System;
+using Content.Shared.Dataset;
+using NUnit.Framework;
+using Robust.Shared.Collections;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Tests.Shared;
+
+[TestFixture]
+[TestOf(typeof(LocalizedDatasetPrototype))]
+public sealed class LocalizedDatasetPrototypeTest : ContentUnitTest
+{
+    private IPrototypeManager _prototypeManager;
+
+    [OneTimeSetUp]
+    public void OneTimeSetup()
+    {
+        IoCManager.Resolve<ISerializationManager>().Initialize();
+        _prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+        _prototypeManager.Initialize();
+        _prototypeManager.LoadString(TestPrototypes);
+        _prototypeManager.ResolveResults();
+    }
+
+    private const string TestPrototypes = @"
+- type: localizedDataset
+  id: Test
+  values:
+    prefix: test-dataset-
+    count: 4
+";
+
+    [Test]
+    public void LocalizedDatasetTest()
+    {
+        var testPrototype = _prototypeManager.Index<LocalizedDatasetPrototype>("Test");
+        var values = new ValueList<string>();
+        foreach (var value in testPrototype.Values)
+        {
+            values.Add(value);
+        }
+
+        // Make sure we get the right number of values
+        Assert.That(values, Has.Count.EqualTo(4));
+
+        // Make sure indexing works as expected
+        Assert.That(values[0], Is.EqualTo("test-dataset-1"));
+        Assert.That(values[1], Is.EqualTo("test-dataset-2"));
+        Assert.That(values[2], Is.EqualTo("test-dataset-3"));
+        Assert.That(values[3], Is.EqualTo("test-dataset-4"));
+        Assert.Throws<IndexOutOfRangeException>(() => { var x = values[4]; });
+        Assert.Throws<IndexOutOfRangeException>(() => { var x = values[-1]; });
+
+        // Make sure that the enumerator gets all of the values
+        Assert.That(testPrototype.Values[testPrototype.Values.Count], Is.EqualTo("test-dataset-4"));
+    }
+}

From 69be7089d1abe34bdadbc19e65f665344351b046 Mon Sep 17 00:00:00 2001
From: basic pack <159909786+packmore@users.noreply.github.com>
Date: Tue, 28 May 2024 18:51:25 -0500
Subject: [PATCH 105/568] Lowers restart round vote's minimum players dead
 percentage. (#27470)

---
 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 1f419fb53f0b..e5d08ad6f362 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1251,7 +1251,7 @@ public static readonly CVarDef<bool>
         ///     Config for when the restart vote should be allowed to be called based on percentage of ghosts.
         ///
         public static readonly CVarDef<int> VoteRestartGhostPercentage =
-            CVarDef.Create("vote.restart_ghost_percentage", 75, CVar.SERVERONLY);
+            CVarDef.Create("vote.restart_ghost_percentage", 55, CVar.SERVERONLY);
 
         /// <summary>
         ///     See vote.enabled, but specific to preset votes

From fedc01a2a96729a07816edd1693a86067a9e4297 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Tue, 28 May 2024 18:54:25 -0500
Subject: [PATCH 106/568] Fix buzz tense (#27708)

---
 Resources/Locale/en-US/chat/emotes.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
index e95cb2795db4..8a3a3b0680dc 100644
--- a/Resources/Locale/en-US/chat/emotes.ftl
+++ b/Resources/Locale/en-US/chat/emotes.ftl
@@ -45,7 +45,7 @@ chat-emote-msg-snap = snaps {POSS-ADJ($entity)} fingers.
 chat-emote-msg-salute = salutes.
 chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
 chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
-chat-emote-msg-buzz = buzz!
+chat-emote-msg-buzz = buzzes!
 chat-emote-msg-chirp = chirps!
 chat-emote-msg-beep = beeps.
 chat-emote-msg-chime = chimes.

From a2f4540cb5cfc58b97ea2c0b1c3e75fc9cb64b28 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 29 May 2024 01:56:41 +0200
Subject: [PATCH 107/568] Remake gasp popup to emote (#27736)

---
 .../Body/Components/RespiratorComponent.cs    |  12 +++++-
 .../Body/Systems/RespiratorSystem.cs          |  10 ++---
 Resources/Audio/Effects/Gasp/attributions.yml |  26 ++++++++++++
 Resources/Audio/Effects/Gasp/deathgasp_1.ogg  | Bin 0 -> 15759 bytes
 Resources/Audio/Effects/Gasp/deathgasp_2.ogg  | Bin 0 -> 26424 bytes
 .../Audio/Effects/Gasp/female_deathgasp_1.ogg | Bin 0 -> 11025 bytes
 .../Audio/Effects/Gasp/female_deathgasp_2.ogg | Bin 0 -> 9004 bytes
 .../Audio/Effects/Gasp/female_deathgasp_3.ogg | Bin 0 -> 7700 bytes
 .../Audio/Effects/Gasp/female_deathgasp_4.ogg | Bin 0 -> 8684 bytes
 .../Audio/Effects/Gasp/female_deathgasp_5.ogg | Bin 0 -> 9132 bytes
 Resources/Audio/Effects/Gasp/gasp_female1.ogg | Bin 0 -> 8511 bytes
 Resources/Audio/Effects/Gasp/gasp_female2.ogg | Bin 0 -> 9203 bytes
 Resources/Audio/Effects/Gasp/gasp_female3.ogg | Bin 0 -> 8278 bytes
 Resources/Audio/Effects/Gasp/gasp_male1.ogg   | Bin 0 -> 7998 bytes
 Resources/Audio/Effects/Gasp/gasp_male2.ogg   | Bin 0 -> 8192 bytes
 .../Audio/Effects/Gasp/male_deathgasp_1.ogg   | Bin 0 -> 9378 bytes
 .../Audio/Effects/Gasp/male_deathgasp_2.ogg   | Bin 0 -> 7791 bytes
 .../Audio/Effects/Gasp/male_deathgasp_3.ogg   | Bin 0 -> 6899 bytes
 .../Audio/Effects/Gasp/male_deathgasp_4.ogg   | Bin 0 -> 8684 bytes
 .../Audio/Effects/Gasp/male_deathgasp_5.ogg   | Bin 0 -> 9132 bytes
 .../Locale/en-US/body/behavior/behavior.ftl   |   1 -
 Resources/Locale/en-US/chat/emotes.ftl        |   2 +
 .../Prototypes/SoundCollections/deathgasp.yml |  23 ++++++++++
 .../Prototypes/SoundCollections/gasp.yml      |  12 ++++++
 .../Prototypes/Voice/speech_emote_sounds.yml  |  40 ++++++++++++++++++
 Resources/Prototypes/Voice/speech_emotes.yml  |  10 ++++-
 26 files changed, 127 insertions(+), 9 deletions(-)
 create mode 100644 Resources/Audio/Effects/Gasp/attributions.yml
 create mode 100644 Resources/Audio/Effects/Gasp/deathgasp_1.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/deathgasp_2.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_1.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_2.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_3.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_4.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/female_deathgasp_5.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/gasp_female1.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/gasp_female2.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/gasp_female3.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/gasp_male1.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/gasp_male2.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_1.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_2.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_3.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_4.ogg
 create mode 100644 Resources/Audio/Effects/Gasp/male_deathgasp_5.ogg
 delete mode 100644 Resources/Locale/en-US/body/behavior/behavior.ftl
 create mode 100644 Resources/Prototypes/SoundCollections/deathgasp.yml
 create mode 100644 Resources/Prototypes/SoundCollections/gasp.yml

diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs
index 4045e21e26a7..a81062362aeb 100644
--- a/Content.Server/Body/Components/RespiratorComponent.cs
+++ b/Content.Server/Body/Components/RespiratorComponent.cs
@@ -1,5 +1,7 @@
 using Content.Server.Body.Systems;
+using Content.Shared.Chat.Prototypes;
 using Content.Shared.Damage;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Body.Components
@@ -50,10 +52,16 @@ public sealed partial class RespiratorComponent : Component
         public DamageSpecifier DamageRecovery = default!;
 
         [DataField]
-        public TimeSpan GaspPopupCooldown = TimeSpan.FromSeconds(8);
+        public TimeSpan GaspEmoteCooldown = TimeSpan.FromSeconds(8);
 
         [ViewVariables]
-        public TimeSpan LastGaspPopupTime;
+        public TimeSpan LastGaspEmoteTime;
+
+        /// <summary>
+        ///     The emote when gasps
+        /// </summary>
+        [DataField]
+        public ProtoId<EmotePrototype> GaspEmote = "Gasp";
 
         /// <summary>
         ///     How many cycles in a row has the mob been under-saturated?
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index c7266e2c463e..a46294beb4d9 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -2,8 +2,8 @@
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
+using Content.Server.Chat.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
@@ -25,9 +25,9 @@ public sealed class RespiratorSystem : EntitySystem
     [Dependency] private readonly BodySystem _bodySystem = default!;
     [Dependency] private readonly DamageableSystem _damageableSys = default!;
     [Dependency] private readonly LungSystem _lungSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
 
     public override void Initialize()
     {
@@ -84,10 +84,10 @@ public override void Update(float frameTime)
 
             if (respirator.Saturation < respirator.SuffocationThreshold)
             {
-                if (_gameTiming.CurTime >= respirator.LastGaspPopupTime + respirator.GaspPopupCooldown)
+                if (_gameTiming.CurTime >= respirator.LastGaspEmoteTime + respirator.GaspEmoteCooldown)
                 {
-                    respirator.LastGaspPopupTime = _gameTiming.CurTime;
-                    _popupSystem.PopupEntity(Loc.GetString("lung-behavior-gasp"), uid);
+                    respirator.LastGaspEmoteTime = _gameTiming.CurTime;
+                    _chat.TryEmoteWithChat(uid, respirator.GaspEmote, ignoreActionBlocker: true);
                 }
 
                 TakeSuffocationDamage((uid, respirator));
diff --git a/Resources/Audio/Effects/Gasp/attributions.yml b/Resources/Audio/Effects/Gasp/attributions.yml
new file mode 100644
index 000000000000..fe8f817c5a35
--- /dev/null
+++ b/Resources/Audio/Effects/Gasp/attributions.yml
@@ -0,0 +1,26 @@
+- files:
+  - deathgasp_1.ogg
+  - deathgasp_2.ogg
+  - female_deathgasp_1.ogg
+  - female_deathgasp_2.ogg
+  - female_deathgasp_3.ogg
+  - female_deathgasp_4.ogg
+  - female_deathgasp_5.ogg
+  - male_deathgasp_1.ogg
+  - male_deathgasp_2.ogg
+  - male_deathgasp_3.ogg
+  - male_deathgasp_4.ogg
+  - male_deathgasp_5.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/4397f13c72998aa7e6ce192215c9f77b9d62eee2"
+  source: "https://github.com/ParadiseSS13/Paradise/tree/4397f13c72998aa7e6ce192215c9f77b9d62eee2/sound/goonstation/voice"
+
+- files:
+  - gasp_female1.ogg
+  - gasp_female2.ogg
+  - gasp_female3.ogg
+  - gasp_male1.ogg
+  - gasp_male2.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f7a49c4068f1277e6857baf0892d355f1c055974"
+  source: "https://github.com/tgstation/tgstation/tree/f7a49c4068f1277e6857baf0892d355f1c055974/sound/voice/human"
diff --git a/Resources/Audio/Effects/Gasp/deathgasp_1.ogg b/Resources/Audio/Effects/Gasp/deathgasp_1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d6e4f8a9e758086c63e0bd6e620d21a11686a7c9
GIT binary patch
literal 15759
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
K_cB1168K;9Zk;~>

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/deathgasp_2.ogg b/Resources/Audio/Effects/Gasp/deathgasp_2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..77959ff8a84dec8d6941869012fa0b7c2bc4449f
GIT binary patch
literal 26424
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%0AD6l%;_b3Fw
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

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/female_deathgasp_1.ogg b/Resources/Audio/Effects/Gasp/female_deathgasp_1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..2139a26695c27a80742de328980082d251bf8e81
GIT binary patch
literal 11025
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
E0q^Qixc~qF

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/female_deathgasp_2.ogg b/Resources/Audio/Effects/Gasp/female_deathgasp_2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..713721d723d0659654f62b67a6860dec1f6f7c03
GIT binary patch
literal 9004
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
Obrg&TkSFy7!2bhDL3AJh

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/female_deathgasp_3.ogg b/Resources/Audio/Effects/Gasp/female_deathgasp_3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..eaf356db4b4029afe798579130658c16742cc308
GIT binary patch
literal 7700
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
T_T+GR()Kb?XI))J!NLCl8^J2%

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/female_deathgasp_4.ogg b/Resources/Audio/Effects/Gasp/female_deathgasp_4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b3c9a8045b5395b6afe14772793a262bbefc2d57
GIT binary patch
literal 8684
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

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/female_deathgasp_5.ogg b/Resources/Audio/Effects/Gasp/female_deathgasp_5.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b9b45c92ad99b106355982fea27a97ba345ef30d
GIT binary patch
literal 9132
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
A-2eap

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/gasp_female1.ogg b/Resources/Audio/Effects/Gasp/gasp_female1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ec9da07eba2e60e7186d9d22e4a7ef2b0fdbae5e
GIT binary patch
literal 8511
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
Ny^_*)LU^zS{1>1`<9h%A

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/gasp_female2.ogg b/Resources/Audio/Effects/Gasp/gasp_female2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..2db7d5109c926c48e7a65266a5df2bf1c35f0f4d
GIT binary patch
literal 9203
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
br7doh*BWi9^G=Ior#dzLB^!=Bh$Qe|spaM9

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/gasp_female3.ogg b/Resources/Audio/Effects/Gasp/gasp_female3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..af94ccba8fce75cbf203f7e5d9f4ca198ea7c5b5
GIT binary patch
literal 8278
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
Ro7B6wtKZ}6jsZcye*qJ7N_zkR

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/gasp_male1.ogg b/Resources/Audio/Effects/Gasp/gasp_male1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..657a2739cdf58b5d66a2e664b0888646e2afbd61
GIT binary patch
literal 7998
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
SZWykU^fh5l7STzOZ2twt?$f;h

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/gasp_male2.ogg b/Resources/Audio/Effects/Gasp/gasp_male2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..88ac0b77f4d8d8b75583232e4e0daa22cc633397
GIT binary patch
literal 8192
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

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/male_deathgasp_1.ogg b/Resources/Audio/Effects/Gasp/male_deathgasp_1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..341ac39fbc527470b8920314e57357c126215205
GIT binary patch
literal 9378
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

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/male_deathgasp_2.ogg b/Resources/Audio/Effects/Gasp/male_deathgasp_2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..15bab8b84868b192aa0acf5c13b544f754c55c0f
GIT binary patch
literal 7791
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
Vr8Qm1K^FB83Gg*`Y@mn<{2x7vQV{?E

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/male_deathgasp_3.ogg b/Resources/Audio/Effects/Gasp/male_deathgasp_3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..c5107366e3ad8b4c14b2551cbea24bc0a3507a87
GIT binary patch
literal 6899
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
D9BH0i

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/male_deathgasp_4.ogg b/Resources/Audio/Effects/Gasp/male_deathgasp_4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b306297917f4ec2bd9280eeaad35b0c05981c9bc
GIT binary patch
literal 8684
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

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Effects/Gasp/male_deathgasp_5.ogg b/Resources/Audio/Effects/Gasp/male_deathgasp_5.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..0f175b40884cff5106469299c5640828beed6a32
GIT binary patch
literal 9132
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
BERg^J

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/body/behavior/behavior.ftl b/Resources/Locale/en-US/body/behavior/behavior.ftl
deleted file mode 100644
index 6870fdb894f0..000000000000
--- a/Resources/Locale/en-US/body/behavior/behavior.ftl
+++ /dev/null
@@ -1 +0,0 @@
-lung-behavior-gasp = Gasp
\ No newline at end of file
diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
index 8a3a3b0680dc..cccb33a1f17b 100644
--- a/Resources/Locale/en-US/chat/emotes.ftl
+++ b/Resources/Locale/en-US/chat/emotes.ftl
@@ -12,6 +12,7 @@ chat-emote-name-click = Click
 chat-emote-name-clap = Clap
 chat-emote-name-snap = Snap
 chat-emote-name-salute = Salute
+chat-emote-name-gasp = Gasp
 chat-emote-name-deathgasp = Deathgasp
 chat-emote-name-buzz = Buzz
 chat-emote-name-weh = Weh
@@ -43,6 +44,7 @@ chat-emote-msg-click = clicks.
 chat-emote-msg-clap = claps!
 chat-emote-msg-snap = snaps {POSS-ADJ($entity)} fingers.
 chat-emote-msg-salute = salutes.
+chat-emote-msg-gasp = gasps.
 chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
 chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
 chat-emote-msg-buzz = buzzes!
diff --git a/Resources/Prototypes/SoundCollections/deathgasp.yml b/Resources/Prototypes/SoundCollections/deathgasp.yml
new file mode 100644
index 000000000000..28c33c1fb458
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/deathgasp.yml
@@ -0,0 +1,23 @@
+- type: soundCollection
+  id: MaleDeathGasp
+  files:
+  - /Audio/Effects/Gasp/male_deathgasp_1.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_2.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_3.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_4.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_5.ogg
+
+- type: soundCollection
+  id: FemaleDeathGasp
+  files:
+  - /Audio/Effects/Gasp/female_deathgasp_1.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_2.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_3.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_4.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_5.ogg
+
+- type: soundCollection
+  id: DeathGasp
+  files:
+  - /Audio/Effects/Gasp/deathgasp_1.ogg
+  - /Audio/Effects/Gasp/deathgasp_2.ogg
diff --git a/Resources/Prototypes/SoundCollections/gasp.yml b/Resources/Prototypes/SoundCollections/gasp.yml
new file mode 100644
index 000000000000..0f1ec51eda07
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/gasp.yml
@@ -0,0 +1,12 @@
+- type: soundCollection
+  id: MaleGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_male1.ogg
+  - /Audio/Effects/Gasp/gasp_male2.ogg
+
+- type: soundCollection
+  id: FemaleGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_female1.ogg
+  - /Audio/Effects/Gasp/gasp_female2.ogg
+  - /Audio/Effects/Gasp/gasp_female3.ogg
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index e86b05f4c887..3358d5be6786 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -34,6 +34,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleHuman
@@ -70,6 +74,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: MaleReptilian
@@ -88,6 +96,10 @@
       collection: MaleCry
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: FemaleReptilian
@@ -142,6 +154,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
   params:
     variation: 0.125
 
@@ -180,6 +196,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
   params:
     variation: 0.125
 
@@ -205,6 +225,10 @@
       collection: BikeHorn
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
   params:
     variation: 0.125
 
@@ -223,6 +247,10 @@
       path: /Audio/Voice/Arachnid/arachnid_click.ogg
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: UnisexDwarf
@@ -257,6 +285,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
   params:
     variation: 0.125
     pitch: 0.75
@@ -294,6 +326,10 @@
       collection: Whistles
     Weh:
       collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
   params:
     variation: 0.125
     pitch: 0.75
@@ -315,6 +351,10 @@
       path: /Audio/Voice/Moth/moth_squeak.ogg
     Weh:
       collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: DeathGasp
 
 - type: emoteSounds
   id: UnisexSilicon
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 84e48c1c23e2..e57183697641 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -1,4 +1,4 @@
-# vocal emotes
+# vocal emotes
 - type: emote
   id: Scream
   name: chat-emote-name-scream
@@ -338,6 +338,14 @@
     - salutes.
     - salutes!
 
+- type: emote
+  id: Gasp
+  name: chat-emote-name-gasp
+  whitelist:
+    components:
+    - Respirator
+  chatMessages: ["chat-emote-msg-gasp"]
+
 - type: emote
   id: DefaultDeathgasp
   name: chat-emote-name-deathgasp

From b144354d71d759304465d947010aefb261986952 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 28 May 2024 23:57:48 +0000
Subject: [PATCH 108/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 12446dfd1574..6e3cbbfb33ed 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Gyrandola
-  changes:
-  - message: Clicking yourself with a knife no longer triggers a butchering popup
-    type: Fix
-  id: 6135
-  time: '2024-03-13T03:52:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26051
 - author: maylokana
   changes:
   - message: Italicized whisper bubbles
@@ -3867,3 +3860,10 @@
   id: 6634
   time: '2024-05-28T18:17:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28002
+- author: lzk228
+  changes:
+  - message: Gasp and deathgasp emotes now have a sound.
+    type: Tweak
+  id: 6635
+  time: '2024-05-28T23:56:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27736

From a852c3c3f31d7b4a080fa2d24bc11576d1eb248a Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Tue, 28 May 2024 19:16:43 -0500
Subject: [PATCH 109/568] Create Consistency in the Syndicate Borgs (#27875)

---
 .../Entities/Mobs/Cyborgs/base_borg_chassis.yml          | 2 ++
 .../Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 187aeae2650a..71f5596ccfd0 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -281,3 +281,5 @@
   - type: Vocal
     sounds:
       Unsexed: UnisexSiliconSyndicate
+  - type: PointLight
+    color: "#dd200b"
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 9f8eab968e8a..81f889b438ad 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -314,8 +314,6 @@
           shader: unshaded
           map: ["light"]
           visible: false
-    - type: PointLight
-      color: "#dd200b"
     - type: BorgChassis
       maxModules: 3
       moduleWhitelist:
@@ -356,6 +354,9 @@
       noMindState: synd_medical
     - type: Construction
       node: syndicatemedical
+    - type: ShowHealthBars
+      damageContainers:
+      - Biological
 
 - type: entity
   id: BorgChassisSyndicateSaboteur
@@ -385,3 +386,7 @@
       noMindState: synd_engi
     - type: Construction
       node: syndicatesaboteur
+    - type: ShowHealthBars
+      damageContainers:
+      - Inorganic
+      - Silicon

From 6bdcbf15489f034ebfa165248bfa4fdb6f7cd554 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 29 May 2024 00:17:49 +0000
Subject: [PATCH 110/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6e3cbbfb33ed..606f588bf569 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: maylokana
-  changes:
-  - message: Italicized whisper bubbles
-    type: Tweak
-  id: 6136
-  time: '2024-03-13T08:03:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25602
 - author: Slava0135
   changes:
   - message: Fixed pie bomb not detonating when eaten or sliced (remember to keep
@@ -3867,3 +3860,11 @@
   id: 6635
   time: '2024-05-28T23:56:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27736
+- author: Cojoke-dot
+  changes:
+  - message: The syndicate Medical and Sabatour borgs now come with medical and diagnostics
+      HUDs  respectively.
+    type: Tweak
+  id: 6636
+  time: '2024-05-29T00:16:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27875

From c53b5d422dd0bdcd5b0d1d8b8b27ff60f938273c Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 29 May 2024 10:34:46 +1000
Subject: [PATCH 111/568] Don't update APC states unless UI open (#27803)

---
 Content.Server/Power/EntitySystems/ApcSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs
index 529d4d81d7c6..d88edd85cb5d 100644
--- a/Content.Server/Power/EntitySystems/ApcSystem.cs
+++ b/Content.Server/Power/EntitySystems/ApcSystem.cs
@@ -45,7 +45,7 @@ public override void Update(float deltaTime)
         var query = EntityQueryEnumerator<ApcComponent, PowerNetworkBatteryComponent, UserInterfaceComponent>();
         while (query.MoveNext(out var uid, out var apc, out var battery, out var ui))
         {
-            if (apc.LastUiUpdate + ApcComponent.VisualsChangeDelay < _gameTiming.CurTime)
+            if (apc.LastUiUpdate + ApcComponent.VisualsChangeDelay < _gameTiming.CurTime && _ui.IsUiOpen((uid, ui), ApcUiKey.Key))
             {
                 apc.LastUiUpdate = _gameTiming.CurTime;
                 UpdateUIState(uid, apc, battery);

From 7f9ed797afccd2317218f7332250f7bbfa6071a8 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 28 May 2024 23:37:03 -0400
Subject: [PATCH 112/568] Fix off-by-one error in LocalizedDatasetPrototype
 (#28366)

---
 .../Dataset/LocalizedDatasetPrototype.cs           |  4 ++--
 .../Shared/LocalizedDatasetPrototypeTest.cs        | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Content.Shared/Dataset/LocalizedDatasetPrototype.cs b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
index 8be9967e309d..2e0aa60c684a 100644
--- a/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
+++ b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
@@ -47,9 +47,9 @@ public string this[int index]
     {
         get
         {
-            if (index > Count || index < 0)
+            if (index >= Count || index < 0)
                 throw new IndexOutOfRangeException();
-            return Prefix + index;
+            return Prefix + (index + 1);
         }
     }
 
diff --git a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
index 0ec4c076f5b4..b07b18efa0a9 100644
--- a/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
+++ b/Content.Tests/Shared/LocalizedDatasetPrototypeTest.cs
@@ -46,14 +46,14 @@ public void LocalizedDatasetTest()
         Assert.That(values, Has.Count.EqualTo(4));
 
         // Make sure indexing works as expected
-        Assert.That(values[0], Is.EqualTo("test-dataset-1"));
-        Assert.That(values[1], Is.EqualTo("test-dataset-2"));
-        Assert.That(values[2], Is.EqualTo("test-dataset-3"));
-        Assert.That(values[3], Is.EqualTo("test-dataset-4"));
-        Assert.Throws<IndexOutOfRangeException>(() => { var x = values[4]; });
-        Assert.Throws<IndexOutOfRangeException>(() => { var x = values[-1]; });
+        Assert.That(testPrototype.Values[0], Is.EqualTo("test-dataset-1"));
+        Assert.That(testPrototype.Values[1], Is.EqualTo("test-dataset-2"));
+        Assert.That(testPrototype.Values[2], Is.EqualTo("test-dataset-3"));
+        Assert.That(testPrototype.Values[3], Is.EqualTo("test-dataset-4"));
+        Assert.Throws<IndexOutOfRangeException>(() => { var x = testPrototype.Values[4]; });
+        Assert.Throws<IndexOutOfRangeException>(() => { var x = testPrototype.Values[-1]; });
 
         // Make sure that the enumerator gets all of the values
-        Assert.That(testPrototype.Values[testPrototype.Values.Count], Is.EqualTo("test-dataset-4"));
+        Assert.That(testPrototype.Values[^1], Is.EqualTo("test-dataset-4"));
     }
 }

From 49982acc883f3acdd3e5bf6cc8027cac3ba03f7f Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Tue, 28 May 2024 21:05:40 -0700
Subject: [PATCH 113/568] Popup duplicate stacking (#27978)

---
 Content.Client/Popups/PopupSystem.cs   | 112 +++++++++++++++++--------
 Resources/Locale/en-US/popup/popup.ftl |   1 +
 2 files changed, 76 insertions(+), 37 deletions(-)
 create mode 100644 Resources/Locale/en-US/popup/popup.ftl

diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 1ef8dfba2d1d..700f6b6d26fc 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -1,18 +1,20 @@
 using System.Linq;
+using Content.Shared.Containers;
 using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Popups;
+using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
+using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Popups
 {
@@ -29,11 +31,11 @@ public sealed class PopupSystem : SharedPopupSystem
         [Dependency] private readonly ExamineSystemShared _examine = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
 
-        public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
-        public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
+        public IReadOnlyCollection<WorldPopupLabel> WorldLabels => _aliveWorldLabels.Values;
+        public IReadOnlyCollection<CursorPopupLabel> CursorLabels => _aliveCursorLabels.Values;
 
-        private readonly List<WorldPopupLabel> _aliveWorldLabels = new();
-        private readonly List<CursorPopupLabel> _aliveCursorLabels = new();
+        private readonly Dictionary<WorldPopupData, WorldPopupLabel> _aliveWorldLabels = new();
+        private readonly Dictionary<CursorPopupData, CursorPopupLabel> _aliveCursorLabels = new();
 
         public const float MinimumPopupLifetime = 0.7f;
         public const float MaximumPopupLifetime = 5f;
@@ -65,6 +67,15 @@ public override void Shutdown()
                 .RemoveOverlay<PopupOverlay>();
         }
 
+        private void WrapAndRepeatPopup(PopupLabel existingLabel, string popupMessage)
+        {
+            existingLabel.TotalTime = 0;
+            existingLabel.Repeats += 1;
+            existingLabel.Text = Loc.GetString("popup-system-repeated-popup-stacking-wrap",
+                ("popup-message", popupMessage),
+                ("count", existingLabel.Repeats));
+        }
+
         private void PopupMessage(string? message, PopupType type, EntityCoordinates coordinates, EntityUid? entity, bool recordReplay)
         {
             if (message == null)
@@ -78,13 +89,20 @@ private void PopupMessage(string? message, PopupType type, EntityCoordinates coo
                     _replayRecording.RecordClientMessage(new PopupCoordinatesEvent(message, type, GetNetCoordinates(coordinates)));
             }
 
+            var popupData = new WorldPopupData(message, type, coordinates, entity);
+            if (_aliveWorldLabels.TryGetValue(popupData, out var existingLabel))
+            {
+                WrapAndRepeatPopup(existingLabel, popupData.Message);
+                return;
+            }
+
             var label = new WorldPopupLabel(coordinates)
             {
                 Text = message,
                 Type = type,
             };
 
-            _aliveWorldLabels.Add(label);
+            _aliveWorldLabels.Add(popupData, label);
         }
 
         #region Abstract Method Implementations
@@ -113,13 +131,20 @@ private void PopupCursorInternal(string? message, PopupType type, bool recordRep
             if (recordReplay && _replayRecording.IsRecording)
                 _replayRecording.RecordClientMessage(new PopupCursorEvent(message, type));
 
+            var popupData = new CursorPopupData(message, type);
+            if (_aliveCursorLabels.TryGetValue(popupData, out var existingLabel))
+            {
+                WrapAndRepeatPopup(existingLabel, popupData.Message);
+                return;
+            }
+
             var label = new CursorPopupLabel(_inputManager.MouseScreenPosition)
             {
                 Text = message,
                 Type = type,
             };
 
-            _aliveCursorLabels.Add(label);
+            _aliveCursorLabels.Add(popupData, label);
         }
 
         public override void PopupCursor(string? message, PopupType type = PopupType.Small)
@@ -249,27 +274,37 @@ public override void FrameUpdate(float frameTime)
             if (_aliveWorldLabels.Count == 0 && _aliveCursorLabels.Count == 0)
                 return;
 
-            for (var i = 0; i < _aliveWorldLabels.Count; i++)
+            if (_aliveWorldLabels.Count > 0)
             {
-                var label = _aliveWorldLabels[i];
-                label.TotalTime += frameTime;
-
-                if (label.TotalTime > GetPopupLifetime(label) || Deleted(label.InitialPos.EntityId))
+                var aliveWorldToRemove = new ValueList<WorldPopupData>();
+                foreach (var (data, label) in _aliveWorldLabels)
+                {
+                    label.TotalTime += frameTime;
+                    if (label.TotalTime > GetPopupLifetime(label) || Deleted(label.InitialPos.EntityId))
+                    {
+                        aliveWorldToRemove.Add(data);
+                    }
+                }
+                foreach (var data in aliveWorldToRemove)
                 {
-                    _aliveWorldLabels.RemoveSwap(i);
-                    i--;
+                    _aliveWorldLabels.Remove(data);
                 }
             }
 
-            for (var i = 0; i < _aliveCursorLabels.Count; i++)
+            if (_aliveCursorLabels.Count > 0)
             {
-                var label = _aliveCursorLabels[i];
-                label.TotalTime += frameTime;
-
-                if (label.TotalTime > GetPopupLifetime(label))
+                var aliveCursorToRemove = new ValueList<CursorPopupData>();
+                foreach (var (data, label) in _aliveCursorLabels)
+                {
+                    label.TotalTime += frameTime;
+                    if (label.TotalTime > GetPopupLifetime(label))
+                    {
+                        aliveCursorToRemove.Add(data);
+                    }
+                }
+                foreach (var data in aliveCursorToRemove)
                 {
-                    _aliveCursorLabels.RemoveSwap(i);
-                    i--;
+                    _aliveCursorLabels.Remove(data);
                 }
             }
         }
@@ -279,29 +314,32 @@ public abstract class PopupLabel
             public PopupType Type = PopupType.Small;
             public string Text { get; set; } = string.Empty;
             public float TotalTime { get; set; }
+            public int Repeats = 1;
         }
 
-        public sealed class CursorPopupLabel : PopupLabel
-        {
-            public ScreenCoordinates InitialPos;
-
-            public CursorPopupLabel(ScreenCoordinates screenCoords)
-            {
-                InitialPos = screenCoords;
-            }
-        }
-
-        public sealed class WorldPopupLabel : PopupLabel
+        public sealed class WorldPopupLabel(EntityCoordinates coordinates) : PopupLabel
         {
             /// <summary>
             /// The original EntityCoordinates of the label.
             /// </summary>
-            public EntityCoordinates InitialPos;
+            public EntityCoordinates InitialPos = coordinates;
+        }
 
-            public WorldPopupLabel(EntityCoordinates coordinates)
-            {
-                InitialPos = coordinates;
-            }
+        public sealed class CursorPopupLabel(ScreenCoordinates screenCoords) : PopupLabel
+        {
+            public ScreenCoordinates InitialPos = screenCoords;
         }
+
+        [UsedImplicitly]
+        private record struct WorldPopupData(
+            string Message,
+            PopupType Type,
+            EntityCoordinates Coordinates,
+            EntityUid? Entity);
+
+        [UsedImplicitly]
+        private record struct CursorPopupData(
+            string Message,
+            PopupType Type);
     }
 }
diff --git a/Resources/Locale/en-US/popup/popup.ftl b/Resources/Locale/en-US/popup/popup.ftl
new file mode 100644
index 000000000000..4bc677c6082d
--- /dev/null
+++ b/Resources/Locale/en-US/popup/popup.ftl
@@ -0,0 +1 @@
+popup-system-repeated-popup-stacking-wrap = {$popup-message} x{$count}

From 7a30f3d8b9194fa0d06f7c5dff19d2a2dc7b4059 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 29 May 2024 04:06:48 +0000
Subject: [PATCH 114/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 606f588bf569..8c7a3ab28559 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: Slava0135
-  changes:
-  - message: Fixed pie bomb not detonating when eaten or sliced (remember to keep
-      hungry mice away from it)!
-    type: Fix
-  - message: Pie bomb now cannot be ejected or swapped (just hope there is no bomb
-      inside)
-    type: Tweak
-  id: 6137
-  time: '2024-03-13T08:36:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25928
 - author: Cojoke-dot
   changes:
   - message: Senior uniforms have been added to the Uniform Printer, visit your local
@@ -3868,3 +3857,11 @@
   id: 6636
   time: '2024-05-29T00:16:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27875
+- author: ShadowCommander
+  changes:
+  - message: Popups with the same message now stack together and append a x# to the
+      end.
+    type: Tweak
+  id: 6637
+  time: '2024-05-29T04:05:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27978

From 4b9fa926c08ab5549a1263e0b65cbee31d632824 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Tue, 28 May 2024 21:21:48 -0800
Subject: [PATCH 115/568] Tune spacing speed to fix under-pressure lockout
 (#28370)

---
 .../Atmos/Piping/Unary/Components/GasVentPumpComponent.cs       | 2 +-
 Content.Shared/CCVar/CCVars.cs                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
index 74d945a0b607..32cf1cac6f85 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -40,7 +40,7 @@ public sealed partial class GasVentPumpComponent : Component
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("underPressureLockoutThreshold")]
-        public float UnderPressureLockoutThreshold = 2;
+        public float UnderPressureLockoutThreshold = 60; // this must be tuned in conjunction with atmos.mmos_spacing_speed
 
         /// <summary>
         ///     Pressure locked vents still leak a little (leading to eventual pressurization of sealed sections)
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index e5d08ad6f362..5ca34945d88a 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1047,7 +1047,7 @@ public static readonly CVarDef<bool>
         ///     1.0 for instant spacing, 0.2 means 20% of remaining air lost each time
         /// </summary>
         public static readonly CVarDef<float> AtmosSpacingEscapeRatio =
-            CVarDef.Create("atmos.mmos_spacing_speed", 0.05f, CVar.SERVERONLY);
+            CVarDef.Create("atmos.mmos_spacing_speed", 0.15f, CVar.SERVERONLY);
 
         /// <summary>
         ///     Minimum amount of air allowed on a spaced tile before it is reset to 0 immediately in kPa

From 0a4458909de8d936ee97c63f103f5b2f6254aa7f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 29 May 2024 05:22:54 +0000
Subject: [PATCH 116/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8c7a3ab28559..814466c271bf 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Cojoke-dot
-  changes:
-  - message: Senior uniforms have been added to the Uniform Printer, visit your local
-      hop today!
-    type: Add
-  id: 6138
-  time: '2024-03-13T08:45:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25668
 - author: Plykiya
   changes:
   - message: Additional syringe doafter delay is now based on syringe contents rather
@@ -3865,3 +3857,12 @@
   id: 6637
   time: '2024-05-29T04:05:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27978
+- author: notafet
+  changes:
+  - message: Slightly increase spacing speed to fix under-pressure lockout.
+    type: Tweak
+  - message: Fix vent under-pressure lockout.
+    type: Fix
+  id: 6638
+  time: '2024-05-29T05:21:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28370

From b8a2decb4bae9b9eb4cbad177717f7931a3c693f Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 29 May 2024 17:32:20 +1000
Subject: [PATCH 117/568] Fix shuttle audio clipping (#27527)

Changed engine to use grid local-center and very high maxdistance / refdistance values so it's seamless.
---
 .../Shuttles/Components/FTLComponent.cs       |  3 ++
 .../Systems/ShuttleSystem.FasterThanLight.cs  | 38 ++++++++-----------
 .../Shuttles/Systems/ShuttleSystem.cs         |  1 +
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/Content.Server/Shuttles/Components/FTLComponent.cs b/Content.Server/Shuttles/Components/FTLComponent.cs
index edcf25981ba7..0a01bb7636e2 100644
--- a/Content.Server/Shuttles/Components/FTLComponent.cs
+++ b/Content.Server/Shuttles/Components/FTLComponent.cs
@@ -50,6 +50,9 @@ public sealed partial class FTLComponent : Component
         Params = AudioParams.Default.WithVolume(-3f).WithLoop(true)
     };
 
+    [DataField]
+    public EntityUid? StartupStream;
+
     [DataField]
     public EntityUid? TravelStream;
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 11cc16e0cd09..28f784f1dda0 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -24,6 +24,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using FTLMapComponent = Content.Shared.Shuttles.Components.FTLMapComponent;
 
@@ -343,12 +344,8 @@ private bool TrySetupFTL(EntityUid uid, ShuttleComponent shuttle, [NotNullWhen(t
         component = AddComp<FTLComponent>(uid);
         component.State = FTLState.Starting;
         var audio = _audio.PlayPvs(_startupSound, uid);
-        audio.Value.Component.Flags |= AudioFlags.GridAudio;
-
-        if (_physicsQuery.TryGetComponent(uid, out var gridPhysics))
-        {
-            _transform.SetLocalPosition(audio.Value.Entity, gridPhysics.LocalCenter);
-        }
+        _audio.SetGridAudio(audio);
+        component.StartupStream = audio?.Entity;
 
         // TODO: Play previs here for docking arrival.
 
@@ -377,6 +374,17 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
         var body = _physicsQuery.GetComponent(entity);
         var shuttleCenter = body.LocalCenter;
 
+        // Leave audio at the old spot
+        // Just so we don't clip
+        if (fromMapUid != null && TryComp(comp.StartupStream, out AudioComponent? startupAudio))
+        {
+            var clippedAudio = _audio.PlayStatic(_startupSound, Filter.Broadcast(),
+                new EntityCoordinates(fromMapUid.Value, _maps.GetGridPosition(entity.Owner)), true, startupAudio.Params);
+
+            _audio.SetPlaybackPosition(clippedAudio, entity.Comp1.StartupTime);
+            clippedAudio.Value.Component.Flags |= AudioFlags.NoOcclusion;
+        }
+
         // Offset the start by buffer range just to avoid overlap.
         var ftlStart = new EntityCoordinates(ftlMap, new Vector2(_index + width / 2f, 0f) - shuttleCenter);
 
@@ -402,15 +410,7 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
         // Audio
         var wowdio = _audio.PlayPvs(comp.TravelSound, uid);
         comp.TravelStream = wowdio?.Entity;
-        if (wowdio?.Component != null)
-        {
-            wowdio.Value.Component.Flags |= AudioFlags.GridAudio;
-
-            if (_physicsQuery.TryGetComponent(uid, out var gridPhysics))
-            {
-                _transform.SetLocalPosition(wowdio.Value.Entity, gridPhysics.LocalCenter);
-            }
-        }
+        _audio.SetGridAudio(wowdio);
     }
 
     /// <summary>
@@ -509,13 +509,7 @@ private void UpdateFTLArriving(Entity<FTLComponent, ShuttleComponent> entity)
 
         comp.TravelStream = _audio.Stop(comp.TravelStream);
         var audio = _audio.PlayPvs(_arrivalSound, uid);
-        audio.Value.Component.Flags |= AudioFlags.GridAudio;
-        // TODO: Shitcode til engine fix
-
-        if (_physicsQuery.TryGetComponent(uid, out var gridPhysics))
-        {
-            _transform.SetLocalPosition(audio.Value.Entity, gridPhysics.LocalCenter);
-        }
+        _audio.SetGridAudio(audio);
 
         if (TryComp<FTLDestinationComponent>(uid, out var dest))
         {
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 6fe2324d51ee..bbafef022c80 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -41,6 +41,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly ShuttleConsoleSystem _console = default!;

From c4ddc8e52925b16191df5858045a86f026991196 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 29 May 2024 17:37:03 +1000
Subject: [PATCH 118/568] Update submodule to 223.3.0 (#28377)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 721408bb3731..c89c529ba4fa 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 721408bb37317e7a66cd34655e068369c47912ac
+Subproject commit c89c529ba4fa7516e2265f3c47549da35ab6c3d8

From ffce93c3e14f7873095b43eb655e37e08bcba3c1 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Wed, 29 May 2024 01:42:15 -0700
Subject: [PATCH 119/568] Fix FixedPoint2.Abs multiplying the value by 100
 (#28378)

---
 Content.Shared/FixedPoint/FixedPoint2.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/FixedPoint/FixedPoint2.cs b/Content.Shared/FixedPoint/FixedPoint2.cs
index 33a9d25bc273..6439ee6c5e2d 100644
--- a/Content.Shared/FixedPoint/FixedPoint2.cs
+++ b/Content.Shared/FixedPoint/FixedPoint2.cs
@@ -237,7 +237,7 @@ public static int Sign(FixedPoint2 value)
 
         public static FixedPoint2 Abs(FixedPoint2 a)
         {
-            return FixedPoint2.New(Math.Abs(a.Value));
+            return FromCents(Math.Abs(a.Value));
         }
 
         public static FixedPoint2 Dist(FixedPoint2 a, FixedPoint2 b)

From 08952b467d9b2b2db85cb9ebb4e8b628c0145716 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 29 May 2024 20:25:16 +1000
Subject: [PATCH 120/568] Fix single-user BUIs erroneously closing (#28375)

---
 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 6f6777ee9648..bcde27ceba3f 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -159,7 +159,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev
             if (uiComp == null)
                 return;
 
-            if (uiComp.SingleUser && uiComp.CurrentSingleUser != ev.Actor)
+            if (uiComp.SingleUser && uiComp.CurrentSingleUser != null && uiComp.CurrentSingleUser != ev.Actor)
             {
                 ev.Cancel();
                 return;

From 8f7e2c81d8767161cb70b371f1c5cecfe057f063 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Wed, 29 May 2024 05:56:14 -0700
Subject: [PATCH 121/568] Change PlaceableSurfaceSystem.cs to file scoped
 namespace (#28379)

---
 .../Placeable/PlaceableSurfaceSystem.cs       | 95 +++++++++----------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index b0031cfa33f2..a9a9390a6e0e 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -3,68 +3,67 @@
 using Content.Shared.Interaction;
 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!;
 
-        public override void Initialize()
-        {
-            base.Initialize();
+    public override void Initialize()
+    {
+        base.Initialize();
 
-            SubscribeLocalEvent<PlaceableSurfaceComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
-        }
+        SubscribeLocalEvent<PlaceableSurfaceComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
+    }
 
-        public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
-        {
-            if (!Resolve(uid, ref surface, false))
-                return;
+    public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
+    {
+        if (!Resolve(uid, ref surface, false))
+            return;
 
-            surface.IsPlaceable = isPlaceable;
-            Dirty(uid, surface);
-        }
+        surface.IsPlaceable = isPlaceable;
+        Dirty(uid, surface);
+    }
 
-        public void SetPlaceCentered(EntityUid uid, bool placeCentered, PlaceableSurfaceComponent? surface = null)
-        {
-            if (!Resolve(uid, ref surface))
-                return;
+    public void SetPlaceCentered(EntityUid uid, bool placeCentered, PlaceableSurfaceComponent? surface = null)
+    {
+        if (!Resolve(uid, ref surface))
+            return;
 
-            surface.PlaceCentered = placeCentered;
-            Dirty(uid, surface);
-        }
+        surface.PlaceCentered = placeCentered;
+        Dirty(uid, surface);
+    }
 
-        public void SetPositionOffset(EntityUid uid, Vector2 offset, PlaceableSurfaceComponent? surface = null)
-        {
-            if (!Resolve(uid, ref surface))
-                return;
+    public void SetPositionOffset(EntityUid uid, Vector2 offset, PlaceableSurfaceComponent? surface = null)
+    {
+        if (!Resolve(uid, ref surface))
+            return;
 
-            surface.PositionOffset = offset;
-            Dirty(uid, surface);
-        }
+        surface.PositionOffset = offset;
+        Dirty(uid, surface);
+    }
 
-        private void OnAfterInteractUsing(EntityUid uid, PlaceableSurfaceComponent surface, AfterInteractUsingEvent args)
-        {
-            if (args.Handled || !args.CanReach)
-                return;
+    private void OnAfterInteractUsing(EntityUid uid, PlaceableSurfaceComponent surface, AfterInteractUsingEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
 
-            if (!surface.IsPlaceable)
-                return;
+        if (!surface.IsPlaceable)
+            return;
 
-            // 99% of the time they want to dump the stuff inside on the table, they can manually place with q if they really need to.
-            // Just causes prediction CBT otherwise.
-            if (HasComp<DumpableComponent>(args.Used))
-                return;
+        // 99% of the time they want to dump the stuff inside on the table, they can manually place with q if they really need to.
+        // Just causes prediction CBT otherwise.
+        if (HasComp<DumpableComponent>(args.Used))
+            return;
 
-            if (!_handsSystem.TryDrop(args.User, args.Used))
-                return;
+        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;
+        if (surface.PlaceCentered)
+            Transform(args.Used).LocalPosition = Transform(uid).LocalPosition + surface.PositionOffset;
+        else
+            Transform(args.Used).Coordinates = args.ClickLocation;
 
-            args.Handled = true;
-        }
+        args.Handled = true;
     }
 }

From a8dade2332880a78597e917b2b7f95a6959cc072 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 29 May 2024 18:46:23 +0200
Subject: [PATCH 122/568] Replace salvage access with cargo for artifact
 container (#28386)

---
 .../Objects/Specific/Xenoarchaeology/artifact_equipment.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index e1716f084394..f2f1cb8ac02a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -7,7 +7,7 @@
     - type: Transform
       noRot: true
     - type: AccessReader
-      access: [["Research"], ["Salvage"]]
+      access: [["Research"], ["Cargo"]]
     - type: Lock
     - type: ResistLocker
     - type: Sprite

From ca34b5dc75e1a8b1e81c88382f334baa889ee48c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 29 May 2024 16:47:29 +0000
Subject: [PATCH 123/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 814466c271bf..5dc65ddaf0e4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: Additional syringe doafter delay is now based on syringe contents rather
-      than transfer amount setting.
-    type: Tweak
-  id: 6139
-  time: '2024-03-13T09:35:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25890
 - author: SlamBamActionman
   changes:
   - message: Renamed Uplink categories and moved items to fit new category names.
@@ -3866,3 +3858,10 @@
   id: 6638
   time: '2024-05-29T05:21:48.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28370
+- author: lzk228
+  changes:
+  - message: Salvage access has been replaced with Cargo for the artifact container.
+    type: Tweak
+  id: 6639
+  time: '2024-05-29T16:46:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28386

From a90cb25ef73d9f2358ee0d668928de2e7a31a47a Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 30 May 2024 03:25:09 +1000
Subject: [PATCH 124/568] Fix surveillance camera closing (#28374)

The boilerplate sucks but I haven't thought of something good.
---
 .../SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs
index 1880e431eea7..295724788e59 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupBoundUi.cs
@@ -31,7 +31,7 @@ protected override void Open()
         _window.OpenCentered();
         _window.OnNameConfirm += SendDeviceName;
         _window.OnNetworkConfirm += SendSelectedNetwork;
-
+        _window.OnClose += Close;
     }
 
     private void SendSelectedNetwork(int idx)
@@ -63,7 +63,8 @@ protected override void Dispose(bool disposing)
 
         if (disposing)
         {
-            _window!.Dispose();
+            _window?.Dispose();
+            _window = null;
         }
     }
 }

From 5d79f897b98540d9318e181403b25899dea1f1c6 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Wed, 29 May 2024 14:06:50 -0400
Subject: [PATCH 125/568] Clean up RefiningSystem (#27904)

cleanup RefiningSystem
---
 .../Components/WelderRefinableComponent.cs    | 19 ++++-
 Content.Server/Construction/RefiningSystem.cs | 75 ++++++++++---------
 .../Entities/Objects/Materials/shards.yml     | 18 ++---
 .../Entities/Objects/Misc/broken_bottle.yml   |  2 +-
 .../Entities/Objects/Power/lights.yml         | 26 +++----
 5 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs
index ed37d6f74b83..2fe88f2670c1 100644
--- a/Content.Server/Construction/Components/WelderRefinableComponent.cs
+++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Storage;
 using Content.Shared.Tools;
 using Robust.Shared.Prototypes;
 
@@ -7,18 +8,30 @@ namespace Content.Server.Construction.Components;
 /// Used for something that can be refined by welder.
 /// For example, glass shard can be refined to glass sheet.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, Access(typeof(RefiningSystem))]
 public sealed partial class WelderRefinableComponent : Component
 {
-    [DataField]
-    public HashSet<EntProtoId>? RefineResult = new();
+    /// <summary>
+    /// The items created when the item is refined.
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntitySpawnEntry> RefineResult = new();
 
+    /// <summary>
+    /// The amount of time it takes to refine a given item.
+    /// </summary>
     [DataField]
     public float RefineTime = 2f;
 
+    /// <summary>
+    /// The amount of fuel it takes to refine a given item.
+    /// </summary>
     [DataField]
     public float RefineFuel;
 
+    /// <summary>
+    /// The tool type needed in order to refine this item.
+    /// </summary>
     [DataField]
     public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
 }
diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Server/Construction/RefiningSystem.cs
index 53cfb14528ed..ce7eb49ef1d7 100644
--- a/Content.Server/Construction/RefiningSystem.cs
+++ b/Content.Server/Construction/RefiningSystem.cs
@@ -1,50 +1,51 @@
 using Content.Server.Construction.Components;
-using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Interaction;
-using Content.Shared.Stacks;
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+using Content.Shared.Storage;
+using Content.Shared.Tools.Systems;
+using Robust.Shared.Random;
 
-namespace Content.Server.Construction
+namespace Content.Server.Construction;
+
+public sealed class RefiningSystem : EntitySystem
 {
-    public sealed class RefiningSystem : EntitySystem
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
+
+    public override void Initialize()
     {
-        [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);
-        }
+        base.Initialize();
+        SubscribeLocalEvent<WelderRefinableComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<WelderRefinableComponent, WelderRefineDoAfterEvent>(OnDoAfter);
+    }
 
-        private void OnInteractUsing(EntityUid uid, WelderRefinableComponent component, InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
+    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);
-        }
+        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)
+    private void OnDoAfter(EntityUid uid, WelderRefinableComponent component, WelderRefineDoAfterEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        var xform = Transform(uid);
+        var spawns = EntitySpawnCollection.GetSpawns(component.RefineResult, _random);
+        foreach (var spawn in spawns)
         {
-            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 result in component.RefineResult!)
-            {
-                var droppedEnt = Spawn(result, 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);
-            }
+            SpawnNextToOrDrop(spawn, uid, xform);
         }
+
+        Del(uid);
     }
 }
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index dfd02b6fccf7..561140a46a44 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -87,7 +87,7 @@
     color: "#bbeeff"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -122,8 +122,8 @@
         Slash: 4.5
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - PartRodMetal1
+    - id: SheetGlass1
+    - id: PartRodMetal1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -158,8 +158,8 @@
         Slash: 5.5
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetPlasma1
+    - id: SheetGlass1
+    - id: SheetPlasma1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -197,8 +197,8 @@
         Radiation: 2
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetUranium1
+    - id: SheetGlass1
+    - id: SheetUranium1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -232,8 +232,8 @@
     color: "#e0aa36"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetBrass1
+    - id: SheetGlass1
+    - id: SheetBrass1
   - type: DamageUserOnTrigger
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
index b7c73f5e0cc8..32222d0036cd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -28,4 +28,4 @@
   - type: SpaceGarbage
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index a5cf712d099c..bccf10bee535 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -68,7 +68,7 @@
   - type: SpaceGarbage
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
 
 - type: entity
   parent: BaseLightbulb
@@ -275,8 +275,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalCyan
+    - id: SheetGlass1
+    - id: ShardCrystalCyan
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -295,8 +295,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalBlue
+    - id: SheetGlass1
+    - id: ShardCrystalBlue
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -315,8 +315,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalPink
+    - id: SheetGlass1
+    - id: ShardCrystalPink
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -335,8 +335,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalOrange
+    - id: SheetGlass1
+    - id: ShardCrystalOrange
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -355,8 +355,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalRed
+    - id: SheetGlass1
+    - id: ShardCrystalRed
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -375,5 +375,5 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalGreen
+    - id: SheetGlass1
+    - id: ShardCrystalGreen

From 962a1192bd0b0b4a6853baa78c330d9aa74050b1 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 30 May 2024 04:19:06 +1000
Subject: [PATCH 126/568] Block gas analyzer updates if the UI doesn't open
 (#28376)

Fixes the gas analyzer UI coming up when used with a target.
---
 .../Atmos/EntitySystems/GasAnalyzerSystem.cs          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
index b42f36262936..c2cdd4a10727 100644
--- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
@@ -68,7 +68,6 @@ private void OnAfterInteract(EntityUid uid, GasAnalyzerComponent component, Afte
                 return;
             }
             ActivateAnalyzer(uid, component, args.User, args.Target);
-            OpenUserInterface(uid, args.User, component);
             args.Handled = true;
         }
 
@@ -86,6 +85,9 @@ private void OnUseInHand(EntityUid uid, GasAnalyzerComponent component, UseInHan
         /// </summary>
         private void ActivateAnalyzer(EntityUid uid, GasAnalyzerComponent component, EntityUid user, EntityUid? target = null)
         {
+            if (!TryOpenUserInterface(uid, user, component))
+                return;
+
             component.Target = target;
             component.User = user;
             if (target != null)
@@ -97,7 +99,6 @@ private void ActivateAnalyzer(EntityUid uid, GasAnalyzerComponent component, Ent
             UpdateAppearance(uid, component);
             EnsureComp<ActiveGasAnalyzerComponent>(uid);
             UpdateAnalyzer(uid, component);
-            OpenUserInterface(uid, user, component);
         }
 
         /// <summary>
@@ -134,12 +135,12 @@ private void OnDisabledMessage(EntityUid uid, GasAnalyzerComponent component, Ga
             DisableAnalyzer(uid, component);
         }
 
-        private void OpenUserInterface(EntityUid uid, EntityUid user, GasAnalyzerComponent? component = null)
+        private bool TryOpenUserInterface(EntityUid uid, EntityUid user, GasAnalyzerComponent? component = null)
         {
             if (!Resolve(uid, ref component, false))
-                return;
+                return false;
 
-            _userInterface.OpenUi(uid, GasAnalyzerUiKey.Key, user);
+            return _userInterface.TryOpenUi(uid, GasAnalyzerUiKey.Key, user);
         }
 
         /// <summary>

From 0374574572a62d714451679aa2161a752ddee5fb Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Wed, 29 May 2024 15:20:29 -0400
Subject: [PATCH 127/568] Update Oasis -- robo control comp, other minor
 changes. (#27990)

* Add robo control comp, also de-reinforce a lot of walls.

* Maybe increase atmos refill rates?

* wawoowewoo
---
 Resources/Maps/oasis.yml | 8286 ++++++++++++++++++++------------------
 1 file changed, 4388 insertions(+), 3898 deletions(-)

diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml
index 79b817105ecc..9fd4c24c89fe 100644
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
@@ -95,7 +95,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: HQAAAAADHQAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAADAAAAAACDAAAAAABDAAAAAADMgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAADHQAAAAACgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAADHQAAAAAANgAAAAABNgAAAAAANgAAAAABNgAAAAADSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAABHQAAAAAANgAAAAAANgAAAAABNgAAAAACNgAAAAACNgAAAAAANgAAAAADNgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAACHQAAAAAASgAAAAAASgAAAAAANgAAAAACNgAAAAABNgAAAAADNgAAAAABNgAAAAABNgAAAAADNgAAAAACSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAAAHQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAABNgAAAAABNgAAAAACNgAAAAAANgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAADHQAAAAADSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAADNgAAAAABNgAAAAADNgAAAAADSgAAAAAASgAAAAAASgAAAAAAHQAAAAACHQAAAAADgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAAANgAAAAADNgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAAAHQAAAAADSgAAAAAASgAAAAAASgAAAAAASgAAAAAANwAAAAABNwAAAAAANwAAAAADSgAAAAAASgAAAAAANgAAAAACNgAAAAABNgAAAAADSgAAAAAASgAAAAAAHQAAAAADHQAAAAACSgAAAAAASgAAAAAASgAAAAAASgAAAAAANwAAAAABNwAAAAAANwAAAAABSgAAAAAASgAAAAAANgAAAAADNgAAAAADNgAAAAADSgAAAAAASgAAAAAAHQAAAAABHQAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAANwAAAAABNwAAAAAANwAAAAABSgAAAAAASgAAAAAASgAAAAAANgAAAAACNgAAAAAASgAAAAAASgAAAAAAHQAAAAAAHQAAAAAAgQAAAAAADAAAAAABDAAAAAACSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAABNgAAAAACNgAAAAACSgAAAAAAHQAAAAAAHQAAAAADHQAAAAABgQAAAAAADAAAAAABDAAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAADNgAAAAABNgAAAAACSgAAAAAAHQAAAAABHQAAAAACHQAAAAADHQAAAAABgQAAAAAADAAAAAACDAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAADNgAAAAABNgAAAAABSgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHQAAAAAAHQAAAAACgQAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAABNgAAAAADgQAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAACHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAABHQAAAAAA
+          tiles: HQAAAAADHQAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAADAAAAAACDAAAAAABDAAAAAADMgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAAAHQAAAAADHQAAAAACgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAAANgAAAAAAHQAAAAADHQAAAAAANgAAAAABNgAAAAAANgAAAAABNgAAAAADSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAAANgAAAAAANgAAAAAAHQAAAAABHQAAAAAANgAAAAAANgAAAAABNgAAAAACNgAAAAACNgAAAAAANgAAAAADNgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAAANgAAAAAANgAAAAAASgAAAAAAHQAAAAACHQAAAAAASgAAAAAASgAAAAAANgAAAAACNgAAAAABNgAAAAADNgAAAAABNgAAAAABNgAAAAADNgAAAAACNgAAAAAANgAAAAAANgAAAAAASgAAAAAASgAAAAAAHQAAAAAAHQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAABNgAAAAABNgAAAAACNgAAAAAANgAAAAAANgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAADHQAAAAADSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAADNgAAAAABNgAAAAADNgAAAAADSgAAAAAASgAAAAAASgAAAAAAHQAAAAACHQAAAAADgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAAANgAAAAADNgAAAAAASgAAAAAASgAAAAAASgAAAAAAHQAAAAAAHQAAAAADSgAAAAAASgAAAAAASgAAAAAASgAAAAAANwAAAAABNwAAAAAANwAAAAADSgAAAAAASgAAAAAANgAAAAACNgAAAAABNgAAAAADSgAAAAAASgAAAAAAHQAAAAADHQAAAAACSgAAAAAASgAAAAAASgAAAAAASgAAAAAANwAAAAABNwAAAAAANwAAAAABSgAAAAAASgAAAAAANgAAAAADNgAAAAADNgAAAAADSgAAAAAASgAAAAAAHQAAAAABHQAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAANwAAAAABNwAAAAAANwAAAAABSgAAAAAASgAAAAAASgAAAAAANgAAAAACNgAAAAAASgAAAAAASgAAAAAAHQAAAAAAHQAAAAAAgQAAAAAADAAAAAABDAAAAAACSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAABNgAAAAACNgAAAAACSgAAAAAAHQAAAAAAHQAAAAADHQAAAAABgQAAAAAADAAAAAABDAAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAADNgAAAAABNgAAAAACSgAAAAAAHQAAAAABHQAAAAACHQAAAAADHQAAAAABgQAAAAAADAAAAAACDAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAADNgAAAAABNgAAAAABSgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHQAAAAAAHQAAAAACgQAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAASgAAAAAASgAAAAAASgAAAAAANgAAAAABNgAAAAADgQAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAACHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAABHQAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -119,7 +119,7 @@ entities:
           version: 6
         0,1:
           ind: 0,1
-          tiles: HQAAAAADHQAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAADAAAAAADDAAAAAABDAAAAAACDAAAAAABDAAAAAADDAAAAAACDAAAAAABSgAAAAAASgAAAAAASgAAAAAAHQAAAAACHQAAAAACSgAAAAAADAAAAAAADAAAAAADDAAAAAADDAAAAAABDAAAAAADDAAAAAADDAAAAAADDAAAAAACDAAAAAADDAAAAAAADAAAAAADDAAAAAADDAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAATwAAAAACTwAAAAADTwAAAAABTwAAAAABYAAAAAACYAAAAAADKQAAAAACPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACKQAAAAACPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYAAAAAACYAAAAAABKQAAAAABPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAKQAAAAABPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYAAAAAABYAAAAAADgQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAKQAAAAABPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAbwAAAAAAgQAAAAAAfQAAAAAAfQAAAAADfQAAAAABfQAAAAACYAAAAAADYAAAAAADYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAC
+          tiles: HQAAAAADHQAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAADAAAAAADDAAAAAABDAAAAAACDAAAAAABDAAAAAADDAAAAAACDAAAAAABSgAAAAAASgAAAAAASgAAAAAAHQAAAAACHQAAAAACSgAAAAAADAAAAAAADAAAAAADDAAAAAADDAAAAAABDAAAAAADDAAAAAADDAAAAAADDAAAAAACDAAAAAADDAAAAAAADAAAAAADDAAAAAADDAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAATwAAAAACTwAAAAADTwAAAAABTwAAAAABYAAAAAACYAAAAAADKQAAAAACPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACKQAAAAACPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAYAAAAAACYAAAAAABKQAAAAABPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAKQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAYAAAAAABYAAAAAADgQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAKQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAbwAAAAAAgQAAAAAAfQAAAAAAfQAAAAADfQAAAAABfQAAAAACYAAAAAADYAAAAAADYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAC
           version: 6
         1,1:
           ind: 1,1
@@ -131,7 +131,7 @@ entities:
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: NgAAAAABNgAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAADSgAAAAAASgAAAAAANwAAAAACgQAAAAAAKQAAAAADKQAAAAADKQAAAAABKQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAADSgAAAAAASgAAAAAANwAAAAADgQAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAASgAAAAAASgAAAAAANwAAAAADgQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAAAKQAAAAABbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAACKQAAAAABSgAAAAAASgAAAAAANwAAAAACgQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAACKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAACKQAAAAADSgAAAAAASgAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAABKQAAAAAAKQAAAAACKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAACSgAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAACgQAAAAAAKQAAAAACKQAAAAABKQAAAAABKQAAAAADKQAAAAADKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAADAAAAAACDAAAAAADgQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAADDAAAAAAADAAAAAADgQAAAAAAKQAAAAABKQAAAAADKQAAAAAAKQAAAAABKQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAACSgAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAABSgAAAAAADAAAAAACgQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAACSgAAAAAASgAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAKQAAAAAAKQAAAAABSgAAAAAASgAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAAASgAAAAAASgAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADHQAAAAAAHQAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAD
+          tiles: NgAAAAABNgAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAADNgAAAAAASgAAAAAANwAAAAACgQAAAAAAKQAAAAADKQAAAAADKQAAAAABKQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAADSgAAAAAASgAAAAAANwAAAAADgQAAAAAAKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAASgAAAAAASgAAAAAANwAAAAADgQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAAAKQAAAAABbwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAACKQAAAAABSgAAAAAASgAAAAAANwAAAAACgQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAACKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAACKQAAAAADSgAAAAAASgAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAABKQAAAAAAKQAAAAACKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAACSgAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAACgQAAAAAAKQAAAAACKQAAAAABKQAAAAABKQAAAAADKQAAAAADKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAADAAAAAACDAAAAAADgQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACKQAAAAADDAAAAAAADAAAAAADgQAAAAAAKQAAAAABKQAAAAADKQAAAAAAKQAAAAABKQAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAACSgAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAABSgAAAAAADAAAAAACgQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAACSgAAAAAASgAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAKQAAAAAAKQAAAAABSgAAAAAASgAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAKQAAAAADKQAAAAAASgAAAAAASgAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADHQAAAAAAHQAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAD
           version: 6
         1,-2:
           ind: 1,-2
@@ -235,11 +235,11 @@ entities:
           version: 6
         1,2:
           ind: 1,2
-          tiles: JQAAAAACJQAAAAACYAAAAAAAYAAAAAABZQAAAAADYAAAAAAAYAAAAAACJQAAAAACJQAAAAADJQAAAAABJQAAAAACJQAAAAADYAAAAAABYAAAAAABgQAAAAAAcAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABZQAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAcAAAAAAAfQAAAAABfQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAfQAAAAABfQAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAABgQAAAAAAZQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAfQAAAAAAfQAAAAACfQAAAAADfQAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAcQAAAAACfQAAAAACfQAAAAAAfQAAAAABfQAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAKQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAcQAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAgQAAAAAAZQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAIQAAAAACIQAAAAADIQAAAAABIQAAAAADIQAAAAADIQAAAAABIQAAAAAAIQAAAAADIQAAAAABIQAAAAABIQAAAAADKQAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAADIQAAAAADIQAAAAABIQAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAAAIQAAAAADIQAAAAACIQAAAAADIQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAKQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAACKQAAAAACgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABKQAAAAADKQAAAAACKQAAAAACKQAAAAAAKQAAAAADKQAAAAACgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAA
+          tiles: JQAAAAACJQAAAAACYAAAAAAAYAAAAAABZQAAAAADYAAAAAAAYAAAAAACJQAAAAACJQAAAAADJQAAAAABJQAAAAACJQAAAAADYAAAAAABYAAAAAABgQAAAAAAcAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABZQAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAcAAAAAAAfQAAAAABfQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAfQAAAAABfQAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAABgQAAAAAAZQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAfQAAAAAAfQAAAAACfQAAAAADfQAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAcQAAAAACfQAAAAACfQAAAAAAfQAAAAABfQAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAKQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAcQAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAgQAAAAAAZQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAIQAAAAACIQAAAAADIQAAAAABIQAAAAADIQAAAAADIQAAAAABIQAAAAAAIQAAAAADIQAAAAABIQAAAAABIQAAAAADKQAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAADIQAAAAADIQAAAAABIQAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAAAIQAAAAADIQAAAAACIQAAAAADIQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAAARAAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAACKQAAAAACgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABRAAAAAAAKQAAAAACKQAAAAACKQAAAAAAKQAAAAADKQAAAAACgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAA
           version: 6
         0,2:
           ind: 0,2
-          tiles: YAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACJQAAAAACYAAAAAADYAAAAAABZQAAAAADYAAAAAAAYAAAAAAAJQAAAAADJQAAAAABJQAAAAADJQAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAADJQAAAAAAYAAAAAACYAAAAAABZQAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAADJQAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAADYAAAAAACfQAAAAACfQAAAAABfQAAAAABfQAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAACJQAAAAADYAAAAAADYAAAAAADgQAAAAAALwAAAAAAYAAAAAABfQAAAAAAfQAAAAABfQAAAAADfQAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAABJQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAALwAAAAAAfQAAAAACfQAAAAADfQAAAAABfQAAAAACfQAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAALwAAAAAAfQAAAAACfQAAAAAAfQAAAAAAfQAAAAADfQAAAAABYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAAKQAAAAACKQAAAAACYAAAAAAAYAAAAAADgQAAAAAAfQAAAAABfQAAAAACfQAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAKQAAAAACYAAAAAADYAAAAAADgQAAAAAAfQAAAAABfQAAAAAAfQAAAAABgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAfQAAAAABfQAAAAACfQAAAAACfwAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAfQAAAAADfQAAAAAAfQAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAfQAAAAABfQAAAAAAfQAAAAABgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAADgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAACgQAAAAAAfQAAAAADfQAAAAAAfQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAfQAAAAABfQAAAAACfQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAKQAAAAACKQAAAAACKQAAAAABgQAAAAAA
+          tiles: YAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACJQAAAAACYAAAAAADYAAAAAABZQAAAAADYAAAAAAAYAAAAAAAJQAAAAADJQAAAAABJQAAAAADJQAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAADJQAAAAAAYAAAAAACYAAAAAABZQAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAADJQAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAADYAAAAAACfQAAAAACfQAAAAABfQAAAAABfQAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAACJQAAAAADYAAAAAADYAAAAAADgQAAAAAALwAAAAAAYAAAAAABfQAAAAAAfQAAAAABfQAAAAADfQAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAABJQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAALwAAAAAAfQAAAAACfQAAAAADfQAAAAABfQAAAAACfQAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAALwAAAAAAfQAAAAACfQAAAAAAfQAAAAAAfQAAAAADfQAAAAABYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAAKQAAAAACKQAAAAACYAAAAAAAYAAAAAADgQAAAAAAfQAAAAABfQAAAAACfQAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAKQAAAAACYAAAAAADYAAAAAADgQAAAAAAfQAAAAABfQAAAAAAfQAAAAABgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAfQAAAAABfQAAAAACfQAAAAACfwAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAfQAAAAADfQAAAAAAfQAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAfQAAAAABfQAAAAAAfQAAAAABgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAADgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAACgQAAAAAAfQAAAAADfQAAAAAAfQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAfQAAAAABfQAAAAACfQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAAgQAAAAAA
           version: 6
         3,0:
           ind: 3,0
@@ -287,11 +287,11 @@ entities:
           version: 6
         0,3:
           ind: 0,3
-          tiles: YAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAKQAAAAADbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAABYAAAAAABgQAAAAAAYAAAAAADJAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAACgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAA
+          tiles: YAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAKQAAAAADbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAABYAAAAAABgQAAAAAAYAAAAAADJAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAA
           version: 6
         1,3:
           ind: 1,3
-          tiles: gQAAAAAAYAAAAAADYAAAAAACYAAAAAADKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAKQAAAAABYAAAAAABYAAAAAADYAAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAABgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: gQAAAAAAYAAAAAADYAAAAAACYAAAAAADRAAAAAAAKQAAAAABKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAKQAAAAABYAAAAAABYAAAAAADYAAAAAAARAAAAAAAKQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,3:
           ind: 2,3
@@ -3337,6 +3337,46 @@ entities:
             1737: 50,-38
             1738: 50,-37
             1739: 50,-36
+        - node:
+            color: '#3EB38896'
+            id: DiagonalCheckerAOverlay
+          decals:
+            3528: 12,23
+            3529: 13,22
+            3530: 13,23
+            3531: 14,23
+            3532: 15,23
+            3533: 15,22
+            3534: 14,22
+            3535: 14,21
+            3536: 13,21
+            3537: 12,20
+            3538: 13,20
+            3539: 14,20
+            3540: 15,20
+            3541: 15,21
+            3543: 12,21
+            3544: 12,22
+        - node:
+            color: '#639137FF'
+            id: DiagonalCheckerBOverlay
+          decals:
+            3515: 12,20
+            3516: 13,20
+            3517: 13,21
+            3518: 13,22
+            3519: 13,23
+            3520: 14,23
+            3521: 14,22
+            3522: 14,21
+            3523: 14,20
+            3524: 15,20
+            3525: 15,21
+            3526: 15,22
+            3527: 15,23
+            3542: 12,23
+            3545: 12,21
+            3546: 12,22
         - node:
             color: '#D381C996'
             id: DiagonalOverlay
@@ -5552,6 +5592,10 @@ entities:
             996: -54,-12
             2469: 17,49
             3345: -54,-9
+            3547: 21,46
+            3548: 21,47
+            3549: 21,48
+            3550: 21,49
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -12672,13 +12716,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,54.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 6864
     - type: DeviceLinkSource
       linkedPorts:
         6863:
         - DoorStatus: DoorBolt
+    - type: DeviceLinkSink
+      links:
+      - 6864
   - uid: 6991
     components:
     - type: Transform
@@ -13186,7 +13230,7 @@ entities:
       pos: 46.5,-40.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -164990.23
+      secondsUntilStateChange: -424809.1
       state: Opening
   - uid: 4137
     components:
@@ -13610,6 +13654,23 @@ entities:
       parent: 2
 - proto: AirlockMedicalGlass
   entities:
+  - uid: 14
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -38.5,-35.5
+      parent: 2
+  - uid: 32
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-35.5
+      parent: 2
+  - uid: 538
+    components:
+    - type: Transform
+      pos: -22.5,-39.5
+      parent: 2
   - uid: 1372
     components:
     - type: Transform
@@ -13623,7 +13684,7 @@ entities:
       pos: -3.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -281157.62
+      secondsUntilStateChange: -540976.5
       state: Opening
   - uid: 1496
     components:
@@ -13686,11 +13747,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-36.5
       parent: 2
-  - uid: 1643
-    components:
-    - type: Transform
-      pos: -22.5,-39.5
-      parent: 2
 - proto: AirlockMedicalLocked
   entities:
   - uid: 1153
@@ -13733,16 +13789,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,-39.5
       parent: 2
-  - uid: 2192
-    components:
-    - type: Transform
-      pos: -37.5,-35.5
-      parent: 2
-  - uid: 2193
-    components:
-    - type: Transform
-      pos: -38.5,-35.5
-      parent: 2
 - proto: AirlockQuartermasterGlassLocked
   entities:
   - uid: 11543
@@ -34921,17 +34967,11 @@ entities:
       parent: 2
 - proto: BaseComputer
   entities:
-  - uid: 10220
+  - uid: 33
     components:
     - type: Transform
       pos: -2.5,-41.5
       parent: 2
-  - uid: 10469
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-50.5
-      parent: 2
   - uid: 13016
     components:
     - type: Transform
@@ -66719,6 +66759,14 @@ entities:
     - type: Transform
       pos: 22.5,-23.5
       parent: 21002
+- proto: Candle
+  entities:
+  - uid: 23174
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.166574,-14.556338
+      parent: 2
 - proto: CandleBlack
   entities:
   - uid: 971
@@ -66827,6 +66875,32 @@ entities:
     - type: Transform
       pos: 44.01076,42.56063
       parent: 2
+- proto: CandleSmall
+  entities:
+  - uid: 23175
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.45824,-14.566754
+      parent: 2
+  - uid: 23176
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.343658,-14.337588
+      parent: 2
+  - uid: 23177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.98949,-14.327171
+      parent: 2
+  - uid: 23178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.854074,-14.566754
+      parent: 2
 - proto: CannabisSeeds
   entities:
   - uid: 22742
@@ -72314,6 +72388,36 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,26.5
       parent: 21002
+  - uid: 28442
+    components:
+    - type: Transform
+      pos: 9.5,53.5
+      parent: 2
+  - uid: 28443
+    components:
+    - type: Transform
+      pos: 8.5,53.5
+      parent: 2
+  - uid: 28444
+    components:
+    - type: Transform
+      pos: 7.5,53.5
+      parent: 2
+  - uid: 28445
+    components:
+    - type: Transform
+      pos: 17.5,53.5
+      parent: 2
+  - uid: 28446
+    components:
+    - type: Transform
+      pos: 18.5,53.5
+      parent: 2
+  - uid: 28447
+    components:
+    - type: Transform
+      pos: 19.5,53.5
+      parent: 2
 - proto: Chair
   entities:
   - uid: 495
@@ -73264,23 +73368,6 @@ entities:
     - type: Transform
       pos: 39.479088,15.666133
       parent: 2
-- proto: chem_master
-  entities:
-  - uid: 1656
-    components:
-    - type: Transform
-      pos: -12.5,-39.5
-      parent: 2
-  - uid: 1658
-    components:
-    - type: Transform
-      pos: -16.5,-39.5
-      parent: 2
-  - uid: 1672
-    components:
-    - type: Transform
-      pos: -11.5,-42.5
-      parent: 2
 - proto: ChemDispenser
   entities:
   - uid: 1635
@@ -73326,6 +73413,23 @@ entities:
     - type: Transform
       pos: -13.5,-39.5
       parent: 2
+- proto: ChemMaster
+  entities:
+  - uid: 1656
+    components:
+    - type: Transform
+      pos: -12.5,-39.5
+      parent: 2
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: -16.5,-39.5
+      parent: 2
+  - uid: 1672
+    components:
+    - type: Transform
+      pos: -11.5,-42.5
+      parent: 2
 - proto: ChessBoard
   entities:
   - uid: 2246
@@ -74668,6 +74772,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingNeckBling
+  entities:
+  - uid: 23169
+    components:
+    - type: Transform
+      pos: -46.98417,-7.2719007
+      parent: 2
 - proto: ClothingNeckCloakGay
   entities:
   - uid: 24198
@@ -75674,6 +75785,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-43.5
       parent: 2
+- proto: ComputerRoboticsControl
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-50.5
+      parent: 2
 - proto: ComputerSalvageExpedition
   entities:
   - uid: 24215
@@ -86292,13 +86411,6 @@ entities:
     - type: Transform
       pos: 16.779772,29.159634
       parent: 2
-- proto: DrinkBottleGoldschlager
-  entities:
-  - uid: 23226
-    components:
-    - type: Transform
-      pos: -53.08521,12.786483
-      parent: 2
 - proto: DrinkBottleTequila
   entities:
   - uid: 23233
@@ -86621,6 +86733,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: DrinkMopwataBottleRandom
+  entities:
+  - uid: 42
+    components:
+    - type: MetaData
+      name: exquisite mopwata
+    - type: Transform
+      pos: -53.095768,12.751947
+      parent: 2
 - proto: DrinkMug
   entities:
   - uid: 23578
@@ -94202,8 +94323,12 @@ entities:
   - uid: 21227
     components:
     - type: Transform
+      anchored: False
       pos: 33.5,-30.5
       parent: 21002
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 21230
     components:
     - type: Transform
@@ -94424,21 +94549,19 @@ entities:
   - uid: 8186
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -24.5,52.5
       parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8188
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,41.5
       parent: 2
-  - uid: 8191
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -23.5,36.5
-      parent: 2
   - uid: 8197
     components:
     - type: Transform
@@ -94454,15 +94577,23 @@ entities:
   - uid: 8218
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -28.5,51.5
       parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8219
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -28.5,51.5
       parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8220
     components:
     - type: Transform
@@ -94596,11 +94727,15 @@ entities:
   - uid: 8754
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -24.5,19.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8990
     components:
     - type: Transform
@@ -96337,9 +96472,13 @@ entities:
   - uid: 22036
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -32.5,23.5
       parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 22274
     components:
     - type: Transform
@@ -96583,6 +96722,36 @@ entities:
       parent: 21002
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 28417
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,24.5
+      parent: 2
+  - uid: 28426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,24.5
+      parent: 2
+  - uid: 28438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,14.5
+      parent: 2
+  - uid: 28439
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,15.5
+      parent: 2
+  - uid: 28440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -27.5,15.5
+      parent: 2
 - proto: GasPipeFourway
   entities:
   - uid: 666
@@ -96920,6 +97089,26 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 253
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,17.5
+      parent: 2
+  - uid: 276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,25.5
+      parent: 2
   - uid: 881
     components:
     - type: Transform
@@ -97031,6 +97220,18 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 3097
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,30.5
+      parent: 2
+  - uid: 3098
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,14.5
+      parent: 2
   - uid: 3202
     components:
     - type: Transform
@@ -97078,11 +97279,15 @@ entities:
   - uid: 6764
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: 0.5,49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 7355
     components:
     - type: Transform
@@ -97129,8 +97334,12 @@ entities:
   - uid: 8091
     components:
     - type: Transform
+      anchored: False
       pos: -20.5,44.5
       parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8094
     components:
     - type: Transform
@@ -97620,18 +97829,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,11.5
       parent: 2
-  - uid: 8562
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,11.5
-      parent: 2
-  - uid: 8564
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,13.5
-      parent: 2
   - uid: 8567
     components:
     - type: Transform
@@ -97979,52 +98176,14 @@ entities:
   - uid: 8655
     components:
     - type: Transform
+      anchored: False
       pos: -36.5,32.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8657
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,17.5
-      parent: 2
-  - uid: 8658
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,19.5
-      parent: 2
-  - uid: 8659
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,21.5
-      parent: 2
-  - uid: 8660
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,23.5
-      parent: 2
-  - uid: 8661
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,25.5
-      parent: 2
-  - uid: 8662
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,29.5
-      parent: 2
-  - uid: 8663
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,31.5
-      parent: 2
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8664
     components:
     - type: Transform
@@ -98071,14 +98230,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8674
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8676
     components:
     - type: Transform
@@ -99751,6 +99902,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 13245
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -31.5,14.5
+      parent: 2
   - uid: 13248
     components:
     - type: Transform
@@ -103361,11 +103518,15 @@ entities:
   - uid: 13936
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: 11.5,-7.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 13937
     components:
     - type: Transform
@@ -103377,11 +103538,15 @@ entities:
   - uid: 13938
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: 12.5,-8.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 13940
     components:
     - type: Transform
@@ -104456,11 +104621,15 @@ entities:
   - uid: 14128
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: 10.5,-19.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 14129
     components:
     - type: Transform
@@ -104599,10 +104768,14 @@ entities:
   - uid: 14151
     components:
     - type: Transform
+      anchored: False
       pos: 32.5,-1.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 14155
     components:
     - type: Transform
@@ -110237,10 +110410,14 @@ entities:
   - uid: 15252
     components:
     - type: Transform
+      anchored: False
       pos: -42.5,-35.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15253
     components:
     - type: Transform
@@ -111233,10 +111410,14 @@ entities:
   - uid: 15443
     components:
     - type: Transform
+      anchored: False
       pos: 33.5,-22.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15447
     components:
     - type: Transform
@@ -111911,10 +112092,14 @@ entities:
   - uid: 15663
     components:
     - type: Transform
+      anchored: False
       pos: -13.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15664
     components:
     - type: Transform
@@ -115948,10 +116133,14 @@ entities:
   - uid: 16518
     components:
     - type: Transform
+      anchored: False
       pos: -42.5,-12.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 16913
     components:
     - type: Transform
@@ -116368,10 +116557,14 @@ entities:
   - uid: 18430
     components:
     - type: Transform
+      anchored: False
       pos: 60.5,12.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 18908
     components:
     - type: Transform
@@ -117329,6 +117522,111 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 23203
+    components:
+    - type: Transform
+      pos: -31.5,16.5
+      parent: 2
+  - uid: 23204
+    components:
+    - type: Transform
+      pos: -31.5,17.5
+      parent: 2
+  - uid: 23205
+    components:
+    - type: Transform
+      pos: -31.5,18.5
+      parent: 2
+  - uid: 23206
+    components:
+    - type: Transform
+      pos: -31.5,19.5
+      parent: 2
+  - uid: 23207
+    components:
+    - type: Transform
+      pos: -31.5,20.5
+      parent: 2
+  - uid: 23208
+    components:
+    - type: Transform
+      pos: -31.5,21.5
+      parent: 2
+  - uid: 23209
+    components:
+    - type: Transform
+      pos: -31.5,22.5
+      parent: 2
+  - uid: 23210
+    components:
+    - type: Transform
+      pos: -31.5,23.5
+      parent: 2
+  - uid: 23211
+    components:
+    - type: Transform
+      pos: -31.5,24.5
+      parent: 2
+  - uid: 23212
+    components:
+    - type: Transform
+      pos: -31.5,25.5
+      parent: 2
+  - uid: 23213
+    components:
+    - type: Transform
+      pos: -31.5,26.5
+      parent: 2
+  - uid: 23214
+    components:
+    - type: Transform
+      pos: -31.5,27.5
+      parent: 2
+  - uid: 23215
+    components:
+    - type: Transform
+      pos: -31.5,28.5
+      parent: 2
+  - uid: 23216
+    components:
+    - type: Transform
+      pos: -30.5,28.5
+      parent: 2
+  - uid: 23217
+    components:
+    - type: Transform
+      pos: -30.5,27.5
+      parent: 2
+  - uid: 23218
+    components:
+    - type: Transform
+      pos: -30.5,26.5
+      parent: 2
+  - uid: 23219
+    components:
+    - type: Transform
+      pos: -30.5,25.5
+      parent: 2
+  - uid: 23220
+    components:
+    - type: Transform
+      pos: -30.5,24.5
+      parent: 2
+  - uid: 23226
+    components:
+    - type: Transform
+      pos: -30.5,23.5
+      parent: 2
+  - uid: 23395
+    components:
+    - type: Transform
+      pos: -30.5,22.5
+      parent: 2
+  - uid: 23433
+    components:
+    - type: Transform
+      pos: -30.5,21.5
+      parent: 2
   - uid: 23460
     components:
     - type: Transform
@@ -117337,6 +117635,31 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 23478
+    components:
+    - type: Transform
+      pos: -30.5,20.5
+      parent: 2
+  - uid: 23479
+    components:
+    - type: Transform
+      pos: -30.5,19.5
+      parent: 2
+  - uid: 23480
+    components:
+    - type: Transform
+      pos: -30.5,18.5
+      parent: 2
+  - uid: 23481
+    components:
+    - type: Transform
+      pos: -30.5,17.5
+      parent: 2
+  - uid: 23482
+    components:
+    - type: Transform
+      pos: -30.5,16.5
+      parent: 2
   - uid: 23501
     components:
     - type: Transform
@@ -117350,11 +117673,15 @@ entities:
   - uid: 23537
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -39.5,4.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 23538
     components:
     - type: Transform
@@ -117371,6 +117698,28 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 23639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,14.5
+      parent: 2
+  - uid: 23640
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,14.5
+      parent: 2
+  - uid: 23663
+    components:
+    - type: Transform
+      pos: -27.5,16.5
+      parent: 2
+  - uid: 23672
+    components:
+    - type: Transform
+      pos: -27.5,17.5
+      parent: 2
   - uid: 23696
     components:
     - type: Transform
@@ -117419,6 +117768,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 23847
+    components:
+    - type: Transform
+      pos: -27.5,18.5
+      parent: 2
   - uid: 23865
     components:
     - type: Transform
@@ -117659,6 +118013,16 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 24126
+    components:
+    - type: Transform
+      pos: -27.5,19.5
+      parent: 2
+  - uid: 24127
+    components:
+    - type: Transform
+      pos: -27.5,20.5
+      parent: 2
   - uid: 25219
     components:
     - type: Transform
@@ -117827,11 +118191,15 @@ entities:
   - uid: 25322
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 25.5,-23.5
       parent: 21002
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 25323
     components:
     - type: Transform
@@ -118037,6 +118405,93 @@ entities:
       parent: 21002
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 28355
+    components:
+    - type: Transform
+      pos: -27.5,21.5
+      parent: 2
+  - uid: 28415
+    components:
+    - type: Transform
+      pos: -27.5,22.5
+      parent: 2
+  - uid: 28416
+    components:
+    - type: Transform
+      pos: -27.5,23.5
+      parent: 2
+  - uid: 28427
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -26.5,24.5
+      parent: 2
+  - uid: 28428
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -25.5,24.5
+      parent: 2
+  - uid: 28429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,25.5
+      parent: 2
+  - uid: 28430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,26.5
+      parent: 2
+  - uid: 28431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,27.5
+      parent: 2
+  - uid: 28432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,28.5
+      parent: 2
+  - uid: 28433
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,29.5
+      parent: 2
+  - uid: 28434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,33.5
+      parent: 2
+  - uid: 28435
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,35.5
+      parent: 2
+  - uid: 28436
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,32.5
+      parent: 2
+  - uid: 28437
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,31.5
+      parent: 2
+  - uid: 28441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,34.5
+      parent: 2
 - proto: GasPipeTJunction
   entities:
   - uid: 17
@@ -118199,11 +118654,15 @@ entities:
   - uid: 7333
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -20.5,24.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 7343
     components:
     - type: Transform
@@ -118280,12 +118739,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,51.5
       parent: 2
-  - uid: 8189
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,36.5
-      parent: 2
   - uid: 8738
     components:
     - type: Transform
@@ -118466,11 +118919,15 @@ entities:
   - uid: 11596
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: 0.5,42.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 11908
     components:
     - type: Transform
@@ -118649,14 +119106,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13245
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,2.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 13246
     components:
     - type: Transform
@@ -118998,11 +119447,15 @@ entities:
   - uid: 13522
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -42.5,-11.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 13544
     components:
     - type: Transform
@@ -119014,11 +119467,15 @@ entities:
   - uid: 13555
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -26.5,20.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 13576
     components:
     - type: Transform
@@ -119060,11 +119517,15 @@ entities:
   - uid: 13664
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -10.5,10.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 13707
     components:
     - type: Transform
@@ -120032,11 +120493,15 @@ entities:
   - uid: 15320
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: -2.5,-43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15321
     components:
     - type: Transform
@@ -120123,10 +120588,14 @@ entities:
   - uid: 15404
     components:
     - type: Transform
+      anchored: False
       pos: -21.5,-47.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15455
     components:
     - type: Transform
@@ -121010,11 +121479,65 @@ entities:
       parent: 21002
 - proto: GasPressurePump
   entities:
-  - uid: 8671
+  - uid: 43
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -31.5,13.5
+      pos: -36.5,11.5
+      parent: 2
+  - uid: 44
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,13.5
+      parent: 2
+  - uid: 222
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,17.5
+      parent: 2
+  - uid: 223
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,19.5
+      parent: 2
+  - uid: 224
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,21.5
+      parent: 2
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,23.5
+      parent: 2
+  - uid: 228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,25.5
+      parent: 2
+  - uid: 229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,31.5
+      parent: 2
+  - uid: 230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -36.5,29.5
+      parent: 2
+  - uid: 231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,13.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -121034,18 +121557,6 @@ entities:
     - type: Transform
       pos: 6.5,-33.5
       parent: 2
-  - uid: 21165
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,17.5
-      parent: 2
-  - uid: 21461
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,25.5
-      parent: 2
   - uid: 23065
     components:
     - type: Transform
@@ -121087,10 +121598,13 @@ entities:
   - uid: 9011
     components:
     - type: Transform
+      anchored: False
       pos: -26.5,17.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      bodyType: Dynamic
   - uid: 15687
     components:
     - type: Transform
@@ -121111,10 +121625,13 @@ entities:
   - uid: 9012
     components:
     - type: Transform
+      anchored: False
       pos: -26.5,18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      bodyType: Dynamic
 - proto: GasValve
   entities:
   - uid: 8100
@@ -121586,11 +122103,15 @@ entities:
   - uid: 14237
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: 43.5,-6.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 14253
     components:
     - type: Transform
@@ -122152,10 +122673,14 @@ entities:
   - uid: 15416
     components:
     - type: Transform
+      anchored: False
       pos: -20.5,-46.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15417
     components:
     - type: Transform
@@ -124167,11 +124692,15 @@ entities:
   - uid: 15810
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: -6.5,-28.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 15814
     components:
     - type: Transform
@@ -124266,6 +124795,7 @@ entities:
   - uid: 16032
     components:
     - type: Transform
+      anchored: False
       pos: 0.5,-59.5
       parent: 2
     - type: DeviceNetwork
@@ -124273,6 +124803,9 @@ entities:
       - 18240
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 16111
     components:
     - type: Transform
@@ -124584,6 +125117,7 @@ entities:
   - uid: 16513
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: -44.5,-1.5
       parent: 2
@@ -124592,6 +125126,9 @@ entities:
       - 18332
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 16522
     components:
     - type: Transform
@@ -133361,11 +133898,6 @@ entities:
     - type: Transform
       pos: 36.313778,-34.34107
       parent: 2
-  - uid: 23395
-    components:
-    - type: Transform
-      pos: 36.501278,-34.549404
-      parent: 2
 - proto: HospitalCurtains
   entities:
   - uid: 2724
@@ -133575,6 +134107,12 @@ entities:
     - type: Transform
       pos: 4.4140625,6.291479
       parent: 21002
+  - uid: 23183
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.420209,20.66474
+      parent: 2
 - proto: HydroponicsToolHatchet
   entities:
   - uid: 9652
@@ -133773,14 +134311,14 @@ entities:
   - uid: 11454
     components:
     - type: Transform
-      pos: -46.648,-7.3827996
+      pos: -46.432087,-7.386484
       parent: 2
 - proto: IngotSilver
   entities:
   - uid: 365
     components:
     - type: Transform
-      pos: -47.467575,-7.3966436
+      pos: -47.536255,-7.386484
       parent: 2
 - proto: IntercomAll
   entities:
@@ -133853,6 +134391,12 @@ entities:
       parent: 2
 - proto: IntercomMedical
   entities:
+  - uid: 23181
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-36.5
+      parent: 2
   - uid: 23520
     components:
     - type: Transform
@@ -135418,6 +135962,16 @@ entities:
     - type: Transform
       pos: -18.5,22.5
       parent: 2
+  - uid: 23172
+    components:
+    - type: Transform
+      pos: 28.5,-14.5
+      parent: 2
+  - uid: 23173
+    components:
+    - type: Transform
+      pos: 17.5,-27.5
+      parent: 2
   - uid: 28333
     components:
     - type: Transform
@@ -136445,6 +136999,22 @@ entities:
     - type: Transform
       pos: -36.5,-41.5
       parent: 2
+- proto: PaintingSkeletonCigarette
+  entities:
+  - uid: 23179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-15.5
+      parent: 2
+- proto: PaintingTheKiss
+  entities:
+  - uid: 23180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,-21.5
+      parent: 2
 - proto: PaintingTheSonOfMan
   entities:
   - uid: 23625
@@ -136828,9 +137398,10 @@ entities:
       parent: 2
 - proto: ParticleAcceleratorFuelChamberUnfinished
   entities:
-  - uid: 7231
+  - uid: 3100
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,50.5
       parent: 2
 - proto: ParticleAcceleratorPowerBoxUnfinished
@@ -141499,17 +142070,17 @@ entities:
   - uid: 23152
     components:
     - type: Transform
-      pos: 35.097088,-34.550453
+      pos: 35.8916,-34.409367
       parent: 2
-  - uid: 23153
+  - uid: 23154
     components:
     - type: Transform
-      pos: 33.956463,-34.56608
+      pos: 42.149597,-40.511173
       parent: 2
-  - uid: 23154
+  - uid: 23170
     components:
     - type: Transform
-      pos: 42.155304,-40.218437
+      pos: 56.492363,-11.409825
       parent: 2
 - proto: RagItem
   entities:
@@ -143893,6 +144464,12 @@ entities:
     - type: Transform
       pos: 32.5,3.5
       parent: 2
+  - uid: 23189
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,2.5
+      parent: 2
   - uid: 23746
     components:
     - type: Transform
@@ -143964,6 +144541,21 @@ entities:
       parent: 2
 - proto: RandomSpawner
   entities:
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 28.5,-13.5
+      parent: 2
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 26.5,-16.5
+      parent: 2
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 28.5,-16.5
+      parent: 2
   - uid: 5538
     components:
     - type: Transform
@@ -144079,6 +144671,11 @@ entities:
     - type: Transform
       pos: 26.5,52.5
       parent: 2
+  - uid: 23171
+    components:
+    - type: Transform
+      pos: 27.5,-23.5
+      parent: 2
 - proto: RandomSpawner100
   entities:
   - uid: 23750
@@ -144719,54 +145316,6 @@ entities:
       parent: 2
 - proto: ReinforcedWindow
   entities:
-  - uid: 13
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,4.5
-      parent: 2
-  - uid: 14
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,3.5
-      parent: 2
-  - uid: 32
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
-      parent: 2
-  - uid: 33
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-3.5
-      parent: 2
-  - uid: 41
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,4.5
-      parent: 2
-  - uid: 42
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,3.5
-      parent: 2
-  - uid: 43
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 2
-  - uid: 44
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-3.5
-      parent: 2
   - uid: 127
     components:
     - type: Transform
@@ -144777,16 +145326,6 @@ entities:
     - type: Transform
       pos: 18.5,8.5
       parent: 2
-  - uid: 222
-    components:
-    - type: Transform
-      pos: 6.5,18.5
-      parent: 2
-  - uid: 223
-    components:
-    - type: Transform
-      pos: 5.5,18.5
-      parent: 2
   - uid: 246
     components:
     - type: Transform
@@ -144905,21 +145444,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-4.5
       parent: 2
-  - uid: 332
-    components:
-    - type: Transform
-      pos: 8.5,18.5
-      parent: 2
-  - uid: 333
-    components:
-    - type: Transform
-      pos: 7.5,18.5
-      parent: 2
-  - uid: 436
-    components:
-    - type: Transform
-      pos: -1.5,20.5
-      parent: 2
   - uid: 743
     components:
     - type: Transform
@@ -145004,16 +145528,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-12.5
       parent: 2
-  - uid: 1255
-    components:
-    - type: Transform
-      pos: -31.5,-21.5
-      parent: 2
-  - uid: 1256
-    components:
-    - type: Transform
-      pos: -32.5,-21.5
-      parent: 2
   - uid: 1272
     components:
     - type: Transform
@@ -145026,119 +145540,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,-13.5
       parent: 2
-  - uid: 1331
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-32.5
-      parent: 2
-  - uid: 1332
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-33.5
-      parent: 2
-  - uid: 1333
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-34.5
-      parent: 2
-  - uid: 1334
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-37.5
-      parent: 2
-  - uid: 1335
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-38.5
-      parent: 2
-  - uid: 1336
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-39.5
-      parent: 2
   - uid: 1386
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-39.5
       parent: 2
-  - uid: 1430
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-24.5
-      parent: 2
-  - uid: 1431
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-24.5
-      parent: 2
-  - uid: 1439
-    components:
-    - type: Transform
-      pos: -22.5,-40.5
-      parent: 2
   - uid: 1471
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,-33.5
       parent: 2
-  - uid: 1473
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-30.5
-      parent: 2
-  - uid: 1475
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,-30.5
-      parent: 2
-  - uid: 1479
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-30.5
-      parent: 2
-  - uid: 1480
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-30.5
-      parent: 2
-  - uid: 1481
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-30.5
-      parent: 2
-  - uid: 1482
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-30.5
-      parent: 2
   - uid: 1494
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,-33.5
       parent: 2
-  - uid: 1514
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-30.5
-      parent: 2
   - uid: 1526
     components:
     - type: Transform
@@ -145191,21 +145610,6 @@ entities:
     - type: Transform
       pos: -18.5,-40.5
       parent: 2
-  - uid: 1862
-    components:
-    - type: Transform
-      pos: -22.5,-38.5
-      parent: 2
-  - uid: 1872
-    components:
-    - type: Transform
-      pos: -28.5,-30.5
-      parent: 2
-  - uid: 1873
-    components:
-    - type: Transform
-      pos: -32.5,-30.5
-      parent: 2
   - uid: 1881
     components:
     - type: Transform
@@ -145231,24 +145635,6 @@ entities:
     - type: Transform
       pos: -27.5,-42.5
       parent: 2
-  - uid: 1894
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,-39.5
-      parent: 2
-  - uid: 1901
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,-40.5
-      parent: 2
-  - uid: 2068
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,-38.5
-      parent: 2
   - uid: 2348
     components:
     - type: Transform
@@ -145311,11 +145697,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,12.5
       parent: 2
-  - uid: 3175
-    components:
-    - type: Transform
-      pos: 39.5,2.5
-      parent: 2
   - uid: 3204
     components:
     - type: Transform
@@ -145340,18 +145721,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,25.5
       parent: 2
-  - uid: 3355
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-1.5
-      parent: 2
-  - uid: 3356
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-1.5
-      parent: 2
   - uid: 3358
     components:
     - type: Transform
@@ -146048,35 +146417,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 37.5,-52.5
       parent: 2
-  - uid: 5774
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,2.5
-      parent: 2
-  - uid: 5775
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,2.5
-      parent: 2
-  - uid: 5776
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,2.5
-      parent: 2
-  - uid: 5777
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,2.5
-      parent: 2
-  - uid: 5830
-    components:
-    - type: Transform
-      pos: 41.5,2.5
-      parent: 2
   - uid: 6103
     components:
     - type: Transform
@@ -146102,26 +146442,6 @@ entities:
     - type: Transform
       pos: 46.5,2.5
       parent: 2
-  - uid: 6182
-    components:
-    - type: Transform
-      pos: 3.5,34.5
-      parent: 2
-  - uid: 6190
-    components:
-    - type: Transform
-      pos: 3.5,31.5
-      parent: 2
-  - uid: 6194
-    components:
-    - type: Transform
-      pos: 3.5,37.5
-      parent: 2
-  - uid: 6195
-    components:
-    - type: Transform
-      pos: 3.5,38.5
-      parent: 2
   - uid: 6222
     components:
     - type: Transform
@@ -146391,24 +146711,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,54.5
       parent: 2
-  - uid: 7624
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,49.5
-      parent: 2
-  - uid: 7625
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,50.5
-      parent: 2
-  - uid: 7626
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,51.5
-      parent: 2
   - uid: 7731
     components:
     - type: Transform
@@ -146469,36 +146771,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,52.5
       parent: 2
-  - uid: 7852
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,34.5
-      parent: 2
-  - uid: 7853
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,32.5
-      parent: 2
-  - uid: 7854
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,33.5
-      parent: 2
-  - uid: 7855
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,32.5
-      parent: 2
-  - uid: 7856
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,31.5
-      parent: 2
   - uid: 8018
     components:
     - type: Transform
@@ -146541,43 +146813,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,46.5
       parent: 2
-  - uid: 8087
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,43.5
-      parent: 2
-  - uid: 8088
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,40.5
-      parent: 2
-  - uid: 8132
-    components:
-    - type: Transform
-      pos: -23.5,38.5
-      parent: 2
-  - uid: 8133
-    components:
-    - type: Transform
-      pos: -24.5,38.5
-      parent: 2
-  - uid: 8134
-    components:
-    - type: Transform
-      pos: -25.5,43.5
-      parent: 2
-  - uid: 8135
-    components:
-    - type: Transform
-      pos: -25.5,41.5
-      parent: 2
-  - uid: 8136
-    components:
-    - type: Transform
-      pos: -25.5,39.5
-      parent: 2
   - uid: 8228
     components:
     - type: Transform
@@ -146752,36 +146987,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,33.5
       parent: 2
-  - uid: 8350
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,35.5
-      parent: 2
-  - uid: 8351
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,37.5
-      parent: 2
-  - uid: 8354
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,38.5
-      parent: 2
-  - uid: 8355
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,38.5
-      parent: 2
-  - uid: 8356
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,38.5
-      parent: 2
   - uid: 8358
     components:
     - type: Transform
@@ -146800,18 +147005,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -34.5,42.5
       parent: 2
-  - uid: 8448
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -37.5,2.5
-      parent: 2
-  - uid: 8449
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -40.5,2.5
-      parent: 2
   - uid: 8466
     components:
     - type: Transform
@@ -146952,11 +147145,6 @@ entities:
     - type: Transform
       pos: 8.5,-32.5
       parent: 2
-  - uid: 9707
-    components:
-    - type: Transform
-      pos: 2.5,-33.5
-      parent: 2
   - uid: 9708
     components:
     - type: Transform
@@ -147004,41 +147192,6 @@ entities:
     - type: Transform
       pos: 10.5,-31.5
       parent: 2
-  - uid: 9738
-    components:
-    - type: Transform
-      pos: 2.5,-35.5
-      parent: 2
-  - uid: 9739
-    components:
-    - type: Transform
-      pos: 12.5,-33.5
-      parent: 2
-  - uid: 9751
-    components:
-    - type: Transform
-      pos: 12.5,-35.5
-      parent: 2
-  - uid: 9796
-    components:
-    - type: Transform
-      pos: 2.5,-37.5
-      parent: 2
-  - uid: 9797
-    components:
-    - type: Transform
-      pos: 2.5,-39.5
-      parent: 2
-  - uid: 9810
-    components:
-    - type: Transform
-      pos: 12.5,-37.5
-      parent: 2
-  - uid: 9811
-    components:
-    - type: Transform
-      pos: 12.5,-39.5
-      parent: 2
   - uid: 9890
     components:
     - type: Transform
@@ -147050,28 +147203,6 @@ entities:
     - type: Transform
       pos: 40.5,-23.5
       parent: 2
-  - uid: 9929
-    components:
-    - type: Transform
-      pos: 4.5,-41.5
-      parent: 2
-  - uid: 9930
-    components:
-    - type: Transform
-      pos: 4.5,-44.5
-      parent: 2
-  - uid: 10172
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-44.5
-      parent: 2
-  - uid: 10173
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-42.5
-      parent: 2
   - uid: 10216
     components:
     - type: Transform
@@ -147113,30 +147244,6 @@ entities:
     - type: Transform
       pos: 42.5,-23.5
       parent: 2
-  - uid: 10261
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-46.5
-      parent: 2
-  - uid: 10262
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-47.5
-      parent: 2
-  - uid: 10263
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-49.5
-      parent: 2
-  - uid: 10264
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-50.5
-      parent: 2
   - uid: 10300
     components:
     - type: Transform
@@ -147199,21 +147306,6 @@ entities:
     - type: Transform
       pos: 19.5,-48.5
       parent: 2
-  - uid: 10430
-    components:
-    - type: Transform
-      pos: -1.5,-49.5
-      parent: 2
-  - uid: 10431
-    components:
-    - type: Transform
-      pos: -1.5,-51.5
-      parent: 2
-  - uid: 10434
-    components:
-    - type: Transform
-      pos: -1.5,-53.5
-      parent: 2
   - uid: 10654
     components:
     - type: Transform
@@ -147759,12 +147851,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 48.5,28.5
       parent: 2
-  - uid: 10892
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-47.5
-      parent: 2
   - uid: 10902
     components:
     - type: Transform
@@ -147908,30 +147994,6 @@ entities:
     - type: Transform
       pos: -7.5,27.5
       parent: 2
-  - uid: 11533
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,-3.5
-      parent: 2
-  - uid: 11534
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,-2.5
-      parent: 2
-  - uid: 11561
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -56.5,-15.5
-      parent: 2
-  - uid: 11562
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -53.5,-15.5
-      parent: 2
   - uid: 11976
     components:
     - type: Transform
@@ -148085,18 +148147,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -54.5,-43.5
       parent: 2
-  - uid: 15015
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -47.5,2.5
-      parent: 2
-  - uid: 15050
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -47.5,-4.5
-      parent: 2
   - uid: 15498
     components:
     - type: Transform
@@ -148121,12 +148171,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 66.5,-2.5
       parent: 2
-  - uid: 16675
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -51.5,2.5
-      parent: 2
   - uid: 17853
     components:
     - type: Transform
@@ -148418,17 +148462,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,-10.5
       parent: 21002
-  - uid: 23672
-    components:
-    - type: Transform
-      pos: -1.5,39.5
-      parent: 2
-  - uid: 24126
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -47.5,3.5
-      parent: 2
   - uid: 24137
     components:
     - type: Transform
@@ -148530,77 +148563,6 @@ entities:
     - type: Transform
       pos: 26.5,5.5
       parent: 21002
-- proto: ReinforcedWindowDiagonal
-  entities:
-  - uid: 2741
-    components:
-    - type: Transform
-      pos: -4.5,3.5
-      parent: 2
-  - uid: 3328
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-4.5
-      parent: 2
-  - uid: 11703
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,4.5
-      parent: 2
-  - uid: 11704
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,5.5
-      parent: 2
-  - uid: 11705
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-3.5
-      parent: 2
-  - uid: 15057
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 2
-  - uid: 15060
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 2
-  - uid: 15070
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-2.5
-      parent: 2
-  - uid: 15071
-    components:
-    - type: Transform
-      pos: -2.5,5.5
-      parent: 2
-  - uid: 15072
-    components:
-    - type: Transform
-      pos: -3.5,4.5
-      parent: 2
-  - uid: 15073
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 2
-  - uid: 15074
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 2
 - proto: RemoteSignaller
   entities:
   - uid: 1858
@@ -150157,6 +150119,14 @@ entities:
     - type: Transform
       pos: -47.570698,-18.444723
       parent: 2
+- proto: SignAi
+  entities:
+  - uid: 23184
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,6.5
+      parent: 2
 - proto: SignalButtonDirectional
   entities:
   - uid: 872
@@ -151064,6 +151034,70 @@ entities:
       linkedPorts:
         12131:
         - Pressed: DoorBolt
+- proto: SignAnomaly
+  entities:
+  - uid: 23200
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-36.5
+      parent: 2
+- proto: SignArmory
+  entities:
+  - uid: 23185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 39.5,-19.5
+      parent: 2
+- proto: SignBar
+  entities:
+  - uid: 23186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,2.5
+      parent: 2
+- proto: SignBio
+  entities:
+  - uid: 23187
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-21.5
+      parent: 2
+- proto: SignBridge
+  entities:
+  - uid: 23188
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,2.5
+      parent: 2
+- proto: SignCargo
+  entities:
+  - uid: 23190
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -46.5,-5.5
+      parent: 2
+- proto: SignCargoDock
+  entities:
+  - uid: 23191
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -61.5,-3.5
+      parent: 2
+- proto: SignChapel
+  entities:
+  - uid: 23192
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-21.5
+      parent: 2
 - proto: SignChemistry1
   entities:
   - uid: 8921
@@ -151072,6 +151106,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-37.5
       parent: 2
+- proto: SignCloning
+  entities:
+  - uid: 23193
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,-47.5
+      parent: 2
+- proto: SignConference
+  entities:
+  - uid: 23194
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,16.5
+      parent: 2
 - proto: SignCourt
   entities:
   - uid: 8922
@@ -151490,6 +151540,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,32.5
       parent: 21002
+- proto: SignEngine
+  entities:
+  - uid: 23195
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,24.5
+      parent: 2
+- proto: SignEngineering
+  entities:
+  - uid: 23196
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,29.5
+      parent: 2
+- proto: SignEscapePods
+  entities:
+  - uid: 23197
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,47.5
+      parent: 2
 - proto: SignExamroom
   entities:
   - uid: 8923
@@ -151498,6 +151572,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-34.5
       parent: 2
+- proto: SignHydro2
+  entities:
+  - uid: 23182
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,22.5
+      parent: 2
 - proto: SignInterrogation
   entities:
   - uid: 8927
@@ -151558,6 +151640,40 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-27.5
       parent: 2
+- proto: SignNTMine
+  entities:
+  - uid: 23483
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,5.5
+      parent: 21002
+  - uid: 23630
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-0.5
+      parent: 21002
+- proto: SignPrison
+  entities:
+  - uid: 23631
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-0.5
+      parent: 21002
+  - uid: 23637
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-14.5
+      parent: 21002
+  - uid: 23638
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-24.5
+      parent: 21002
 - proto: SignPsychology
   entities:
   - uid: 2070
@@ -151578,6 +151694,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,-33.5
       parent: 2
+- proto: SignRobo
+  entities:
+  - uid: 23199
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-47.5
+      parent: 2
+- proto: SignScience
+  entities:
+  - uid: 23198
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-36.5
+      parent: 2
 - proto: SignSecurity
   entities:
   - uid: 8933
@@ -151997,7 +152129,7 @@ entities:
     - type: Transform
       pos: 35.97009,22.553062
       parent: 2
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 458
     components:
@@ -154790,6 +154922,20 @@ entities:
     - type: Transform
       pos: 23.5,-3.5
       parent: 2
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 23201
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -46.5,-33.5
+      parent: 2
+  - uid: 23202
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-58.5
+      parent: 2
 - proto: SpawnPointLawyer
   entities:
   - uid: 20801
@@ -156991,7 +157137,7 @@ entities:
   - uid: 23494
     components:
     - type: Transform
-      pos: -22.5,-26.5
+      pos: -19.5,-26.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
@@ -161313,16 +161459,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,15.5
       parent: 2
-  - uid: 224
-    components:
-    - type: Transform
-      pos: 9.5,18.5
-      parent: 2
-  - uid: 225
-    components:
-    - type: Transform
-      pos: 10.5,18.5
-      parent: 2
   - uid: 226
     components:
     - type: Transform
@@ -161333,26 +161469,6 @@ entities:
     - type: Transform
       pos: 11.5,19.5
       parent: 2
-  - uid: 228
-    components:
-    - type: Transform
-      pos: 12.5,19.5
-      parent: 2
-  - uid: 229
-    components:
-    - type: Transform
-      pos: 13.5,19.5
-      parent: 2
-  - uid: 230
-    components:
-    - type: Transform
-      pos: 14.5,19.5
-      parent: 2
-  - uid: 231
-    components:
-    - type: Transform
-      pos: 15.5,19.5
-      parent: 2
   - uid: 232
     components:
     - type: Transform
@@ -161433,16 +161549,6 @@ entities:
     - type: Transform
       pos: 18.5,-1.5
       parent: 2
-  - uid: 253
-    components:
-    - type: Transform
-      pos: 18.5,-2.5
-      parent: 2
-  - uid: 254
-    components:
-    - type: Transform
-      pos: 18.5,-3.5
-      parent: 2
   - uid: 261
     components:
     - type: Transform
@@ -161469,36 +161575,6 @@ entities:
     - type: Transform
       pos: -17.5,-15.5
       parent: 2
-  - uid: 276
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-18.5
-      parent: 2
-  - uid: 277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,-18.5
-      parent: 2
-  - uid: 278
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-15.5
-      parent: 2
-  - uid: 279
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-10.5
-      parent: 2
-  - uid: 286
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-10.5
-      parent: 2
   - uid: 287
     components:
     - type: Transform
@@ -161536,26 +161612,6 @@ entities:
     - type: Transform
       pos: -18.5,11.5
       parent: 2
-  - uid: 303
-    components:
-    - type: Transform
-      pos: -18.5,12.5
-      parent: 2
-  - uid: 304
-    components:
-    - type: Transform
-      pos: -18.5,13.5
-      parent: 2
-  - uid: 305
-    components:
-    - type: Transform
-      pos: -18.5,14.5
-      parent: 2
-  - uid: 306
-    components:
-    - type: Transform
-      pos: -18.5,15.5
-      parent: 2
   - uid: 307
     components:
     - type: Transform
@@ -161591,26 +161647,6 @@ entities:
     - type: Transform
       pos: -15.5,19.5
       parent: 2
-  - uid: 314
-    components:
-    - type: Transform
-      pos: -14.5,19.5
-      parent: 2
-  - uid: 315
-    components:
-    - type: Transform
-      pos: -13.5,19.5
-      parent: 2
-  - uid: 316
-    components:
-    - type: Transform
-      pos: -12.5,19.5
-      parent: 2
-  - uid: 317
-    components:
-    - type: Transform
-      pos: -11.5,19.5
-      parent: 2
   - uid: 318
     components:
     - type: Transform
@@ -161641,16 +161677,6 @@ entities:
     - type: Transform
       pos: 2.5,18.5
       parent: 2
-  - uid: 330
-    components:
-    - type: Transform
-      pos: 3.5,18.5
-      parent: 2
-  - uid: 331
-    components:
-    - type: Transform
-      pos: 4.5,18.5
-      parent: 2
   - uid: 386
     components:
     - type: Transform
@@ -161666,21 +161692,6 @@ entities:
     - type: Transform
       pos: -21.5,11.5
       parent: 2
-  - uid: 397
-    components:
-    - type: Transform
-      pos: -21.5,2.5
-      parent: 2
-  - uid: 398
-    components:
-    - type: Transform
-      pos: -1.5,22.5
-      parent: 2
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -1.5,23.5
-      parent: 2
   - uid: 408
     components:
     - type: Transform
@@ -161701,11 +161712,6 @@ entities:
     - type: Transform
       pos: -15.5,20.5
       parent: 2
-  - uid: 425
-    components:
-    - type: Transform
-      pos: -1.5,19.5
-      parent: 2
   - uid: 451
     components:
     - type: Transform
@@ -161716,18 +161722,6 @@ entities:
     - type: Transform
       pos: -19.5,11.5
       parent: 2
-  - uid: 459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,2.5
-      parent: 2
-  - uid: 460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -18.5,2.5
-      parent: 2
   - uid: 502
     components:
     - type: Transform
@@ -161746,18 +161740,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -22.5,-2.5
       parent: 2
-  - uid: 515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,-3.5
-      parent: 2
-  - uid: 516
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,-4.5
-      parent: 2
   - uid: 517
     components:
     - type: Transform
@@ -161786,61 +161768,11 @@ entities:
     - type: Transform
       pos: 6.5,-17.5
       parent: 2
-  - uid: 524
-    components:
-    - type: Transform
-      pos: 3.5,-17.5
-      parent: 2
-  - uid: 525
-    components:
-    - type: Transform
-      pos: 7.5,-17.5
-      parent: 2
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 2
-  - uid: 527
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 2
-  - uid: 529
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 2
   - uid: 534
     components:
     - type: Transform
       pos: 18.5,-5.5
       parent: 2
-  - uid: 535
-    components:
-    - type: Transform
-      pos: 18.5,-4.5
-      parent: 2
-  - uid: 536
-    components:
-    - type: Transform
-      pos: 18.5,-7.5
-      parent: 2
-  - uid: 537
-    components:
-    - type: Transform
-      pos: 18.5,-6.5
-      parent: 2
-  - uid: 538
-    components:
-    - type: Transform
-      pos: 18.5,-9.5
-      parent: 2
-  - uid: 539
-    components:
-    - type: Transform
-      pos: 18.5,-8.5
-      parent: 2
   - uid: 540
     components:
     - type: Transform
@@ -161856,21 +161788,11 @@ entities:
     - type: Transform
       pos: 11.5,-17.5
       parent: 2
-  - uid: 543
-    components:
-    - type: Transform
-      pos: 9.5,-17.5
-      parent: 2
   - uid: 544
     components:
     - type: Transform
       pos: 11.5,-18.5
       parent: 2
-  - uid: 545
-    components:
-    - type: Transform
-      pos: 10.5,-17.5
-      parent: 2
   - uid: 546
     components:
     - type: Transform
@@ -161904,36 +161826,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-5.5
       parent: 2
-  - uid: 558
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-5.5
-      parent: 2
-  - uid: 559
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-5.5
-      parent: 2
-  - uid: 560
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-1.5
-      parent: 2
-  - uid: 562
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-1.5
-      parent: 2
-  - uid: 563
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-1.5
-      parent: 2
   - uid: 564
     components:
     - type: Transform
@@ -161946,12 +161838,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-10.5
       parent: 2
-  - uid: 566
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-15.5
-      parent: 2
   - uid: 567
     components:
     - type: Transform
@@ -161970,36 +161856,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.5,-20.5
       parent: 2
-  - uid: 578
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-19.5
-      parent: 2
-  - uid: 579
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,-19.5
-      parent: 2
   - uid: 580
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-20.5
       parent: 2
-  - uid: 581
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-18.5
-      parent: 2
-  - uid: 582
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-19.5
-      parent: 2
   - uid: 583
     components:
     - type: Transform
@@ -162040,24 +161902,6 @@ entities:
     - type: Transform
       pos: -23.5,-9.5
       parent: 2
-  - uid: 718
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,-10.5
-      parent: 2
-  - uid: 719
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,-12.5
-      parent: 2
-  - uid: 720
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,-11.5
-      parent: 2
   - uid: 721
     components:
     - type: Transform
@@ -162068,11 +161912,6 @@ entities:
     - type: Transform
       pos: -24.5,-17.5
       parent: 2
-  - uid: 724
-    components:
-    - type: Transform
-      pos: -24.5,-16.5
-      parent: 2
   - uid: 725
     components:
     - type: Transform
@@ -162120,31 +161959,6 @@ entities:
     - type: Transform
       pos: -9.5,-23.5
       parent: 2
-  - uid: 746
-    components:
-    - type: Transform
-      pos: -8.5,-23.5
-      parent: 2
-  - uid: 748
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 2
-  - uid: 749
-    components:
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 2
-  - uid: 750
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 2
-  - uid: 751
-    components:
-    - type: Transform
-      pos: -3.5,-23.5
-      parent: 2
   - uid: 752
     components:
     - type: Transform
@@ -162189,36 +162003,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 57.5,-13.5
       parent: 2
-  - uid: 811
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-10.5
-      parent: 2
-  - uid: 812
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-11.5
-      parent: 2
-  - uid: 814
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-13.5
-      parent: 2
-  - uid: 815
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-14.5
-      parent: 2
-  - uid: 816
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-15.5
-      parent: 2
   - uid: 817
     components:
     - type: Transform
@@ -162237,78 +162021,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-21.5
       parent: 2
-  - uid: 823
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-24.5
-      parent: 2
-  - uid: 824
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,-24.5
-      parent: 2
-  - uid: 825
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-24.5
-      parent: 2
-  - uid: 826
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,-24.5
-      parent: 2
-  - uid: 827
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-24.5
-      parent: 2
-  - uid: 828
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-24.5
-      parent: 2
   - uid: 829
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,-24.5
       parent: 2
-  - uid: 830
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-24.5
-      parent: 2
-  - uid: 831
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-24.5
-      parent: 2
-  - uid: 832
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-24.5
-      parent: 2
-  - uid: 833
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-24.5
-      parent: 2
-  - uid: 834
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 22.5,-24.5
-      parent: 2
   - uid: 835
     components:
     - type: Transform
@@ -162321,36 +162039,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,-22.5
       parent: 2
-  - uid: 837
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-21.5
-      parent: 2
-  - uid: 838
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-20.5
-      parent: 2
-  - uid: 839
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-19.5
-      parent: 2
-  - uid: 840
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-18.5
-      parent: 2
-  - uid: 841
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-17.5
-      parent: 2
   - uid: 905
     components:
     - type: Transform
@@ -162371,96 +162059,21 @@ entities:
     - type: Transform
       pos: 25.5,-22.5
       parent: 2
-  - uid: 939
-    components:
-    - type: Transform
-      pos: 25.5,-8.5
-      parent: 2
-  - uid: 940
-    components:
-    - type: Transform
-      pos: 25.5,-7.5
-      parent: 2
-  - uid: 941
-    components:
-    - type: Transform
-      pos: 25.5,-6.5
-      parent: 2
   - uid: 942
     components:
     - type: Transform
       pos: 25.5,-5.5
       parent: 2
-  - uid: 943
-    components:
-    - type: Transform
-      pos: 24.5,-5.5
-      parent: 2
-  - uid: 944
-    components:
-    - type: Transform
-      pos: 23.5,-5.5
-      parent: 2
-  - uid: 945
-    components:
-    - type: Transform
-      pos: 22.5,-5.5
-      parent: 2
-  - uid: 946
-    components:
-    - type: Transform
-      pos: 21.5,-5.5
-      parent: 2
-  - uid: 947
-    components:
-    - type: Transform
-      pos: 20.5,-5.5
-      parent: 2
-  - uid: 948
-    components:
-    - type: Transform
-      pos: 19.5,-5.5
-      parent: 2
   - uid: 992
     components:
     - type: Transform
       pos: 6.5,-21.5
       parent: 2
-  - uid: 993
-    components:
-    - type: Transform
-      pos: 10.5,-24.5
-      parent: 2
-  - uid: 994
-    components:
-    - type: Transform
-      pos: 9.5,-24.5
-      parent: 2
-  - uid: 995
-    components:
-    - type: Transform
-      pos: 8.5,-24.5
-      parent: 2
-  - uid: 996
-    components:
-    - type: Transform
-      pos: 7.5,-24.5
-      parent: 2
   - uid: 997
     components:
     - type: Transform
       pos: 6.5,-24.5
       parent: 2
-  - uid: 998
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 2
-  - uid: 999
-    components:
-    - type: Transform
-      pos: 4.5,-24.5
-      parent: 2
   - uid: 1000
     components:
     - type: Transform
@@ -162471,152 +162084,12 @@ entities:
     - type: Transform
       pos: 2.5,-24.5
       parent: 2
-  - uid: 1002
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 2
-  - uid: 1003
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 2
-  - uid: 1004
-    components:
-    - type: Transform
-      pos: 2.5,-20.5
-      parent: 2
-  - uid: 1005
-    components:
-    - type: Transform
-      pos: 2.5,-21.5
-      parent: 2
-  - uid: 1064
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-24.5
-      parent: 2
-  - uid: 1065
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-25.5
-      parent: 2
-  - uid: 1066
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-26.5
-      parent: 2
-  - uid: 1067
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-27.5
-      parent: 2
-  - uid: 1068
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-28.5
-      parent: 2
-  - uid: 1070
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-30.5
-      parent: 2
   - uid: 1071
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-31.5
       parent: 2
-  - uid: 1072
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-31.5
-      parent: 2
-  - uid: 1073
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-31.5
-      parent: 2
-  - uid: 1074
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-31.5
-      parent: 2
-  - uid: 1075
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-31.5
-      parent: 2
-  - uid: 1076
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-31.5
-      parent: 2
-  - uid: 1077
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-31.5
-      parent: 2
-  - uid: 1078
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-31.5
-      parent: 2
-  - uid: 1079
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-31.5
-      parent: 2
-  - uid: 1080
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-30.5
-      parent: 2
-  - uid: 1081
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-29.5
-      parent: 2
-  - uid: 1083
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-27.5
-      parent: 2
-  - uid: 1084
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-26.5
-      parent: 2
-  - uid: 1085
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-25.5
-      parent: 2
-  - uid: 1086
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-24.5
-      parent: 2
   - uid: 1117
     components:
     - type: Transform
@@ -162657,41 +162130,6 @@ entities:
     - type: Transform
       pos: -25.5,13.5
       parent: 2
-  - uid: 1134
-    components:
-    - type: Transform
-      pos: -25.5,14.5
-      parent: 2
-  - uid: 1135
-    components:
-    - type: Transform
-      pos: -25.5,15.5
-      parent: 2
-  - uid: 1136
-    components:
-    - type: Transform
-      pos: -25.5,16.5
-      parent: 2
-  - uid: 1137
-    components:
-    - type: Transform
-      pos: -25.5,17.5
-      parent: 2
-  - uid: 1138
-    components:
-    - type: Transform
-      pos: -25.5,18.5
-      parent: 2
-  - uid: 1139
-    components:
-    - type: Transform
-      pos: -25.5,19.5
-      parent: 2
-  - uid: 1140
-    components:
-    - type: Transform
-      pos: -25.5,20.5
-      parent: 2
   - uid: 1141
     components:
     - type: Transform
@@ -162707,46 +162145,16 @@ entities:
     - type: Transform
       pos: -22.5,21.5
       parent: 2
-  - uid: 1145
-    components:
-    - type: Transform
-      pos: -22.5,22.5
-      parent: 2
-  - uid: 1146
-    components:
-    - type: Transform
-      pos: -22.5,23.5
-      parent: 2
-  - uid: 1147
-    components:
-    - type: Transform
-      pos: -22.5,24.5
-      parent: 2
-  - uid: 1148
-    components:
-    - type: Transform
-      pos: -22.5,25.5
-      parent: 2
   - uid: 1149
     components:
     - type: Transform
       pos: -24.5,21.5
       parent: 2
-  - uid: 1150
-    components:
-    - type: Transform
-      pos: -23.5,22.5
-      parent: 2
   - uid: 1151
     components:
     - type: Transform
       pos: -24.5,22.5
       parent: 2
-  - uid: 1156
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 2
   - uid: 1158
     components:
     - type: Transform
@@ -162805,16 +162213,6 @@ entities:
     - type: Transform
       pos: -1.5,25.5
       parent: 2
-  - uid: 1176
-    components:
-    - type: Transform
-      pos: -2.5,25.5
-      parent: 2
-  - uid: 1177
-    components:
-    - type: Transform
-      pos: -2.5,26.5
-      parent: 2
   - uid: 1178
     components:
     - type: Transform
@@ -162841,24 +162239,6 @@ entities:
     - type: Transform
       pos: -24.5,-7.5
       parent: 2
-  - uid: 1186
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-9.5
-      parent: 2
-  - uid: 1187
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-9.5
-      parent: 2
-  - uid: 1188
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-9.5
-      parent: 2
   - uid: 1189
     components:
     - type: Transform
@@ -162899,21 +162279,6 @@ entities:
     - type: Transform
       pos: -27.5,-2.5
       parent: 2
-  - uid: 1197
-    components:
-    - type: Transform
-      pos: -27.5,-1.5
-      parent: 2
-  - uid: 1198
-    components:
-    - type: Transform
-      pos: -24.5,-14.5
-      parent: 2
-  - uid: 1199
-    components:
-    - type: Transform
-      pos: -24.5,-15.5
-      parent: 2
   - uid: 1204
     components:
     - type: Transform
@@ -162932,23 +162297,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-21.5
       parent: 2
-  - uid: 1210
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-21.5
-      parent: 2
-  - uid: 1211
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-21.5
-      parent: 2
   - uid: 1212
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-21.5
+      pos: -1.5,23.5
       parent: 2
   - uid: 1219
     components:
@@ -162992,156 +162344,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,-21.5
       parent: 2
-  - uid: 1257
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-21.5
-      parent: 2
-  - uid: 1258
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-21.5
-      parent: 2
-  - uid: 1274
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-20.5
-      parent: 2
-  - uid: 1275
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-19.5
-      parent: 2
-  - uid: 1276
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-18.5
-      parent: 2
-  - uid: 1277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-17.5
-      parent: 2
-  - uid: 1278
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-16.5
-      parent: 2
-  - uid: 1279
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-15.5
-      parent: 2
-  - uid: 1280
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-14.5
-      parent: 2
   - uid: 1281
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -33.5,-13.5
       parent: 2
-  - uid: 1282
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-12.5
-      parent: 2
-  - uid: 1283
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-11.5
-      parent: 2
-  - uid: 1284
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-10.5
-      parent: 2
-  - uid: 1324
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-2.5
-      parent: 2
-  - uid: 1325
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-2.5
-      parent: 2
-  - uid: 1326
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-2.5
-      parent: 2
-  - uid: 1327
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-1.5
-      parent: 2
   - uid: 1337
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,-40.5
       parent: 2
-  - uid: 1338
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-40.5
-      parent: 2
   - uid: 1339
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-40.5
       parent: 2
-  - uid: 1340
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-40.5
-      parent: 2
-  - uid: 1341
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-40.5
-      parent: 2
-  - uid: 1342
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-40.5
-      parent: 2
-  - uid: 1343
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-40.5
-      parent: 2
-  - uid: 1344
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-40.5
-      parent: 2
   - uid: 1345
     components:
     - type: Transform
@@ -163184,65 +162404,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-24.5
       parent: 2
-  - uid: 1415
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-24.5
-      parent: 2
-  - uid: 1416
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,-24.5
-      parent: 2
-  - uid: 1420
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,-24.5
-      parent: 2
   - uid: 1421
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-24.5
       parent: 2
-  - uid: 1425
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-22.5
-      parent: 2
-  - uid: 1426
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-22.5
-      parent: 2
   - uid: 1427
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -33.5,-24.5
       parent: 2
-  - uid: 1428
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-24.5
-      parent: 2
-  - uid: 1429
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-24.5
-      parent: 2
-  - uid: 1440
-    components:
-    - type: Transform
-      pos: -29.5,-30.5
-      parent: 2
   - uid: 1477
     components:
     - type: Transform
@@ -163410,11 +162583,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,-33.5
       parent: 2
-  - uid: 1552
-    components:
-    - type: Transform
-      pos: -34.5,-29.5
-      parent: 2
   - uid: 1553
     components:
     - type: Transform
@@ -163472,28 +162640,11 @@ entities:
     - type: Transform
       pos: -18.5,-42.5
       parent: 2
-  - uid: 1685
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-41.5
-      parent: 2
-  - uid: 1686
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-42.5
-      parent: 2
   - uid: 1849
     components:
     - type: Transform
       pos: -18.5,-41.5
       parent: 2
-  - uid: 1855
-    components:
-    - type: Transform
-      pos: -37.5,-29.5
-      parent: 2
   - uid: 1863
     components:
     - type: Transform
@@ -163509,11 +162660,6 @@ entities:
     - type: Transform
       pos: -19.5,-41.5
       parent: 2
-  - uid: 1871
-    components:
-    - type: Transform
-      pos: -31.5,-30.5
-      parent: 2
   - uid: 1879
     components:
     - type: Transform
@@ -163546,11 +162692,6 @@ entities:
     - type: Transform
       pos: 39.5,-18.5
       parent: 2
-  - uid: 1948
-    components:
-    - type: Transform
-      pos: -35.5,-29.5
-      parent: 2
   - uid: 1998
     components:
     - type: Transform
@@ -163575,41 +162716,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-5.5
       parent: 2
-  - uid: 2027
-    components:
-    - type: Transform
-      pos: -38.5,-29.5
-      parent: 2
-  - uid: 2028
-    components:
-    - type: Transform
-      pos: -39.5,-30.5
-      parent: 2
   - uid: 2029
     components:
     - type: Transform
       pos: -39.5,-29.5
       parent: 2
-  - uid: 2030
-    components:
-    - type: Transform
-      pos: -39.5,-32.5
-      parent: 2
-  - uid: 2031
-    components:
-    - type: Transform
-      pos: -39.5,-31.5
-      parent: 2
-  - uid: 2032
-    components:
-    - type: Transform
-      pos: -39.5,-33.5
-      parent: 2
-  - uid: 2033
-    components:
-    - type: Transform
-      pos: -39.5,-34.5
-      parent: 2
   - uid: 2042
     components:
     - type: Transform
@@ -163646,78 +162757,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,-41.5
       parent: 2
-  - uid: 2058
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,-36.5
-      parent: 2
-  - uid: 2059
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,-37.5
-      parent: 2
-  - uid: 2060
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,-38.5
-      parent: 2
-  - uid: 2061
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,-40.5
-      parent: 2
   - uid: 2063
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-41.5
       parent: 2
-  - uid: 2064
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -30.5,-41.5
-      parent: 2
-  - uid: 2065
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -31.5,-41.5
-      parent: 2
-  - uid: 2066
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-41.5
-      parent: 2
-  - uid: 2072
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-41.5
-      parent: 2
-  - uid: 2074
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -34.5,-41.5
-      parent: 2
-  - uid: 2075
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-41.5
-      parent: 2
-  - uid: 2124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -44.5,-33.5
-      parent: 2
   - uid: 2126
     components:
     - type: Transform
@@ -163729,12 +162774,6 @@ entities:
     - type: Transform
       pos: 37.5,29.5
       parent: 2
-  - uid: 2129
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -43.5,-37.5
-      parent: 2
   - uid: 2130
     components:
     - type: Transform
@@ -163747,12 +162786,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -43.5,-46.5
       parent: 2
-  - uid: 2132
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -43.5,-38.5
-      parent: 2
   - uid: 2133
     components:
     - type: Transform
@@ -163771,12 +162804,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -43.5,-39.5
       parent: 2
-  - uid: 2136
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -43.5,-40.5
-      parent: 2
   - uid: 2137
     components:
     - type: Transform
@@ -163785,8 +162812,7 @@ entities:
   - uid: 2138
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -43.5,-41.5
+      pos: -2.5,-31.5
       parent: 2
   - uid: 2139
     components:
@@ -163797,14 +162823,7 @@ entities:
   - uid: 2142
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -44.5,-34.5
-      parent: 2
-  - uid: 2143
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -44.5,-35.5
+      pos: -3.5,-31.5
       parent: 2
   - uid: 2151
     components:
@@ -163812,12 +162831,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -44.5,-31.5
       parent: 2
-  - uid: 2152
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -44.5,-32.5
-      parent: 2
   - uid: 2154
     components:
     - type: Transform
@@ -163836,29 +162849,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-48.5
       parent: 2
-  - uid: 2160
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -36.5,-48.5
-      parent: 2
-  - uid: 2161
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-48.5
-      parent: 2
-  - uid: 2162
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -34.5,-48.5
-      parent: 2
   - uid: 2163
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-48.5
+      pos: -9.5,-31.5
       parent: 2
   - uid: 2164
     components:
@@ -163866,36 +162860,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-48.5
       parent: 2
-  - uid: 2165
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -31.5,-48.5
-      parent: 2
-  - uid: 2166
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-48.5
-      parent: 2
-  - uid: 2167
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-48.5
-      parent: 2
   - uid: 2168
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -28.5,-48.5
       parent: 2
-  - uid: 2292
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-37.5
-      parent: 2
   - uid: 2335
     components:
     - type: Transform
@@ -164650,25 +163620,10 @@ entities:
     - type: Transform
       pos: 25.5,-2.5
       parent: 2
-  - uid: 3037
+  - uid: 3086
     components:
     - type: Transform
-      pos: 25.5,-4.5
-      parent: 2
-  - uid: 3084
-    components:
-    - type: Transform
-      pos: 26.5,-2.5
-      parent: 2
-  - uid: 3085
-    components:
-    - type: Transform
-      pos: 27.5,-2.5
-      parent: 2
-  - uid: 3086
-    components:
-    - type: Transform
-      pos: 29.5,-1.5
+      pos: 29.5,-1.5
       parent: 2
   - uid: 3087
     components:
@@ -164695,25 +163650,10 @@ entities:
     - type: Transform
       pos: 29.5,-6.5
       parent: 2
-  - uid: 3092
-    components:
-    - type: Transform
-      pos: 28.5,-7.5
-      parent: 2
-  - uid: 3093
-    components:
-    - type: Transform
-      pos: 28.5,-8.5
-      parent: 2
-  - uid: 3094
-    components:
-    - type: Transform
-      pos: 28.5,-9.5
-      parent: 2
   - uid: 3095
     components:
     - type: Transform
-      pos: 28.5,-10.5
+      pos: -22.5,22.5
       parent: 2
   - uid: 3096
     components:
@@ -164796,16 +163736,6 @@ entities:
     - type: Transform
       pos: 23.5,-25.5
       parent: 2
-  - uid: 3129
-    components:
-    - type: Transform
-      pos: 19.5,-25.5
-      parent: 2
-  - uid: 3130
-    components:
-    - type: Transform
-      pos: 14.5,-25.5
-      parent: 2
   - uid: 3131
     components:
     - type: Transform
@@ -164826,11 +163756,6 @@ entities:
     - type: Transform
       pos: 24.5,-27.5
       parent: 2
-  - uid: 3136
-    components:
-    - type: Transform
-      pos: 22.5,-29.5
-      parent: 2
   - uid: 3137
     components:
     - type: Transform
@@ -164919,7 +163844,7 @@ entities:
   - uid: 3158
     components:
     - type: Transform
-      pos: 3.5,-25.5
+      pos: -23.5,22.5
       parent: 2
   - uid: 3159
     components:
@@ -164931,16 +163856,6 @@ entities:
     - type: Transform
       pos: 2.5,-28.5
       parent: 2
-  - uid: 3164
-    components:
-    - type: Transform
-      pos: 34.5,3.5
-      parent: 2
-  - uid: 3165
-    components:
-    - type: Transform
-      pos: 35.5,3.5
-      parent: 2
   - uid: 3166
     components:
     - type: Transform
@@ -164951,20 +163866,15 @@ entities:
     - type: Transform
       pos: 37.5,3.5
       parent: 2
-  - uid: 3168
-    components:
-    - type: Transform
-      pos: 37.5,4.5
-      parent: 2
   - uid: 3169
     components:
     - type: Transform
-      pos: 37.5,5.5
+      pos: -26.5,-9.5
       parent: 2
   - uid: 3170
     components:
     - type: Transform
-      pos: 37.5,6.5
+      pos: -25.5,-9.5
       parent: 2
   - uid: 3171
     components:
@@ -164974,22 +163884,7 @@ entities:
   - uid: 3172
     components:
     - type: Transform
-      pos: 38.5,7.5
-      parent: 2
-  - uid: 3173
-    components:
-    - type: Transform
-      pos: 39.5,7.5
-      parent: 2
-  - uid: 3174
-    components:
-    - type: Transform
-      pos: 40.5,7.5
-      parent: 2
-  - uid: 3176
-    components:
-    - type: Transform
-      pos: 42.5,7.5
+      pos: -24.5,-9.5
       parent: 2
   - uid: 3177
     components:
@@ -165131,36 +164026,6 @@ entities:
     - type: Transform
       pos: 38.5,24.5
       parent: 2
-  - uid: 3213
-    components:
-    - type: Transform
-      pos: 44.5,27.5
-      parent: 2
-  - uid: 3215
-    components:
-    - type: Transform
-      pos: 42.5,27.5
-      parent: 2
-  - uid: 3216
-    components:
-    - type: Transform
-      pos: 41.5,27.5
-      parent: 2
-  - uid: 3217
-    components:
-    - type: Transform
-      pos: 40.5,27.5
-      parent: 2
-  - uid: 3218
-    components:
-    - type: Transform
-      pos: 39.5,27.5
-      parent: 2
-  - uid: 3219
-    components:
-    - type: Transform
-      pos: 38.5,27.5
-      parent: 2
   - uid: 3221
     components:
     - type: Transform
@@ -165176,56 +164041,11 @@ entities:
     - type: Transform
       pos: 34.5,27.5
       parent: 2
-  - uid: 3228
-    components:
-    - type: Transform
-      pos: 41.5,28.5
-      parent: 2
-  - uid: 3229
-    components:
-    - type: Transform
-      pos: 41.5,29.5
-      parent: 2
-  - uid: 3230
-    components:
-    - type: Transform
-      pos: 41.5,30.5
-      parent: 2
-  - uid: 3231
-    components:
-    - type: Transform
-      pos: 41.5,31.5
-      parent: 2
-  - uid: 3232
-    components:
-    - type: Transform
-      pos: 40.5,31.5
-      parent: 2
-  - uid: 3233
-    components:
-    - type: Transform
-      pos: 39.5,31.5
-      parent: 2
   - uid: 3237
     components:
     - type: Transform
       pos: 33.5,29.5
       parent: 2
-  - uid: 3238
-    components:
-    - type: Transform
-      pos: 39.5,32.5
-      parent: 2
-  - uid: 3239
-    components:
-    - type: Transform
-      pos: 39.5,33.5
-      parent: 2
-  - uid: 3240
-    components:
-    - type: Transform
-      pos: 39.5,34.5
-      parent: 2
   - uid: 3241
     components:
     - type: Transform
@@ -165772,12 +164592,12 @@ entities:
   - uid: 3777
     components:
     - type: Transform
-      pos: 54.5,-34.5
+      pos: -2.5,-40.5
       parent: 2
   - uid: 3779
     components:
     - type: Transform
-      pos: 57.5,-34.5
+      pos: -4.5,-40.5
       parent: 2
   - uid: 3780
     components:
@@ -165794,12 +164614,12 @@ entities:
   - uid: 3784
     components:
     - type: Transform
-      pos: 52.5,-34.5
+      pos: -5.5,-40.5
       parent: 2
   - uid: 3785
     components:
     - type: Transform
-      pos: 60.5,-34.5
+      pos: -6.5,-40.5
       parent: 2
   - uid: 3786
     components:
@@ -165882,7 +164702,7 @@ entities:
   - uid: 3865
     components:
     - type: Transform
-      pos: 59.5,-34.5
+      pos: -7.5,-40.5
       parent: 2
   - uid: 3866
     components:
@@ -165917,8 +164737,7 @@ entities:
   - uid: 3874
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,-30.5
+      pos: -8.5,-40.5
       parent: 2
   - uid: 3875
     components:
@@ -166019,16 +164838,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,-19.5
       parent: 2
-  - uid: 3906
-    components:
-    - type: Transform
-      pos: 56.5,-34.5
-      parent: 2
-  - uid: 3907
-    components:
-    - type: Transform
-      pos: 58.5,-34.5
-      parent: 2
   - uid: 3908
     components:
     - type: Transform
@@ -166137,12 +164946,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 43.5,-23.5
       parent: 2
-  - uid: 3936
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-30.5
-      parent: 2
   - uid: 3937
     components:
     - type: Transform
@@ -166209,52 +165012,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 41.5,24.5
       parent: 2
-  - uid: 3971
-    components:
-    - type: Transform
-      pos: 53.5,-34.5
-      parent: 2
-  - uid: 3972
-    components:
-    - type: Transform
-      pos: 51.5,-34.5
-      parent: 2
-  - uid: 3973
-    components:
-    - type: Transform
-      pos: 50.5,-34.5
-      parent: 2
   - uid: 3974
     components:
     - type: Transform
       pos: 49.5,-34.5
       parent: 2
-  - uid: 3975
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
-  - uid: 3976
-    components:
-    - type: Transform
-      pos: 47.5,-34.5
-      parent: 2
   - uid: 3978
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 45.5,-34.5
       parent: 2
-  - uid: 3980
-    components:
-    - type: Transform
-      pos: 26.5,-31.5
-      parent: 2
-  - uid: 3981
-    components:
-    - type: Transform
-      pos: 26.5,-30.5
-      parent: 2
   - uid: 3982
     components:
     - type: Transform
@@ -166687,18 +165455,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,-40.5
       parent: 2
-  - uid: 4136
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-40.5
-      parent: 2
-  - uid: 4138
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-40.5
-      parent: 2
   - uid: 4139
     components:
     - type: Transform
@@ -166759,26 +165515,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,-31.5
       parent: 2
-  - uid: 4249
-    components:
-    - type: Transform
-      pos: 26.5,-32.5
-      parent: 2
   - uid: 4250
     components:
     - type: Transform
       pos: 26.5,-33.5
       parent: 2
-  - uid: 4251
-    components:
-    - type: Transform
-      pos: 27.5,-33.5
-      parent: 2
-  - uid: 4252
-    components:
-    - type: Transform
-      pos: 28.5,-33.5
-      parent: 2
   - uid: 4302
     components:
     - type: Transform
@@ -166924,41 +165665,10 @@ entities:
     - type: Transform
       pos: 35.5,9.5
       parent: 2
-  - uid: 5189
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-34.5
-      parent: 2
-  - uid: 5190
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-35.5
-      parent: 2
   - uid: 5191
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-36.5
-      parent: 2
-  - uid: 5194
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-39.5
-      parent: 2
-  - uid: 5195
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-40.5
-      parent: 2
-  - uid: 5196
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-41.5
+      pos: -39.5,-31.5
       parent: 2
   - uid: 5197
     components:
@@ -166966,54 +165676,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 26.5,-42.5
       parent: 2
-  - uid: 5198
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-42.5
-      parent: 2
-  - uid: 5199
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-42.5
-      parent: 2
-  - uid: 5200
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-42.5
-      parent: 2
-  - uid: 5201
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-42.5
-      parent: 2
-  - uid: 5202
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-42.5
-      parent: 2
-  - uid: 5203
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-42.5
-      parent: 2
-  - uid: 5204
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-42.5
-      parent: 2
-  - uid: 5205
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-42.5
-      parent: 2
   - uid: 5213
     components:
     - type: Transform
@@ -167254,48 +165916,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,-44.5
       parent: 2
-  - uid: 5282
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-44.5
-      parent: 2
-  - uid: 5283
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-44.5
-      parent: 2
   - uid: 5284
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,-44.5
       parent: 2
-  - uid: 5285
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-45.5
-      parent: 2
-  - uid: 5286
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-45.5
-      parent: 2
-  - uid: 5287
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,-45.5
-      parent: 2
-  - uid: 5288
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-45.5
-      parent: 2
   - uid: 5289
     components:
     - type: Transform
@@ -167344,24 +165970,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-47.5
       parent: 2
-  - uid: 5297
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-47.5
-      parent: 2
-  - uid: 5298
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-47.5
-      parent: 2
-  - uid: 5299
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-47.5
-      parent: 2
   - uid: 5300
     components:
     - type: Transform
@@ -167374,12 +165982,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-47.5
       parent: 2
-  - uid: 5344
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,26.5
-      parent: 2
   - uid: 5345
     components:
     - type: Transform
@@ -167392,36 +165994,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,29.5
       parent: 2
-  - uid: 5347
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,29.5
-      parent: 2
-  - uid: 5348
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,29.5
-      parent: 2
-  - uid: 5349
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,29.5
-      parent: 2
-  - uid: 5350
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,29.5
-      parent: 2
-  - uid: 5351
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,29.5
-      parent: 2
   - uid: 5352
     components:
     - type: Transform
@@ -167458,24 +166030,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,24.5
       parent: 2
-  - uid: 5368
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,28.5
-      parent: 2
-  - uid: 5369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,25.5
-      parent: 2
-  - uid: 5370
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,27.5
-      parent: 2
   - uid: 5371
     components:
     - type: Transform
@@ -167500,48 +166054,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 27.5,27.5
       parent: 2
-  - uid: 5377
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,27.5
-      parent: 2
-  - uid: 5378
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,27.5
-      parent: 2
-  - uid: 5379
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,26.5
-      parent: 2
-  - uid: 5380
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 26.5,29.5
-      parent: 2
   - uid: 5381
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 27.5,29.5
       parent: 2
-  - uid: 5382
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,29.5
-      parent: 2
-  - uid: 5383
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,29.5
-      parent: 2
   - uid: 5384
     components:
     - type: Transform
@@ -167554,66 +166072,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,29.5
       parent: 2
-  - uid: 5386
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,30.5
-      parent: 2
-  - uid: 5387
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,31.5
-      parent: 2
-  - uid: 5388
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,32.5
-      parent: 2
-  - uid: 5389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,33.5
-      parent: 2
-  - uid: 5390
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,34.5
-      parent: 2
-  - uid: 5391
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,29.5
-      parent: 2
-  - uid: 5394
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 22.5,29.5
-      parent: 2
-  - uid: 5395
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,29.5
-      parent: 2
   - uid: 5396
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 20.5,29.5
       parent: 2
-  - uid: 5399
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,27.5
-      parent: 2
   - uid: 5410
     components:
     - type: Transform
@@ -167671,21 +166135,11 @@ entities:
     - type: Transform
       pos: -34.5,7.5
       parent: 2
-  - uid: 5823
-    components:
-    - type: Transform
-      pos: 38.5,2.5
-      parent: 2
   - uid: 5824
     components:
     - type: Transform
       pos: 43.5,2.5
       parent: 2
-  - uid: 5825
-    components:
-    - type: Transform
-      pos: 42.5,2.5
-      parent: 2
   - uid: 5826
     components:
     - type: Transform
@@ -167706,18 +166160,6 @@ entities:
     - type: Transform
       pos: 43.5,6.5
       parent: 2
-  - uid: 5884
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-27.5
-      parent: 2
-  - uid: 5885
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -35.5,-28.5
-      parent: 2
   - uid: 6090
     components:
     - type: Transform
@@ -167844,14 +166286,7 @@ entities:
   - uid: 6208
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,37.5
-      parent: 2
-  - uid: 6209
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,36.5
+      pos: 41.5,31.5
       parent: 2
   - uid: 6210
     components:
@@ -167862,8 +166297,7 @@ entities:
   - uid: 6211
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,34.5
+      pos: 39.5,31.5
       parent: 2
   - uid: 6213
     components:
@@ -167883,12 +166317,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,39.5
       parent: 2
-  - uid: 6216
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,38.5
-      parent: 2
   - uid: 6227
     components:
     - type: Transform
@@ -167900,12 +166328,6 @@ entities:
     - type: Transform
       pos: -42.5,38.5
       parent: 2
-  - uid: 6305
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,31.5
-      parent: 2
   - uid: 6363
     components:
     - type: Transform
@@ -167939,8 +166361,7 @@ entities:
   - uid: 6380
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,40.5
+      pos: 39.5,34.5
       parent: 2
   - uid: 6381
     components:
@@ -167948,54 +166369,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,30.5
       parent: 2
-  - uid: 6382
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,31.5
-      parent: 2
-  - uid: 6383
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,37.5
-      parent: 2
-  - uid: 6385
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,34.5
-      parent: 2
   - uid: 6386
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,35.5
       parent: 2
-  - uid: 6387
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,36.5
-      parent: 2
-  - uid: 6388
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,37.5
-      parent: 2
   - uid: 6389
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,38.5
       parent: 2
-  - uid: 6390
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,39.5
-      parent: 2
   - uid: 6393
     components:
     - type: Transform
@@ -168017,50 +166402,17 @@ entities:
     - type: Transform
       pos: 30.5,37.5
       parent: 2
-  - uid: 6399
-    components:
-    - type: Transform
-      pos: 37.5,35.5
-      parent: 2
   - uid: 6400
     components:
     - type: Transform
       pos: 37.5,36.5
       parent: 2
-  - uid: 6401
-    components:
-    - type: Transform
-      pos: 37.5,37.5
-      parent: 2
-  - uid: 6402
-    components:
-    - type: Transform
-      pos: 37.5,38.5
-      parent: 2
   - uid: 6403
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 30.5,39.5
       parent: 2
-  - uid: 6431
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,41.5
-      parent: 2
-  - uid: 6432
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 32.5,41.5
-      parent: 2
-  - uid: 6435
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 35.5,41.5
-      parent: 2
   - uid: 6436
     components:
     - type: Transform
@@ -168073,168 +166425,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.5,41.5
       parent: 2
-  - uid: 6438
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 37.5,40.5
-      parent: 2
-  - uid: 6439
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 37.5,39.5
-      parent: 2
-  - uid: 6458
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,36.5
-      parent: 2
-  - uid: 6504
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,41.5
-      parent: 2
-  - uid: 6505
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,41.5
-      parent: 2
-  - uid: 6506
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,41.5
-      parent: 2
-  - uid: 6507
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,35.5
-      parent: 2
-  - uid: 6508
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,35.5
-      parent: 2
-  - uid: 6509
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,35.5
-      parent: 2
-  - uid: 6510
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,41.5
-      parent: 2
-  - uid: 6511
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 22.5,41.5
-      parent: 2
-  - uid: 6512
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,41.5
-      parent: 2
   - uid: 6513
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,41.5
       parent: 2
-  - uid: 6514
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,35.5
-      parent: 2
-  - uid: 6515
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,35.5
-      parent: 2
-  - uid: 6516
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 22.5,35.5
-      parent: 2
-  - uid: 6517
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,35.5
-      parent: 2
-  - uid: 6518
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,41.5
-      parent: 2
   - uid: 6530
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 41.5,35.5
       parent: 2
-  - uid: 6531
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,35.5
-      parent: 2
-  - uid: 6532
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 43.5,35.5
-      parent: 2
-  - uid: 6533
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,35.5
-      parent: 2
-  - uid: 6534
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,34.5
-      parent: 2
-  - uid: 6535
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,33.5
-      parent: 2
-  - uid: 6536
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,33.5
-      parent: 2
-  - uid: 6537
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,32.5
-      parent: 2
-  - uid: 6538
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,31.5
-      parent: 2
   - uid: 6541
     components:
     - type: Transform
@@ -168342,36 +166544,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,39.5
       parent: 2
-  - uid: 6561
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,38.5
-      parent: 2
-  - uid: 6562
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,39.5
-      parent: 2
-  - uid: 6563
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,40.5
-      parent: 2
-  - uid: 6564
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,41.5
-      parent: 2
-  - uid: 6565
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,42.5
-      parent: 2
   - uid: 6566
     components:
     - type: Transform
@@ -168432,23 +166604,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 39.5,43.5
       parent: 2
-  - uid: 6577
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,43.5
-      parent: 2
   - uid: 6578
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 36.5,44.5
       parent: 2
-  - uid: 6579
-    components:
-    - type: Transform
-      pos: 38.5,44.5
-      parent: 2
   - uid: 6581
     components:
     - type: Transform
@@ -168579,36 +166740,6 @@ entities:
     - type: Transform
       pos: 27.5,44.5
       parent: 2
-  - uid: 6785
-    components:
-    - type: Transform
-      pos: 28.5,44.5
-      parent: 2
-  - uid: 6786
-    components:
-    - type: Transform
-      pos: 29.5,44.5
-      parent: 2
-  - uid: 6787
-    components:
-    - type: Transform
-      pos: 30.5,44.5
-      parent: 2
-  - uid: 6788
-    components:
-    - type: Transform
-      pos: 31.5,44.5
-      parent: 2
-  - uid: 6789
-    components:
-    - type: Transform
-      pos: 32.5,44.5
-      parent: 2
-  - uid: 6790
-    components:
-    - type: Transform
-      pos: 33.5,44.5
-      parent: 2
   - uid: 6791
     components:
     - type: Transform
@@ -168629,31 +166760,11 @@ entities:
     - type: Transform
       pos: 37.5,47.5
       parent: 2
-  - uid: 6795
-    components:
-    - type: Transform
-      pos: 36.5,47.5
-      parent: 2
-  - uid: 6796
-    components:
-    - type: Transform
-      pos: 32.5,49.5
-      parent: 2
-  - uid: 6797
-    components:
-    - type: Transform
-      pos: 33.5,47.5
-      parent: 2
   - uid: 6798
     components:
     - type: Transform
       pos: 32.5,47.5
       parent: 2
-  - uid: 6799
-    components:
-    - type: Transform
-      pos: 32.5,48.5
-      parent: 2
   - uid: 6806
     components:
     - type: Transform
@@ -168962,18 +167073,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,54.5
       parent: 2
-  - uid: 7041
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,49.5
-      parent: 2
-  - uid: 7043
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,51.5
-      parent: 2
   - uid: 7044
     components:
     - type: Transform
@@ -169352,6 +167451,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,70.5
       parent: 2
+  - uid: 7231
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-12.5
+      parent: 2
   - uid: 7293
     components:
     - type: Transform
@@ -169600,70 +167705,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,34.5
       parent: 2
-  - uid: 8013
-    components:
-    - type: Transform
-      pos: -22.5,27.5
-      parent: 2
-  - uid: 8014
-    components:
-    - type: Transform
-      pos: -22.5,28.5
-      parent: 2
-  - uid: 8015
-    components:
-    - type: Transform
-      pos: -22.5,29.5
-      parent: 2
-  - uid: 8016
-    components:
-    - type: Transform
-      pos: -22.5,30.5
-      parent: 2
-  - uid: 8017
-    components:
-    - type: Transform
-      pos: -22.5,31.5
-      parent: 2
-  - uid: 8020
-    components:
-    - type: Transform
-      pos: -22.5,34.5
-      parent: 2
-  - uid: 8021
-    components:
-    - type: Transform
-      pos: -22.5,35.5
-      parent: 2
-  - uid: 8022
-    components:
-    - type: Transform
-      pos: -22.5,36.5
-      parent: 2
-  - uid: 8023
-    components:
-    - type: Transform
-      pos: -22.5,37.5
-      parent: 2
   - uid: 8024
     components:
     - type: Transform
       pos: -22.5,38.5
       parent: 2
-  - uid: 8025
-    components:
-    - type: Transform
-      pos: -21.5,38.5
-      parent: 2
-  - uid: 8026
-    components:
-    - type: Transform
-      pos: -20.5,38.5
-      parent: 2
   - uid: 8027
     components:
     - type: Transform
-      pos: -19.5,38.5
+      pos: 9.5,38.5
       parent: 2
   - uid: 8038
     components:
@@ -169785,28 +167835,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -26.5,44.5
       parent: 2
-  - uid: 8118
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,38.5
-      parent: 2
-  - uid: 8142
-    components:
-    - type: Transform
-      pos: -25.5,38.5
-      parent: 2
-  - uid: 8159
+  - uid: 8189
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -18.5,38.5
+      pos: 29.5,-11.5
       parent: 2
-  - uid: 8160
+  - uid: 8191
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -16.5,38.5
+      pos: 29.5,-13.5
       parent: 2
   - uid: 8225
     components:
@@ -170328,12 +168367,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,34.5
       parent: 2
-  - uid: 8349
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,38.5
-      parent: 2
   - uid: 8352
     components:
     - type: Transform
@@ -170346,12 +168379,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,36.5
       parent: 2
-  - uid: 8357
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,38.5
-      parent: 2
   - uid: 8366
     components:
     - type: Transform
@@ -170478,11 +168505,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,27.5
       parent: 2
-  - uid: 8950
-    components:
-    - type: Transform
-      pos: 37.5,28.5
-      parent: 2
   - uid: 8953
     components:
     - type: Transform
@@ -170554,12 +168576,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,-8.5
       parent: 2
-  - uid: 9490
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -33.5,-1.5
-      parent: 2
   - uid: 9491
     components:
     - type: Transform
@@ -170591,11 +168607,6 @@ entities:
     - type: Transform
       pos: 21.5,-33.5
       parent: 2
-  - uid: 9512
-    components:
-    - type: Transform
-      pos: 25.5,-33.5
-      parent: 2
   - uid: 9513
     components:
     - type: Transform
@@ -170683,11 +168694,6 @@ entities:
     - type: Transform
       pos: 22.5,-36.5
       parent: 2
-  - uid: 9698
-    components:
-    - type: Transform
-      pos: 25.5,-40.5
-      parent: 2
   - uid: 9699
     components:
     - type: Transform
@@ -170748,11 +168754,6 @@ entities:
     - type: Transform
       pos: 12.5,-32.5
       parent: 2
-  - uid: 9737
-    components:
-    - type: Transform
-      pos: 2.5,-34.5
-      parent: 2
   - uid: 9740
     components:
     - type: Transform
@@ -170783,11 +168784,6 @@ entities:
     - type: Transform
       pos: 3.5,-36.5
       parent: 2
-  - uid: 9750
-    components:
-    - type: Transform
-      pos: 2.5,-36.5
-      parent: 2
   - uid: 9798
     components:
     - type: Transform
@@ -170931,18 +168927,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-47.5
       parent: 2
-  - uid: 9968
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-47.5
-      parent: 2
-  - uid: 9969
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,-47.5
-      parent: 2
   - uid: 9970
     components:
     - type: Transform
@@ -171099,108 +169083,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,-48.5
       parent: 2
-  - uid: 10163
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-41.5
-      parent: 2
   - uid: 10167
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-47.5
       parent: 2
-  - uid: 10168
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-47.5
-      parent: 2
-  - uid: 10170
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-47.5
-      parent: 2
   - uid: 10171
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,-47.5
       parent: 2
-  - uid: 10174
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-41.5
-      parent: 2
-  - uid: 10177
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-45.5
-      parent: 2
-  - uid: 10180
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-1.5
-      parent: 2
-  - uid: 10181
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-1.5
-      parent: 2
-  - uid: 10182
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-1.5
-      parent: 2
-  - uid: 10183
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,-1.5
-      parent: 2
-  - uid: 10184
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-3.5
-      parent: 2
-  - uid: 10185
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-3.5
-      parent: 2
-  - uid: 10186
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-5.5
-      parent: 2
-  - uid: 10187
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-5.5
-      parent: 2
-  - uid: 10188
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-7.5
-      parent: 2
-  - uid: 10189
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-7.5
-      parent: 2
   - uid: 10190
     components:
     - type: Transform
@@ -171213,48 +169107,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-17.5
       parent: 2
-  - uid: 10193
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-13.5
-      parent: 2
-  - uid: 10196
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,-1.5
-      parent: 2
-  - uid: 10197
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -34.5,-9.5
-      parent: 2
-  - uid: 10198
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -35.5,-9.5
-      parent: 2
-  - uid: 10200
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,-9.5
-      parent: 2
-  - uid: 10201
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -38.5,-9.5
-      parent: 2
-  - uid: 10202
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-15.5
-      parent: 2
   - uid: 10203
     components:
     - type: Transform
@@ -171291,59 +169143,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,-45.5
       parent: 2
-  - uid: 10234
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-51.5
-      parent: 2
   - uid: 10250
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-45.5
       parent: 2
-  - uid: 10252
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-51.5
-      parent: 2
-  - uid: 10253
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-51.5
-      parent: 2
-  - uid: 10254
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-51.5
-      parent: 2
-  - uid: 10255
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-51.5
-      parent: 2
   - uid: 10256
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -14.5,-51.5
       parent: 2
-  - uid: 10257
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-51.5
-      parent: 2
   - uid: 10258
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -17.5,-51.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-34.5
       parent: 2
   - uid: 10259
     components:
@@ -171351,29 +169167,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,-51.5
       parent: 2
-  - uid: 10284
+  - uid: 10261
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -19.5,-50.5
+      pos: 2.5,-36.5
       parent: 2
-  - uid: 10286
+  - uid: 10262
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-50.5
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-47.5
       parent: 2
-  - uid: 10287
+  - uid: 10263
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -22.5,-50.5
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-47.5
       parent: 2
-  - uid: 10293
+  - uid: 10287
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,-49.5
+      rot: 3.141592653589793 rad
+      pos: -22.5,-50.5
       parent: 2
   - uid: 10294
     components:
@@ -171387,90 +169203,25 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-52.5
       parent: 2
-  - uid: 10307
-    components:
-    - type: Transform
-      pos: 24.5,-47.5
-      parent: 2
   - uid: 10317
     components:
     - type: Transform
       pos: 19.5,-52.5
       parent: 2
-  - uid: 10429
-    components:
-    - type: Transform
-      pos: -1.5,-48.5
-      parent: 2
-  - uid: 10432
-    components:
-    - type: Transform
-      pos: -1.5,-50.5
-      parent: 2
-  - uid: 10433
-    components:
-    - type: Transform
-      pos: -1.5,-52.5
-      parent: 2
-  - uid: 10435
-    components:
-    - type: Transform
-      pos: -1.5,-54.5
-      parent: 2
   - uid: 10436
     components:
     - type: Transform
       pos: -1.5,-55.5
       parent: 2
-  - uid: 10437
-    components:
-    - type: Transform
-      pos: -2.5,-55.5
-      parent: 2
-  - uid: 10438
-    components:
-    - type: Transform
-      pos: -3.5,-55.5
-      parent: 2
-  - uid: 10439
-    components:
-    - type: Transform
-      pos: -4.5,-55.5
-      parent: 2
-  - uid: 10440
-    components:
-    - type: Transform
-      pos: -5.5,-55.5
-      parent: 2
-  - uid: 10441
-    components:
-    - type: Transform
-      pos: -6.5,-55.5
-      parent: 2
-  - uid: 10442
-    components:
-    - type: Transform
-      pos: -7.5,-55.5
-      parent: 2
-  - uid: 10443
-    components:
-    - type: Transform
-      pos: -8.5,-55.5
-      parent: 2
   - uid: 10444
     components:
     - type: Transform
       pos: -9.5,-55.5
       parent: 2
-  - uid: 10445
-    components:
-    - type: Transform
-      pos: -9.5,-52.5
-      parent: 2
   - uid: 10446
     components:
     - type: Transform
-      pos: -9.5,-54.5
+      pos: -38.5,-9.5
       parent: 2
   - uid: 10466
     components:
@@ -171544,12 +169295,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-56.5
       parent: 2
-  - uid: 10595
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-48.5
-      parent: 2
   - uid: 10598
     components:
     - type: Transform
@@ -171612,11 +169357,6 @@ entities:
     - type: Transform
       pos: -10.5,-55.5
       parent: 2
-  - uid: 10673
-    components:
-    - type: Transform
-      pos: -10.5,-56.5
-      parent: 2
   - uid: 10678
     components:
     - type: Transform
@@ -172705,21 +170445,11 @@ entities:
     - type: Transform
       pos: -50.5,5.5
       parent: 2
-  - uid: 11220
-    components:
-    - type: Transform
-      pos: -51.5,-22.5
-      parent: 2
   - uid: 11221
     components:
     - type: Transform
       pos: -51.5,-24.5
       parent: 2
-  - uid: 11222
-    components:
-    - type: Transform
-      pos: -51.5,-23.5
-      parent: 2
   - uid: 11223
     components:
     - type: Transform
@@ -172745,16 +170475,6 @@ entities:
     - type: Transform
       pos: -56.5,-24.5
       parent: 2
-  - uid: 11229
-    components:
-    - type: Transform
-      pos: -51.5,-19.5
-      parent: 2
-  - uid: 11230
-    components:
-    - type: Transform
-      pos: -51.5,-18.5
-      parent: 2
   - uid: 11231
     components:
     - type: Transform
@@ -172767,22 +170487,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -45.5,-6.5
       parent: 2
-  - uid: 11233
-    components:
-    - type: Transform
-      pos: -57.5,-15.5
-      parent: 2
   - uid: 11235
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -43.5,-13.5
       parent: 2
-  - uid: 11236
-    components:
-    - type: Transform
-      pos: -51.5,-20.5
-      parent: 2
   - uid: 11237
     components:
     - type: Transform
@@ -172836,22 +170546,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -51.5,-5.5
       parent: 2
-  - uid: 11250
-    components:
-    - type: Transform
-      pos: -51.5,-16.5
-      parent: 2
   - uid: 11251
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -50.5,-6.5
       parent: 2
-  - uid: 11252
-    components:
-    - type: Transform
-      pos: -51.5,-17.5
-      parent: 2
   - uid: 11254
     components:
     - type: Transform
@@ -172893,11 +170593,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -44.5,-5.5
       parent: 2
-  - uid: 11261
-    components:
-    - type: Transform
-      pos: -52.5,-15.5
-      parent: 2
   - uid: 11289
     components:
     - type: Transform
@@ -172992,12 +170687,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -38.5,-12.5
       parent: 2
-  - uid: 11390
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -37.5,-12.5
-      parent: 2
   - uid: 11391
     components:
     - type: Transform
@@ -173010,72 +170699,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -39.5,-9.5
       parent: 2
-  - uid: 11393
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-8.5
-      parent: 2
-  - uid: 11394
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-7.5
-      parent: 2
-  - uid: 11395
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-6.5
-      parent: 2
-  - uid: 11396
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-5.5
-      parent: 2
-  - uid: 11397
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-4.5
-      parent: 2
-  - uid: 11398
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-3.5
-      parent: 2
-  - uid: 11399
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-1.5
-      parent: 2
-  - uid: 11404
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-16.5
-      parent: 2
-  - uid: 11405
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-18.5
-      parent: 2
-  - uid: 11406
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-20.5
-      parent: 2
-  - uid: 11407
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-21.5
-      parent: 2
   - uid: 11408
     components:
     - type: Transform
@@ -173240,6 +170863,11 @@ entities:
     - type: Transform
       pos: -26.5,7.5
       parent: 2
+  - uid: 11513
+    components:
+    - type: Transform
+      pos: -10.5,-56.5
+      parent: 2
   - uid: 11528
     components:
     - type: Transform
@@ -173251,82 +170879,16 @@ entities:
     - type: Transform
       pos: -51.5,4.5
       parent: 2
-  - uid: 11532
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,-4.5
-      parent: 2
-  - uid: 11535
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,-1.5
-      parent: 2
-  - uid: 11536
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -51.5,1.5
-      parent: 2
-  - uid: 11566
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -56.5,-31.5
-      parent: 2
-  - uid: 11567
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -55.5,-31.5
-      parent: 2
-  - uid: 11568
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -54.5,-31.5
-      parent: 2
   - uid: 11569
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -53.5,-31.5
       parent: 2
-  - uid: 11570
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -53.5,-30.5
-      parent: 2
-  - uid: 11572
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -53.5,-28.5
-      parent: 2
-  - uid: 11573
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -53.5,-27.5
-      parent: 2
-  - uid: 11574
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -53.5,-26.5
-      parent: 2
-  - uid: 11575
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -53.5,-25.5
-      parent: 2
   - uid: 11579
     components:
     - type: Transform
-      pos: -39.5,-23.5
+      pos: -39.5,-1.5
       parent: 2
   - uid: 11580
     components:
@@ -173366,16 +170928,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -51.5,-27.5
       parent: 2
-  - uid: 11840
-    components:
-    - type: Transform
-      pos: -43.5,-26.5
-      parent: 2
-  - uid: 11841
-    components:
-    - type: Transform
-      pos: -43.5,-27.5
-      parent: 2
   - uid: 11842
     components:
     - type: Transform
@@ -173386,74 +170938,11 @@ entities:
     - type: Transform
       pos: -44.5,-28.5
       parent: 2
-  - uid: 11844
-    components:
-    - type: Transform
-      pos: -45.5,-28.5
-      parent: 2
-  - uid: 11845
-    components:
-    - type: Transform
-      pos: -46.5,-28.5
-      parent: 2
-  - uid: 11846
-    components:
-    - type: Transform
-      pos: -47.5,-28.5
-      parent: 2
   - uid: 11847
     components:
     - type: Transform
       pos: -48.5,-28.5
       parent: 2
-  - uid: 12125
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-30.5
-      parent: 2
-  - uid: 12128
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-28.5
-      parent: 2
-  - uid: 12129
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,-27.5
-      parent: 2
-  - uid: 12217
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-31.5
-      parent: 2
-  - uid: 12218
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-32.5
-      parent: 2
-  - uid: 12219
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-33.5
-      parent: 2
-  - uid: 12220
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-34.5
-      parent: 2
-  - uid: 12221
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,-35.5
-      parent: 2
   - uid: 12222
     components:
     - type: Transform
@@ -173478,54 +170967,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -45.5,-36.5
       parent: 2
-  - uid: 12228
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-55.5
-      parent: 2
-  - uid: 12232
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-54.5
-      parent: 2
   - uid: 12234
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-54.5
       parent: 2
-  - uid: 12235
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-51.5
-      parent: 2
-  - uid: 12236
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -24.5,-52.5
-      parent: 2
-  - uid: 12237
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -28.5,-51.5
-      parent: 2
   - uid: 12238
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -28.5,-52.5
       parent: 2
-  - uid: 12239
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -37.5,-51.5
-      parent: 2
   - uid: 12240
     components:
     - type: Transform
@@ -173538,42 +170991,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -45.5,-51.5
       parent: 2
-  - uid: 12252
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -50.5,-44.5
-      parent: 2
-  - uid: 12253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -52.5,-41.5
-      parent: 2
-  - uid: 12254
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -50.5,-42.5
-      parent: 2
   - uid: 12255
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -50.5,-41.5
       parent: 2
-  - uid: 12256
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -53.5,-41.5
-      parent: 2
-  - uid: 12257
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,-41.5
-      parent: 2
   - uid: 12267
     components:
     - type: Transform
@@ -173963,11 +171386,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,21.5
       parent: 2
-  - uid: 12939
-    components:
-    - type: Transform
-      pos: 44.5,24.5
-      parent: 2
   - uid: 12940
     components:
     - type: Transform
@@ -174149,12 +171567,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-9.5
       parent: 2
-  - uid: 13632
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,40.5
-      parent: 2
   - uid: 14805
     components:
     - type: Transform
@@ -174170,12 +171582,6 @@ entities:
     - type: Transform
       pos: 11.5,39.5
       parent: 2
-  - uid: 16366
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -37.5,-54.5
-      parent: 2
   - uid: 16627
     components:
     - type: Transform
@@ -174194,24 +171600,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,48.5
       parent: 2
-  - uid: 17129
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -17.5,-37.5
-      parent: 2
-  - uid: 17776
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-37.5
-      parent: 2
-  - uid: 17901
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -51.5,3.5
-      parent: 2
   - uid: 18052
     components:
     - type: Transform
@@ -175362,21 +172750,31 @@ entities:
     - type: Transform
       pos: 19.5,-11.5
       parent: 21002
-  - uid: 23425
+  - uid: 23156
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-13.5
+      pos: 11.5,38.5
       parent: 2
-  - uid: 23630
+  - uid: 23164
     components:
     - type: Transform
-      pos: 10.5,38.5
+      pos: -26.5,8.5
       parent: 2
-  - uid: 23631
+  - uid: 23165
     components:
     - type: Transform
-      pos: 11.5,38.5
+      pos: -26.5,9.5
+      parent: 2
+  - uid: 23166
+    components:
+    - type: Transform
+      pos: -26.5,10.5
+      parent: 2
+  - uid: 23425
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-13.5
       parent: 2
   - uid: 23632
     components:
@@ -175403,26 +172801,6 @@ entities:
     - type: Transform
       pos: 16.5,38.5
       parent: 2
-  - uid: 23637
-    components:
-    - type: Transform
-      pos: 17.5,38.5
-      parent: 2
-  - uid: 23638
-    components:
-    - type: Transform
-      pos: 18.5,38.5
-      parent: 2
-  - uid: 23639
-    components:
-    - type: Transform
-      pos: 19.5,38.5
-      parent: 2
-  - uid: 23640
-    components:
-    - type: Transform
-      pos: 18.5,35.5
-      parent: 2
   - uid: 23641
     components:
     - type: Transform
@@ -175452,12 +172830,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,44.5
       parent: 2
-  - uid: 23663
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,43.5
-      parent: 2
   - uid: 23810
     components:
     - type: Transform
@@ -175476,22 +172848,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -51.5,-10.5
       parent: 2
-  - uid: 23847
-    components:
-    - type: Transform
-      pos: 26.5,-43.5
-      parent: 2
   - uid: 23852
     components:
     - type: Transform
       pos: -4.5,-59.5
       parent: 2
-  - uid: 24127
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -47.5,-1.5
-      parent: 2
   - uid: 24309
     components:
     - type: Transform
@@ -177145,6 +174506,83 @@ entities:
     - type: Transform
       pos: 6.5,-18.5
       parent: 2
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: 9.5,18.5
+      parent: 2
+  - uid: 1086
+    components:
+    - type: Transform
+      pos: 10.5,18.5
+      parent: 2
+  - uid: 1134
+    components:
+    - type: Transform
+      pos: 12.5,19.5
+      parent: 2
+  - uid: 1135
+    components:
+    - type: Transform
+      pos: 13.5,19.5
+      parent: 2
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: 14.5,19.5
+      parent: 2
+  - uid: 1137
+    components:
+    - type: Transform
+      pos: 15.5,19.5
+      parent: 2
+  - uid: 1138
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-2.5
+      parent: 2
+  - uid: 1139
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-3.5
+      parent: 2
+  - uid: 1140
+    components:
+    - type: Transform
+      pos: -15.5,-18.5
+      parent: 2
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: -10.5,-18.5
+      parent: 2
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: -18.5,-15.5
+      parent: 2
+  - uid: 1147
+    components:
+    - type: Transform
+      pos: -18.5,-10.5
+      parent: 2
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: -19.5,-10.5
+      parent: 2
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: -18.5,12.5
+      parent: 2
+  - uid: 1156
+    components:
+    - type: Transform
+      pos: -18.5,13.5
+      parent: 2
   - uid: 1157
     components:
     - type: Transform
@@ -177169,6 +174607,278 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,38.5
       parent: 2
+  - uid: 1176
+    components:
+    - type: Transform
+      pos: -18.5,14.5
+      parent: 2
+  - uid: 1177
+    components:
+    - type: Transform
+      pos: -18.5,15.5
+      parent: 2
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: -14.5,19.5
+      parent: 2
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: -13.5,19.5
+      parent: 2
+  - uid: 1188
+    components:
+    - type: Transform
+      pos: -12.5,19.5
+      parent: 2
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: -11.5,19.5
+      parent: 2
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: 3.5,18.5
+      parent: 2
+  - uid: 1199
+    components:
+    - type: Transform
+      pos: 4.5,18.5
+      parent: 2
+  - uid: 1210
+    components:
+    - type: Transform
+      pos: -21.5,2.5
+      parent: 2
+  - uid: 1211
+    components:
+    - type: Transform
+      pos: -1.5,22.5
+      parent: 2
+  - uid: 1255
+    components:
+    - type: Transform
+      pos: -1.5,19.5
+      parent: 2
+  - uid: 1256
+    components:
+    - type: Transform
+      pos: -20.5,2.5
+      parent: 2
+  - uid: 1257
+    components:
+    - type: Transform
+      pos: -18.5,2.5
+      parent: 2
+  - uid: 1258
+    components:
+    - type: Transform
+      pos: -22.5,-3.5
+      parent: 2
+  - uid: 1274
+    components:
+    - type: Transform
+      pos: -22.5,-4.5
+      parent: 2
+  - uid: 1275
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-17.5
+      parent: 2
+  - uid: 1276
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-17.5
+      parent: 2
+  - uid: 1277
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-17.5
+      parent: 2
+  - uid: 1278
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-17.5
+      parent: 2
+  - uid: 1279
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-17.5
+      parent: 2
+  - uid: 1280
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-4.5
+      parent: 2
+  - uid: 1282
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-7.5
+      parent: 2
+  - uid: 1283
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-6.5
+      parent: 2
+  - uid: 1284
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-9.5
+      parent: 2
+  - uid: 1324
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-8.5
+      parent: 2
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-17.5
+      parent: 2
+  - uid: 1326
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-17.5
+      parent: 2
+  - uid: 1327
+    components:
+    - type: Transform
+      pos: -19.5,-5.5
+      parent: 2
+  - uid: 1331
+    components:
+    - type: Transform
+      pos: -18.5,-5.5
+      parent: 2
+  - uid: 1332
+    components:
+    - type: Transform
+      pos: -18.5,-1.5
+      parent: 2
+  - uid: 1333
+    components:
+    - type: Transform
+      pos: -20.5,-1.5
+      parent: 2
+  - uid: 1334
+    components:
+    - type: Transform
+      pos: -21.5,-1.5
+      parent: 2
+  - uid: 1335
+    components:
+    - type: Transform
+      pos: -19.5,-15.5
+      parent: 2
+  - uid: 1336
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 2
+  - uid: 1338
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 2
+  - uid: 1340
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 2
+  - uid: 1341
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 2
+  - uid: 1342
+    components:
+    - type: Transform
+      pos: -23.5,-10.5
+      parent: 2
+  - uid: 1343
+    components:
+    - type: Transform
+      pos: -23.5,-12.5
+      parent: 2
+  - uid: 1344
+    components:
+    - type: Transform
+      pos: -23.5,-11.5
+      parent: 2
+  - uid: 1415
+    components:
+    - type: Transform
+      pos: -24.5,-16.5
+      parent: 2
+  - uid: 1416
+    components:
+    - type: Transform
+      pos: -8.5,-23.5
+      parent: 2
+  - uid: 1420
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 2
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: -5.5,-23.5
+      parent: 2
+  - uid: 1426
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 2
+  - uid: 1428
+    components:
+    - type: Transform
+      pos: -3.5,-23.5
+      parent: 2
+  - uid: 1429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-10.5
+      parent: 2
+  - uid: 1430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-11.5
+      parent: 2
+  - uid: 1431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-13.5
+      parent: 2
+  - uid: 1439
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-14.5
+      parent: 2
+  - uid: 1440
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-15.5
+      parent: 2
   - uid: 1441
     components:
     - type: Transform
@@ -177181,18 +174891,60 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,-26.5
       parent: 2
+  - uid: 1454
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-24.5
+      parent: 2
+  - uid: 1473
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-24.5
+      parent: 2
   - uid: 1474
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,-29.5
       parent: 2
+  - uid: 1475
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-24.5
+      parent: 2
   - uid: 1476
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,-29.5
       parent: 2
+  - uid: 1479
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-24.5
+      parent: 2
+  - uid: 1480
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-24.5
+      parent: 2
+  - uid: 1481
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,-24.5
+      parent: 2
+  - uid: 1482
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-24.5
+      parent: 2
   - uid: 1503
     components:
     - type: Transform
@@ -177223,6 +174975,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-29.5
       parent: 2
+  - uid: 1514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-24.5
+      parent: 2
+  - uid: 1552
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-24.5
+      parent: 2
   - uid: 1554
     components:
     - type: Transform
@@ -177248,16 +175012,76 @@ entities:
     - type: Transform
       pos: -33.5,-25.5
       parent: 2
+  - uid: 1643
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-24.5
+      parent: 2
   - uid: 1651
     components:
     - type: Transform
       pos: -22.5,-44.5
       parent: 2
+  - uid: 1685
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-24.5
+      parent: 2
+  - uid: 1686
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-21.5
+      parent: 2
+  - uid: 1855
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-20.5
+      parent: 2
+  - uid: 1862
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-19.5
+      parent: 2
+  - uid: 1871
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-18.5
+      parent: 2
+  - uid: 1872
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-17.5
+      parent: 2
+  - uid: 1873
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-8.5
+      parent: 2
   - uid: 1880
     components:
     - type: Transform
       pos: -22.5,-43.5
       parent: 2
+  - uid: 1894
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-7.5
+      parent: 2
+  - uid: 1901
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-6.5
+      parent: 2
   - uid: 1909
     components:
     - type: Transform
@@ -177305,6 +175129,112 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-46.5
       parent: 2
+  - uid: 1948
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-5.5
+      parent: 2
+  - uid: 2027
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-5.5
+      parent: 2
+  - uid: 2028
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-5.5
+      parent: 2
+  - uid: 2030
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-5.5
+      parent: 2
+  - uid: 2031
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-5.5
+      parent: 2
+  - uid: 2032
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-5.5
+      parent: 2
+  - uid: 2033
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-24.5
+      parent: 2
+  - uid: 2058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-24.5
+      parent: 2
+  - uid: 2059
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-24.5
+      parent: 2
+  - uid: 2060
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-24.5
+      parent: 2
+  - uid: 2061
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-24.5
+      parent: 2
+  - uid: 2064
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-24.5
+      parent: 2
+  - uid: 2065
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-18.5
+      parent: 2
+  - uid: 2066
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-19.5
+      parent: 2
+  - uid: 2068
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-20.5
+      parent: 2
+  - uid: 2072
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-21.5
+      parent: 2
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: -1.5,-24.5
+      parent: 2
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: -1.5,-25.5
+      parent: 2
   - uid: 2113
     components:
     - type: Transform
@@ -177353,6 +175283,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: -39.5,-38.5
       parent: 2
+  - uid: 2124
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 2
+  - uid: 2129
+    components:
+    - type: Transform
+      pos: -1.5,-27.5
+      parent: 2
+  - uid: 2132
+    components:
+    - type: Transform
+      pos: -1.5,-28.5
+      parent: 2
+  - uid: 2136
+    components:
+    - type: Transform
+      pos: -1.5,-30.5
+      parent: 2
   - uid: 2140
     components:
     - type: Transform
@@ -177365,6 +175315,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-44.5
       parent: 2
+  - uid: 2143
+    components:
+    - type: Transform
+      pos: -4.5,-31.5
+      parent: 2
   - uid: 2144
     components:
     - type: Transform
@@ -177380,498 +175335,1858 @@ entities:
   - uid: 2146
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-42.5
+      rot: 3.141592653589793 rad
+      pos: -32.5,-42.5
+      parent: 2
+  - uid: 2147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-43.5
+      parent: 2
+  - uid: 2148
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-43.5
+      parent: 2
+  - uid: 2152
+    components:
+    - type: Transform
+      pos: -5.5,-31.5
+      parent: 2
+  - uid: 2160
+    components:
+    - type: Transform
+      pos: -6.5,-31.5
+      parent: 2
+  - uid: 2161
+    components:
+    - type: Transform
+      pos: -7.5,-31.5
+      parent: 2
+  - uid: 2162
+    components:
+    - type: Transform
+      pos: -8.5,-31.5
+      parent: 2
+  - uid: 2165
+    components:
+    - type: Transform
+      pos: -9.5,-30.5
+      parent: 2
+  - uid: 2166
+    components:
+    - type: Transform
+      pos: -9.5,-29.5
+      parent: 2
+  - uid: 2167
+    components:
+    - type: Transform
+      pos: -9.5,-27.5
+      parent: 2
+  - uid: 2188
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-44.5
+      parent: 2
+  - uid: 2189
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-44.5
+      parent: 2
+  - uid: 2192
+    components:
+    - type: Transform
+      pos: -9.5,-26.5
+      parent: 2
+  - uid: 2193
+    components:
+    - type: Transform
+      pos: -9.5,-25.5
+      parent: 2
+  - uid: 2292
+    components:
+    - type: Transform
+      pos: -9.5,-24.5
+      parent: 2
+  - uid: 2741
+    components:
+    - type: Transform
+      pos: -25.5,14.5
+      parent: 2
+  - uid: 3037
+    components:
+    - type: Transform
+      pos: -25.5,15.5
+      parent: 2
+  - uid: 3082
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,39.5
+      parent: 2
+  - uid: 3084
+    components:
+    - type: Transform
+      pos: -25.5,16.5
+      parent: 2
+  - uid: 3085
+    components:
+    - type: Transform
+      pos: -25.5,17.5
+      parent: 2
+  - uid: 3092
+    components:
+    - type: Transform
+      pos: -25.5,18.5
+      parent: 2
+  - uid: 3093
+    components:
+    - type: Transform
+      pos: -25.5,19.5
+      parent: 2
+  - uid: 3094
+    components:
+    - type: Transform
+      pos: -25.5,20.5
+      parent: 2
+  - uid: 3099
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-14.5
+      parent: 2
+  - uid: 3101
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-16.5
+      parent: 2
+  - uid: 3102
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-15.5
+      parent: 2
+  - uid: 3129
+    components:
+    - type: Transform
+      pos: -22.5,23.5
+      parent: 2
+  - uid: 3130
+    components:
+    - type: Transform
+      pos: -22.5,24.5
+      parent: 2
+  - uid: 3136
+    components:
+    - type: Transform
+      pos: -22.5,25.5
+      parent: 2
+  - uid: 3164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-22.5
+      parent: 2
+  - uid: 3165
+    components:
+    - type: Transform
+      pos: -2.5,25.5
+      parent: 2
+  - uid: 3168
+    components:
+    - type: Transform
+      pos: -2.5,26.5
+      parent: 2
+  - uid: 3173
+    components:
+    - type: Transform
+      pos: -27.5,-1.5
+      parent: 2
+  - uid: 3174
+    components:
+    - type: Transform
+      pos: -24.5,-14.5
+      parent: 2
+  - uid: 3175
+    components:
+    - type: Transform
+      pos: -24.5,-15.5
+      parent: 2
+  - uid: 3176
+    components:
+    - type: Transform
+      pos: -24.5,-21.5
+      parent: 2
+  - uid: 3213
+    components:
+    - type: Transform
+      pos: -25.5,-21.5
+      parent: 2
+  - uid: 3215
+    components:
+    - type: Transform
+      pos: -26.5,-21.5
+      parent: 2
+  - uid: 3216
+    components:
+    - type: Transform
+      pos: -30.5,-21.5
+      parent: 2
+  - uid: 3217
+    components:
+    - type: Transform
+      pos: -28.5,-21.5
+      parent: 2
+  - uid: 3218
+    components:
+    - type: Transform
+      pos: -33.5,-20.5
+      parent: 2
+  - uid: 3219
+    components:
+    - type: Transform
+      pos: -33.5,-19.5
+      parent: 2
+  - uid: 3228
+    components:
+    - type: Transform
+      pos: -33.5,-18.5
+      parent: 2
+  - uid: 3229
+    components:
+    - type: Transform
+      pos: -33.5,-17.5
+      parent: 2
+  - uid: 3230
+    components:
+    - type: Transform
+      pos: -33.5,-16.5
+      parent: 2
+  - uid: 3231
+    components:
+    - type: Transform
+      pos: -33.5,-15.5
+      parent: 2
+  - uid: 3232
+    components:
+    - type: Transform
+      pos: -33.5,-14.5
+      parent: 2
+  - uid: 3233
+    components:
+    - type: Transform
+      pos: -33.5,-12.5
+      parent: 2
+  - uid: 3238
+    components:
+    - type: Transform
+      pos: -33.5,-11.5
+      parent: 2
+  - uid: 3239
+    components:
+    - type: Transform
+      pos: -33.5,-10.5
+      parent: 2
+  - uid: 3240
+    components:
+    - type: Transform
+      pos: -24.5,-2.5
+      parent: 2
+  - uid: 3328
+    components:
+    - type: Transform
+      pos: -25.5,-2.5
+      parent: 2
+  - uid: 3355
+    components:
+    - type: Transform
+      pos: -26.5,-2.5
+      parent: 2
+  - uid: 3356
+    components:
+    - type: Transform
+      pos: -26.5,-1.5
+      parent: 2
+  - uid: 3742
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-13.5
+      parent: 2
+  - uid: 3744
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-13.5
+      parent: 2
+  - uid: 3745
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-13.5
+      parent: 2
+  - uid: 3749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-16.5
+      parent: 2
+  - uid: 3750
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-15.5
+      parent: 2
+  - uid: 3751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-14.5
+      parent: 2
+  - uid: 3752
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-13.5
+      parent: 2
+  - uid: 3753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-13.5
+      parent: 2
+  - uid: 3906
+    components:
+    - type: Transform
+      pos: -26.5,-24.5
+      parent: 2
+  - uid: 3907
+    components:
+    - type: Transform
+      pos: -25.5,-24.5
+      parent: 2
+  - uid: 3936
+    components:
+    - type: Transform
+      pos: -24.5,-24.5
+      parent: 2
+  - uid: 3971
+    components:
+    - type: Transform
+      pos: -27.5,-22.5
+      parent: 2
+  - uid: 3972
+    components:
+    - type: Transform
+      pos: -33.5,-22.5
+      parent: 2
+  - uid: 3973
+    components:
+    - type: Transform
+      pos: -32.5,-24.5
+      parent: 2
+  - uid: 3975
+    components:
+    - type: Transform
+      pos: -30.5,-24.5
+      parent: 2
+  - uid: 3976
+    components:
+    - type: Transform
+      pos: -29.5,-30.5
+      parent: 2
+  - uid: 3980
+    components:
+    - type: Transform
+      pos: -34.5,-29.5
+      parent: 2
+  - uid: 3981
+    components:
+    - type: Transform
+      pos: -9.5,-41.5
+      parent: 2
+  - uid: 4136
+    components:
+    - type: Transform
+      pos: -9.5,-42.5
+      parent: 2
+  - uid: 4138
+    components:
+    - type: Transform
+      pos: -37.5,-29.5
+      parent: 2
+  - uid: 4249
+    components:
+    - type: Transform
+      pos: -31.5,-30.5
+      parent: 2
+  - uid: 4251
+    components:
+    - type: Transform
+      pos: -35.5,-29.5
+      parent: 2
+  - uid: 4252
+    components:
+    - type: Transform
+      pos: -38.5,-29.5
+      parent: 2
+  - uid: 5157
+    components:
+    - type: Transform
+      pos: -19.5,23.5
+      parent: 2
+  - uid: 5189
+    components:
+    - type: Transform
+      pos: -39.5,-30.5
+      parent: 2
+  - uid: 5190
+    components:
+    - type: Transform
+      pos: -39.5,-32.5
+      parent: 2
+  - uid: 5194
+    components:
+    - type: Transform
+      pos: -39.5,-33.5
+      parent: 2
+  - uid: 5195
+    components:
+    - type: Transform
+      pos: -39.5,-34.5
+      parent: 2
+  - uid: 5196
+    components:
+    - type: Transform
+      pos: -36.5,-36.5
+      parent: 2
+  - uid: 5198
+    components:
+    - type: Transform
+      pos: -36.5,-37.5
+      parent: 2
+  - uid: 5199
+    components:
+    - type: Transform
+      pos: -36.5,-38.5
+      parent: 2
+  - uid: 5200
+    components:
+    - type: Transform
+      pos: -36.5,-40.5
+      parent: 2
+  - uid: 5201
+    components:
+    - type: Transform
+      pos: -30.5,-41.5
+      parent: 2
+  - uid: 5202
+    components:
+    - type: Transform
+      pos: -31.5,-41.5
+      parent: 2
+  - uid: 5203
+    components:
+    - type: Transform
+      pos: -29.5,-41.5
+      parent: 2
+  - uid: 5204
+    components:
+    - type: Transform
+      pos: -33.5,-41.5
+      parent: 2
+  - uid: 5205
+    components:
+    - type: Transform
+      pos: -34.5,-41.5
+      parent: 2
+  - uid: 5282
+    components:
+    - type: Transform
+      pos: -35.5,-41.5
+      parent: 2
+  - uid: 5283
+    components:
+    - type: Transform
+      pos: -44.5,-33.5
+      parent: 2
+  - uid: 5285
+    components:
+    - type: Transform
+      pos: -43.5,-37.5
+      parent: 2
+  - uid: 5286
+    components:
+    - type: Transform
+      pos: -43.5,-38.5
+      parent: 2
+  - uid: 5287
+    components:
+    - type: Transform
+      pos: -43.5,-40.5
+      parent: 2
+  - uid: 5288
+    components:
+    - type: Transform
+      pos: -43.5,-41.5
+      parent: 2
+  - uid: 5297
+    components:
+    - type: Transform
+      pos: -44.5,-34.5
+      parent: 2
+  - uid: 5298
+    components:
+    - type: Transform
+      pos: -44.5,-35.5
+      parent: 2
+  - uid: 5299
+    components:
+    - type: Transform
+      pos: -44.5,-32.5
+      parent: 2
+  - uid: 5344
+    components:
+    - type: Transform
+      pos: -36.5,-48.5
+      parent: 2
+  - uid: 5347
+    components:
+    - type: Transform
+      pos: -35.5,-48.5
+      parent: 2
+  - uid: 5348
+    components:
+    - type: Transform
+      pos: -34.5,-48.5
+      parent: 2
+  - uid: 5349
+    components:
+    - type: Transform
+      pos: -33.5,-48.5
+      parent: 2
+  - uid: 5350
+    components:
+    - type: Transform
+      pos: -31.5,-48.5
+      parent: 2
+  - uid: 5351
+    components:
+    - type: Transform
+      pos: -30.5,-48.5
+      parent: 2
+  - uid: 5368
+    components:
+    - type: Transform
+      pos: -29.5,-48.5
+      parent: 2
+  - uid: 5369
+    components:
+    - type: Transform
+      pos: -12.5,-37.5
+      parent: 2
+  - uid: 5370
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-4.5
+      parent: 2
+  - uid: 5377
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,-2.5
+      parent: 2
+  - uid: 5378
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-2.5
+      parent: 2
+  - uid: 5379
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-7.5
+      parent: 2
+  - uid: 5380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-8.5
+      parent: 2
+  - uid: 5382
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-9.5
+      parent: 2
+  - uid: 5383
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-10.5
+      parent: 2
+  - uid: 5386
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-25.5
+      parent: 2
+  - uid: 5387
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-25.5
+      parent: 2
+  - uid: 5388
+    components:
+    - type: Transform
+      pos: 22.5,-29.5
+      parent: 2
+  - uid: 5389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-25.5
+      parent: 2
+  - uid: 5390
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,3.5
+      parent: 2
+  - uid: 5391
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,3.5
+      parent: 2
+  - uid: 5394
+    components:
+    - type: Transform
+      pos: 37.5,4.5
+      parent: 2
+  - uid: 5395
+    components:
+    - type: Transform
+      pos: 37.5,5.5
+      parent: 2
+  - uid: 5399
+    components:
+    - type: Transform
+      pos: 37.5,6.5
+      parent: 2
+  - uid: 5467
+    components:
+    - type: Transform
+      pos: -18.5,23.5
+      parent: 2
+  - uid: 5745
+    components:
+    - type: Transform
+      pos: -27.5,3.5
+      parent: 2
+  - uid: 5746
+    components:
+    - type: Transform
+      pos: -27.5,4.5
+      parent: 2
+  - uid: 5747
+    components:
+    - type: Transform
+      pos: -27.5,5.5
+      parent: 2
+  - uid: 5748
+    components:
+    - type: Transform
+      pos: -27.5,6.5
+      parent: 2
+  - uid: 5756
+    components:
+    - type: Transform
+      pos: -34.5,6.5
+      parent: 2
+  - uid: 5757
+    components:
+    - type: Transform
+      pos: -34.5,5.5
+      parent: 2
+  - uid: 5758
+    components:
+    - type: Transform
+      pos: -34.5,4.5
+      parent: 2
+  - uid: 5759
+    components:
+    - type: Transform
+      pos: -34.5,3.5
+      parent: 2
+  - uid: 5762
+    components:
+    - type: Transform
+      pos: -33.5,7.5
+      parent: 2
+  - uid: 5763
+    components:
+    - type: Transform
+      pos: -32.5,7.5
+      parent: 2
+  - uid: 5764
+    components:
+    - type: Transform
+      pos: -31.5,7.5
+      parent: 2
+  - uid: 5765
+    components:
+    - type: Transform
+      pos: -30.5,7.5
+      parent: 2
+  - uid: 5766
+    components:
+    - type: Transform
+      pos: -29.5,7.5
+      parent: 2
+  - uid: 5767
+    components:
+    - type: Transform
+      pos: -28.5,7.5
+      parent: 2
+  - uid: 5774
+    components:
+    - type: Transform
+      pos: 38.5,7.5
+      parent: 2
+  - uid: 5775
+    components:
+    - type: Transform
+      pos: 39.5,7.5
+      parent: 2
+  - uid: 5776
+    components:
+    - type: Transform
+      pos: 40.5,7.5
+      parent: 2
+  - uid: 5777
+    components:
+    - type: Transform
+      pos: 42.5,7.5
+      parent: 2
+  - uid: 5823
+    components:
+    - type: Transform
+      pos: 44.5,27.5
+      parent: 2
+  - uid: 5825
+    components:
+    - type: Transform
+      pos: 42.5,27.5
+      parent: 2
+  - uid: 5830
+    components:
+    - type: Transform
+      pos: 41.5,27.5
+      parent: 2
+  - uid: 5884
+    components:
+    - type: Transform
+      pos: 40.5,27.5
+      parent: 2
+  - uid: 5885
+    components:
+    - type: Transform
+      pos: 39.5,27.5
+      parent: 2
+  - uid: 6182
+    components:
+    - type: Transform
+      pos: 38.5,27.5
+      parent: 2
+  - uid: 6183
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,39.5
+      parent: 2
+  - uid: 6184
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,39.5
+      parent: 2
+  - uid: 6188
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,33.5
+      parent: 2
+  - uid: 6190
+    components:
+    - type: Transform
+      pos: 41.5,28.5
+      parent: 2
+  - uid: 6194
+    components:
+    - type: Transform
+      pos: 41.5,29.5
+      parent: 2
+  - uid: 6195
+    components:
+    - type: Transform
+      pos: 41.5,30.5
+      parent: 2
+  - uid: 6197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,39.5
+      parent: 2
+  - uid: 6198
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,39.5
+      parent: 2
+  - uid: 6203
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,35.5
+      parent: 2
+  - uid: 6205
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,36.5
+      parent: 2
+  - uid: 6209
+    components:
+    - type: Transform
+      pos: 40.5,31.5
+      parent: 2
+  - uid: 6216
+    components:
+    - type: Transform
+      pos: 39.5,32.5
+      parent: 2
+  - uid: 6225
+    components:
+    - type: Transform
+      pos: -19.5,27.5
+      parent: 2
+  - uid: 6228
+    components:
+    - type: Transform
+      pos: -18.5,26.5
+      parent: 2
+  - uid: 6229
+    components:
+    - type: Transform
+      pos: -17.5,26.5
+      parent: 2
+  - uid: 6230
+    components:
+    - type: Transform
+      pos: -16.5,26.5
+      parent: 2
+  - uid: 6235
+    components:
+    - type: Transform
+      pos: -15.5,26.5
+      parent: 2
+  - uid: 6241
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,39.5
+      parent: 2
+  - uid: 6305
+    components:
+    - type: Transform
+      pos: 39.5,33.5
+      parent: 2
+  - uid: 6382
+    components:
+    - type: Transform
+      pos: 54.5,-34.5
+      parent: 2
+  - uid: 6383
+    components:
+    - type: Transform
+      pos: 57.5,-34.5
+      parent: 2
+  - uid: 6385
+    components:
+    - type: Transform
+      pos: 52.5,-34.5
+      parent: 2
+  - uid: 6387
+    components:
+    - type: Transform
+      pos: 60.5,-34.5
+      parent: 2
+  - uid: 6388
+    components:
+    - type: Transform
+      pos: 59.5,-34.5
+      parent: 2
+  - uid: 6390
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-30.5
+      parent: 2
+  - uid: 6399
+    components:
+    - type: Transform
+      pos: 56.5,-34.5
+      parent: 2
+  - uid: 6401
+    components:
+    - type: Transform
+      pos: 58.5,-34.5
+      parent: 2
+  - uid: 6402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-30.5
+      parent: 2
+  - uid: 6431
+    components:
+    - type: Transform
+      pos: 53.5,-34.5
+      parent: 2
+  - uid: 6432
+    components:
+    - type: Transform
+      pos: 51.5,-34.5
+      parent: 2
+  - uid: 6435
+    components:
+    - type: Transform
+      pos: 50.5,-34.5
+      parent: 2
+  - uid: 6438
+    components:
+    - type: Transform
+      pos: 48.5,-34.5
+      parent: 2
+  - uid: 6439
+    components:
+    - type: Transform
+      pos: 47.5,-34.5
+      parent: 2
+  - uid: 6458
+    components:
+    - type: Transform
+      pos: 26.5,-31.5
+      parent: 2
+  - uid: 6504
+    components:
+    - type: Transform
+      pos: 26.5,-30.5
+      parent: 2
+  - uid: 6505
+    components:
+    - type: Transform
+      pos: 47.5,-40.5
+      parent: 2
+  - uid: 6506
+    components:
+    - type: Transform
+      pos: 45.5,-40.5
+      parent: 2
+  - uid: 6507
+    components:
+    - type: Transform
+      pos: 26.5,-32.5
+      parent: 2
+  - uid: 6508
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-33.5
+      parent: 2
+  - uid: 6509
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-33.5
+      parent: 2
+  - uid: 6510
+    components:
+    - type: Transform
+      pos: 26.5,-34.5
+      parent: 2
+  - uid: 6511
+    components:
+    - type: Transform
+      pos: 26.5,-35.5
+      parent: 2
+  - uid: 6512
+    components:
+    - type: Transform
+      pos: 26.5,-36.5
+      parent: 2
+  - uid: 6514
+    components:
+    - type: Transform
+      pos: 26.5,-39.5
+      parent: 2
+  - uid: 6515
+    components:
+    - type: Transform
+      pos: 26.5,-40.5
+      parent: 2
+  - uid: 6516
+    components:
+    - type: Transform
+      pos: 26.5,-41.5
+      parent: 2
+  - uid: 6517
+    components:
+    - type: Transform
+      pos: 27.5,-42.5
+      parent: 2
+  - uid: 6518
+    components:
+    - type: Transform
+      pos: 28.5,-42.5
+      parent: 2
+  - uid: 6531
+    components:
+    - type: Transform
+      pos: 29.5,-42.5
+      parent: 2
+  - uid: 6532
+    components:
+    - type: Transform
+      pos: 30.5,-42.5
+      parent: 2
+  - uid: 6533
+    components:
+    - type: Transform
+      pos: 31.5,-42.5
+      parent: 2
+  - uid: 6534
+    components:
+    - type: Transform
+      pos: 32.5,-42.5
+      parent: 2
+  - uid: 6535
+    components:
+    - type: Transform
+      pos: 33.5,-42.5
+      parent: 2
+  - uid: 6536
+    components:
+    - type: Transform
+      pos: 34.5,-42.5
+      parent: 2
+  - uid: 6537
+    components:
+    - type: Transform
+      pos: 21.5,-44.5
+      parent: 2
+  - uid: 6538
+    components:
+    - type: Transform
+      pos: 20.5,-44.5
+      parent: 2
+  - uid: 6561
+    components:
+    - type: Transform
+      pos: 18.5,-45.5
+      parent: 2
+  - uid: 6562
+    components:
+    - type: Transform
+      pos: 17.5,-45.5
+      parent: 2
+  - uid: 6563
+    components:
+    - type: Transform
+      pos: 16.5,-45.5
+      parent: 2
+  - uid: 6564
+    components:
+    - type: Transform
+      pos: 15.5,-45.5
+      parent: 2
+  - uid: 6565
+    components:
+    - type: Transform
+      pos: 8.5,-47.5
+      parent: 2
+  - uid: 6577
+    components:
+    - type: Transform
+      pos: 7.5,-47.5
+      parent: 2
+  - uid: 6579
+    components:
+    - type: Transform
+      pos: 6.5,-47.5
+      parent: 2
+  - uid: 6785
+    components:
+    - type: Transform
+      pos: 3.5,26.5
+      parent: 2
+  - uid: 6786
+    components:
+    - type: Transform
+      pos: 4.5,29.5
+      parent: 2
+  - uid: 6787
+    components:
+    - type: Transform
+      pos: 5.5,29.5
+      parent: 2
+  - uid: 6788
+    components:
+    - type: Transform
+      pos: 6.5,29.5
+      parent: 2
+  - uid: 6789
+    components:
+    - type: Transform
+      pos: 7.5,29.5
+      parent: 2
+  - uid: 6790
+    components:
+    - type: Transform
+      pos: 8.5,29.5
+      parent: 2
+  - uid: 6795
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,28.5
+      parent: 2
+  - uid: 6796
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,25.5
+      parent: 2
+  - uid: 6797
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,27.5
+      parent: 2
+  - uid: 6799
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,27.5
+      parent: 2
+  - uid: 7041
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,27.5
+      parent: 2
+  - uid: 7043
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,26.5
+      parent: 2
+  - uid: 7624
+    components:
+    - type: Transform
+      pos: 26.5,29.5
+      parent: 2
+  - uid: 7625
+    components:
+    - type: Transform
+      pos: 28.5,29.5
+      parent: 2
+  - uid: 7626
+    components:
+    - type: Transform
+      pos: 29.5,29.5
+      parent: 2
+  - uid: 7656
+    components:
+    - type: Transform
+      pos: 14.5,30.5
+      parent: 2
+  - uid: 7783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,39.5
+      parent: 2
+  - uid: 7788
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,39.5
+      parent: 2
+  - uid: 7799
+    components:
+    - type: Transform
+      pos: -22.5,-23.5
+      parent: 2
+  - uid: 7805
+    components:
+    - type: Transform
+      pos: -21.5,-23.5
+      parent: 2
+  - uid: 7806
+    components:
+    - type: Transform
+      pos: -19.5,-23.5
+      parent: 2
+  - uid: 7807
+    components:
+    - type: Transform
+      pos: -18.5,-23.5
+      parent: 2
+  - uid: 7808
+    components:
+    - type: Transform
+      pos: -17.5,-23.5
+      parent: 2
+  - uid: 7809
+    components:
+    - type: Transform
+      pos: -15.5,-23.5
+      parent: 2
+  - uid: 7810
+    components:
+    - type: Transform
+      pos: -14.5,-23.5
+      parent: 2
+  - uid: 7811
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-43.5
+      parent: 2
+  - uid: 7833
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-43.5
+      parent: 2
+  - uid: 7835
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,31.5
+      parent: 2
+  - uid: 7838
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,34.5
+      parent: 2
+  - uid: 7846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,31.5
+      parent: 2
+  - uid: 7847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,33.5
+      parent: 2
+  - uid: 7848
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,35.5
+      parent: 2
+  - uid: 7849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,36.5
+      parent: 2
+  - uid: 7852
+    components:
+    - type: Transform
+      pos: 30.5,30.5
+      parent: 2
+  - uid: 7853
+    components:
+    - type: Transform
+      pos: 30.5,31.5
+      parent: 2
+  - uid: 7854
+    components:
+    - type: Transform
+      pos: 30.5,32.5
+      parent: 2
+  - uid: 7855
+    components:
+    - type: Transform
+      pos: 30.5,33.5
+      parent: 2
+  - uid: 7856
+    components:
+    - type: Transform
+      pos: 30.5,34.5
+      parent: 2
+  - uid: 7949
+    components:
+    - type: Transform
+      pos: -19.5,28.5
+      parent: 2
+  - uid: 7951
+    components:
+    - type: Transform
+      pos: -19.5,29.5
+      parent: 2
+  - uid: 7953
+    components:
+    - type: Transform
+      pos: -19.5,31.5
+      parent: 2
+  - uid: 7954
+    components:
+    - type: Transform
+      pos: -19.5,32.5
+      parent: 2
+  - uid: 7955
+    components:
+    - type: Transform
+      pos: -19.5,33.5
+      parent: 2
+  - uid: 7956
+    components:
+    - type: Transform
+      pos: -18.5,33.5
+      parent: 2
+  - uid: 7957
+    components:
+    - type: Transform
+      pos: -15.5,33.5
+      parent: 2
+  - uid: 7958
+    components:
+    - type: Transform
+      pos: -16.5,33.5
+      parent: 2
+  - uid: 8013
+    components:
+    - type: Transform
+      pos: 25.5,29.5
+      parent: 2
+  - uid: 8014
+    components:
+    - type: Transform
+      pos: 22.5,29.5
+      parent: 2
+  - uid: 8015
+    components:
+    - type: Transform
+      pos: 21.5,29.5
+      parent: 2
+  - uid: 8016
+    components:
+    - type: Transform
+      pos: 3.5,27.5
+      parent: 2
+  - uid: 8017
+    components:
+    - type: Transform
+      pos: 38.5,2.5
+      parent: 2
+  - uid: 8020
+    components:
+    - type: Transform
+      pos: 42.5,2.5
+      parent: 2
+  - uid: 8021
+    components:
+    - type: Transform
+      pos: -35.5,-27.5
+      parent: 2
+  - uid: 8022
+    components:
+    - type: Transform
+      pos: -35.5,-28.5
+      parent: 2
+  - uid: 8023
+    components:
+    - type: Transform
+      pos: 9.5,37.5
+      parent: 2
+  - uid: 8025
+    components:
+    - type: Transform
+      pos: 9.5,36.5
+      parent: 2
+  - uid: 8026
+    components:
+    - type: Transform
+      pos: 9.5,34.5
       parent: 2
-  - uid: 2147
+  - uid: 8087
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -36.5,-43.5
+      pos: 9.5,31.5
       parent: 2
-  - uid: 2148
+  - uid: 8088
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -32.5,-43.5
+      pos: 20.5,40.5
       parent: 2
-  - uid: 2188
+  - uid: 8118
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -35.5,-44.5
+      pos: 20.5,31.5
       parent: 2
-  - uid: 2189
+  - uid: 8132
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-44.5
+      pos: 41.5,37.5
       parent: 2
-  - uid: 3082
+  - uid: 8133
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,39.5
+      pos: 20.5,34.5
       parent: 2
-  - uid: 3097
+  - uid: 8134
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-12.5
+      pos: 20.5,36.5
       parent: 2
-  - uid: 3098
+  - uid: 8135
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-11.5
+      pos: 20.5,37.5
       parent: 2
-  - uid: 3099
+  - uid: 8136
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-14.5
+      pos: 20.5,39.5
       parent: 2
-  - uid: 3100
+  - uid: 8142
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-13.5
+      pos: 37.5,35.5
       parent: 2
-  - uid: 3101
+  - uid: 8159
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-16.5
+      pos: 37.5,37.5
       parent: 2
-  - uid: 3102
+  - uid: 8160
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-15.5
+      pos: 37.5,38.5
       parent: 2
-  - uid: 3742
+  - uid: 8349
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-13.5
+      pos: 31.5,41.5
       parent: 2
-  - uid: 3744
+  - uid: 8350
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-13.5
+      pos: 32.5,41.5
       parent: 2
-  - uid: 3745
+  - uid: 8351
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-13.5
+      pos: 35.5,41.5
       parent: 2
-  - uid: 3749
+  - uid: 8354
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-16.5
+      pos: 37.5,40.5
       parent: 2
-  - uid: 3750
+  - uid: 8355
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-15.5
+      pos: 37.5,39.5
       parent: 2
-  - uid: 3751
+  - uid: 8356
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-14.5
+      pos: 41.5,36.5
       parent: 2
-  - uid: 3752
+  - uid: 8357
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 36.5,-13.5
+      pos: 29.5,41.5
       parent: 2
-  - uid: 3753
+  - uid: 8436
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-13.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,-43.5
       parent: 2
-  - uid: 5157
+  - uid: 8448
     components:
     - type: Transform
-      pos: -19.5,23.5
+      pos: 28.5,41.5
       parent: 2
-  - uid: 5467
+  - uid: 8449
     components:
     - type: Transform
-      pos: -18.5,23.5
+      pos: 27.5,41.5
       parent: 2
-  - uid: 5745
+  - uid: 8455
     components:
     - type: Transform
-      pos: -27.5,3.5
+      rot: 3.141592653589793 rad
+      pos: -11.5,-43.5
       parent: 2
-  - uid: 5746
+  - uid: 8456
     components:
     - type: Transform
-      pos: -27.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,-43.5
       parent: 2
-  - uid: 5747
+  - uid: 8462
     components:
     - type: Transform
-      pos: -27.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -41.5,-31.5
       parent: 2
-  - uid: 5748
+  - uid: 8463
     components:
     - type: Transform
-      pos: -27.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: -40.5,-31.5
       parent: 2
-  - uid: 5756
+  - uid: 8469
     components:
     - type: Transform
-      pos: -34.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-31.5
       parent: 2
-  - uid: 5757
+  - uid: 8470
     components:
     - type: Transform
-      pos: -34.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -42.5,-31.5
       parent: 2
-  - uid: 5758
+  - uid: 8562
     components:
     - type: Transform
-      pos: -34.5,4.5
+      pos: 29.5,35.5
       parent: 2
-  - uid: 5759
+  - uid: 8564
     components:
     - type: Transform
-      pos: -34.5,3.5
+      pos: 27.5,35.5
       parent: 2
-  - uid: 5762
+  - uid: 8657
     components:
     - type: Transform
-      pos: -33.5,7.5
+      pos: 28.5,35.5
       parent: 2
-  - uid: 5763
+  - uid: 8658
     components:
     - type: Transform
-      pos: -32.5,7.5
+      pos: 23.5,41.5
       parent: 2
-  - uid: 5764
+  - uid: 8659
     components:
     - type: Transform
-      pos: -31.5,7.5
+      pos: 22.5,41.5
       parent: 2
-  - uid: 5765
+  - uid: 8660
     components:
     - type: Transform
-      pos: -30.5,7.5
+      pos: 21.5,41.5
       parent: 2
-  - uid: 5766
+  - uid: 8661
     components:
     - type: Transform
-      pos: -29.5,7.5
+      pos: 25.5,35.5
       parent: 2
-  - uid: 5767
+  - uid: 8662
     components:
     - type: Transform
-      pos: -28.5,7.5
+      pos: 23.5,35.5
       parent: 2
-  - uid: 6183
+  - uid: 8663
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,39.5
+      pos: 22.5,35.5
       parent: 2
-  - uid: 6184
+  - uid: 8671
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,39.5
+      pos: 21.5,35.5
       parent: 2
-  - uid: 6188
+  - uid: 8674
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,33.5
+      pos: 25.5,41.5
       parent: 2
-  - uid: 6197
+  - uid: 8950
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,39.5
+      pos: 42.5,35.5
       parent: 2
-  - uid: 6198
+  - uid: 9366
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,39.5
+      pos: 11.5,36.5
       parent: 2
-  - uid: 6203
+  - uid: 9490
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,35.5
+      pos: 43.5,35.5
       parent: 2
-  - uid: 6205
+  - uid: 9512
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,36.5
+      pos: 44.5,35.5
       parent: 2
-  - uid: 6225
+  - uid: 9693
     components:
     - type: Transform
-      pos: -19.5,27.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-37.5
       parent: 2
-  - uid: 6228
+  - uid: 9694
     components:
     - type: Transform
-      pos: -18.5,26.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-38.5
       parent: 2
-  - uid: 6229
+  - uid: 9695
     components:
     - type: Transform
-      pos: -17.5,26.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-39.5
       parent: 2
-  - uid: 6230
+  - uid: 9696
     components:
     - type: Transform
-      pos: -16.5,26.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-40.5
       parent: 2
-  - uid: 6235
+  - uid: 9697
     components:
     - type: Transform
-      pos: -15.5,26.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-41.5
       parent: 2
-  - uid: 6241
+  - uid: 9698
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,39.5
+      pos: 44.5,34.5
       parent: 2
-  - uid: 7656
+  - uid: 9707
     components:
     - type: Transform
-      pos: 14.5,30.5
+      pos: 44.5,33.5
       parent: 2
-  - uid: 7783
+  - uid: 9737
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,39.5
+      pos: 45.5,33.5
       parent: 2
-  - uid: 7788
+  - uid: 9738
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,39.5
+      pos: 45.5,32.5
       parent: 2
-  - uid: 7799
+  - uid: 9739
     components:
     - type: Transform
-      pos: -22.5,-23.5
+      pos: 45.5,31.5
       parent: 2
-  - uid: 7805
+  - uid: 9750
     components:
     - type: Transform
-      pos: -21.5,-23.5
+      pos: 41.5,38.5
       parent: 2
-  - uid: 7806
+  - uid: 9751
     components:
     - type: Transform
-      pos: -19.5,-23.5
+      pos: 41.5,39.5
       parent: 2
-  - uid: 7807
+  - uid: 9796
     components:
     - type: Transform
-      pos: -18.5,-23.5
+      pos: 41.5,40.5
       parent: 2
-  - uid: 7808
+  - uid: 9797
     components:
     - type: Transform
-      pos: -17.5,-23.5
+      pos: 41.5,41.5
       parent: 2
-  - uid: 7809
+  - uid: 9810
     components:
     - type: Transform
-      pos: -15.5,-23.5
+      pos: 41.5,42.5
       parent: 2
-  - uid: 7810
+  - uid: 9811
     components:
     - type: Transform
-      pos: -14.5,-23.5
+      pos: 36.5,43.5
       parent: 2
-  - uid: 7811
+  - uid: 9929
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,-43.5
+      pos: 38.5,44.5
       parent: 2
-  - uid: 7833
+  - uid: 9930
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-43.5
+      pos: 28.5,44.5
       parent: 2
-  - uid: 7835
+  - uid: 9962
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,31.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-43.5
       parent: 2
-  - uid: 7838
+  - uid: 9968
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,34.5
+      pos: 29.5,44.5
       parent: 2
-  - uid: 7846
+  - uid: 9969
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,31.5
+      pos: 30.5,44.5
       parent: 2
-  - uid: 7847
+  - uid: 10163
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,33.5
+      pos: 31.5,44.5
       parent: 2
-  - uid: 7848
+  - uid: 10168
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,35.5
+      pos: 32.5,44.5
       parent: 2
-  - uid: 7849
+  - uid: 10170
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,36.5
+      pos: 33.5,44.5
       parent: 2
-  - uid: 7949
+  - uid: 10172
     components:
     - type: Transform
-      pos: -19.5,28.5
+      pos: 36.5,47.5
       parent: 2
-  - uid: 7951
+  - uid: 10173
     components:
     - type: Transform
-      pos: -19.5,29.5
+      pos: 32.5,49.5
       parent: 2
-  - uid: 7953
+  - uid: 10174
     components:
     - type: Transform
-      pos: -19.5,31.5
+      pos: 33.5,47.5
       parent: 2
-  - uid: 7954
+  - uid: 10177
     components:
     - type: Transform
-      pos: -19.5,32.5
+      pos: 32.5,48.5
       parent: 2
-  - uid: 7955
+  - uid: 10180
     components:
     - type: Transform
-      pos: -19.5,33.5
+      pos: 6.5,49.5
       parent: 2
-  - uid: 7956
+  - uid: 10181
     components:
     - type: Transform
-      pos: -18.5,33.5
+      pos: 6.5,51.5
       parent: 2
-  - uid: 7957
+  - uid: 10182
     components:
     - type: Transform
-      pos: -15.5,33.5
+      pos: -22.5,27.5
       parent: 2
-  - uid: 7958
+  - uid: 10183
     components:
     - type: Transform
-      pos: -16.5,33.5
+      pos: -22.5,28.5
       parent: 2
-  - uid: 8436
+  - uid: 10184
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-43.5
+      pos: -22.5,29.5
       parent: 2
-  - uid: 8455
+  - uid: 10185
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-43.5
+      pos: -22.5,30.5
       parent: 2
-  - uid: 8456
+  - uid: 10186
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,-43.5
+      pos: -22.5,31.5
       parent: 2
-  - uid: 8462
+  - uid: 10187
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -41.5,-31.5
+      pos: -22.5,34.5
       parent: 2
-  - uid: 8463
+  - uid: 10188
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -40.5,-31.5
+      pos: -22.5,35.5
       parent: 2
-  - uid: 8469
+  - uid: 10189
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -43.5,-31.5
+      pos: -22.5,36.5
       parent: 2
-  - uid: 8470
+  - uid: 10193
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -42.5,-31.5
+      pos: -22.5,37.5
       parent: 2
-  - uid: 9366
+  - uid: 10196
     components:
     - type: Transform
-      pos: 11.5,36.5
+      pos: -21.5,38.5
       parent: 2
-  - uid: 9693
+  - uid: 10197
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-37.5
+      pos: -20.5,38.5
       parent: 2
-  - uid: 9694
+  - uid: 10198
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-38.5
+      pos: -19.5,38.5
       parent: 2
-  - uid: 9695
+  - uid: 10200
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-39.5
+      pos: -15.5,38.5
       parent: 2
-  - uid: 9696
+  - uid: 10201
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-40.5
+      pos: -25.5,38.5
       parent: 2
-  - uid: 9697
+  - uid: 10202
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-41.5
+      pos: -18.5,38.5
       parent: 2
-  - uid: 9962
+  - uid: 10220
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-43.5
+      pos: -16.5,38.5
       parent: 2
   - uid: 10225
     components:
@@ -177909,6 +177224,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,-47.5
       parent: 2
+  - uid: 10234
+    components:
+    - type: Transform
+      pos: -27.5,38.5
+      parent: 2
   - uid: 10235
     components:
     - type: Transform
@@ -177939,6 +177259,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-45.5
       parent: 2
+  - uid: 10252
+    components:
+    - type: Transform
+      pos: -29.5,38.5
+      parent: 2
+  - uid: 10253
+    components:
+    - type: Transform
+      pos: 37.5,28.5
+      parent: 2
+  - uid: 10254
+    components:
+    - type: Transform
+      pos: -33.5,-1.5
+      parent: 2
+  - uid: 10255
+    components:
+    - type: Transform
+      pos: 25.5,-33.5
+      parent: 2
+  - uid: 10257
+    components:
+    - type: Transform
+      pos: 25.5,-40.5
+      parent: 2
+  - uid: 10264
+    components:
+    - type: Transform
+      pos: -1.5,-41.5
+      parent: 2
   - uid: 10265
     components:
     - type: Transform
@@ -177981,6 +177331,21 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-49.5
       parent: 2
+  - uid: 10284
+    components:
+    - type: Transform
+      pos: -2.5,-47.5
+      parent: 2
+  - uid: 10286
+    components:
+    - type: Transform
+      pos: -4.5,-47.5
+      parent: 2
+  - uid: 10293
+    components:
+    - type: Transform
+      pos: -5.5,-41.5
+      parent: 2
   - uid: 10295
     components:
     - type: Transform
@@ -178011,16 +177376,116 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,-50.5
       parent: 2
+  - uid: 10307
+    components:
+    - type: Transform
+      pos: -5.5,-45.5
+      parent: 2
+  - uid: 10429
+    components:
+    - type: Transform
+      pos: -34.5,-1.5
+      parent: 2
+  - uid: 10430
+    components:
+    - type: Transform
+      pos: -35.5,-1.5
+      parent: 2
+  - uid: 10431
+    components:
+    - type: Transform
+      pos: -36.5,-1.5
+      parent: 2
+  - uid: 10432
+    components:
+    - type: Transform
+      pos: -37.5,-1.5
+      parent: 2
+  - uid: 10433
+    components:
+    - type: Transform
+      pos: -35.5,-3.5
+      parent: 2
+  - uid: 10434
+    components:
+    - type: Transform
+      pos: -34.5,-3.5
+      parent: 2
+  - uid: 10435
+    components:
+    - type: Transform
+      pos: -35.5,-5.5
+      parent: 2
+  - uid: 10437
+    components:
+    - type: Transform
+      pos: -34.5,-5.5
+      parent: 2
+  - uid: 10438
+    components:
+    - type: Transform
+      pos: -35.5,-7.5
+      parent: 2
+  - uid: 10439
+    components:
+    - type: Transform
+      pos: -34.5,-7.5
+      parent: 2
+  - uid: 10440
+    components:
+    - type: Transform
+      pos: -39.5,-13.5
+      parent: 2
+  - uid: 10441
+    components:
+    - type: Transform
+      pos: -38.5,-1.5
+      parent: 2
+  - uid: 10442
+    components:
+    - type: Transform
+      pos: -34.5,-9.5
+      parent: 2
+  - uid: 10443
+    components:
+    - type: Transform
+      pos: -35.5,-9.5
+      parent: 2
+  - uid: 10445
+    components:
+    - type: Transform
+      pos: -37.5,-9.5
+      parent: 2
+  - uid: 10469
+    components:
+    - type: Transform
+      pos: -39.5,-15.5
+      parent: 2
   - uid: 10584
     components:
     - type: Transform
       pos: -15.5,23.5
       parent: 2
+  - uid: 10595
+    components:
+    - type: Transform
+      pos: -16.5,-51.5
+      parent: 2
+  - uid: 10673
+    components:
+    - type: Transform
+      pos: -10.5,-51.5
+      parent: 2
   - uid: 10797
     components:
     - type: Transform
       pos: -16.5,23.5
       parent: 2
+  - uid: 10892
+    components:
+    - type: Transform
+      pos: -11.5,-51.5
+      parent: 2
   - uid: 10893
     components:
     - type: Transform
@@ -178045,6 +177510,112 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-14.5
       parent: 2
+  - uid: 11220
+    components:
+    - type: Transform
+      pos: -12.5,-51.5
+      parent: 2
+  - uid: 11222
+    components:
+    - type: Transform
+      pos: -13.5,-51.5
+      parent: 2
+  - uid: 11229
+    components:
+    - type: Transform
+      pos: -15.5,-51.5
+      parent: 2
+  - uid: 11230
+    components:
+    - type: Transform
+      pos: -17.5,-51.5
+      parent: 2
+  - uid: 11233
+    components:
+    - type: Transform
+      pos: -19.5,-50.5
+      parent: 2
+  - uid: 11236
+    components:
+    - type: Transform
+      pos: -21.5,-50.5
+      parent: 2
+  - uid: 11250
+    components:
+    - type: Transform
+      pos: -28.5,-49.5
+      parent: 2
+  - uid: 11252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-47.5
+      parent: 2
+  - uid: 11261
+    components:
+    - type: Transform
+      pos: -1.5,-48.5
+      parent: 2
+  - uid: 11390
+    components:
+    - type: Transform
+      pos: -1.5,-50.5
+      parent: 2
+  - uid: 11393
+    components:
+    - type: Transform
+      pos: -1.5,-52.5
+      parent: 2
+  - uid: 11394
+    components:
+    - type: Transform
+      pos: -1.5,-54.5
+      parent: 2
+  - uid: 11395
+    components:
+    - type: Transform
+      pos: -2.5,-55.5
+      parent: 2
+  - uid: 11396
+    components:
+    - type: Transform
+      pos: -3.5,-55.5
+      parent: 2
+  - uid: 11397
+    components:
+    - type: Transform
+      pos: -4.5,-55.5
+      parent: 2
+  - uid: 11398
+    components:
+    - type: Transform
+      pos: -5.5,-55.5
+      parent: 2
+  - uid: 11399
+    components:
+    - type: Transform
+      pos: -6.5,-55.5
+      parent: 2
+  - uid: 11404
+    components:
+    - type: Transform
+      pos: -7.5,-55.5
+      parent: 2
+  - uid: 11405
+    components:
+    - type: Transform
+      pos: -8.5,-55.5
+      parent: 2
+  - uid: 11406
+    components:
+    - type: Transform
+      pos: -9.5,-52.5
+      parent: 2
+  - uid: 11407
+    components:
+    - type: Transform
+      pos: -9.5,-54.5
+      parent: 2
   - uid: 11409
     components:
     - type: Transform
@@ -178115,17 +177686,87 @@ entities:
   - uid: 11512
     components:
     - type: Transform
-      pos: -26.5,8.5
+      pos: 5.5,-48.5
       parent: 2
-  - uid: 11513
+  - uid: 11514
     components:
     - type: Transform
-      pos: -26.5,9.5
+      pos: -51.5,-22.5
       parent: 2
-  - uid: 11514
+  - uid: 11532
     components:
     - type: Transform
-      pos: -26.5,10.5
+      pos: -51.5,-23.5
+      parent: 2
+  - uid: 11533
+    components:
+    - type: Transform
+      pos: -51.5,-19.5
+      parent: 2
+  - uid: 11534
+    components:
+    - type: Transform
+      pos: -51.5,-18.5
+      parent: 2
+  - uid: 11535
+    components:
+    - type: Transform
+      pos: -57.5,-15.5
+      parent: 2
+  - uid: 11536
+    components:
+    - type: Transform
+      pos: -51.5,-20.5
+      parent: 2
+  - uid: 11561
+    components:
+    - type: Transform
+      pos: -51.5,-16.5
+      parent: 2
+  - uid: 11562
+    components:
+    - type: Transform
+      pos: -51.5,-17.5
+      parent: 2
+  - uid: 11566
+    components:
+    - type: Transform
+      pos: -52.5,-15.5
+      parent: 2
+  - uid: 11567
+    components:
+    - type: Transform
+      pos: -37.5,-12.5
+      parent: 2
+  - uid: 11568
+    components:
+    - type: Transform
+      pos: -39.5,-8.5
+      parent: 2
+  - uid: 11570
+    components:
+    - type: Transform
+      pos: -39.5,-7.5
+      parent: 2
+  - uid: 11572
+    components:
+    - type: Transform
+      pos: -39.5,-6.5
+      parent: 2
+  - uid: 11573
+    components:
+    - type: Transform
+      pos: -39.5,-5.5
+      parent: 2
+  - uid: 11574
+    components:
+    - type: Transform
+      pos: -39.5,-4.5
+      parent: 2
+  - uid: 11575
+    components:
+    - type: Transform
+      pos: -39.5,-3.5
       parent: 2
   - uid: 11585
     components:
@@ -178133,6 +177774,46 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -38.5,-22.5
       parent: 2
+  - uid: 11703
+    components:
+    - type: Transform
+      pos: -39.5,-16.5
+      parent: 2
+  - uid: 11704
+    components:
+    - type: Transform
+      pos: -39.5,-18.5
+      parent: 2
+  - uid: 11705
+    components:
+    - type: Transform
+      pos: -39.5,-20.5
+      parent: 2
+  - uid: 11840
+    components:
+    - type: Transform
+      pos: -39.5,-21.5
+      parent: 2
+  - uid: 11841
+    components:
+    - type: Transform
+      pos: -51.5,-4.5
+      parent: 2
+  - uid: 11844
+    components:
+    - type: Transform
+      pos: -51.5,-1.5
+      parent: 2
+  - uid: 11845
+    components:
+    - type: Transform
+      pos: -51.5,1.5
+      parent: 2
+  - uid: 11846
+    components:
+    - type: Transform
+      pos: -56.5,-31.5
+      parent: 2
   - uid: 11848
     components:
     - type: Transform
@@ -178151,18 +177832,93 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-20.5
       parent: 2
+  - uid: 12125
+    components:
+    - type: Transform
+      pos: -55.5,-31.5
+      parent: 2
+  - uid: 12128
+    components:
+    - type: Transform
+      pos: -54.5,-31.5
+      parent: 2
+  - uid: 12129
+    components:
+    - type: Transform
+      pos: -53.5,-30.5
+      parent: 2
+  - uid: 12217
+    components:
+    - type: Transform
+      pos: -53.5,-28.5
+      parent: 2
+  - uid: 12218
+    components:
+    - type: Transform
+      pos: -53.5,-27.5
+      parent: 2
+  - uid: 12219
+    components:
+    - type: Transform
+      pos: -53.5,-26.5
+      parent: 2
+  - uid: 12220
+    components:
+    - type: Transform
+      pos: -53.5,-25.5
+      parent: 2
+  - uid: 12221
+    components:
+    - type: Transform
+      pos: -39.5,-23.5
+      parent: 2
+  - uid: 12228
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -43.5,-26.5
+      parent: 2
   - uid: 12231
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -36.5,-19.5
       parent: 2
+  - uid: 12232
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -43.5,-27.5
+      parent: 2
   - uid: 12233
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -36.5,-18.5
       parent: 2
+  - uid: 12235
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -45.5,-28.5
+      parent: 2
+  - uid: 12236
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -46.5,-28.5
+      parent: 2
+  - uid: 12237
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -47.5,-28.5
+      parent: 2
+  - uid: 12239
+    components:
+    - type: Transform
+      pos: -48.5,-30.5
+      parent: 2
   - uid: 12241
     components:
     - type: Transform
@@ -178223,6 +177979,31 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-52.5
       parent: 2
+  - uid: 12252
+    components:
+    - type: Transform
+      pos: -39.5,-28.5
+      parent: 2
+  - uid: 12253
+    components:
+    - type: Transform
+      pos: -39.5,-27.5
+      parent: 2
+  - uid: 12254
+    components:
+    - type: Transform
+      pos: -48.5,-31.5
+      parent: 2
+  - uid: 12256
+    components:
+    - type: Transform
+      pos: -48.5,-32.5
+      parent: 2
+  - uid: 12257
+    components:
+    - type: Transform
+      pos: -48.5,-33.5
+      parent: 2
   - uid: 12272
     components:
     - type: Transform
@@ -178249,6 +178030,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -35.5,-52.5
       parent: 2
+  - uid: 12939
+    components:
+    - type: Transform
+      pos: -48.5,-34.5
+      parent: 2
   - uid: 13008
     components:
     - type: Transform
@@ -178260,6 +178046,11 @@ entities:
     - type: Transform
       pos: 11.5,37.5
       parent: 2
+  - uid: 13632
+    components:
+    - type: Transform
+      pos: -48.5,-35.5
+      parent: 2
   - uid: 14631
     components:
     - type: Transform
@@ -178272,6 +178063,53 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-52.5
       parent: 2
+  - uid: 15015
+    components:
+    - type: Transform
+      pos: -12.5,-55.5
+      parent: 2
+  - uid: 15050
+    components:
+    - type: Transform
+      pos: -12.5,-54.5
+      parent: 2
+  - uid: 15057
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-51.5
+      parent: 2
+  - uid: 15060
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -24.5,-52.5
+      parent: 2
+  - uid: 15070
+    components:
+    - type: Transform
+      pos: -28.5,-51.5
+      parent: 2
+  - uid: 15071
+    components:
+    - type: Transform
+      pos: -37.5,-51.5
+      parent: 2
+  - uid: 15072
+    components:
+    - type: Transform
+      pos: -50.5,-44.5
+      parent: 2
+  - uid: 15073
+    components:
+    - type: Transform
+      pos: -52.5,-41.5
+      parent: 2
+  - uid: 15074
+    components:
+    - type: Transform
+      pos: -50.5,-42.5
+      parent: 2
   - uid: 15127
     components:
     - type: Transform
@@ -178335,11 +178173,26 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -29.5,-52.5
       parent: 2
+  - uid: 16366
+    components:
+    - type: Transform
+      pos: -53.5,-41.5
+      parent: 2
   - uid: 16376
     components:
     - type: Transform
       pos: 16.5,30.5
       parent: 2
+  - uid: 16675
+    components:
+    - type: Transform
+      pos: -51.5,-41.5
+      parent: 2
+  - uid: 17129
+    components:
+    - type: Transform
+      pos: 44.5,24.5
+      parent: 2
   - uid: 17434
     components:
     - type: Transform
@@ -178350,6 +178203,16 @@ entities:
     - type: Transform
       pos: 17.5,30.5
       parent: 2
+  - uid: 17776
+    components:
+    - type: Transform
+      pos: -0.5,40.5
+      parent: 2
+  - uid: 17901
+    components:
+    - type: Transform
+      pos: -37.5,-54.5
+      parent: 2
   - uid: 18078
     components:
     - type: Transform
@@ -178400,6 +178263,62 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,-20.5
       parent: 2
+  - uid: 21165
+    components:
+    - type: Transform
+      pos: -17.5,-37.5
+      parent: 2
+  - uid: 21461
+    components:
+    - type: Transform
+      pos: -11.5,-37.5
+      parent: 2
+  - uid: 23153
+    components:
+    - type: Transform
+      pos: -51.5,3.5
+      parent: 2
+  - uid: 23155
+    components:
+    - type: Transform
+      pos: 10.5,38.5
+      parent: 2
+  - uid: 23157
+    components:
+    - type: Transform
+      pos: 17.5,38.5
+      parent: 2
+  - uid: 23158
+    components:
+    - type: Transform
+      pos: 18.5,38.5
+      parent: 2
+  - uid: 23159
+    components:
+    - type: Transform
+      pos: 19.5,38.5
+      parent: 2
+  - uid: 23160
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,35.5
+      parent: 2
+  - uid: 23161
+    components:
+    - type: Transform
+      pos: -0.5,43.5
+      parent: 2
+  - uid: 23162
+    components:
+    - type: Transform
+      pos: 26.5,-43.5
+      parent: 2
+  - uid: 23163
+    components:
+    - type: Transform
+      pos: -47.5,-1.5
+      parent: 2
   - uid: 24643
     components:
     - type: Transform
@@ -180077,6 +179996,501 @@ entities:
       parent: 2
 - proto: Window
   entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -22.5,-38.5
+      parent: 2
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 306
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 2
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 5.5,18.5
+      parent: 2
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 8.5,18.5
+      parent: 2
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 7.5,18.5
+      parent: 2
+  - uid: 332
+    components:
+    - type: Transform
+      pos: -1.5,20.5
+      parent: 2
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -31.5,-21.5
+      parent: 2
+  - uid: 397
+    components:
+    - type: Transform
+      pos: -32.5,-21.5
+      parent: 2
+  - uid: 398
+    components:
+    - type: Transform
+      pos: -3.5,-38.5
+      parent: 2
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -3.5,-37.5
+      parent: 2
+  - uid: 425
+    components:
+    - type: Transform
+      pos: -3.5,-34.5
+      parent: 2
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -3.5,-33.5
+      parent: 2
+  - uid: 459
+    components:
+    - type: Transform
+      pos: -3.5,-32.5
+      parent: 2
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -28.5,-24.5
+      parent: 2
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -29.5,-24.5
+      parent: 2
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -22.5,-40.5
+      parent: 2
+  - uid: 525
+    components:
+    - type: Transform
+      pos: -14.5,-30.5
+      parent: 2
+  - uid: 526
+    components:
+    - type: Transform
+      pos: -22.5,-30.5
+      parent: 2
+  - uid: 527
+    components:
+    - type: Transform
+      pos: -21.5,-30.5
+      parent: 2
+  - uid: 529
+    components:
+    - type: Transform
+      pos: -24.5,-30.5
+      parent: 2
+  - uid: 535
+    components:
+    - type: Transform
+      pos: -25.5,-30.5
+      parent: 2
+  - uid: 536
+    components:
+    - type: Transform
+      pos: -26.5,-30.5
+      parent: 2
+  - uid: 537
+    components:
+    - type: Transform
+      pos: -15.5,-30.5
+      parent: 2
+  - uid: 539
+    components:
+    - type: Transform
+      pos: -32.5,-30.5
+      parent: 2
+  - uid: 543
+    components:
+    - type: Transform
+      pos: -28.5,-30.5
+      parent: 2
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -28.5,-39.5
+      parent: 2
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -28.5,-38.5
+      parent: 2
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -28.5,-40.5
+      parent: 2
+  - uid: 560
+    components:
+    - type: Transform
+      pos: 33.5,-1.5
+      parent: 2
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 39.5,2.5
+      parent: 2
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 41.5,2.5
+      parent: 2
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -31.5,2.5
+      parent: 2
+  - uid: 578
+    components:
+    - type: Transform
+      pos: -40.5,2.5
+      parent: 2
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -37.5,2.5
+      parent: 2
+  - uid: 581
+    components:
+    - type: Transform
+      pos: -33.5,2.5
+      parent: 2
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 30.5,-1.5
+      parent: 2
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 3.5,31.5
+      parent: 2
+  - uid: 719
+    components:
+    - type: Transform
+      pos: 3.5,34.5
+      parent: 2
+  - uid: 720
+    components:
+    - type: Transform
+      pos: -2.5,34.5
+      parent: 2
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -2.5,32.5
+      parent: 2
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 2.5,51.5
+      parent: 2
+  - uid: 748
+    components:
+    - type: Transform
+      pos: 2.5,50.5
+      parent: 2
+  - uid: 749
+    components:
+    - type: Transform
+      pos: 2.5,49.5
+      parent: 2
+  - uid: 750
+    components:
+    - type: Transform
+      pos: 3.5,37.5
+      parent: 2
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 3.5,38.5
+      parent: 2
+  - uid: 811
+    components:
+    - type: Transform
+      pos: -10.5,31.5
+      parent: 2
+  - uid: 812
+    components:
+    - type: Transform
+      pos: -10.5,32.5
+      parent: 2
+  - uid: 814
+    components:
+    - type: Transform
+      pos: -10.5,33.5
+      parent: 2
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -7.5,40.5
+      parent: 2
+  - uid: 816
+    components:
+    - type: Transform
+      pos: -7.5,43.5
+      parent: 2
+  - uid: 823
+    components:
+    - type: Transform
+      pos: -25.5,43.5
+      parent: 2
+  - uid: 824
+    components:
+    - type: Transform
+      pos: -25.5,41.5
+      parent: 2
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -25.5,39.5
+      parent: 2
+  - uid: 826
+    components:
+    - type: Transform
+      pos: -24.5,38.5
+      parent: 2
+  - uid: 827
+    components:
+    - type: Transform
+      pos: -23.5,38.5
+      parent: 2
+  - uid: 828
+    components:
+    - type: Transform
+      pos: -31.5,35.5
+      parent: 2
+  - uid: 830
+    components:
+    - type: Transform
+      pos: -31.5,37.5
+      parent: 2
+  - uid: 831
+    components:
+    - type: Transform
+      pos: -30.5,38.5
+      parent: 2
+  - uid: 832
+    components:
+    - type: Transform
+      pos: -28.5,38.5
+      parent: 2
+  - uid: 833
+    components:
+    - type: Transform
+      pos: -26.5,38.5
+      parent: 2
+  - uid: 834
+    components:
+    - type: Transform
+      pos: -30.5,2.5
+      parent: 2
+  - uid: 837
+    components:
+    - type: Transform
+      pos: -28.5,2.5
+      parent: 2
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 2.5,-35.5
+      parent: 2
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 2.5,-33.5
+      parent: 2
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 2.5,-37.5
+      parent: 2
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 2.5,-39.5
+      parent: 2
+  - uid: 939
+    components:
+    - type: Transform
+      pos: 12.5,-33.5
+      parent: 2
+  - uid: 940
+    components:
+    - type: Transform
+      pos: 12.5,-35.5
+      parent: 2
+  - uid: 941
+    components:
+    - type: Transform
+      pos: 4.5,-44.5
+      parent: 2
+  - uid: 943
+    components:
+    - type: Transform
+      pos: 4.5,-41.5
+      parent: 2
+  - uid: 944
+    components:
+    - type: Transform
+      pos: 12.5,-37.5
+      parent: 2
+  - uid: 945
+    components:
+    - type: Transform
+      pos: 12.5,-39.5
+      parent: 2
+  - uid: 946
+    components:
+    - type: Transform
+      pos: -1.5,-49.5
+      parent: 2
+  - uid: 947
+    components:
+    - type: Transform
+      pos: -3.5,-47.5
+      parent: 2
+  - uid: 948
+    components:
+    - type: Transform
+      pos: -1.5,-53.5
+      parent: 2
+  - uid: 993
+    components:
+    - type: Transform
+      pos: -9.5,-50.5
+      parent: 2
+  - uid: 994
+    components:
+    - type: Transform
+      pos: -9.5,-49.5
+      parent: 2
+  - uid: 995
+    components:
+    - type: Transform
+      pos: -9.5,-47.5
+      parent: 2
+  - uid: 996
+    components:
+    - type: Transform
+      pos: -9.5,-46.5
+      parent: 2
+  - uid: 998
+    components:
+    - type: Transform
+      pos: -5.5,-44.5
+      parent: 2
+  - uid: 999
+    components:
+    - type: Transform
+      pos: -5.5,-42.5
+      parent: 2
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: -1.5,-51.5
+      parent: 2
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: -51.5,-2.5
+      parent: 2
+  - uid: 1004
+    components:
+    - type: Transform
+      pos: -51.5,-3.5
+      parent: 2
+  - uid: 1005
+    components:
+    - type: Transform
+      pos: -53.5,-15.5
+      parent: 2
+  - uid: 1064
+    components:
+    - type: Transform
+      pos: -56.5,-15.5
+      parent: 2
+  - uid: 1065
+    components:
+    - type: Transform
+      pos: -47.5,-4.5
+      parent: 2
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: -51.5,2.5
+      parent: 2
+  - uid: 1067
+    components:
+    - type: Transform
+      pos: -47.5,3.5
+      parent: 2
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: -1.5,39.5
+      parent: 2
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: -47.5,2.5
+      parent: 2
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 1079
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
   - uid: 1443
     components:
     - type: Transform
@@ -180101,6 +180515,82 @@ entities:
       rot: 3.141592653589793 rad
       pos: -16.5,-24.5
       parent: 2
+  - uid: 23168
+    components:
+    - type: Transform
+      pos: -3.5,-39.5
+      parent: 2
+- proto: WindowDiagonal
+  entities:
+  - uid: 279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 2
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 1073
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-3.5
+      parent: 2
+  - uid: 1074
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-2.5
+      parent: 2
+  - uid: 1075
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,3.5
+      parent: 2
+  - uid: 1076
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-2.5
+      parent: 2
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 2
+  - uid: 1081
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+  - uid: 1083
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-3.5
+      parent: 2
 - proto: WindowDirectional
   entities:
   - uid: 1352
@@ -180141,12 +180631,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-26.5
       parent: 2
-  - uid: 1454
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-26.5
-      parent: 2
   - uid: 1455
     components:
     - type: Transform
@@ -180253,6 +180737,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 57.5,-2.5
       parent: 2
+  - uid: 23167
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-26.5
+      parent: 2
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 352
@@ -180798,7 +181288,7 @@ entities:
       pos: 24.5,2.5
       parent: 21002
     - type: Door
-      secondsUntilStateChange: -59289.46
+      secondsUntilStateChange: -319108.34
       state: Opening
 - proto: WoodenBench
   entities:

From a315f90abcb27d901d5f27e2fb274eebc15fe3ee Mon Sep 17 00:00:00 2001
From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Date: Wed, 29 May 2024 19:55:38 +0000
Subject: [PATCH 128/568] fix: Include the officer name in all criminal records
 status changes (#28332)

---
 .../Locale/en-US/criminal-records/criminal-records.ftl      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index cd73883f06f2..f603b446666c 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -33,12 +33,12 @@ criminal-records-permission-denied = Permission denied
 
 criminal-records-console-wanted = {$name} is wanted by {$officer} for: {$reason}.
 criminal-records-console-suspected = {$officer} marked {$name} as suspicious because of: {$reason}
-criminal-records-console-not-suspected = {$name} is no longer a suspect.
+criminal-records-console-not-suspected = {$name} has been cleared as a suspect by {$officer}.
 criminal-records-console-detained = {$name} has been detained by {$officer}.
 criminal-records-console-released = {$name} has been released by {$officer}.
-criminal-records-console-not-wanted = {$name} is no longer wanted.
+criminal-records-console-not-wanted = {$name} is no longer wanted, according to {$officer}.
 criminal-records-console-paroled = {$name} has been released on parole by {$officer}.
-criminal-records-console-not-parole = {$name} is no longer on parole.
+criminal-records-console-not-parole = {$name}'s parole status has been lifted by {$officer}.
 criminal-records-console-unknown-officer = <unknown officer>
 
 ## Filters

From 404fe818e8dffc9166c8572a4725283a5b88a5cd Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Wed, 29 May 2024 20:08:33 +0000
Subject: [PATCH 129/568] item cabinet rework + stuff (#26779)

---
 Content.Client/Cabinet/ItemCabinetSystem.cs   |  27 ----
 Content.Server/Cabinet/ItemCabinetSystem.cs   |   9 --
 .../Cabinet/ItemCabinetComponent.cs           |  44 ++----
 Content.Shared/Cabinet/ItemCabinetSystem.cs   |  95 ++++++++++++
 .../Cabinet/SharedItemCabinetSystem.cs        | 136 ------------------
 Content.Shared/Lock/LockSystem.cs             |   1 +
 .../Nutrition/Components/OpenableComponent.cs |   8 +-
 .../Nutrition/EntitySystems/OpenableSystem.cs |  78 ++++++++--
 .../Structures/Storage/base_cabinet.yml       |  44 ++++++
 .../Entities/Structures/Storage/glass_box.yml |  54 +++----
 .../Structures/Wallmounts/defib_cabinet.yml   | 128 +++++++----------
 .../Wallmounts/extinguisher_cabinet.yml       |  67 +++------
 .../Structures/Wallmounts/fireaxe_cabinet.yml | 100 +++++--------
 .../Structures/Wallmounts/shotgun_cabinet.yml |  40 +++---
 14 files changed, 378 insertions(+), 453 deletions(-)
 delete mode 100644 Content.Client/Cabinet/ItemCabinetSystem.cs
 delete mode 100644 Content.Server/Cabinet/ItemCabinetSystem.cs
 create mode 100644 Content.Shared/Cabinet/ItemCabinetSystem.cs
 delete mode 100644 Content.Shared/Cabinet/SharedItemCabinetSystem.cs
 create mode 100644 Resources/Prototypes/Entities/Structures/Storage/base_cabinet.yml

diff --git a/Content.Client/Cabinet/ItemCabinetSystem.cs b/Content.Client/Cabinet/ItemCabinetSystem.cs
deleted file mode 100644
index aba4fdae00e9..000000000000
--- a/Content.Client/Cabinet/ItemCabinetSystem.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Shared.Cabinet;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Cabinet;
-
-public sealed class ItemCabinetSystem : SharedItemCabinetSystem
-{
-    protected override void UpdateAppearance(EntityUid uid, ItemCabinetComponent? cabinet = null)
-    {
-        if (!Resolve(uid, ref cabinet))
-            return;
-
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-            return;
-
-        var state = cabinet.Opened ? cabinet.OpenState : cabinet.ClosedState;
-        if (state != null)
-            sprite.LayerSetState(ItemCabinetVisualLayers.Door, state);
-        sprite.LayerSetVisible(ItemCabinetVisualLayers.ContainsItem, cabinet.CabinetSlot.HasItem);
-    }
-}
-
-public enum ItemCabinetVisualLayers
-{
-    Door,
-    ContainsItem
-}
diff --git a/Content.Server/Cabinet/ItemCabinetSystem.cs b/Content.Server/Cabinet/ItemCabinetSystem.cs
deleted file mode 100644
index a21532ad0cef..000000000000
--- a/Content.Server/Cabinet/ItemCabinetSystem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Cabinet;
-
-namespace Content.Server.Cabinet;
-
-public sealed class ItemCabinetSystem : SharedItemCabinetSystem
-{
-    // shitposting on main???
-}
-
diff --git a/Content.Shared/Cabinet/ItemCabinetComponent.cs b/Content.Shared/Cabinet/ItemCabinetComponent.cs
index dcc276e5651b..b1d7e4a263fb 100644
--- a/Content.Shared/Cabinet/ItemCabinetComponent.cs
+++ b/Content.Shared/Cabinet/ItemCabinetComponent.cs
@@ -1,43 +1,25 @@
-using Content.Shared.Containers.ItemSlots;
-using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Cabinet;
 
 /// <summary>
-///     Used for entities that can be opened, closed, and can hold one item. E.g., fire extinguisher cabinets.
+/// Used for entities that can be opened, closed, and can hold one item. E.g., fire extinguisher cabinets.
+/// Requires <c>OpenableComponent</c>.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[RegisterComponent, NetworkedComponent, Access(typeof(ItemCabinetSystem))]
 public sealed partial class ItemCabinetComponent : Component
 {
     /// <summary>
-    ///     Sound to be played when the cabinet door is opened.
+    /// Name of the <see cref="ItemSlot"/> that stores the actual item.
     /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier? DoorSound;
-
-    /// <summary>
-    ///     The <see cref="ItemSlot"/> that stores the actual item. The entity whitelist, sounds, and other
-    ///     behaviours are specified by this <see cref="ItemSlot"/> definition.
-    /// </summary>
-    [DataField, ViewVariables]
-    public ItemSlot CabinetSlot = new();
-
-    /// <summary>
-    ///     Whether the cabinet is currently open or not.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Opened;
-
-    /// <summary>
-    /// The state for when the cabinet is open
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
-    public string? OpenState;
+    [DataField]
+    public string Slot = "ItemCabinet";
+}
 
-    /// <summary>
-    /// The state for when the cabinet is closed
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables(VVAccess.ReadWrite)]
-    public string? ClosedState;
+[Serializable, NetSerializable]
+public enum ItemCabinetVisuals : byte
+{
+    ContainsItem,
+    Layer
 }
diff --git a/Content.Shared/Cabinet/ItemCabinetSystem.cs b/Content.Shared/Cabinet/ItemCabinetSystem.cs
new file mode 100644
index 000000000000..749065ac4761
--- /dev/null
+++ b/Content.Shared/Cabinet/ItemCabinetSystem.cs
@@ -0,0 +1,95 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Interaction;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Containers;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Content.Shared.Cabinet;
+
+/// <summary>
+/// Controls ItemCabinet slot locking and visuals.
+/// </summary>
+public sealed class ItemCabinetSystem : EntitySystem
+{
+    [Dependency] private readonly ItemSlotsSystem _slots = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ItemCabinetComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<ItemCabinetComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ItemCabinetComponent, EntInsertedIntoContainerMessage>(OnContainerModified);
+        SubscribeLocalEvent<ItemCabinetComponent, EntRemovedFromContainerMessage>(OnContainerModified);
+        SubscribeLocalEvent<ItemCabinetComponent, OpenableOpenedEvent>(OnOpened);
+        SubscribeLocalEvent<ItemCabinetComponent, OpenableClosedEvent>(OnClosed);
+    }
+
+    private void OnStartup(Entity<ItemCabinetComponent> ent, ref ComponentStartup args)
+    {
+        UpdateAppearance(ent);
+    }
+
+    private void OnMapInit(Entity<ItemCabinetComponent> ent, ref MapInitEvent args)
+    {
+        // update at mapinit to avoid copy pasting locked: true and locked: false for each closed/open prototype
+        SetSlotLock(ent, !_openable.IsOpen(ent));
+    }
+
+    private void UpdateAppearance(Entity<ItemCabinetComponent> ent)
+    {
+        _appearance.SetData(ent, ItemCabinetVisuals.ContainsItem, HasItem(ent));
+    }
+
+    private void OnContainerModified(EntityUid uid, ItemCabinetComponent component, ContainerModifiedMessage args)
+    {
+        if (args.Container.ID == component.Slot)
+            UpdateAppearance((uid, component));
+    }
+
+    private void OnOpened(Entity<ItemCabinetComponent> ent, ref OpenableOpenedEvent args)
+    {
+        SetSlotLock(ent, false);
+    }
+
+    private void OnClosed(Entity<ItemCabinetComponent> ent, ref OpenableClosedEvent args)
+    {
+        SetSlotLock(ent, true);
+    }
+
+    /// <summary>
+    /// Tries to get the cabinet's item slot.
+    /// </summary>
+    public bool TryGetSlot(Entity<ItemCabinetComponent> ent, [NotNullWhen(true)] out ItemSlot? slot)
+    {
+        slot = null;
+        if (!TryComp<ItemSlotsComponent>(ent, out var slots))
+            return false;
+
+        return _slots.TryGetSlot(ent, ent.Comp.Slot, out slot, slots);
+    }
+
+    /// <summary>
+    /// Returns true if the cabinet contains an item.
+    /// </summary>
+    public bool HasItem(Entity<ItemCabinetComponent> ent)
+    {
+        return TryGetSlot(ent, out var slot) && slot.HasItem;
+    }
+
+    /// <summary>
+    /// Lock or unlock the underlying item slot.
+    /// </summary>
+    public void SetSlotLock(Entity<ItemCabinetComponent> ent, bool closed)
+    {
+        if (!TryComp<ItemSlotsComponent>(ent, out var slots))
+            return;
+
+        if (_slots.TryGetSlot(ent, ent.Comp.Slot, out var slot, slots))
+            _slots.SetLock(ent, slot, closed, slots);
+    }
+}
diff --git a/Content.Shared/Cabinet/SharedItemCabinetSystem.cs b/Content.Shared/Cabinet/SharedItemCabinetSystem.cs
deleted file mode 100644
index ca496814c71f..000000000000
--- a/Content.Shared/Cabinet/SharedItemCabinetSystem.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Interaction;
-using Content.Shared.Lock;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Cabinet;
-
-public abstract class SharedItemCabinetSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<ItemCabinetComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<ItemCabinetComponent, ComponentRemove>(OnComponentRemove);
-        SubscribeLocalEvent<ItemCabinetComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<ItemCabinetComponent, AfterAutoHandleStateEvent>(OnComponentHandleState);
-
-        SubscribeLocalEvent<ItemCabinetComponent, ActivateInWorldEvent>(OnActivateInWorld);
-        SubscribeLocalEvent<ItemCabinetComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleOpenVerb);
-
-        SubscribeLocalEvent<ItemCabinetComponent, EntInsertedIntoContainerMessage>(OnContainerModified);
-        SubscribeLocalEvent<ItemCabinetComponent, EntRemovedFromContainerMessage>(OnContainerModified);
-
-        SubscribeLocalEvent<ItemCabinetComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
-    }
-
-    private void OnComponentInit(EntityUid uid, ItemCabinetComponent cabinet, ComponentInit args)
-    {
-        _itemSlots.AddItemSlot(uid, "ItemCabinet", cabinet.CabinetSlot);
-    }
-
-    private void OnComponentRemove(EntityUid uid, ItemCabinetComponent cabinet, ComponentRemove args)
-    {
-        _itemSlots.RemoveItemSlot(uid, cabinet.CabinetSlot);
-    }
-
-    private void OnComponentStartup(EntityUid uid, ItemCabinetComponent cabinet, ComponentStartup args)
-    {
-        UpdateAppearance(uid, cabinet);
-        _itemSlots.SetLock(uid, cabinet.CabinetSlot, !cabinet.Opened);
-    }
-
-    private void OnComponentHandleState(Entity<ItemCabinetComponent> ent, ref AfterAutoHandleStateEvent args)
-    {
-        UpdateAppearance(ent, ent);
-    }
-
-    protected virtual void UpdateAppearance(EntityUid uid, ItemCabinetComponent? cabinet = null)
-    {
-        // we don't fuck with appearance data, and instead just manually update the sprite on the client
-    }
-
-    private void OnContainerModified(EntityUid uid, ItemCabinetComponent cabinet, ContainerModifiedMessage args)
-    {
-        if (!cabinet.Initialized)
-            return;
-
-        if (args.Container.ID == cabinet.CabinetSlot.ID)
-            UpdateAppearance(uid, cabinet);
-    }
-
-    private void OnLockToggleAttempt(EntityUid uid, ItemCabinetComponent cabinet, ref LockToggleAttemptEvent args)
-    {
-        // Cannot lock or unlock while open.
-        if (cabinet.Opened)
-            args.Cancelled = true;
-    }
-
-    private void AddToggleOpenVerb(EntityUid uid, ItemCabinetComponent cabinet, GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
-            return;
-
-        if (TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
-            return;
-
-        // Toggle open verb
-        AlternativeVerb toggleVerb = new()
-        {
-            Act = () => ToggleItemCabinet(uid, args.User, cabinet)
-        };
-        if (cabinet.Opened)
-        {
-            toggleVerb.Text = Loc.GetString("verb-common-close");
-            toggleVerb.Icon =
-                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
-        }
-        else
-        {
-            toggleVerb.Text = Loc.GetString("verb-common-open");
-            toggleVerb.Icon =
-                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
-        }
-        args.Verbs.Add(toggleVerb);
-    }
-
-    private void OnActivateInWorld(EntityUid uid, ItemCabinetComponent comp, ActivateInWorldEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = true;
-        ToggleItemCabinet(uid, args.User, comp);
-    }
-
-    /// <summary>
-    ///     Toggles the ItemCabinet's state.
-    /// </summary>
-    public void ToggleItemCabinet(EntityUid uid, EntityUid? user = null, ItemCabinetComponent? cabinet = null)
-    {
-        if (!Resolve(uid, ref cabinet))
-            return;
-
-        if (TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
-            return;
-
-        cabinet.Opened = !cabinet.Opened;
-        Dirty(uid, cabinet);
-        _itemSlots.SetLock(uid, cabinet.CabinetSlot, !cabinet.Opened);
-
-        if (_timing.IsFirstTimePredicted)
-        {
-            UpdateAppearance(uid, cabinet);
-            _audio.PlayPredicted(cabinet.DoorSound, uid, user, AudioParams.Default.WithVariation(0.15f));
-        }
-    }
-}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index 36ac5f025b1a..a25dcea8a78e 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -235,6 +235,7 @@ public bool CanToggleLock(EntityUid uid, EntityUid user, bool quiet = true)
         return !ev.Cancelled;
     }
 
+    // TODO: this should be a helper on AccessReaderSystem since so many systems copy paste it
     private bool HasUserAccess(EntityUid uid, EntityUid user, AccessReaderComponent? reader = null, bool quiet = true)
     {
         // Not having an AccessComponent means you get free access. woo!
diff --git a/Content.Shared/Nutrition/Components/OpenableComponent.cs b/Content.Shared/Nutrition/Components/OpenableComponent.cs
index 0381888e2824..58d6665c588d 100644
--- a/Content.Shared/Nutrition/Components/OpenableComponent.cs
+++ b/Content.Shared/Nutrition/Components/OpenableComponent.cs
@@ -26,6 +26,12 @@ public sealed partial class OpenableComponent : Component
     [DataField, AutoNetworkedField]
     public bool OpenableByHand = true;
 
+    /// <summary>
+    /// If true, tries to open when activated in world.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool OpenOnActivate;
+
     /// <summary>
     /// Text shown when examining and its open.
     /// </summary>
@@ -58,7 +64,7 @@ public sealed partial class OpenableComponent : Component
     /// Sound played when opening.
     /// </summary>
     [DataField]
-    public SoundSpecifier Sound = new SoundCollectionSpecifier("canOpenSounds");
+    public SoundSpecifier? Sound = new SoundCollectionSpecifier("canOpenSounds");
 
     /// <summary>
     /// Can this item be closed again after opening?
diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
index 2934ced8b4a7..0a7a8d88f33c 100644
--- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Examine;
+using Content.Shared.Lock;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Nutrition.Components;
@@ -16,6 +17,7 @@ namespace Content.Shared.Nutrition.EntitySystems;
 /// </summary>
 public sealed partial class OpenableSystem : EntitySystem
 {
+    [Dependency] private readonly LockSystem _lock = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -26,26 +28,49 @@ public override void Initialize()
 
         SubscribeLocalEvent<OpenableComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<OpenableComponent, UseInHandEvent>(OnUse);
+        // always try to unlock first before opening
+        SubscribeLocalEvent<OpenableComponent, ActivateInWorldEvent>(OnActivated, after: new[] { typeof(LockSystem) });
         SubscribeLocalEvent<OpenableComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
         SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
-        SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
+        SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<AlternativeVerb>>(OnGetVerbs);
         SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
         SubscribeLocalEvent<OpenableComponent, AttemptShakeEvent>(OnAttemptShake);
         SubscribeLocalEvent<OpenableComponent, AttemptAddFizzinessEvent>(OnAttemptAddFizziness);
+        SubscribeLocalEvent<OpenableComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
+
+#if DEBUG
+        SubscribeLocalEvent<OpenableComponent, MapInitEvent>(OnMapInit);
     }
 
-    private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
+    private void OnMapInit(Entity<OpenableComponent> ent, ref MapInitEvent args)
     {
-        UpdateAppearance(uid, comp);
+        if (ent.Comp.Opened && _lock.IsLocked(ent.Owner))
+            Log.Error($"Entity {ent} spawned locked open, this is a prototype mistake.");
+    }
+#else
+    }
+#endif
+
+    private void OnInit(Entity<OpenableComponent> ent, ref ComponentInit args)
+    {
+        UpdateAppearance(ent, ent.Comp);
+    }
+
+    private void OnUse(Entity<OpenableComponent> ent, ref UseInHandEvent args)
+    {
+        if (args.Handled || !ent.Comp.OpenableByHand)
+            return;
+
+        args.Handled = TryToggle(ent, args.User);
     }
 
-    private void OnUse(EntityUid uid, OpenableComponent comp, UseInHandEvent args)
+    private void OnActivated(Entity<OpenableComponent> ent, ref ActivateInWorldEvent args)
     {
-        if (args.Handled || !comp.OpenableByHand)
+        if (args.Handled || !ent.Comp.OpenOnActivate)
             return;
 
-        args.Handled = TryOpen(uid, comp, args.User);
+        args.Handled = TryToggle(ent, args.User);
     }
 
     private void OnExamined(EntityUid uid, OpenableComponent comp, ExaminedEvent args)
@@ -63,12 +88,12 @@ private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntity
         args.Handled = !comp.Opened;
     }
 
-    private void AddOpenCloseVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEvent<Verb> args)
+    private void OnGetVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEvent<AlternativeVerb> args)
     {
-        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
+        if (args.Hands == null || !args.CanAccess || !args.CanInteract || _lock.IsLocked(uid))
             return;
 
-        Verb verb;
+        AlternativeVerb verb;
         if (comp.Opened)
         {
             if (!comp.Closeable)
@@ -78,7 +103,8 @@ private void AddOpenCloseVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEv
             {
                 Text = Loc.GetString(comp.CloseVerbText),
                 Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
-                Act = () => TryClose(args.Target, comp, args.User)
+                Act = () => TryClose(args.Target, comp, args.User),
+                // this verb is lower priority than drink verb (2) so it doesn't conflict
             };
         }
         else
@@ -116,6 +142,13 @@ private void OnAttemptAddFizziness(Entity<OpenableComponent> entity, ref Attempt
             args.Cancelled = true;
     }
 
+    private void OnLockToggleAttempt(Entity<OpenableComponent> ent, ref LockToggleAttemptEvent args)
+    {
+        // can't lock something while it's open
+        if (ent.Comp.Opened)
+            args.Cancelled = true;
+    }
+
     /// <summary>
     /// Returns true if the entity either does not have OpenableComponent or it is opened.
     /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
@@ -189,7 +222,12 @@ public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp =
     /// <returns>Whether it got opened</returns>
     public bool TryOpen(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
     {
-        if (!Resolve(uid, ref comp, false) || comp.Opened)
+        if (!Resolve(uid, ref comp, false) || comp.Opened || _lock.IsLocked(uid))
+            return false;
+
+        var ev = new OpenableOpenAttemptEvent(user);
+        RaiseLocalEvent(uid, ref ev);
+        if (ev.Cancelled)
             return false;
 
         SetOpen(uid, true, comp, user);
@@ -211,6 +249,18 @@ public bool TryClose(EntityUid uid, OpenableComponent? comp = null, EntityUid? u
             _audio.PlayPredicted(comp.CloseSound, uid, user);
         return true;
     }
+
+    /// <summary>
+    /// If opened, tries closing it if it's closeable.
+    /// If closed, tries opening it.
+    /// </summary>
+    public bool TryToggle(Entity<OpenableComponent> ent, EntityUid? user)
+    {
+        if (ent.Comp.Opened && ent.Comp.Closeable)
+            return TryClose(ent, ent.Comp, user);
+
+        return TryOpen(ent, ent.Comp, user);
+    }
 }
 
 /// <summary>
@@ -224,3 +274,9 @@ public record struct OpenableOpenedEvent(EntityUid? User = null);
 /// </summary>
 [ByRefEvent]
 public record struct OpenableClosedEvent(EntityUid? User = null);
+
+/// <summary>
+/// Raised before trying to open an Openable.
+/// </summary>
+[ByRefEvent]
+public record struct OpenableOpenAttemptEvent(EntityUid? User, bool Cancelled = false);
diff --git a/Resources/Prototypes/Entities/Structures/Storage/base_cabinet.yml b/Resources/Prototypes/Entities/Structures/Storage/base_cabinet.yml
new file mode 100644
index 000000000000..9fcbb0241620
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/base_cabinet.yml
@@ -0,0 +1,44 @@
+- type: entity
+  abstract: true
+  id: BaseItemCabinet
+  components:
+  - type: Openable
+    openOnActivate: true
+    closeable: true
+    sound:
+      path: /Audio/Machines/machine_switch.ogg
+    closeSound:
+      path: /Audio/Machines/machine_switch.ogg
+  - type: ItemCabinet
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      ItemCabinet: !type:ContainerSlot
+  - type: Appearance
+  # perfect for most things but you can always replace it
+  - type: GenericVisualizer
+    visuals:
+      enum.ItemCabinetVisuals.ContainsItem:
+        enum.ItemCabinetVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: { state: open }
+          False: { state: closed }
+
+- type: entity
+  abstract: true
+  parent: BaseItemCabinet
+  id: BaseItemCabinetGlass
+  components:
+  - type: GenericVisualizer
+    visuals:
+      enum.ItemCabinetVisuals.ContainsItem:
+        enum.ItemCabinetVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: { state: glass-up }
+          False: { state: glass }
diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
index 8177b6b6f0d3..c868bbbc332d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -1,15 +1,12 @@
 - type: entity
+  parent: [BaseStructureDynamic, BaseItemCabinetGlass]
   id: BaseGlassBox
-  parent: BaseStructureDynamic
   abstract: true
-  placement:
-    mode: SnapgridCenter
   components:
   - type: Transform
     anchored: true
   - type: Physics
     bodyType: Static
-  - type: Clickable
   - type: InteractionOutline
   - type: Fixtures
     fixtures:
@@ -23,13 +20,8 @@
         layer:
         - MidImpassable
         - LowImpassable
-  - type: ItemSlots
-  - type: ContainerContainer
-    containers:
-      ItemCabinet: !type:ContainerSlot
   - type: Anchorable
     delay: 4
-  - type: Appearance
 
 - type: entity
   id: GlassBox
@@ -44,10 +36,10 @@
     layers:
     - state: base
     - state: caplaser # TODO: Remove it after item scaling in cabinets is implemented.
-      map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+      map: ["enum.ItemCabinetVisuals.Layer"]
       visible: true
     - state: glass
-      map: ["enum.ItemCabinetVisualLayers.Door"]
+      map: ["enum.OpenableVisuals.Layer"]
     - state: locked
       shader: unshaded
       map: ["enum.LockVisualLayers.Lock"]
@@ -118,49 +110,39 @@
   - type: Construction
     graph: GlassBox
     node: glassBox
-  - type: ItemCabinet
-    cabinetSlot:
-      ejectOnInteract: true
-      whitelist:
-        tags:
-        - WeaponAntiqueLaser
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: glass-up
-    closedState: glass
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        ejectOnInteract: true
+        whitelist:
+          tags:
+          - WeaponAntiqueLaser
+        ejectSound: /Audio/Machines/machine_switch.ogg
 
 - type: entity
   id: GlassBoxLaserOpen
   parent: GlassBoxLaser
   suffix: AntiqueLaser, Open
   components:
+  - type: Openable
+    opened: true
   - type: Lock
     locked: false
-  - type: ItemCabinet
-    opened: true
 
 - type: entity
   id: GlassBoxLaserFilled
   parent: GlassBoxLaser
   suffix: AntiqueLaser, Filled
   components:
-  - type: ItemCabinet
-    cabinetSlot:
-      startingItem: WeaponAntiqueLaser
-      ejectOnInteract: true
-      whitelist:
-        tags:
-        - WeaponAntiqueLaser
+  - type: ContainerFill
+    containers:
+      ItemCabinet:
+      - WeaponAntiqueLaser
 
 - type: entity
+  parent: [GlassBoxLaserFilled, GlassBoxLaserOpen]
   id: GlassBoxLaserFilledOpen
-  parent: GlassBoxLaserFilled
   suffix: AntiqueLaser, Filled, Open
-  components:
-  - type: Lock
-    locked: false
-  - type: ItemCabinet
-    opened: true
 
 - type: entity
   id: GlassBoxFrame
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
index d9f4a827ccd4..18b218b35169 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
@@ -1,100 +1,74 @@
-- type: entity
+# TODO: same as other wallmount cabinets they should use a base structure prototype
+- type: entity
+  parent: BaseItemCabinet
   id: DefibrillatorCabinet
   name: defibrillator cabinet
   description: A small wall mounted cabinet designed to hold a defibrillator.
+  placement:
+    mode: SnapgridCenter
   components:
-    - type: WallMount
-      arc: 175
-    - type: Transform
-      anchored: true
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      sprite: Structures/Wallmounts/defib_cabinet.rsi
-      noRot: false
-      layers:
-      - state: frame
-      - state: fill
-        map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
-        visible: true
-      - state: closed
-        map: ["enum.ItemCabinetVisualLayers.Door"]
-    - type: ItemCabinet
-      cabinetSlot:
+  - type: WallMount
+    arc: 175
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Wallmounts/defib_cabinet.rsi
+    noRot: false
+    layers:
+    - state: frame
+    - state: fill
+      map: ["enum.ItemCabinetVisuals.Layer"]
+      visible: true
+    - state: closed
+      map: ["enum.OpenableVisuals.Layer"]
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
         ejectOnInteract: true
         whitelist:
           components:
           - Defibrillator
-      doorSound:
-        path: /Audio/Machines/machine_switch.ogg
-      openState: open
-      closedState: closed
-    - type: Appearance
-    - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        ItemCabinet: !type:ContainerSlot
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 80
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 40
-          behaviors:
-            - !type:EmptyAllContainersBehaviour
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalGlassBreak
-  placement:
-    mode: SnapgridCenter
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger: !type:DamageTrigger
+        damage: 80
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger: !type:DamageTrigger
+        damage: 40
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
 
 - type: entity
-  id: DefibrillatorCabinetOpen
   parent: DefibrillatorCabinet
+  id: DefibrillatorCabinetOpen
   suffix: Open
   components:
-  - type: ItemCabinet
+  - type: Openable
     opened: true
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: open
-    closedState: closed
 
 - type: entity
-  id: DefibrillatorCabinetFilled
   parent: DefibrillatorCabinet
+  id: DefibrillatorCabinetFilled
   suffix: Filled
   components:
-  - type: ItemCabinet
-    cabinetSlot:
-      ejectOnInteract: true
-      startingItem: Defibrillator
-      whitelist:
-        components:
-        - Defibrillator
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: open
-    closedState: closed
+  - type: ContainerFill
+    containers:
+      ItemCabinet:
+      - Defibrillator
 
 - type: entity
+  parent: [DefibrillatorCabinetFilled, DefibrillatorCabinetOpen]
   id: DefibrillatorCabinetFilledOpen
-  parent: DefibrillatorCabinetFilled
   suffix: Filled, Open
-  components:
-  - type: ItemCabinet
-    opened: true
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: open
-    closedState: closed
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
index a0775641ef2d..7e6a1632a783 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -1,7 +1,12 @@
-- type: entity
+# TODO: this could probably use some kind of base structure prototype
+# every wallmount cabinet copypastes placement and like 8 components
+- type: entity
+  parent: BaseItemCabinet
   id: ExtinguisherCabinet
   name: extinguisher cabinet
   description: A small wall mounted cabinet designed to hold a fire extinguisher.
+  placement:
+    mode: SnapgridCenter
   components:
     - type: WallMount
       arc: 360
@@ -15,25 +20,17 @@
       layers:
       - state: frame
       - state: extinguisher
-        map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+        map: ["enum.ItemCabinetVisuals.Layer"]
         visible: true
       - state: closed
-        map: ["enum.ItemCabinetVisualLayers.Door"]
-    - type: ItemCabinet
-      cabinetSlot:
-        ejectOnInteract: true
-        whitelist:
-          components:
-          - FireExtinguisher
-      doorSound:
-        path: /Audio/Machines/machine_switch.ogg
-      openState: open
-      closedState: closed
-    - type: Appearance
+        map: ["enum.OpenableVisuals.Layer"]
     - type: ItemSlots
-    - type: ContainerContainer
-      containers:
-        ItemCabinet: !type:ContainerSlot
+      slots:
+        ItemCabinet:
+          ejectOnInteract: true
+          whitelist:
+            components:
+            - FireExtinguisher
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: Metallic
@@ -57,46 +54,26 @@
                 collection: MetalGlassBreak
                 params:
                   volume: -4
-  placement:
-    mode: SnapgridCenter
 
 - type: entity
-  id: ExtinguisherCabinetOpen
   parent: ExtinguisherCabinet
+  id: ExtinguisherCabinetOpen
   suffix: Open
   components:
-  - type: ItemCabinet
+  - type: Openable
     opened: true
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: open
-    closedState: closed
 
 - type: entity
-  id: ExtinguisherCabinetFilled
   parent: ExtinguisherCabinet
+  id: ExtinguisherCabinetFilled
   suffix: Filled
   components:
-  - type: ItemCabinet
-    cabinetSlot:
-      ejectOnInteract: true
-      startingItem: FireExtinguisher
-      whitelist:
-        components:
-        - FireExtinguisher
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: open
-    closedState: closed
+  - type: ContainerFill
+    containers:
+      ItemCabinet:
+      - FireExtinguisher
 
 - type: entity
+  parent: [ExtinguisherCabinetFilled, ExtinguisherCabinetOpen]
   id: ExtinguisherCabinetFilledOpen
-  parent: ExtinguisherCabinetFilled
   suffix: Filled, Open
-  components:
-  - type: ItemCabinet
-    opened: true
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: open
-    closedState: closed
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
index acd865aa6258..42b528ce68df 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -1,29 +1,33 @@
+# TODO: same as fire extinguisher make it use a base structure theres lots of copy paste
 - type: entity
+  parent: BaseItemCabinetGlass
   id: FireAxeCabinet
   name: fire axe cabinet
   description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if.
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Glass
   - type: Destructible
     thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 300
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-      - trigger:
-          !type:DamageTrigger
-          damage: 200 #20ish crowbar hits
-        behaviors:
-        - !type:EmptyAllContainersBehaviour
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-        - !type:PlaySoundBehavior
-          sound:
-            collection: MetalGlassBreak
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 200 #20ish crowbar hits
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: MeleeSound
     soundGroups:
       Brute:
@@ -36,68 +40,42 @@
     layers:
     - state: cabinet
     - state: fireaxe
-      map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+      map: ["enum.ItemCabinetVisuals.Layer"]
       visible: true
     - state: glass
-      map: ["enum.ItemCabinetVisualLayers.Door"]
-  - type: ItemCabinet
-    cabinetSlot:
-      ejectOnInteract: true
-      whitelist:
-        tags:
-        - FireAxe
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: glass-up
-    closedState: glass
-  - type: Appearance
+      map: ["enum.OpenableVisuals.Layer"]
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        ejectOnInteract: true
+        whitelist:
+          tags:
+          - FireAxe
   - type: Lock
   - type: AccessReader
     access: [["Atmospherics"], ["Command"]]
-  - type: ItemSlots
-  - type: ContainerContainer
-    containers:
-      ItemCabinet: !type:ContainerSlot
-  placement:
-    mode: SnapgridCenter
 
 - type: entity
-  id: FireAxeCabinetOpen
   parent: FireAxeCabinet
+  id: FireAxeCabinetOpen
   suffix: Open
   components:
-  - type: ItemCabinet
+  - type: Openable
     opened: true
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: glass-up
-    closedState: glass
+  - type: Lock
+    locked: false
 
 - type: entity
-  id: FireAxeCabinetFilled
   parent: FireAxeCabinet
+  id: FireAxeCabinetFilled
   suffix: Filled
   components:
-  - type: ItemCabinet
-    cabinetSlot:
-      startingItem: FireAxe
-      ejectOnInteract: true
-      whitelist:
-        tags:
-        - FireAxe
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: glass-up
-    closedState: glass
+  - type: ContainerFill
+    containers:
+      ItemCabinet:
+      - FireAxe
 
 - type: entity
+  parent: [FireAxeCabinetFilled, FireAxeCabinetOpen]
   id: FireAxeCabinetFilledOpen
-  parent: FireAxeCabinetFilled
   suffix: Filled, Open
-  components:
-  - type: ItemCabinet
-    opened: true
-    doorSound:
-      path: /Audio/Machines/machine_switch.ogg
-    openState: glass-up
-    closedState: glass
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml
index fcbceb594b84..ae48f2b3ddc1 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml
@@ -9,39 +9,41 @@
     layers:
     - state: cabinet
     - state: shotgun
-      map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+      map: ["enum.ItemCabinetVisuals.Layer"]
       visible: true
     - state: glass
-      map: ["enum.ItemCabinetVisualLayers.Door"]
-  - type: ItemCabinet
-    cabinetSlot:
-      ejectOnInteract: true
-      whitelist:
-        tags:
-        - WeaponShotgunKammerer
+      map: ["enum.OpenableVisuals.Layer"]
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        ejectOnInteract: true
+        whitelist:
+          tags:
+          - WeaponShotgunKammerer
   - type: AccessReader
     access: [["Security"], ["Command"]]
 
 - type: entity
+  parent: ShotGunCabinet
   id: ShotGunCabinetOpen
-  parent: [ShotGunCabinet, FireAxeCabinetOpen]
   suffix: Open
+  components:
+  - type: Openable
+    opened: true
+  - type: Lock
+    locked: false
 
 - type: entity
+  parent: ShotGunCabinet
   id: ShotGunCabinetFilled
-  parent: [ShotGunCabinet,FireAxeCabinetFilled]
   suffix: Filled
   components:
-  - type: ItemCabinet
-    cabinetSlot:
-      startingItem: WeaponShotgunKammerer
-      ejectOnInteract: true
-      whitelist:
-        tags:
-        - WeaponShotgunKammerer
+  - type: ContainerFill
+    containers:
+      ItemCabinet:
+      - WeaponShotgunKammerer
 
 - type: entity
+  parent: [ShotGunCabinetFilled, ShotGunCabinetOpen]
   id: ShotGunCabinetFilledOpen
-  parent: [ShotGunCabinetFilled,FireAxeCabinetFilledOpen]
   suffix: Filled, Open
-

From 241b8d8be5d3dc0391121ae22f0c21d25f297b35 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Wed, 29 May 2024 16:34:41 -0800
Subject: [PATCH 130/568] Fix flow rate display (#28372)

---
 .../Piping/Binary/EntitySystems/GasPassiveGateSystem.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
index fced4d79884a..008d3cb4ce61 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs
@@ -39,7 +39,7 @@ private void OnPassiveGateUpdated(EntityUid uid, GasPassiveGateComponent gate, r
             var T2 = outlet.Air.Temperature;
             var pressureDelta = P1 - P2;
 
-            float dt = 1/_atmosphereSystem.AtmosTickRate;
+            float dt = args.dt;
             float dV = 0;
             var denom = (T1*V2 + T2*V1);
 
@@ -63,7 +63,9 @@ private void OnPassiveGateUpdated(EntityUid uid, GasPassiveGateComponent gate, r
                 var transferMoles = n1 - (n1+n2)*T2*V1 / denom;
 
                 // Get the volume transfered to update our flow meter.
-                dV = n1*Atmospherics.R*T1/P1;
+                // When you remove x from one side and add x to the other the total difference is 2x.
+                // Also account for atmos speedup so that measured flow rate matches the setting on the volume pump.
+                dV = 2*transferMoles*Atmospherics.R*T1/P1 / _atmosphereSystem.Speedup;
 
                 // Actually transfer the gas.
                 _atmosphereSystem.Merge(outlet.Air, inlet.Air.Remove(transferMoles));

From a6a54baf0d3f725499ab5ea831579e190e752402 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 30 May 2024 00:35:48 +0000
Subject: [PATCH 131/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5dc65ddaf0e4..f5b8095c90f4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Renamed Uplink categories and moved items to fit new category names.
-    type: Tweak
-  id: 6140
-  time: '2024-03-13T09:47:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25079
 - author: veprolet
   changes:
   - message: Injectors like the syringe can now toggle their transfer amount using
@@ -3865,3 +3858,10 @@
   id: 6639
   time: '2024-05-29T16:46:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28386
+- author: notafet
+  changes:
+  - message: Fix passive gate flow rate display.
+    type: Fix
+  id: 6640
+  time: '2024-05-30T00:34:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28372

From aa94a85721b37ec9f1fbe0d8a62bdc54eb6c288e Mon Sep 17 00:00:00 2001
From: Lamrr <96937466+Lamrr@users.noreply.github.com>
Date: Thu, 30 May 2024 14:15:30 +1000
Subject: [PATCH 132/568] Fix some abnormally high-capacity boxes (#28314)

---
 .../Catalog/Fills/Boxes/general.yml           | 123 ++++++------------
 .../Catalog/Fills/Boxes/syndicate.yml         |  20 +++
 .../Entities/Objects/Misc/candles.yml         |   3 +
 Resources/Prototypes/tags.yml                 |   3 +
 4 files changed, 66 insertions(+), 83 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 5b3f88c1bbd8..85ee9f9ab894 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -39,10 +39,6 @@
   id: BoxLightbulb
   description: This box is shaped on the inside so that only light tubes and bulbs fit.
   components:
-  - type: StorageFill
-    contents:
-      - id: LightBulb
-        amount: 12
   - type: Sprite
     layers:
       - state: box
@@ -53,50 +49,40 @@
     whitelist:
       components:
       - LightBulb
+  - type: StorageFill
+    contents:
+      - id: LightBulb
+        amount: 12
 
 - type: entity
   name: lighttube box
-  parent: BoxCardboard
+  parent: BoxLightbulb
   id: BoxLighttube
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
   components:
-  - type: StorageFill
-    contents:
-      - id: LightTube
-        amount: 12
   - type: Sprite
     layers:
       - state: box
       - state: lighttube
-  - type: Storage
-    grid:
-    - 0,0,5,3
-    whitelist:
-      components:
-      - LightBulb
+  - type: StorageFill
+    contents:
+      - id: LightTube
+        amount: 12
 
 - type: entity
   name: mixed lights box
-  parent: BoxCardboard
+  parent: BoxLightbulb
   id: BoxLightMixed
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
   components:
+  - type: Sprite
+    layers:
+      - state: box
+      - state: lightmixed
   - type: StorageFill
     contents:
       - id: LightTube
         amount: 6
       - id: LightBulb
         amount: 6
-  - type: Sprite
-    layers:
-      - state: box
-      - state: lightmixed
-  - type: Storage
-    grid:
-    - 0,0,5,3
-    whitelist:
-      components:
-      - LightBulb
 
 - type: entity
   name: PDA box
@@ -366,28 +352,6 @@
         amount: 2
   - type: Storage
 
-- type: entity
-  name: deathrattle implant box
-  parent: BoxCardboard
-  id: BoxDeathRattleImplants
-  description: Six deathrattle implants and handheld GPS devices for the whole squad.
-  components:
-  - type: Item
-    size: Normal
-  - type: StorageFill
-    contents:
-      - id: DeathRattleImplanter
-        amount: 6
-      - id: HandheldGPSBasic
-        amount: 6
-  - type: Storage
-    grid:
-    - 0,0,5,3
-  - type: Sprite
-    layers:
-      - state: box
-      - state: syringe
-
 - type: entity
   name: lead-lined box
   parent: BoxCardboard
@@ -404,6 +368,7 @@
   name: candle box
   parent: BoxCardboard
   id: BoxCandle
+  description: This box is specifically moulded to only carry candles.
   components:
   - type: Sprite
     layers:
@@ -411,67 +376,59 @@
       - state: candle
   - type: Storage
     grid:
-    - 0,0,9,2
+    - 0,0,5,3
+    whitelist:
+      tags:
+      - Candle
   - type: StorageFill
     contents:
       - id: Candle
-        amount: 3
+        amount: 4
       - id: CandleBlue
-        amount: 3
+        amount: 2
       - id: CandleRed
-        amount: 3
+        amount: 2
       - id: CandleGreen
-        amount: 3
+        amount: 2
       - id: CandlePurple
-        amount: 3
+        amount: 2
 
 - type: entity
   name: small candle box
-  parent: BoxCardboard
+  parent: BoxCandle
   id: BoxCandleSmall
   components:
-  - type: Sprite
-    layers:
-      - state: box
-      - state: candle
-  - type: Storage
-    grid:
-    - 0,0,9,2
   - type: StorageFill
     contents:
       - id: CandleSmall
-        amount: 5
+        amount: 8
       - id: CandleBlueSmall
-        amount: 5
+        amount: 4
       - id: CandleRedSmall
-        amount: 5
+        amount: 4
       - id: CandleGreenSmall
-        amount: 5
+        amount: 4
       - id: CandlePurpleSmall
-        amount: 5
+        amount: 4
 
 - type: entity
   name: darts box
   parent: BoxCardboard
   id: BoxDarts
-  description: This box filled with colorful darts.
+  description: A box filled with colorful darts.
   components:
-  - type: Item
-    size: Normal
+  - type: Sprite
+    layers:
+      - state: box
+      - state: darts
   - type: StorageFill
     contents:
       - id: Dart
-        amount: 3
+        amount: 2
       - id: DartBlue
-        amount: 3
+        amount: 2
       - id: DartPurple
-        amount: 3
+        amount: 2
       - id: DartYellow
-        amount: 3
-  - type: Storage
-    grid:
-    - 0,0,5,3
-  - type: Sprite
-    layers:
-      - state: box
-      - state: darts
+        amount: 2
+
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index d2e889c937d5..2bfca8362a36 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -49,3 +49,23 @@
     layers:
       - state: box_of_doom
       - state: throwing_knives
+
+- type: entity
+  name: deathrattle implant box
+  parent: BoxCardboard
+  id: BoxDeathRattleImplants
+  description: Six deathrattle implants and handheld GPS devices for the whole squad.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: syringe
+  - type: Storage
+    grid:
+    - 0,0,5,3
+  - type: StorageFill
+    contents:
+      - id: DeathRattleImplanter
+        amount: 6
+      - id: HandheldGPSBasic
+        amount: 6
diff --git a/Resources/Prototypes/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
index bef37e5fd087..55d3ecb9d350 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/candles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
@@ -4,6 +4,9 @@
   id: Candle
   description: A thin wick threaded through fat.
   components:
+    - type: Tag
+      tags:
+      - Candle
     - type: Sprite
       noRot: true
       sprite: Objects/Misc/candles.rsi
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 439ad47c0f80..d60b6329865b 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -254,6 +254,9 @@
 
 - type: Tag
   id: CableCoil
+  
+- type: Tag
+  id: Candle
 
 - type: Tag
   id: Cake

From 620ce8fb2a6b37ebf9d2a6c2df9a1f2e2dcc535c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 30 May 2024 04:16:37 +0000
Subject: [PATCH 133/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f5b8095c90f4..10ba127a8876 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: veprolet
-  changes:
-  - message: Injectors like the syringe can now toggle their transfer amount using
-      alternative interactions.
-    type: Tweak
-  id: 6141
-  time: '2024-03-13T10:00:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25566
 - author: Dutch-VanDerLinde
   changes:
   - message: Zombies can now wideswing, similar to how a space carp would.
@@ -3865,3 +3857,10 @@
   id: 6640
   time: '2024-05-30T00:34:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28372
+- author: Lamrr
+  changes:
+  - message: Candle boxes can now only hold candles.
+    type: Tweak
+  id: 6641
+  time: '2024-05-30T04:15:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28314

From 3efd7559b02105a5b1266fc30106b5dd5ca2aa79 Mon Sep 17 00:00:00 2001
From: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Date: Thu, 30 May 2024 00:18:07 -0400
Subject: [PATCH 134/568] Fixed hypo and injector entities going into disposal
 units (#28317)

---
 .../EntitySystems/HypospraySystem.cs          | 21 +++--
 .../Chemistry/EntitySystems/InjectorSystem.cs | 80 +++++++++----------
 2 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 56cc0f967093..7b70497c7d3f 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -35,16 +35,16 @@ public override void Initialize()
         SubscribeLocalEvent<HyposprayComponent, UseInHandEvent>(OnUseInHand);
     }
 
-    private void UseHypospray(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
+    private bool TryUseHypospray(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
     {
         // if target is ineligible but is a container, try to draw from the container
         if (!EligibleEntity(target, EntityManager, entity)
             && _solutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
         {
-            TryDraw(entity, target, drawableSolution.Value, user);
+            return TryDraw(entity, target, drawableSolution.Value, user);
         }
 
-        TryDoInject(entity, target, user);
+        return TryDoInject(entity, target, user);
     }
 
     private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent args)
@@ -52,8 +52,7 @@ private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent a
         if (args.Handled)
             return;
 
-        TryDoInject(entity, args.User, args.User);
-        args.Handled = true;
+        args.Handled = TryDoInject(entity, args.User, args.User);
     }
 
     public void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteractEvent args)
@@ -61,8 +60,7 @@ public void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteract
         if (args.Handled || !args.CanReach || args.Target == null)
             return;
 
-        UseHypospray(entity, args.Target.Value, args.User);
-        args.Handled = true;
+        args.Handled = TryUseHypospray(entity, args.Target.Value, args.User);
     }
 
     public void OnAttack(Entity<HyposprayComponent> entity, ref MeleeHitEvent args)
@@ -150,12 +148,12 @@ public bool TryDoInject(Entity<HyposprayComponent> entity, EntityUid target, Ent
         return true;
     }
 
-    private void TryDraw(Entity<HyposprayComponent> entity, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution, EntityUid user)
+    private bool TryDraw(Entity<HyposprayComponent> entity, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution, EntityUid user)
     {
         if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln,
                 out var solution) || solution.AvailableVolume == 0)
         {
-            return;
+            return false;
         }
 
         // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
@@ -168,19 +166,20 @@ private void TryDraw(Entity<HyposprayComponent> entity, Entity<BloodstreamCompon
                 Loc.GetString("injector-component-target-is-empty-message",
                     ("target", Identity.Entity(target, EntityManager))),
                 entity.Owner, user);
-            return;
+            return false;
         }
 
         var removedSolution = _solutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
 
         if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
         {
-            return;
+            return false;
         }
 
         _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
             ("amount", removedSolution.Volume),
             ("target", Identity.Entity(target, EntityManager))), entity.Owner, user);
+        return true;
     }
 
     private bool EligibleEntity(EntityUid entity, IEntityManager entMan, HyposprayComponent component)
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index 77c8620ea49f..aac171371fb1 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -29,50 +29,43 @@ public override void Initialize()
         SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
     }
 
-    private void UseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
+    private bool TryUseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
     {
         // Handle injecting/drawing for solutions
         if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
         {
             if (SolutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
-            {
-                TryInject(injector, target, injectableSolution.Value, user, false);
-            }
-            else if (SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
-            {
-                TryInject(injector, target, refillableSolution.Value, user, true);
-            }
-            else if (TryComp<BloodstreamComponent>(target, out var bloodstream))
-            {
-                TryInjectIntoBloodstream(injector, (target, bloodstream), user);
-            }
-            else
-            {
-                Popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
-                    ("target", Identity.Entity(target, EntityManager))), injector, user);
-            }
+                return TryInject(injector, target, injectableSolution.Value, user, false);
+
+            if (SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
+                return TryInject(injector, target, refillableSolution.Value, user, true);
+
+            if (TryComp<BloodstreamComponent>(target, out var bloodstream))
+                return TryInjectIntoBloodstream(injector, (target, bloodstream), user);
+
+            Popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
+                ("target", Identity.Entity(target, EntityManager))), injector, user);
+            return false;
         }
-        else if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
+
+        if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
         {
             // Draw from a bloodstream, if the target has that
             if (TryComp<BloodstreamComponent>(target, out var stream) &&
                 SolutionContainers.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
             {
-                TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
-                return;
+                return TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
             }
 
             // Draw from an object (food, beaker, etc)
             if (SolutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
-            {
-                TryDraw(injector, target, drawableSolution.Value, user);
-            }
-            else
-            {
-                Popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
-                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            }
+                return TryDraw(injector, target, drawableSolution.Value, user);
+
+            Popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
+                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return false;
         }
+        return false;
     }
 
     private void OnInjectDoAfter(Entity<InjectorComponent> entity, ref InjectorDoAfterEvent args)
@@ -80,8 +73,7 @@ private void OnInjectDoAfter(Entity<InjectorComponent> entity, ref InjectorDoAft
         if (args.Cancelled || args.Handled || args.Args.Target == null)
             return;
 
-        UseInjector(entity, args.Args.Target.Value, args.Args.User);
-        args.Handled = true;
+        args.Handled = TryUseInjector(entity, args.Args.Target.Value, args.Args.User);
     }
 
     private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref AfterInteractEvent args)
@@ -105,8 +97,7 @@ private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref After
             return;
         }
 
-        UseInjector(entity, target, args.User);
-        args.Handled = true;
+        args.Handled = TryUseInjector(entity, target, args.User);
     }
 
     /// <summary>
@@ -214,7 +205,7 @@ private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target,
         });
     }
 
-    private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
+    private bool TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
         EntityUid user)
     {
         // Get transfer amount. May be smaller than _transferAmount if not enough room
@@ -224,7 +215,7 @@ private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
             Popup.PopupEntity(
                 Loc.GetString("injector-component-cannot-inject-message",
                     ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            return;
+            return false;
         }
 
         var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
@@ -233,7 +224,7 @@ private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
             Popup.PopupEntity(
                 Loc.GetString("injector-component-cannot-inject-message",
                     ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            return;
+            return false;
         }
 
         // Move units from attackSolution to targetSolution
@@ -249,14 +240,15 @@ private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
 
         Dirty(injector);
         AfterInject(injector, target);
+        return true;
     }
 
-    private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity,
+    private bool TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity,
         Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
     {
         if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
                 out var solution) || solution.Volume == 0)
-            return;
+            return false;
 
         // Get transfer amount. May be smaller than _transferAmount if not enough room
         var realTransferAmount =
@@ -268,7 +260,7 @@ private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntit
                 Loc.GetString("injector-component-target-already-full-message",
                     ("target", Identity.Entity(targetEntity, EntityManager))),
                 injector.Owner, user);
-            return;
+            return false;
         }
 
         // Move units from attackSolution to targetSolution
@@ -291,6 +283,7 @@ private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntit
 
         Dirty(injector);
         AfterInject(injector, targetEntity);
+        return true;
     }
 
     private void AfterInject(Entity<InjectorComponent> injector, EntityUid target)
@@ -321,13 +314,13 @@ private void AfterDraw(Entity<InjectorComponent> injector, EntityUid target)
         RaiseLocalEvent(target, ref ev);
     }
 
-    private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target,
+    private bool TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target,
         Entity<SolutionComponent> targetSolution, EntityUid user)
     {
         if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
                 out var solution) || solution.AvailableVolume == 0)
         {
-            return;
+            return false;
         }
 
         // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
@@ -340,14 +333,14 @@ private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamCompo
                 Loc.GetString("injector-component-target-is-empty-message",
                     ("target", Identity.Entity(target, EntityManager))),
                 injector.Owner, user);
-            return;
+            return false;
         }
 
         // We have some snowflaked behavior for streams.
         if (target.Comp != null)
         {
             DrawFromBlood(injector, (target.Owner, target.Comp), soln.Value, realTransferAmount, user);
-            return;
+            return true;
         }
 
         // Move units from attackSolution to targetSolution
@@ -355,7 +348,7 @@ private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamCompo
 
         if (!SolutionContainers.TryAddSolution(soln.Value, removedSolution))
         {
-            return;
+            return false;
         }
 
         Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
@@ -364,6 +357,7 @@ private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamCompo
 
         Dirty(injector);
         AfterDraw(injector, target);
+        return true;
     }
 
     private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,

From ce2446a6125c2666954eda4a1c559c437c7097b1 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 30 May 2024 04:19:13 +0000
Subject: [PATCH 135/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 10ba127a8876..60289bd35b48 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Zombies can now wideswing, similar to how a space carp would.
-    type: Tweak
-  id: 6142
-  time: '2024-03-13T10:02:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26064
 - author: Krunk
   changes:
   - message: Clown & Jester shoes can now hold plastic knives and cap guns! All clowning,
@@ -3864,3 +3857,10 @@
   id: 6641
   time: '2024-05-30T04:15:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28314
+- author: blueDev2
+  changes:
+  - message: Epipens can be disposed
+    type: Fix
+  id: 6642
+  time: '2024-05-30T04:18:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28317

From e2bf127323ebf48c99c1ecf473de878a1ce5d88d 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 136/568] Move ApcPowerReceiverComponent Powered state to
 shared (#28206)

* Try syncing powered state to client

For some reason the client is not receiving the ApcPowerReceiverComponentState, so it's not working.

* Fix powered state not syncing to client

The client PowerReceiverSystem was abstract, which prevented it from
running initialize.

* Flip check so that it runs bigger checks first

PowerDisabled skips the others.
NeedsPower skips the receiving check.

* Disallow changing Powered manually

* Move Powered update to PowerReceiverSystem

* Move appearance to event subscription

* Move metadata component to AllEntityQuery

* Cleanup

* Move Powered update back to PowerNetSystem

It's easier to use the EntityQueries and it dosen't need to be updated
anywhere else.

* Put appearance updating back

* Move IsPowered to shared

* Simplify IsPowered

* Cleanup

* Remove duplicate PowerChangedEvent

PowerChangedEvent on ProviderChanged doesn't seem to be needed
PowerChangedEvent gets raised by in update if the power state changes
after a new provider is connected
---
 .../Components/ApcPowerReceiverComponent.cs   |  8 +++++
 .../EntitySystems/PowerReceiverSystem.cs      | 23 ++++++++++++++
 .../Components/ApcPowerReceiverComponent.cs   | 18 ++++-------
 .../Power/EntitySystems/PowerNetSystem.cs     | 21 +++++++++----
 .../EntitySystems/PowerReceiverSystem.cs      | 30 +++++++++++++------
 .../ApcPowerReceiverComponentState.cs         |  9 ++++++
 .../SharedApcPowerReceiverComponent.cs        | 10 +++++++
 .../SharedPowerReceiverSystem.cs              |  6 ++++
 8 files changed, 98 insertions(+), 27 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 000000000000..fbebcb7cf83a
--- /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 000000000000..4d56592c2322
--- /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 b8340d0be4b1..9a68e2aabb89 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 07ecc2eafb0e..7bd057951c9b 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -19,6 +19,7 @@ public sealed class PowerNetSystem : EntitySystem
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly PowerNetConnectorSystem _powerNetConnector = default!;
         [Dependency] private readonly IParallelManager _parMan = default!;
+        [Dependency] private readonly PowerReceiverSystem _powerReceiver = default!;
 
         private readonly PowerState _powerState = new();
         private readonly HashSet<PowerNet> _powerNetReconnectQueue = new();
@@ -302,19 +303,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 048fda23553a..51520f046446 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -6,15 +6,18 @@
 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;
 
 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!;
@@ -38,6 +41,8 @@ public override void Initialize()
             SubscribeLocalEvent<ApcPowerReceiverComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
             SubscribeLocalEvent<PowerSwitchComponent, GetVerbsEvent<AlternativeVerb>>(AddSwitchPowerVerb);
 
+            SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentGetState>(OnGetState);
+
             _recQuery = GetEntityQuery<ApcPowerReceiverComponent>();
             _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
@@ -140,14 +145,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>
@@ -155,12 +164,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>
@@ -192,5 +199,10 @@ public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerRece
 
             return !receiver.PowerDisabled; // i.e. PowerEnabled
         }
+
+        public void SetLoad(ApcPowerReceiverComponent comp, float load)
+        {
+            comp.Load = load;
+        }
     }
 }
diff --git a/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs b/Content.Shared/Power/Components/ApcPowerReceiverComponentState.cs
new file mode 100644
index 000000000000..9b18d6ad938f
--- /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 000000000000..d73993357a3c
--- /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 000000000000..be2a9dc3abc6
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Power.EntitySystems;
+
+public abstract class SharedPowerReceiverSystem : EntitySystem
+{
+
+}

From e4a5f2a1450d226bf281e46f1323f41213707bb6 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 30 May 2024 17:32:16 +1000
Subject: [PATCH 137/568] Predict ActivatableUIRequiresPower (#28405)

A lot of BUIs aren't going to handle the state coming in cleanly but we can fix em as we find em.
---
 .../Power/ActivatableUIRequiresPowerSystem.cs | 22 +++++++++++-------
 .../Power/EntitySystems/StaticPowerSystem.cs  | 16 +++++++++++++
 .../ActivatableUIRequiresPowerSystem.cs       | 23 +++++++++----------
 .../SharedActivatableUIRequiresPowerSystem.cs | 15 ++++++++++++
 4 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 Content.Client/Power/EntitySystems/StaticPowerSystem.cs
 create mode 100644 Content.Shared/Power/EntitySystems/SharedActivatableUIRequiresPowerSystem.cs

diff --git a/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs b/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs
index 60ed8d87b9e6..5a082485a5ac 100644
--- a/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs
+++ b/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs
@@ -1,21 +1,27 @@
+using Content.Client.Power.EntitySystems;
+using Content.Shared.Popups;
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.UserInterface;
 using Content.Shared.Wires;
 
 namespace Content.Client.Power;
 
-public sealed class ActivatableUIRequiresPowerSystem : EntitySystem
+public sealed class ActivatableUIRequiresPowerSystem : SharedActivatableUIRequiresPowerSystem
 {
-    public override void Initialize()
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    protected override void OnActivate(Entity<ActivatableUIRequiresPowerComponent> ent, ref ActivatableUIOpenAttemptEvent args)
     {
-        base.Initialize();
+        if (args.Cancelled || this.IsPowered(ent.Owner, EntityManager))
+        {
+            return;
+        }
 
-        SubscribeLocalEvent<ActivatableUIRequiresPowerComponent, ActivatableUIOpenAttemptEvent>(OnActivate);
-    }
+        if (TryComp<WiresPanelComponent>(ent.Owner, out var panel) && panel.Open)
+            return;
 
-    private void OnActivate(EntityUid uid, ActivatableUIRequiresPowerComponent component, ActivatableUIOpenAttemptEvent args)
-    {
-        // Client can't predict the power properly at the moment so rely upon the server to do it.
+        _popup.PopupClient(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent.Owner)), args.User, args.User);
         args.Cancel();
     }
 }
diff --git a/Content.Client/Power/EntitySystems/StaticPowerSystem.cs b/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
new file mode 100644
index 000000000000..2ca945cbbd8c
--- /dev/null
+++ b/Content.Client/Power/EntitySystems/StaticPowerSystem.cs
@@ -0,0 +1,16 @@
+using Content.Client.Power.Components;
+
+namespace Content.Client.Power.EntitySystems;
+
+public static class StaticPowerSystem
+{
+    // Using this makes the call shorter.
+    // ReSharper disable once UnusedParameter.Global
+    public static bool IsPowered(this EntitySystem system, EntityUid uid, IEntityManager entManager, ApcPowerReceiverComponent? receiver = null)
+    {
+        if (receiver == null && !entManager.TryGetComponent(uid, out receiver))
+            return false;
+
+        return receiver.Powered;
+    }
+}
diff --git a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
index 72843a65b84e..11f35634b20b 100644
--- a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs
@@ -1,34 +1,33 @@
-using Content.Shared.Popups;
 using Content.Server.Power.Components;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.UserInterface;
-using JetBrains.Annotations;
 using Content.Shared.Wires;
-using Content.Server.UserInterface;
-using Content.Shared.Power.Components;
 using ActivatableUISystem = Content.Shared.UserInterface.ActivatableUISystem;
 
 namespace Content.Server.Power.EntitySystems;
 
-public sealed class ActivatableUIRequiresPowerSystem : EntitySystem
+public sealed class ActivatableUIRequiresPowerSystem : SharedActivatableUIRequiresPowerSystem
 {
     [Dependency] private readonly ActivatableUISystem _activatableUI = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ActivatableUIRequiresPowerComponent, ActivatableUIOpenAttemptEvent>(OnActivate);
         SubscribeLocalEvent<ActivatableUIRequiresPowerComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
-    private void OnActivate(EntityUid uid, ActivatableUIRequiresPowerComponent component, ActivatableUIOpenAttemptEvent args)
+    protected override void OnActivate(Entity<ActivatableUIRequiresPowerComponent> ent, ref ActivatableUIOpenAttemptEvent args)
     {
-        if (args.Cancelled) return;
-        if (this.IsPowered(uid, EntityManager)) return;
-        if (TryComp<WiresPanelComponent>(uid, out var panel) && panel.Open)
+        if (args.Cancelled || this.IsPowered(ent.Owner, EntityManager))
+        {
             return;
-        _popup.PopupCursor(Loc.GetString("base-computer-ui-component-not-powered", ("machine", uid)), args.User);
+        }
+
+        if (TryComp<WiresPanelComponent>(ent.Owner, out var panel) && panel.Open)
+            return;
+
         args.Cancel();
     }
 
diff --git a/Content.Shared/Power/EntitySystems/SharedActivatableUIRequiresPowerSystem.cs b/Content.Shared/Power/EntitySystems/SharedActivatableUIRequiresPowerSystem.cs
new file mode 100644
index 000000000000..b3ac5bfbffbb
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/SharedActivatableUIRequiresPowerSystem.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Power.Components;
+using Content.Shared.UserInterface;
+
+namespace Content.Shared.Power.EntitySystems;
+
+public abstract class SharedActivatableUIRequiresPowerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<ActivatableUIRequiresPowerComponent, ActivatableUIOpenAttemptEvent>(OnActivate);
+    }
+
+    protected abstract void OnActivate(Entity<ActivatableUIRequiresPowerComponent> ent, ref ActivatableUIOpenAttemptEvent args);
+}

From c3b687f7d60f6db8ee8bf75660c16b7379455463 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 30 May 2024 07:33:22 +0000
Subject: [PATCH 138/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 60289bd35b48..7bbc12d0b918 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Krunk
-  changes:
-  - message: Clown & Jester shoes can now hold plastic knives and cap guns! All clowning,
-      all the time!
-    type: Add
-  id: 6143
-  time: '2024-03-13T10:03:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25661
 - author: 778b
   changes:
   - message: Guns which use battery as magazines now display ammo. Like Svalinn pistol.
@@ -3864,3 +3856,10 @@
   id: 6642
   time: '2024-05-30T04:18:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28317
+- author: metalgearsloth
+  changes:
+  - message: Predict opening even more interfaces.
+    type: Tweak
+  id: 6643
+  time: '2024-05-30T07:32:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28405

From a1bcaf58973d1b15ced827ee50bae724339d1ec0 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 30 May 2024 14:39:07 +0300
Subject: [PATCH 139/568] Localize tips (#28285)

* localize tip

* localizzedDataset
---
 Content.Server/Tips/TipsSystem.cs      |   4 +-
 Resources/Locale/en-US/tips.ftl        | 134 ++++++++++++++++++++++++
 Resources/Prototypes/Datasets/tips.yml | 138 +------------------------
 3 files changed, 139 insertions(+), 137 deletions(-)
 create mode 100644 Resources/Locale/en-US/tips.ftl

diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 168f11de8f82..2f7edd45d672 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -185,11 +185,11 @@ private void SetTippyChance(float value)
 
     private void AnnounceRandomTip()
     {
-        if (!_prototype.TryIndex<DatasetPrototype>(_tipsDataset, out var tips))
+        if (!_prototype.TryIndex<LocalizedDatasetPrototype>(_tipsDataset, out var tips))
             return;
 
         var tip = _random.Pick(tips.Values);
-        var msg = Loc.GetString("tips-system-chat-message-wrap", ("tip", tip));
+        var msg = Loc.GetString("tips-system-chat-message-wrap", ("tip", Loc.GetString(tip)));
 
         if (_random.Prob(_tipTippyChance))
         {
diff --git a/Resources/Locale/en-US/tips.ftl b/Resources/Locale/en-US/tips.ftl
new file mode 100644
index 000000000000..52912d1ba407
--- /dev/null
+++ b/Resources/Locale/en-US/tips.ftl
@@ -0,0 +1,134 @@
+tips-dataset-1 = If you're on fire, you can click the alert on the right of your screen to stop, drop, and roll.
+tips-dataset-2 = You can view and edit all keybindings used in-game at any time through the Options menu.
+tips-dataset-3 = You can access the in-game guidebook through the escape menu, or by pressing Numpad 0 by default.
+tips-dataset-4 = Some entities ingame have guidebook entries associated with them, which you can view by examining the entity and clicking the question mark icon.
+tips-dataset-5 = Artifacts have the ability to gain permanent effects for some triggered nodes, including becoming an intercom or an extremely efficient generator.
+tips-dataset-6 = You can avoid slipping on most puddles by walking. However, some strong chemicals like space lube will slip people anyway.
+tips-dataset-7 = Some plants, such as galaxy thistle, can be ground up into extremely useful and potent medicines.
+tips-dataset-8 = Mopping up puddles and draining them into other containers conserves the reagents found in the puddle.
+tips-dataset-9 = Floor drains, usually found in the chef's freezer or janitor's office, rapidly consume reagent found in puddles around them--including blood.
+tips-dataset-10 = Cognizine, a hard to manufacture chemical, makes animals sentient when they are injected with it.
+tips-dataset-11 = Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants.
+tips-dataset-12 = Fire extinguishers can be loaded with any reagent in the game.
+tips-dataset-13 = Some reagents, like chlorine trifluoride, have unique effects when applied by touch, such as through a spray bottle or foam.
+tips-dataset-14 = Remember to touch grass in between playing Space Station 14 every once in a while.
+tips-dataset-15 = You can use the Activate in World keybind, E by default, to interact with objects while your hands are full, or without picking them up.
+tips-dataset-16 = Common sense goes a long way to avoiding conflict.
+tips-dataset-17 = Every other player in game is a human being as well.
+tips-dataset-18 = When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk.
+tips-dataset-19 = If the Singularity is up, make sure to refuel the radiation collectors once in a while.
+tips-dataset-20 = Chemicals don't react while inside the ChemMaster's buffer.
+tips-dataset-21 = Don't anger the bartender by throwing their glasses! Politely place them on the table by tapping Q.
+tips-dataset-22 = You can hold SPACE by default to slow the movement of the shuttle when piloting, to allow for precise movements--or even coming to a complete stop.
+tips-dataset-23 = Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing.
+tips-dataset-24 = Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid.
+tips-dataset-25 = The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows.
+tips-dataset-26 = During a teslaloose, make sure to get rid of all electronic items so you don't become a target.
+tips-dataset-27 = You can add labels to any item, including food or pill canisters, using a hand labeller.
+tips-dataset-28 = Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor.
+tips-dataset-29 = As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically.
+tips-dataset-30 = As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others.
+tips-dataset-31 = As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it.
+tips-dataset-32 = As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!
+tips-dataset-33 = As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask.
+tips-dataset-34 = As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes.
+tips-dataset-35 = As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed.
+tips-dataset-36 = As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you.
+tips-dataset-37 = As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach.
+tips-dataset-38 = As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it.
+tips-dataset-39 = As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction.
+tips-dataset-40 = As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!
+tips-dataset-41 = As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire.
+tips-dataset-42 = As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan.
+tips-dataset-43 = As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!
+tips-dataset-44 = As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!
+tips-dataset-45 = You can examine your headset to see which radio channels you have available and how to speak in them.
+tips-dataset-46 = As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space.
+tips-dataset-47 = As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective.
+tips-dataset-48 = As a Salvage Specialist, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology.
+tips-dataset-49 = As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!
+tips-dataset-50 = As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator.
+tips-dataset-52 = As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials.
+tips-dataset-53 = As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner.
+tips-dataset-54 = As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to.
+tips-dataset-55 = As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with.
+tips-dataset-56 = As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying.
+tips-dataset-57 = As the Bartender, you can use a circular saw on your shotgun to make it easier to store.
+tips-dataset-58 = As the Bartender, try experimenting with unique drinks. Have you tried to make demon's blood yet?
+tips-dataset-59 = As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields.
+tips-dataset-60 = As the Clown, spice your gimmicks up! Nobody likes a one-trick pony.
+tips-dataset-61 = As the Clown, if you lose your banana peels and soap, you can still slip people with your PDA! Honk!
+tips-dataset-62 = As the Chef, your knife can act as a weapon in an emergency.
+tips-dataset-63 = As the Chef, you can sneak liquids into your foods. As a traitor, putting a little bit of amatoxin or other poison can greatly annoy the crew!
+tips-dataset-64 = As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor.
+tips-dataset-65 = As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime.
+tips-dataset-66 = As a Security Officer, communicate and coordinate with your fellow officers using the security radio channel to avoid confusion.
+tips-dataset-67 = As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!
+tips-dataset-68 = As a Detective, you can chase criminals more effectively by using fingerprint fiber data and DNA obtained from forensic scans of objects the perpetrator likely interacted with.
+tips-dataset-69 = As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches.
+tips-dataset-70 = As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnecessary friendly fire!
+tips-dataset-71 = As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode.
+tips-dataset-72 = As an Engineer, you can electrify grilles by placing powered cables beneath them.
+tips-dataset-73 = As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!
+tips-dataset-74 = As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation.
+tips-dataset-75 = As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about.
+tips-dataset-76 = As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe.
+tips-dataset-77 = As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny.
+tips-dataset-78 = As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!
+tips-dataset-79 = As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly.
+tips-dataset-80 = As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor!
+tips-dataset-81 = As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member.
+tips-dataset-82 = As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!
+tips-dataset-83 = As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch.
+tips-dataset-84 = As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine.
+tips-dataset-85 = As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask science to print a better battery for you!
+tips-dataset-86 = As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine or licoxide?
+tips-dataset-87 = As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients.
+tips-dataset-88 = Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!
+tips-dataset-89 = You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people--it's a much better experience!
+tips-dataset-90 = If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!
+tips-dataset-91 = The station's nuke is invincible. Go find the disk instead of trying to destroy it.
+tips-dataset-92 = Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using.
+tips-dataset-93 = We were all new once, be patient and guide new players, especially those playing intern roles, in the right direction.
+tips-dataset-94 = Firesuits, winter coats and emergency EVA suits offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all.
+tips-dataset-95 = In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation.
+tips-dataset-96 = In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one.
+tips-dataset-97 = Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly.
+tips-dataset-98 = You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage.
+tips-dataset-99 = Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them.
+tips-dataset-100 = All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat.
+tips-dataset-101 = You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway.
+tips-dataset-102 = You can put napalm in a backpack water tank to make a flamethrower.
+tips-dataset-103 = Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!
+tips-dataset-104 = Speed is almost everything in combat. Using hardsuits just for their armor is usually a terrible idea unless the resistances it provides are geared towards combat, or you're not planning to go head-first into the fray.
+tips-dataset-105 = Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor.
+tips-dataset-106 = Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!
+tips-dataset-107 = Demoman takes skill.
+tips-dataset-108 = You can spray a fire extinguisher, throw items or fire a gun while floating through space to give yourself a minor boost. Simply fire opposite to where you want to go.
+tips-dataset-109 = You can drag other players onto yourself to open the strip menu, allowing you to remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others.
+tips-dataset-110 = You can climb onto a table by dragging yourself onto one.
+tips-dataset-111 = You can move an item out of the way by dragging it, and then holding CTRL + right click and moving your mouse into the direction you want it to go.
+tips-dataset-112 = When dealing with security, you can often get your sentence negated entirely through cooperation and deception.
+tips-dataset-113 = Fire can spread to other players through touch! Be careful around flaming bodies or large crowds with people on fire in them.
+tips-dataset-114 = Hull breaches take a few seconds to fully space an area. You can use this time to patch up the hole if you're confident enough, or just run away.
+tips-dataset-115 = Burn damage, such as that from a welding tool or lightbulb, can be used to cauterize wounds and stop bleeding.
+tips-dataset-116 = Bleeding is no joke! If you've been shot or acquired any other major injury, make sure to treat it quickly.
+tips-dataset-117 = In an emergency, you can butcher a jumpsuit with a sharp object to get cloth, which can be crafted into gauze.
+tips-dataset-118 = You can use sharp objects to butcher clothes or animals in the right click context menu. This includes glass shards.
+tips-dataset-119 = Most explosives have an adjustable timer that you can set in the right click menu. This includes grenade penguins!
+tips-dataset-120 = You can stun grenade penguins, which can bide valuable time for you to kill them.
+tips-dataset-121 = You can click on the names of items to pick them up in the right click menu, instead of hovering over the item and then selecting pick up.
+tips-dataset-122 = Space Station 14 is open source! If there's a change you want to make, or a simple item you want to add, then try contributing to the game. It's not as hard as you'd think it is.
+tips-dataset-123 = In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you.
+tips-dataset-124 = Some weapons, such as knives & shivs, have a fast attack speed.
+tips-dataset-125 = The jaws of life can be used to open powered doors.
+tips-dataset-126 = If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently.
+tips-dataset-127 = If you're a human, don't drink blood! It makes you sick and you'll begin to take damage.
+tips-dataset-128 = There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes.
+tips-dataset-129 = Welding without proper eye protection can cause eye damage, which must be cured with oculine.
+tips-dataset-130 = Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them.
+tips-dataset-131 = You can weld glass shards into glass sheets.
+tips-dataset-132 = By right clicking on a player, and then clicking the heart icon, you can quickly examine them to check for injuries or how badly they're bleeding. You can also do this to yourself.
+tips-dataset-133 = Monkeys and kobolds have a rare chance to be sentient. Ook!
+tips-dataset-134 = You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them.
+tips-dataset-135 = Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands.
diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml
index 88dc09c22083..b710d69fabfd 100644
--- a/Resources/Prototypes/Datasets/tips.yml
+++ b/Resources/Prototypes/Datasets/tips.yml
@@ -1,137 +1,5 @@
-- type: dataset
+- type: localizedDataset
   id: Tips
   values:
-  - "If you're on fire, you can click the alert on the right of your screen to stop, drop, and roll."
-  - "You can view and edit all keybindings used in-game at any time through the Options menu."
-  - "You can access the in-game guidebook through the escape menu, or by pressing Numpad 0 by default."
-  - "Some entities ingame have guidebook entries associated with them, which you can view by examining the entity and clicking the question mark icon."
-  - "Artifacts have the ability to gain permanent effects for some triggered nodes, including becoming an intercom or an extremely efficient generator."
-  - "You can avoid slipping on most puddles by walking. However, some strong chemicals like space lube will slip people anyway."
-  - "Some plants, such as galaxy thistle, can be ground up into extremely useful and potent medicines."
-  - "Mopping up puddles and draining them into other containers conserves the reagents found in the puddle."
-  - "Floor drains, usually found in the chef's freezer or janitor's office, rapidly consume reagent found in puddles around them--including blood."
-  - "Cognizine, a hard to manufacture chemical, makes animals sentient when they are injected with it."
-  - "Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants."
-  - "Fire extinguishers can be loaded with any reagent in the game."
-  - "Some reagents, like chlorine trifluoride, have unique effects when applied by touch, such as through a spray bottle or foam."
-  - "Remember to touch grass in between playing Space Station 14 every once in a while."
-  - "You can use the Activate in World keybind, E by default, to interact with objects while your hands are full, or without picking them up."
-  - "Common sense goes a long way to avoiding conflict."
-  - "Every other player in game is a human being as well."
-  - "When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk."
-  - "If the Singularity is up, make sure to refuel the radiation collectors once in a while."
-  - "Chemicals don't react while inside the ChemMaster's buffer."
-  - "Don't anger the bartender by throwing their glasses! Politely place them on the table by tapping Q."
-  - "You can hold SPACE by default to slow the movement of the shuttle when piloting, to allow for precise movements--or even coming to a complete stop."
-  - "Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing."
-  - "Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid."
-  - "The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows."
-  - "During a teslaloose, make sure to get rid of all electronic items so you don't become a target."
-  - "You can add labels to any item, including food or pill canisters, using a hand labeller."
-  - "Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor."
-  - "As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically."
-  - "As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others."
-  - "As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it."
-  - "As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!"
-  - "As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask."
-  - "As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes."
-  - "As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed."
-  - "As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you."
-  - "As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach."
-  - "As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it."
-  - "As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction."
-  - "As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!"
-  - "As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire."
-  - "As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan."
-  - "As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!"
-  - "As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!"
-  - "You can examine your headset to see which radio channels you have available and how to speak in them."
-  - "As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space."
-  - "As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective."
-  - "As a Salvage Specialist, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
-  - "As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
-  - "As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator."
-  - "As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials."
-  - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner."
-  - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to."
-  - "As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with."
-  - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying."
-  - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store."
-  - "As the Bartender, try experimenting with unique drinks. Have you tried to make demon's blood yet?"
-  - "As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields."
-  - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony."
-  - "As the Clown, if you lose your banana peels and soap, you can still slip people with your PDA! Honk!"
-  - "As the Chef, your knife can act as a weapon in an emergency."
-  - "As the Chef, you can sneak liquids into your foods. As a traitor, putting a little bit of amatoxin or other poison can greatly annoy the crew!"
-  - "As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor."
-  - "As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime."
-  - "As a Security Officer, communicate and coordinate with your fellow officers using the security radio channel to avoid confusion."
-  - "As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!"
-  - "As a Detective, you can chase criminals more effectively by using fingerprint fiber data and DNA obtained from forensic scans of objects the perpetrator likely interacted with."
-  - "As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches."
-  - "As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnecessary friendly fire!"
-  - "As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode."
-  - "As an Engineer, you can electrify grilles by placing powered cables beneath them."
-  - "As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!"
-  - "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation."
-  - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about."
-  - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe."
-  - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny."
-  - "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!"
-  - "As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly."
-  - "As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor!"
-  - "As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member."
-  - "As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!"
-  - "As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch."
-  - "As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine."
-  - "As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask science to print a better battery for you!"
-  - "As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine or licoxide?"
-  - "As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients."
-  - "Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!"
-  - "You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people--it's a much better experience!"
-  - "If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!"
-  - "The station's nuke is invincible. Go find the disk instead of trying to destroy it."
-  - "Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using."
-  - "We were all new once, be patient and guide new players, especially those playing intern roles, in the right direction."
-  - "Firesuits, winter coats and emergency EVA suits offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all."
-  - "In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation."
-  - "In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one."
-  - "Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly."
-  - "You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage."
-  - "Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them."
-  - "All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat."
-  - "You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway."
-  - "You can put napalm in a backpack water tank to make a flamethrower."
-  - "Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!"
-  - "Speed is almost everything in combat. Using hardsuits just for their armor is usually a terrible idea unless the resistances it provides are geared towards combat, or you're not planning to go head-first into the fray."
-  - "Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor."
-  - "Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!"
-  - "Demoman takes skill."
-  - "You can spray a fire extinguisher, throw items or fire a gun while floating through space to give yourself a minor boost. Simply fire opposite to where you want to go."
-  - "You can drag other players onto yourself to open the strip menu, allowing you to remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others."
-  - "You can climb onto a table by dragging yourself onto one."
-  - "You can move an item out of the way by dragging it, and then holding CTRL + right click and moving your mouse into the direction you want it to go."
-  - "When dealing with security, you can often get your sentence negated entirely through cooperation and deception."
-  - "Fire can spread to other players through touch! Be careful around flaming bodies or large crowds with people on fire in them."
-  - "Hull breaches take a few seconds to fully space an area. You can use this time to patch up the hole if you're confident enough, or just run away."
-  - "Burn damage, such as that from a welding tool or lightbulb, can be used to cauterize wounds and stop bleeding."
-  - "Bleeding is no joke! If you've been shot or acquired any other major injury, make sure to treat it quickly."
-  - "In an emergency, you can butcher a jumpsuit with a sharp object to get cloth, which can be crafted into gauze."
-  - "You can use sharp objects to butcher clothes or animals in the right click context menu. This includes glass shards."
-  - "Most explosives have an adjustable timer that you can set in the right click menu. This includes grenade penguins!"
-  - "You can stun grenade penguins, which can bide valuable time for you to kill them."
-  - "You can click on the names of items to pick them up in the right click menu, instead of hovering over the item and then selecting pick up."
-  - "Space Station 14 is open source! If there's a change you want to make, or a simple item you want to add, then try contributing to the game. It's not as hard as you'd think it is."
-  - "In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you."
-  - "Some weapons, such as knives & shivs, have a fast attack speed."
-  - "The jaws of life can be used to open powered doors."
-  - "If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently."
-  - "If you're a human, don't drink blood! It makes you sick and you'll begin to take damage."
-  - "There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes."
-  - "Welding without proper eye protection can cause eye damage, which must be cured with oculine."
-  - "Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them."
-  - "You can weld glass shards into glass sheets."
-  - "By right clicking on a player, and then clicking the heart icon, you can quickly examine them to check for injuries or how badly they're bleeding. You can also do this to yourself."
-  - "Monkeys and kobolds have a rare chance to be sentient. Ook!"
-  - "You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them."
-  - "Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands."
+    prefix: tips-dataset-
+    count: 135

From d6f1f0ac1cba76e469848026359e24eede7d5602 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 30 May 2024 07:49:12 -0400
Subject: [PATCH 140/568] Convert story generation to use LocalizedDatasets
 (#28402)

Converted story generation to use LocalizedDatasets
---
 .../Prototypes/StoryTemplatePrototype.cs      |   4 +-
 .../Prototypes/Datasets/story_generation.yml  | 266 +++---------------
 2 files changed, 35 insertions(+), 235 deletions(-)

diff --git a/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs b/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
index 7f6afacccc5e..948c7b2dc024 100644
--- a/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
+++ b/Content.Shared/StoryGen/Prototypes/StoryTemplatePrototype.cs
@@ -24,10 +24,10 @@ public sealed partial class StoryTemplatePrototype : IPrototype
 
     /// <summary>
     /// Dictionary containing the name of each variable to pass to the template and the ID of the
-    /// <see cref="DatasetPrototype"/> from which a random entry will be selected as its value.
+    /// <see cref="LocalizedDatasetPrototype"/> from which a random entry will be selected as its value.
     /// For example, <c>name: book_character</c> will pick a random entry from the book_character
     /// dataset which can then be used in the template by <c>{$name}</c>.
     /// </summary>
     [DataField]
-    public Dictionary<string, ProtoId<DatasetPrototype>> Variables { get; } = default!;
+    public Dictionary<string, ProtoId<LocalizedDatasetPrototype>> Variables { get; } = default!;
 }
diff --git a/Resources/Prototypes/Datasets/story_generation.yml b/Resources/Prototypes/Datasets/story_generation.yml
index 1a461c7596dd..9f5741c43307 100644
--- a/Resources/Prototypes/Datasets/story_generation.yml
+++ b/Resources/Prototypes/Datasets/story_generation.yml
@@ -1,266 +1,66 @@
-- type: dataset
+- type: localizedDataset
   id: BookTypes
   values:
-  - story-gen-book-type1
-  - story-gen-book-type2
-  - story-gen-book-type3
-  - story-gen-book-type4
-  - story-gen-book-type5
-  - story-gen-book-type6
-  - story-gen-book-type7
-  - story-gen-book-type8
-  - story-gen-book-type9
-  - story-gen-book-type10
-  - story-gen-book-type11
-  - story-gen-book-type12
+    prefix: story-gen-book-type
+    count: 12
 
-- type: dataset
+- type: localizedDataset
   id: BookGenres
   values:
-  - story-gen-book-genre1
-  - story-gen-book-genre2
-  - story-gen-book-genre3
-  - story-gen-book-genre4
-  - story-gen-book-genre5
-  - story-gen-book-genre6
-  - story-gen-book-genre7
-  - story-gen-book-genre8
-  - story-gen-book-genre9
-  - story-gen-book-genre10
-  - story-gen-book-genre11
-  - story-gen-book-genre12
-  - story-gen-book-genre13
-  - story-gen-book-genre14
+    prefix: story-gen-book-genre
+    count: 14
 
-- type: dataset
+- type: localizedDataset
   id: BookHintAppearances
   values:
-  - story-gen-book-appearance1
-  - story-gen-book-appearance2
-  - story-gen-book-appearance3
-  - story-gen-book-appearance4
-  - story-gen-book-appearance5
-  - story-gen-book-appearance6
-  - story-gen-book-appearance7
-  - story-gen-book-appearance8
-  - story-gen-book-appearance9
-  - story-gen-book-appearance10
-  - story-gen-book-appearance11
-  - story-gen-book-appearance12
-  - story-gen-book-appearance13
-  - story-gen-book-appearance14
-  - story-gen-book-appearance15
-  - story-gen-book-appearance16
-  - story-gen-book-appearance17
-  - story-gen-book-appearance18
-  - story-gen-book-appearance19
-  - story-gen-book-appearance20
-  - story-gen-book-appearance21
-  - story-gen-book-appearance22
-  - story-gen-book-appearance23
-  - story-gen-book-appearance24
-  - story-gen-book-appearance25
-  - story-gen-book-appearance26
-  - story-gen-book-appearance27
+    prefix: story-gen-book-appearance
+    count: 27
 
-- type: dataset
+- type: localizedDataset
   id: BookCharacters
   values:
-  - story-gen-book-character1
-  - story-gen-book-character2
-  - story-gen-book-character3
-  - story-gen-book-character4
-  - story-gen-book-character5
-  - story-gen-book-character6
-  - story-gen-book-character7
-  - story-gen-book-character8
-  - story-gen-book-character9
-  - story-gen-book-character10
-  - story-gen-book-character11
-  - story-gen-book-character12
-  - story-gen-book-character13
-  - story-gen-book-character14
-  - story-gen-book-character15
-  - story-gen-book-character16
-  - story-gen-book-character17
-  - story-gen-book-character18
-  - story-gen-book-character19
-  - story-gen-book-character20
-  - story-gen-book-character21
-  - story-gen-book-character22
-  - story-gen-book-character23
-  - story-gen-book-character24
-  - story-gen-book-character25
-  - story-gen-book-character26
-  - story-gen-book-character27
-  - story-gen-book-character28
-  - story-gen-book-character29
-  - story-gen-book-character30
-  - story-gen-book-character31
-  - story-gen-book-character32
-  - story-gen-book-character33
-  - story-gen-book-character34
-  - story-gen-book-character35
-  - story-gen-book-character36
-  - story-gen-book-character37
-  - story-gen-book-character38
-  - story-gen-book-character39
-  - story-gen-book-character40
+    prefix: story-gen-book-character
+    count: 40
 
-- type: dataset
+- type: localizedDataset
   id: BookCharacterTraits
   values:
-  - story-gen-book-character-trait1
-  - story-gen-book-character-trait2
-  - story-gen-book-character-trait3
-  - story-gen-book-character-trait4
-  - story-gen-book-character-trait5
-  - story-gen-book-character-trait6
-  - story-gen-book-character-trait7
-  - story-gen-book-character-trait8
-  - story-gen-book-character-trait9
-  - story-gen-book-character-trait10
-  - story-gen-book-character-trait11
-  - story-gen-book-character-trait12
-  - story-gen-book-character-trait13
-  - story-gen-book-character-trait14
-  - story-gen-book-character-trait15
-  - story-gen-book-character-trait16
-  - story-gen-book-character-trait17
-  - story-gen-book-character-trait18
-  - story-gen-book-character-trait19
-  - story-gen-book-character-trait20
-  - story-gen-book-character-trait21
-  - story-gen-book-character-trait22
-  - story-gen-book-character-trait23
-  - story-gen-book-character-trait24
+    prefix: story-gen-book-character-trait
+    count: 24
 
 
-- type: dataset
+- type: localizedDataset
   id: BookEvents
   values:
-  - story-gen-book-event1
-  - story-gen-book-event2
-  - story-gen-book-event3
-  - story-gen-book-event4
-  - story-gen-book-event5
-  - story-gen-book-event6
-  - story-gen-book-event7
-  - story-gen-book-event8
-  - story-gen-book-event9
-  - story-gen-book-event10
-  - story-gen-book-event11
-  - story-gen-book-event12
-  - story-gen-book-event13
-  - story-gen-book-event14
-  - story-gen-book-event15
-  - story-gen-book-event16
-  - story-gen-book-event17
-  - story-gen-book-event18
-  - story-gen-book-event19
-  - story-gen-book-event20
-  - story-gen-book-event21
-  - story-gen-book-event22
-  - story-gen-book-event23
-  - story-gen-book-event24
+    prefix: story-gen-book-event
+    count: 24
 
-- type: dataset
+- type: localizedDataset
   id: BookActions
   values:
-  - story-gen-book-action1
-  - story-gen-book-action2
-  - story-gen-book-action3
-  - story-gen-book-action4
-  - story-gen-book-action5
-  - story-gen-book-action6
-  - story-gen-book-action7
-  - story-gen-book-action8
-  - story-gen-book-action9
-  - story-gen-book-action10
-  - story-gen-book-action11
-  - story-gen-book-action12
+    prefix: story-gen-book-action
+    count: 12
 
-- type: dataset
+- type: localizedDataset
   id: BookActionTraits
   values:
-  - story-gen-book-action-trait1
-  - story-gen-book-action-trait2
-  - story-gen-book-action-trait3
-  - story-gen-book-action-trait4
-  - story-gen-book-action-trait5
-  - story-gen-book-action-trait6
-  - story-gen-book-action-trait7
-  - story-gen-book-action-trait8
-  - story-gen-book-action-trait9
-  - story-gen-book-action-trait10
-  - story-gen-book-action-trait11
-  - story-gen-book-action-trait12
-  - story-gen-book-action-trait13
+    prefix: story-gen-book-action-trait
+    count: 13
 
-- type: dataset
+- type: localizedDataset
   id: BookLocations
   values:
-  - story-gen-book-location1
-  - story-gen-book-location2
-  - story-gen-book-location3
-  - story-gen-book-location4
-  - story-gen-book-location5
-  - story-gen-book-location6
-  - story-gen-book-location7
-  - story-gen-book-location8
-  - story-gen-book-location9
-  - story-gen-book-location10
-  - story-gen-book-location11
-  - story-gen-book-location12
-  - story-gen-book-location13
-  - story-gen-book-location14
-  - story-gen-book-location15
-  - story-gen-book-location16
-  - story-gen-book-location17
-  - story-gen-book-location18
-  - story-gen-book-location19
-  - story-gen-book-location20
-  - story-gen-book-location21
-  - story-gen-book-location22
-  - story-gen-book-location23
-  - story-gen-book-location24
-  - story-gen-book-location25
-  - story-gen-book-location26
-  - story-gen-book-location27
-  - story-gen-book-location28
-  - story-gen-book-location29
-  - story-gen-book-location30
-  - story-gen-book-location31
-  - story-gen-book-location32
-  - story-gen-book-location33
-  - story-gen-book-location34
+    prefix: story-gen-book-location
+    count: 34
 
-- type: dataset
+- type: localizedDataset
   id: BookStoryElements
   values:
-  - story-gen-book-element1
-  - story-gen-book-element2
-  - story-gen-book-element3
-  - story-gen-book-element4
-  - story-gen-book-element5
-  - story-gen-book-element6
-  - story-gen-book-element7
-  - story-gen-book-element8
-  - story-gen-book-element9
+    prefix: story-gen-book-element
+    count: 9
 
-- type: dataset
+- type: localizedDataset
   id: BookStoryElementTraits
   values:
-  - story-gen-book-element-trait1
-  - story-gen-book-element-trait2
-  - story-gen-book-element-trait3
-  - story-gen-book-element-trait4
-  - story-gen-book-element-trait5
-  - story-gen-book-element-trait6
-  - story-gen-book-element-trait7
-  - story-gen-book-element-trait8
-  - story-gen-book-element-trait9
-  - story-gen-book-element-trait10
-  - story-gen-book-element-trait11
-  - story-gen-book-element-trait12
-  - story-gen-book-element-trait13
+    prefix: story-gen-book-element-trait
+    count: 13

From 98446cb0616be2b2e89144293122f6ff9bff7d50 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 30 May 2024 12:08:42 -0400
Subject: [PATCH 141/568] Convert advertisements to use localized datasets
 (#28400)

* Convert advertisements to use LocalizedDatasets

* File consolidation

* Arcade machines too
---
 .../Components/AdvertiseComponent.cs          |   8 +-
 .../Components/SpeakOnUIClosedComponent.cs    |   6 +-
 .../EntitySystems/AdvertiseSystem.cs          |   2 +-
 .../EntitySystems/SpeakOnUIClosedSystem.cs    |   7 +-
 .../Advertise/MessagePackPrototype.cs         |  14 -
 .../vending-machines/vending-machine.ftl      |   2 +-
 .../Arcade/Advertisements/blockgame.yml       |  16 --
 .../Arcade/Advertisements/spacevillain.yml    |  18 --
 .../Catalog/Arcade/Goodbyes/blockgame.yml     |  15 -
 .../Catalog/Arcade/Goodbyes/spacevillain.yml  |  15 -
 .../Catalog/Arcade/advertisements.yml         |  11 +
 .../Prototypes/Catalog/Arcade/goodbyes.yml    |  11 +
 .../VendingMachines/Advertisements/ammo.yml   |  13 -
 .../Advertisements/atmosdrobe.yml             |   6 -
 .../Advertisements/bardrobe.yml               |   5 -
 .../Advertisements/boozeomat.yml              |  22 --
 .../Advertisements/cargodrobe.yml             |   6 -
 .../VendingMachines/Advertisements/chang.yml  |   8 -
 .../Advertisements/chefdrobe.yml              |   6 -
 .../Advertisements/chefvend.yml               |  12 -
 .../Advertisements/chemdrobe.yml              |   6 -
 .../VendingMachines/Advertisements/cigs.yml   |  15 -
 .../Advertisements/clothesmate.yml            |  10 -
 .../VendingMachines/Advertisements/coffee.yml |  17 --
 .../VendingMachines/Advertisements/cola.yml   |  11 -
 .../Advertisements/condiments.yml             |   9 -
 .../Advertisements/curadrobe.yml              |   6 -
 .../Advertisements/detdrobe.yml               |   6 -
 .../Advertisements/dinnerware.yml             |  13 -
 .../Advertisements/discount.yml               |  12 -
 .../VendingMachines/Advertisements/donut.yml  |   8 -
 .../Advertisements/engidrobe.yml              |   8 -
 .../Advertisements/fatextractor.yml           |   9 -
 .../VendingMachines/Advertisements/games.yml  |  13 -
 .../Advertisements/genedrobe.yml              |   5 -
 .../Advertisements/happyhonk.yml              |  13 -
 .../Advertisements/hydrobe.yml                |   7 -
 .../Advertisements/janidrobe.yml              |   6 -
 .../Advertisements/lawdrobe.yml               |  11 -
 .../Advertisements/magivend.yml               |  14 -
 .../Advertisements/medidrobe.yml              |   6 -
 .../Advertisements/megaseed.yml               |   9 -
 .../Advertisements/nanomed.yml                |  12 -
 .../Advertisements/nutrimax.yml               |  10 -
 .../Advertisements/robodrobe.yml              |   7 -
 .../Advertisements/scidrobe.yml               |   6 -
 .../Advertisements/secdrobe.yml               |   8 -
 .../Advertisements/sectech.yml                |   8 -
 .../Advertisements/smartfridge.yml            |  11 -
 .../VendingMachines/Advertisements/snack.yml  |  18 --
 .../Advertisements/sovietsoda.yml             |   9 -
 .../Advertisements/syndiedrobe.yml            |  34 ---
 .../Advertisements/theater.yml                |   9 -
 .../Advertisements/vendomat.yml               |  10 -
 .../Advertisements/virodrobe.yml              |   6 -
 .../VendingMachines/Goodbyes/boozeomat.yml    |   7 -
 .../VendingMachines/Goodbyes/chang.yml        |   6 -
 .../VendingMachines/Goodbyes/chefvend.yml     |   8 -
 .../Catalog/VendingMachines/Goodbyes/cigs.yml |   7 -
 .../VendingMachines/Goodbyes/coffee.yml       |   8 -
 .../Catalog/VendingMachines/Goodbyes/cola.yml |   8 -
 .../VendingMachines/Goodbyes/discount.yml     |  12 -
 .../VendingMachines/Goodbyes/donut.yml        |   8 -
 .../VendingMachines/Goodbyes/games.yml        |   8 -
 .../VendingMachines/Goodbyes/generic.yml      |   4 -
 .../VendingMachines/Goodbyes/happyhonk.yml    |   8 -
 .../VendingMachines/Goodbyes/lawdrobe.yml     |   8 -
 .../VendingMachines/Goodbyes/nutrimax.yml     |   6 -
 .../VendingMachines/Goodbyes/sectech.yml      |   7 -
 .../VendingMachines/Goodbyes/snack.yml        |  10 -
 .../VendingMachines/Goodbyes/sovietsoda.yml   |   7 -
 .../VendingMachines/Goodbyes/syndiedrobe.yml  |   9 -
 .../VendingMachines/advertisements.yml        | 257 ++++++++++++++++++
 .../Catalog/VendingMachines/goodbyes.yml      | 101 +++++++
 74 files changed, 392 insertions(+), 662 deletions(-)
 delete mode 100644 Content.Shared/Advertise/MessagePackPrototype.cs
 delete mode 100644 Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
 delete mode 100644 Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
 delete mode 100644 Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
 delete mode 100644 Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
 create mode 100644 Resources/Prototypes/Catalog/Arcade/advertisements.yml
 create mode 100644 Resources/Prototypes/Catalog/Arcade/goodbyes.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
 delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
 create mode 100644 Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
 create mode 100644 Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml

diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
index 3d617e3a340e..94650234bbb2 100644
--- a/Content.Server/Advertise/Components/AdvertiseComponent.cs
+++ b/Content.Server/Advertise/Components/AdvertiseComponent.cs
@@ -1,12 +1,12 @@
 using Content.Server.Advertise.EntitySystems;
-using Content.Shared.Advertise;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Advertise.Components;
 
 /// <summary>
 /// Makes this entity periodically advertise by speaking a randomly selected
-/// message from a specified MessagePack into local chat.
+/// message from a specified dataset into local chat.
 /// </summary>
 [RegisterComponent, Access(typeof(AdvertiseSystem))]
 public sealed partial class AdvertiseComponent : Component
@@ -33,10 +33,10 @@ public sealed partial class AdvertiseComponent : Component
     public bool Prewarm = true;
 
     /// <summary>
-    /// The identifier for the advertisements pack prototype.
+    /// The identifier for the advertisements dataset prototype.
     /// </summary>
     [DataField(required: true)]
-    public ProtoId<MessagePackPrototype> Pack { get; private set; }
+    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
 
     /// <summary>
     /// The next time an advertisement will be said.
diff --git a/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
index 2a663b7f89db..99d0080d7f22 100644
--- a/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
+++ b/Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Advertise;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Advertise.Components;
@@ -11,10 +11,10 @@ namespace Content.Server.Advertise.Components;
 public sealed partial class SpeakOnUIClosedComponent : Component
 {
     /// <summary>
-    /// The identifier for the message pack prototype containing messages to be spoken by this entity.
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
     /// </summary>
     [DataField(required: true)]
-    public ProtoId<MessagePackPrototype> Pack { get; private set; }
+    public ProtoId<LocalizedDatasetPrototype> Pack { get; private set; }
 
     /// <summary>
     /// Is this component active? If false, no messages will be spoken.
diff --git a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
index 28fa01628f43..7f2e12818358 100644
--- a/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
+++ b/Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
@@ -62,7 +62,7 @@ public void SayAdvertisement(EntityUid uid, AdvertiseComponent? advert = null)
             return;
 
         if (_prototypeManager.TryIndex(advert.Pack, out var advertisements))
-            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Messages)), InGameICChatType.Speak, hideChat: true);
+            _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Values)), InGameICChatType.Speak, hideChat: true);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
index 232b4b7edab5..a0a709e5fadd 100644
--- a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
+++ b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Advertise.Components;
 using Content.Server.Chat.Systems;
-using Content.Server.UserInterface;
-using Content.Shared.Advertise;
+using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using ActivatableUIComponent = Content.Shared.UserInterface.ActivatableUIComponent;
@@ -39,10 +38,10 @@ public bool TrySpeak(Entity<SpeakOnUIClosedComponent?> entity)
         if (!entity.Comp.Enabled)
             return false;
 
-        if (!_prototypeManager.TryIndex(entity.Comp.Pack, out MessagePackPrototype? messagePack))
+        if (!_prototypeManager.TryIndex(entity.Comp.Pack, out var messagePack))
             return false;
 
-        var message = Loc.GetString(_random.Pick(messagePack.Messages), ("name", Name(entity)));
+        var message = Loc.GetString(_random.Pick(messagePack.Values), ("name", Name(entity)));
         _chat.TrySendInGameICMessage(entity, message, InGameICChatType.Speak, true);
         entity.Comp.Flag = false;
         return true;
diff --git a/Content.Shared/Advertise/MessagePackPrototype.cs b/Content.Shared/Advertise/MessagePackPrototype.cs
deleted file mode 100644
index f7495d7e468e..000000000000
--- a/Content.Shared/Advertise/MessagePackPrototype.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Advertise;
-
-[Serializable, Prototype("messagePack")]
-public sealed partial class MessagePackPrototype : IPrototype
-{
-    [ViewVariables]
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField]
-    public List<LocId> Messages { get; private set; } = [];
-}
diff --git a/Resources/Locale/en-US/vending-machines/vending-machine.ftl b/Resources/Locale/en-US/vending-machines/vending-machine.ftl
index 637a9c7568e5..cb1dd3502f88 100644
--- a/Resources/Locale/en-US/vending-machines/vending-machine.ftl
+++ b/Resources/Locale/en-US/vending-machines/vending-machine.ftl
@@ -1,3 +1,3 @@
-vending-machine-thanks = Thanks for using { $name }!
+vending-machine-thanks-1 = Thanks for using { $name }!
 vending-machine-flavor-left = Request refills at cargo
 vending-machine-flavor-right = v1.1
diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
deleted file mode 100644
index 7fb036729517..000000000000
--- a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: messagePack
-  id: BlockGameAds
-  messages:
-    - advertisement-block-game-1
-    - advertisement-block-game-2
-    - advertisement-block-game-3
-    - advertisement-block-game-4
-    - advertisement-block-game-5
-    - advertisement-block-game-6
-    - advertisement-block-game-7
-    - advertisement-block-game-8
-    - advertisement-block-game-9
-    - advertisement-block-game-10
-    - advertisement-block-game-11
-    - advertisement-block-game-12
-    - advertisement-block-game-13
diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
deleted file mode 100644
index 7c94ab94f6bf..000000000000
--- a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: messagePack
-  id: SpaceVillainAds
-  messages:
-    - advertisement-space-villain-1
-    - advertisement-space-villain-2
-    - advertisement-space-villain-3
-    - advertisement-space-villain-4
-    - advertisement-space-villain-5
-    - advertisement-space-villain-6
-    - advertisement-space-villain-7
-    - advertisement-space-villain-8
-    - advertisement-space-villain-9
-    - advertisement-space-villain-10
-    - advertisement-space-villain-11
-    - advertisement-space-villain-12
-    - advertisement-space-villain-13
-    - advertisement-space-villain-14
-    - advertisement-space-villain-15
diff --git a/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
deleted file mode 100644
index 460e8d13bff9..000000000000
--- a/Resources/Prototypes/Catalog/Arcade/Goodbyes/blockgame.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: messagePack
-  id: BlockGameGoodbyes
-  messages:
-  - thankyou-block-game-1
-  - thankyou-block-game-2
-  - thankyou-block-game-3
-  - thankyou-block-game-4
-  - thankyou-block-game-5
-  - thankyou-block-game-6
-  - thankyou-block-game-7
-  - thankyou-block-game-8
-  - thankyou-block-game-9
-  - thankyou-block-game-10
-  - thankyou-block-game-11
-  - thankyou-block-game-12
diff --git a/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
deleted file mode 100644
index 09016afec31c..000000000000
--- a/Resources/Prototypes/Catalog/Arcade/Goodbyes/spacevillain.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: messagePack
-  id: SpaceVillainGoodbyes
-  messages:
-  - thankyou-space-villain-1
-  - thankyou-space-villain-2
-  - thankyou-space-villain-3
-  - thankyou-space-villain-4
-  - thankyou-space-villain-5
-  - thankyou-space-villain-6
-  - thankyou-space-villain-7
-  - thankyou-space-villain-8
-  - thankyou-space-villain-9
-  - thankyou-space-villain-10
-  - thankyou-space-villain-11
-  - thankyou-space-villain-12
diff --git a/Resources/Prototypes/Catalog/Arcade/advertisements.yml b/Resources/Prototypes/Catalog/Arcade/advertisements.yml
new file mode 100644
index 000000000000..47ecfb60b82d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/advertisements.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: BlockGameAds
+  values:
+    prefix: advertisement-block-game-
+    count: 13
+
+- type: localizedDataset
+  id: SpaceVillainAds
+  values:
+    prefix: advertisement-space-villain-
+    count: 15
diff --git a/Resources/Prototypes/Catalog/Arcade/goodbyes.yml b/Resources/Prototypes/Catalog/Arcade/goodbyes.yml
new file mode 100644
index 000000000000..48b45eb40efb
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Arcade/goodbyes.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: BlockGameGoodbyes
+  values:
+    prefix: thankyou-block-game-
+    count: 12
+
+- type: localizedDataset
+  id: SpaceVillainGoodbyes
+  values:
+    prefix: thankyou-space-villain-
+    count: 12
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
deleted file mode 100644
index 7e089a282595..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: AmmoVendAds
-  messages:
-  - advertisement-ammo-1
-  - advertisement-ammo-2
-  - advertisement-ammo-3
-  - advertisement-ammo-4
-  - advertisement-ammo-5
-  - advertisement-ammo-6
-  - advertisement-ammo-7
-  - advertisement-ammo-8
-  - advertisement-ammo-9
-  - advertisement-ammo-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
deleted file mode 100644
index 7946c0631027..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: AtmosDrobeAds
-  messages:
-    - advertisement-atmosdrobe-1
-    - advertisement-atmosdrobe-2
-    - advertisement-atmosdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
deleted file mode 100644
index 0a21acf2cb5b..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: messagePack
-  id: BarDrobeAds
-  messages:
-    - advertisement-bardrobe-1
-    - advertisement-bardrobe-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
deleted file mode 100644
index e6bcbbcb9c38..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: messagePack
-  id: BoozeOMatAds
-  messages:
-  - advertisement-boozeomat-1
-  - advertisement-boozeomat-2
-  - advertisement-boozeomat-3
-  - advertisement-boozeomat-4
-  - advertisement-boozeomat-5
-  - advertisement-boozeomat-6
-  - advertisement-boozeomat-7
-  - advertisement-boozeomat-8
-  - advertisement-boozeomat-9
-  - advertisement-boozeomat-10
-  - advertisement-boozeomat-11
-  - advertisement-boozeomat-12
-  - advertisement-boozeomat-13
-  - advertisement-boozeomat-14
-  - advertisement-boozeomat-15
-  - advertisement-boozeomat-16
-  - advertisement-boozeomat-17
-  - advertisement-boozeomat-18
-  - advertisement-boozeomat-19
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
deleted file mode 100644
index f2cd38f737e2..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: CargoDrobeAds
-  messages:
-    - advertisement-cargodrobe-1
-    - advertisement-cargodrobe-2
-    - advertisement-cargodrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
deleted file mode 100644
index 911d467e7d06..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: ChangAds
-  messages:
-    - advertisement-chang-1
-    - advertisement-chang-2
-    - advertisement-chang-3
-    - advertisement-chang-4
-    - advertisement-chang-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
deleted file mode 100644
index c71d8225e031..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ChefDrobeAds
-  messages:
-    - advertisement-chefdrobe-1
-    - advertisement-chefdrobe-2
-    - advertisement-chefdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
deleted file mode 100644
index d52fcf9894cf..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: ChefvendAds
-  messages:
-    - advertisement-chefvend-1
-    - advertisement-chefvend-2
-    - advertisement-chefvend-3
-    - advertisement-chefvend-4
-    - advertisement-chefvend-5
-    - advertisement-chefvend-6
-    - advertisement-chefvend-7
-    - advertisement-chefvend-8
-    - advertisement-chefvend-9
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
deleted file mode 100644
index 69a37de184be..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ChemDrobeAds
-  messages:
-    - advertisement-chemdrobe-1
-    - advertisement-chemdrobe-2
-    - advertisement-chemdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
deleted file mode 100644
index db3d492c4596..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: messagePack
-  id: CigaretteMachineAds
-  messages:
-  - advertisement-cigs-1
-  - advertisement-cigs-2
-  - advertisement-cigs-3
-  - advertisement-cigs-4
-  - advertisement-cigs-5
-  - advertisement-cigs-6
-  - advertisement-cigs-7
-  - advertisement-cigs-8
-  - advertisement-cigs-9
-  - advertisement-cigs-10
-  - advertisement-cigs-11
-  - advertisement-cigs-12
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
deleted file mode 100644
index dc109f8eb996..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: ClothesMateAds
-  messages:
-  - advertisement-clothes-1
-  - advertisement-clothes-2
-  - advertisement-clothes-3
-  - advertisement-clothes-4
-  - advertisement-clothes-5
-  - advertisement-clothes-6
-  - advertisement-clothes-7
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
deleted file mode 100644
index 4781768cf0c5..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: messagePack
-  id: HotDrinksMachineAds
-  messages:
-    - advertisement-coffee-1
-    - advertisement-coffee-2
-    - advertisement-coffee-3
-    - advertisement-coffee-4
-    - advertisement-coffee-5
-    - advertisement-coffee-6
-    - advertisement-coffee-7
-    - advertisement-coffee-8
-    - advertisement-coffee-9
-    - advertisement-coffee-10
-    - advertisement-coffee-11
-    - advertisement-coffee-12
-    - advertisement-coffee-13
-    - advertisement-coffee-14
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
deleted file mode 100644
index d12d7eb92f47..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: messagePack
-  id: RobustSoftdrinksAds
-  messages:
-  - advertisement-cola-1
-  - advertisement-cola-2
-  - advertisement-cola-3
-  - advertisement-cola-4
-  - advertisement-cola-5
-  - advertisement-cola-6
-  - advertisement-cola-7
-  - advertisement-cola-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
deleted file mode 100644
index d1d07df0c4e5..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: CondimentVendAds
-  messages:
-  - advertisement-condiment-1
-  - advertisement-condiment-2
-  - advertisement-condiment-3
-  - advertisement-condiment-4
-  - advertisement-condiment-5
-  - advertisement-condiment-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
deleted file mode 100644
index 47523c6e936e..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: CuraDrobeAds
-  messages:
-    - advertisement-curadrobe-1
-    - advertisement-curadrobe-2
-    - advertisement-curadrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
deleted file mode 100644
index 50024ce3d991..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: DetDrobeAds
-  messages:
-    - advertisement-detdrobe-1
-    - advertisement-detdrobe-2
-    - advertisement-detdrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
deleted file mode 100644
index ac31dc075b95..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: DinnerwareAds
-  messages:
-    - advertisement-dinnerware-1
-    - advertisement-dinnerware-2
-    - advertisement-dinnerware-3
-    - advertisement-dinnerware-4
-    - advertisement-dinnerware-5
-    - advertisement-dinnerware-6
-    - advertisement-dinnerware-7
-    - advertisement-dinnerware-8
-    - advertisement-dinnerware-9
-    - advertisement-dinnerware-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
deleted file mode 100644
index dce8646a60ca..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: DiscountDansAds
-  messages:
-  - advertisement-discount-1
-  - advertisement-discount-2
-  - advertisement-discount-3
-  - advertisement-discount-4
-  - advertisement-discount-5
-  - advertisement-discount-6
-  - advertisement-discount-7
-  - advertisement-discount-8
-  - advertisement-discount-9
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
deleted file mode 100644
index 73766aa749f9..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: DonutAds
-  messages:
-    - advertisement-donut-1
-    - advertisement-donut-2
-    - advertisement-donut-3
-    - advertisement-donut-4
-    - advertisement-donut-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
deleted file mode 100644
index ec92fbe4dea8..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: EngiDrobeAds
-  messages:
-    - advertisement-engidrobe-1
-    - advertisement-engidrobe-2
-    - advertisement-engidrobe-3
-    - advertisement-engidrobe-4
-    - advertisement-engidrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
deleted file mode 100644
index 7619ea1856c3..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: FatExtractorFacts
-  messages:
-  - fat-extractor-fact-1
-  - fat-extractor-fact-2
-  - fat-extractor-fact-3
-  - fat-extractor-fact-4
-  - fat-extractor-fact-5
-  - fat-extractor-fact-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
deleted file mode 100644
index 1348635e1f50..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: GoodCleanFunAds
-  messages:
-  - advertisement-goodcleanfun-1
-  - advertisement-goodcleanfun-2
-  - advertisement-goodcleanfun-3
-  - advertisement-goodcleanfun-4
-  - advertisement-goodcleanfun-5
-  - advertisement-goodcleanfun-6
-  - advertisement-goodcleanfun-7
-  - advertisement-goodcleanfun-8
-  - advertisement-goodcleanfun-9
-  - advertisement-goodcleanfun-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
deleted file mode 100644
index 722388055b9f..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: messagePack
-  id: GeneDrobeAds
-  messages:
-    - advertisement-genedrobe-1
-    - advertisement-genedrobe-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
deleted file mode 100644
index e145ebcdacbd..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: messagePack
-  id: HappyHonkAds
-  messages:
-  - advertisement-happyhonk-1
-  - advertisement-happyhonk-2
-  - advertisement-happyhonk-3
-  - advertisement-happyhonk-4
-  - advertisement-happyhonk-5
-  - advertisement-happyhonk-6
-  - advertisement-happyhonk-7
-  - advertisement-happyhonk-8
-  - advertisement-happyhonk-9
-  - advertisement-happyhonk-10
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
deleted file mode 100644
index 5999c496f51f..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: HyDrobeAds
-  messages:
-    - advertisement-hydrobe-1
-    - advertisement-hydrobe-2
-    - advertisement-hydrobe-3
-    - advertisement-hydrobe-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
deleted file mode 100644
index 8310136bf8fb..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: JaniDrobeAds
-  messages:
-    - advertisement-janidrobe-1
-    - advertisement-janidrobe-2
-    - advertisement-janidrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
deleted file mode 100644
index a948413abde3..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: messagePack
-  id: LawDrobeAds
-  messages:
-    - advertisement-lawdrobe-1
-    - advertisement-lawdrobe-2
-    - advertisement-lawdrobe-3
-    - advertisement-lawdrobe-4
-    - advertisement-lawdrobe-5
-    - advertisement-lawdrobe-6
-    - advertisement-lawdrobe-7
-    - advertisement-lawdrobe-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
deleted file mode 100644
index 896a3853e7c4..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: messagePack
-  id: MagiVendAds
-  messages:
-  - advertisement-magivend-1
-  - advertisement-magivend-2
-  - advertisement-magivend-3
-  - advertisement-magivend-4
-  - advertisement-magivend-5
-  - advertisement-magivend-6
-  - advertisement-magivend-7
-  - advertisement-magivend-8
-  - advertisement-magivend-9
-  - advertisement-magivend-10
-  - advertisement-magivend-11
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
deleted file mode 100644
index b7b055231b82..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: MediDrobeAds
-  messages:
-    - advertisement-medidrobe-1
-    - advertisement-medidrobe-2
-    - advertisement-medidrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
deleted file mode 100644
index b6e6ae098e9d..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: MegaSeedAds
-  messages:
-    - advertisement-megaseed-1
-    - advertisement-megaseed-2
-    - advertisement-megaseed-3
-    - advertisement-megaseed-4
-    - advertisement-megaseed-5
-    - advertisement-megaseed-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
deleted file mode 100644
index a79a4c8a6c49..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: NanoMedAds
-  messages:
-    - advertisement-nanomed-1
-    - advertisement-nanomed-2
-    - advertisement-nanomed-3
-    - advertisement-nanomed-4
-    - advertisement-nanomed-5
-    - advertisement-nanomed-6
-    - advertisement-nanomed-7
-    - advertisement-nanomed-8
-    - advertisement-nanomed-9
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
deleted file mode 100644
index a3ade349602b..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: NutriMaxAds
-  messages:
-    - advertisement-nutrimax-1
-    - advertisement-nutrimax-2
-    - advertisement-nutrimax-3
-    - advertisement-nutrimax-4
-    - advertisement-nutrimax-5
-    - advertisement-nutrimax-6
-    - advertisement-nutrimax-7
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
deleted file mode 100644
index 82ece7d76329..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: RoboDrobeAds
-  messages:
-    - advertisement-robodrobe-1
-    - advertisement-robodrobe-2
-    - advertisement-robodrobe-3
-    - advertisement-robodrobe-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
deleted file mode 100644
index f8b125073b85..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: SciDrobeAds
-  messages:
-    - advertisement-scidrobe-1
-    - advertisement-scidrobe-2
-    - advertisement-scidrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
deleted file mode 100644
index 99c2c402deeb..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: SecDrobeAds
-  messages:
-    - advertisement-secdrobe-1
-    - advertisement-secdrobe-2
-    - advertisement-secdrobe-3
-    - advertisement-secdrobe-4
-    - advertisement-secdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
deleted file mode 100644
index 0b32ed166d52..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: SecTechAds
-  messages:
-    - advertisement-sectech-1
-    - advertisement-sectech-2
-    - advertisement-sectech-3
-    - advertisement-sectech-4
-    - advertisement-sectech-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
deleted file mode 100644
index d92a95f70ffe..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: messagePack
-  id: SmartFridgeAds
-  messages:
-  - advertisement-smartfridge-1
-  - advertisement-smartfridge-2
-  - advertisement-smartfridge-3
-  - advertisement-smartfridge-4
-  - advertisement-smartfridge-5
-  - advertisement-smartfridge-6
-  - advertisement-smartfridge-7
-  - advertisement-smartfridge-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
deleted file mode 100644
index 3d9b93f9c27b..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: messagePack
-  id: GetmoreChocolateCorpAds
-  messages:
-  - advertisement-snack-1
-  - advertisement-snack-2
-  - advertisement-snack-3
-  - advertisement-snack-4
-  - advertisement-snack-5
-  - advertisement-snack-6
-  - advertisement-snack-7
-  - advertisement-snack-8
-  - advertisement-snack-9
-  - advertisement-snack-10
-  - advertisement-snack-11
-  - advertisement-snack-12
-  - advertisement-snack-13
-  - advertisement-snack-14
-  - advertisement-snack-15
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
deleted file mode 100644
index 630de1e615f0..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: BodaAds
-  messages:
-  - advertisement-sovietsoda-1
-  - advertisement-sovietsoda-2
-  - advertisement-sovietsoda-3
-  - advertisement-sovietsoda-4
-  - advertisement-sovietsoda-5
-  - advertisement-sovietsoda-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
deleted file mode 100644
index dc89d04aa0b2..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-- type: messagePack
-  id: SyndieDrobeAds
-  messages:
-    - advertisement-syndiedrobe-1
-    - advertisement-syndiedrobe-2
-    - advertisement-syndiedrobe-3
-    - advertisement-syndiedrobe-4
-    - advertisement-syndiedrobe-5
-    - advertisement-syndiedrobe-6
-    - advertisement-syndiedrobe-7
-    - advertisement-syndiedrobe-8
-    - advertisement-syndiedrobe-9
-    - advertisement-syndiedrobe-10
-    - advertisement-syndiedrobe-11
-    - advertisement-syndiedrobe-12
-    - advertisement-syndiedrobe-13
-    - advertisement-syndiedrobe-14
-    - advertisement-syndiedrobe-15
-    - advertisement-syndiedrobe-16
-    - advertisement-syndiedrobe-17
-    - advertisement-syndiedrobe-18
-    - advertisement-syndiedrobe-19
-    - advertisement-syndiedrobe-20
-    - advertisement-syndiedrobe-21
-    - advertisement-syndiedrobe-22
-    - advertisement-syndiedrobe-23
-    - advertisement-syndiedrobe-24
-    - advertisement-syndiedrobe-25
-    - advertisement-syndiedrobe-26
-    - advertisement-syndiedrobe-27
-    - advertisement-syndiedrobe-28
-    - advertisement-syndiedrobe-29
-    - advertisement-syndiedrobe-30
-    - advertisement-syndiedrobe-31
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
deleted file mode 100644
index 8b06cdb51726..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: AutoDrobeAds
-  messages:
-  - advertisement-theater-1
-  - advertisement-theater-2
-  - advertisement-theater-3
-  - advertisement-theater-4
-  - advertisement-theater-5
-  - advertisement-theater-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
deleted file mode 100644
index 31c0e0c24112..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: VendomatAds
-  messages:
-  - advertisement-vendomat-1
-  - advertisement-vendomat-2
-  - advertisement-vendomat-3
-  - advertisement-vendomat-4
-  - advertisement-vendomat-5
-  - advertisement-vendomat-6
-  - advertisement-vendomat-7
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
deleted file mode 100644
index c48f9e7d2e45..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ViroDrobeAds
-  messages:
-    - advertisement-virodrobe-1
-    - advertisement-virodrobe-2
-    - advertisement-virodrobe-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
deleted file mode 100644
index e5c96887b974..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: BoozeOMatGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-boozeomat-1
-  - thankyou-boozeomat-2
-  - thankyou-boozeomat-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
deleted file mode 100644
index a348d8fa9c18..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: ChangGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-chang-1
-  - thankyou-chang-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
deleted file mode 100644
index 93249586e10a..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: ChefvendGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-chefvend-1
-  - thankyou-chefvend-2
-  - thankyou-chefvend-3
-  - thankyou-chefvend-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
deleted file mode 100644
index 108a34a4722f..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: CigaretteMachineGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-cigs-1
-  - thankyou-cigs-2
-  - thankyou-cigs-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
deleted file mode 100644
index 6f2aef01b8c4..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: HotDrinksMachineGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-coffee-1
-  - thankyou-coffee-2
-  - thankyou-coffee-3
-  - thankyou-coffee-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
deleted file mode 100644
index 76f00fddaf7a..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: RobustSoftdrinksGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-cola-1
-  - thankyou-cola-2
-  - thankyou-cola-3
-  - thankyou-cola-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
deleted file mode 100644
index d3f7d89a93dd..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: messagePack
-  id: DiscountDansGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-discount-1
-  - thankyou-discount-2
-  - thankyou-discount-3
-  - thankyou-discount-4
-  - thankyou-discount-5
-  - thankyou-discount-6
-  - thankyou-discount-7
-  - thankyou-discount-8
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
deleted file mode 100644
index 3c28741e3b6c..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: DonutGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-donut-1
-  - thankyou-donut-2
-  - thankyou-donut-3
-  - thankyou-donut-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
deleted file mode 100644
index 5d842619bb30..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: GoodCleanFunGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-goodcleanfun-1
-  - thankyou-goodcleanfun-2
-  - thankyou-goodcleanfun-3
-  - thankyou-goodcleanfun-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
deleted file mode 100644
index 98a2d7d17a28..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: messagePack
-  id: GenericVendGoodbyes
-  messages:
-  - vending-machine-thanks
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
deleted file mode 100644
index 7859d5546340..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: HappyHonkGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-happyhonk-1
-  - thankyou-happyhonk-2
-  - thankyou-happyhonk-3
-  - thankyou-happyhonk-4
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
deleted file mode 100644
index 56678c10178e..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: messagePack
-  id: LawDrobeGoodbyes
-  messages:
-  - thankyou-lawdrobe-1
-  - thankyou-lawdrobe-2
-  - thankyou-lawdrobe-3
-  - thankyou-lawdrobe-4
-  - thankyou-lawdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
deleted file mode 100644
index 3568ae303142..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: messagePack
-  id: NutriMaxGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-nutrimax-1
-  - thankyou-nutrimax-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
deleted file mode 100644
index 890969347386..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: SecTechGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-sectech-1
-  - thankyou-sectech-2
-  - thankyou-sectech-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
deleted file mode 100644
index bd86e074c6bb..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: messagePack
-  id: GetmoreChocolateCorpGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-snack-1
-  - thankyou-snack-2
-  - thankyou-snack-3
-  - thankyou-snack-4
-  - thankyou-snack-5
-  - thankyou-snack-6
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
deleted file mode 100644
index 01ab25a7ad4a..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: messagePack
-  id: BodaGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-sovietsoda-1
-  - thankyou-sovietsoda-2
-  - thankyou-sovietsoda-3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
deleted file mode 100644
index 1246eb3089dd..000000000000
--- a/Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: messagePack
-  id: SyndieDrobeGoodbyes
-  messages:
-  - vending-machine-thanks
-  - thankyou-syndiedrobe-1
-  - thankyou-syndiedrobe-2
-  - thankyou-syndiedrobe-3
-  - thankyou-syndiedrobe-4
-  - thankyou-syndiedrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
new file mode 100644
index 000000000000..6dbb60af6a97
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -0,0 +1,257 @@
+- type: localizedDataset
+  id: AmmoVendAds
+  values:
+    prefix: advertisement-ammo-
+    count: 10
+
+- type: localizedDataset
+  id: AtmosDrobeAds
+  values:
+    prefix: advertisement-atmosdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: BarDrobeAds
+  values:
+    prefix: advertisement-bardrobe-
+    count: 2
+
+- type: localizedDataset
+  id: BoozeOMatAds
+  values:
+    prefix: advertisement-boozeomat-
+    count: 19
+
+- type: localizedDataset
+  id: CargoDrobeAds
+  values:
+    prefix: advertisement-cargodrobe-
+    count: 3
+
+- type: localizedDataset
+  id: ChangAds
+  values:
+    prefix: advertisement-chang-
+    count: 5
+
+- type: localizedDataset
+  id: ChefDrobeAds
+  values:
+    prefix: advertisement-chefdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: ChefvendAds
+  values:
+    prefix: advertisement-chefvend-
+    count: 9
+
+- type: localizedDataset
+  id: ChemDrobeAds
+  values:
+    prefix: advertisement-chemdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: CigaretteMachineAds
+  values:
+    prefix: advertisement-cigs-
+    count: 12
+
+- type: localizedDataset
+  id: ClothesMateAds
+  values:
+    prefix: advertisement-clothes-
+    count: 7
+
+- type: localizedDataset
+  id: HotDrinksMachineAds
+  values:
+    prefix: advertisement-coffee-
+    count: 14
+
+- type: localizedDataset
+  id: RobustSoftdrinksAds
+  values:
+    prefix: advertisement-cola-
+    count: 8
+
+- type: localizedDataset
+  id: CondimentVendAds
+  values:
+    prefix: advertisement-condiment-
+    count: 6
+
+- type: localizedDataset
+  id: CuraDrobeAds
+  values:
+    prefix: advertisement-curadrobe-
+    count: 3
+
+- type: localizedDataset
+  id: DetDrobeAds
+  values:
+    prefix: advertisement-detdrobe-
+    count: 3
+
+- type: localizedDataset
+  id: DinnerwareAds
+  values:
+    prefix: advertisement-dinnerware-
+    count: 10
+
+- type: localizedDataset
+  id: DiscountDansAds
+  values:
+    prefix: advertisement-discount-
+    count: 9
+
+- type: localizedDataset
+  id: DonutAds
+  values:
+    prefix: advertisement-donut-
+    count: 5
+
+- type: localizedDataset
+  id: EngiDrobeAds
+  values:
+    prefix: advertisement-engidrobe-
+    count: 5
+
+- type: localizedDataset
+  id: FatExtractorFacts
+  values:
+    prefix: fat-extractor-fact-
+    count: 6
+
+- type: localizedDataset
+  id: GoodCleanFunAds
+  values:
+    prefix: advertisement-goodcleanfun-
+    count: 10
+
+- type: localizedDataset
+  id: GeneDrobeAds
+  values:
+    prefix: advertisement-genedrobe-
+    count: 2
+
+- type: localizedDataset
+  id: HappyHonkAds
+  values:
+    prefix: advertisement-happyhonk-
+    count: 10
+
+- type: localizedDataset
+  id: HyDrobeAds
+  values:
+    prefix: advertisement-hydrobe-
+    count: 4
+
+- type: localizedDataset
+  id: JaniDrobeAds
+  values:
+    prefix: advertisement-janidrobe-
+    count: 3
+
+- type: localizedDataset
+  id: LawDrobeAds
+  values:
+    prefix: advertisement-lawdrobe-
+    count: 8
+
+- type: localizedDataset
+  id: MagiVendAds
+  values:
+    prefix: advertisement-magivend-
+    count: 11
+
+- type: localizedDataset
+  id: MediDrobeAds
+  values:
+    prefix: advertisement-medidrobe-
+    count: 3
+
+- type: localizedDataset
+  id: MegaSeedAds
+  values:
+    prefix: advertisement-megaseed-
+    count: 6
+
+- type: localizedDataset
+  id: NanoMedAds
+  values:
+    prefix: advertisement-nanomed-
+    count: 9
+
+- type: localizedDataset
+  id: NutriMaxAds
+  values:
+    prefix: advertisement-nutrimax-
+    count: 7
+
+- type: localizedDataset
+  id: RoboDrobeAds
+  values:
+    prefix: advertisement-robodrobe-
+    count: 4
+
+- type: localizedDataset
+  id: SciDrobeAds
+  values:
+    prefix: advertisement-scidrobe-
+    count: 3
+
+- type: localizedDataset
+  id: SecDrobeAds
+  values:
+    prefix: advertisement-secdrobe-
+    count: 5
+
+- type: localizedDataset
+  id: SecTechAds
+  values:
+    prefix: advertisement-sectech-
+    count: 5
+
+- type: localizedDataset
+  id: SmartFridgeAds
+  values:
+    prefix: advertisement-smartfridge-
+    count: 8
+
+- type: localizedDataset
+  id: GetmoreChocolateCorpAds
+  values:
+    prefix: advertisement-snack-
+    count: 15
+
+- type: localizedDataset
+  id: BodaAds
+  values:
+    prefix: advertisement-sovietsoda-
+    count: 6
+
+- type: localizedDataset
+  id: SyndieDrobeAds
+  values:
+    prefix: advertisement-syndiedrobe-
+    count: 31
+
+- type: localizedDataset
+  id: AutoDrobeAds
+  values:
+    prefix: advertisement-theater-
+    count: 6
+
+- type: localizedDataset
+  id: VendomatAds
+  values:
+    prefix: advertisement-vendomat-
+    count: 7
+
+- type: localizedDataset
+  id: ViroDrobeAds
+  values:
+    prefix: advertisement-virodrobe-
+    count: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
new file mode 100644
index 000000000000..5a3d91db1167
--- /dev/null
+++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
@@ -0,0 +1,101 @@
+- type: localizedDataset
+  id: BoozeOMatGoodbyes
+  values:
+    prefix: thankyou-boozeomat-
+    count: 3
+
+- type: localizedDataset
+  id: ChangGoodbyes
+  values:
+    prefix: thankyou-chang-
+    count: 2
+
+- type: localizedDataset
+  id: ChefvendGoodbyes
+  values:
+    prefix: thankyou-chefvend-
+    count: 4
+
+- type: localizedDataset
+  id: CigaretteMachineGoodbyes
+  values:
+    prefix: thankyou-cigs-
+    count: 3
+
+- type: localizedDataset
+  id: HotDrinksMachineGoodbyes
+  values:
+    prefix: thankyou-coffee-
+    count: 4
+
+- type: localizedDataset
+  id: RobustSoftdrinksGoodbyes
+  values:
+    prefix: thankyou-cola-
+    count: 4
+
+- type: localizedDataset
+  id: DiscountDansGoodbyes
+  values:
+    prefix: thankyou-discount-
+    count: 8
+
+- type: localizedDataset
+  id: DonutGoodbyes
+  values:
+    prefix: thankyou-donut-
+    count: 4
+
+- type: localizedDataset
+  id: GoodCleanFunGoodbyes
+  values:
+    prefix: thankyou-goodcleanfun-
+    count: 4
+
+- type: localizedDataset
+  id: GenericVendGoodbyes
+  values:
+    prefix: vending-machine-thanks-
+    count: 1
+
+- type: localizedDataset
+  id: HappyHonkGoodbyes
+  values:
+    prefix: thankyou-happyhonk-
+    count: 4
+
+- type: localizedDataset
+  id: LawDrobeGoodbyes
+  values:
+    prefix: thankyou-lawdrobe-
+    count: 5
+
+- type: localizedDataset
+  id: NutriMaxGoodbyes
+  values:
+    prefix: thankyou-nutrimax-
+    count: 2
+
+- type: localizedDataset
+  id: SecTechGoodbyes
+  values:
+    prefix: thankyou-sectech-
+    count: 3
+
+- type: localizedDataset
+  id: GetmoreChocolateCorpGoodbyes
+  values:
+    prefix: thankyou-snack-
+    count: 6
+
+- type: localizedDataset
+  id: BodaGoodbyes
+  values:
+    prefix: thankyou-sovietsoda-
+    count: 3
+
+- type: localizedDataset
+  id: SyndieDrobeGoodbyes
+  values:
+    prefix: thankyou-syndiedrobe-
+    count: 5

From 5a25d1cc4b77ed84242075b043ddc6e987dd17f4 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Thu, 30 May 2024 08:09:07 -0800
Subject: [PATCH 142/568] Make mapping actions slightly more useable (#28394)

---
 Resources/mapping_actions.yml | 115 ++++++++++++++++------------------
 1 file changed, 54 insertions(+), 61 deletions(-)

diff --git a/Resources/mapping_actions.yml b/Resources/mapping_actions.yml
index 9498c3062a30..e7ab1b4bf3d2 100644
--- a/Resources/mapping_actions.yml
+++ b/Resources/mapping_actions.yml
@@ -1,6 +1,5 @@
 - action: !type:InstantActionComponent
-    icon:
-      entity: ReinforcedWindow
+    icon: /Textures/Tiles/cropped_parallax.png
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -8,14 +7,41 @@
     autoPopulate: False
     temporary: True
     event: !type:StartPlacementActionEvent
-      placementOption: SnapgridCenter
-      entityType: ReinforcedWindow
+      placementOption: AlignTileAny
+      tileId: Space
   assignments:
-  - 0: 3
-  name: ReinforcedWindow
+  - 0: 8
+  name: space
+- action: !type:InstantActionComponent
+    icon: Interface/VerbIcons/delete.svg.192dpi.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      eraser: True
+  assignments:
+  - 0: 9
+  name: action-name-mapping-erase
+- action: !type:InstantActionComponent
+    icon: /Textures/Tiles/plating.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: AlignTileAny
+      tileId: Plating
+  assignments:
+  - 0: 7
+  name: plating
 - action: !type:InstantActionComponent
     icon:
-      entity: WallSolid
+      entity: Grille
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -24,13 +50,13 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: WallSolid
+      entityType: Grille
   assignments:
-  - 0: 0
-  name: WallSolid
+  - 0: 4
+  name: Grille
 - action: !type:InstantActionComponent
     icon:
-      entity: WallReinforced
+      entity: WallSolid
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -39,10 +65,10 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: WallReinforced
+      entityType: WallSolid
   assignments:
-  - 0: 1
-  name: WallReinforced
+  - 0: 0
+  name: WallSolid
 - action: !type:InstantActionComponent
     icon:
       entity: Window
@@ -60,7 +86,7 @@
   name: Window
 - action: !type:InstantActionComponent
     icon:
-      entity: Firelock
+      entity: WallReinforced
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -69,13 +95,13 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: Firelock
+      entityType: WallReinforced
   assignments:
-  - 0: 5
-  name: Firelock
+  - 0: 1
+  name: WallReinforced
 - action: !type:InstantActionComponent
     icon:
-      entity: Grille
+      entity: ReinforcedWindow
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -84,12 +110,13 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: Grille
+      entityType: ReinforcedWindow
   assignments:
-  - 0: 4
-  name: Grille
+  - 0: 3
+  name: ReinforcedWindow
 - action: !type:InstantActionComponent
-    icon: Interface/VerbIcons/delete.svg.192dpi.png
+    icon:
+      entity: Firelock
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -97,15 +124,11 @@
     autoPopulate: False
     temporary: True
     event: !type:StartPlacementActionEvent
-      eraser: True
+      placementOption: SnapgridCenter
+      entityType: Firelock
   assignments:
-  - 0: 9
-  - 1: 9
-  - 2: 9
-  - 4: 9
-  - 5: 9
-  - 6: 9
-  name: action-name-mapping-erase
+  - 0: 5
+  name: Firelock
 - action: !type:InstantActionComponent
     icon:
       entity: GasPipeStraight
@@ -1110,34 +1133,4 @@
   assignments:
   - 0: 6
   name: steel floor
-- action: !type:InstantActionComponent
-    icon: /Textures/Tiles/plating.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: AlignTileAny
-      tileId: Plating
-  assignments:
-  - 0: 7
-  - 1: 8
-  - 2: 8
-  name: plating
-- action: !type:InstantActionComponent
-    icon: /Textures/Tiles/cropped_parallax.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: AlignTileAny
-      tileId: Space
-  assignments:
-  - 0: 8
-  name: space
 ...

From 34486f7451465acd4d1e22d792f6fc07f2a25d14 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 30 May 2024 10:25:07 -0700
Subject: [PATCH 143/568] Fix firelocks not requiring engineering access
 (#28415)

---
 .../Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index c098409f3aa3..d6815abcdc6a 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -105,6 +105,8 @@
       arc: 360
     - type: StaticPrice
       price: 150
+    - type: AccessReader
+      access: [ [ "Engineering" ] ]
     - type: PryUnpowered
       pryModifier: 0.5
 

From 9163af46b63be9b697c05824d391e0e3f9ac4e70 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 30 May 2024 17:26:14 +0000
Subject: [PATCH 144/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7bbc12d0b918..6614ad87359f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: 778b
-  changes:
-  - message: Guns which use battery as magazines now display ammo. Like Svalinn pistol.
-    type: Fix
-  id: 6144
-  time: '2024-03-13T11:13:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26009
 - author: icekot8
   changes:
   - message: Foxes are now neutral and deal 8 piercing damage
@@ -3863,3 +3856,11 @@
   id: 6643
   time: '2024-05-30T07:32:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28405
+- author: ShadowCommander
+  changes:
+  - message: Fixed firelocks with warnings enabled opening immediately for characters
+      without engineering access.
+    type: Fix
+  id: 6644
+  time: '2024-05-30T17:25:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28415

From 2459572ecc4ecc570ef3aeedf77fe00b93cc8ed6 Mon Sep 17 00:00:00 2001
From: Moony <moony@hellomouse.net>
Date: Thu, 30 May 2024 15:45:16 -0500
Subject: [PATCH 145/568] Handheld teleporter portals now must start on the
 same grid. (#28423)

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
---
 .../Teleportation/HandTeleporterSystem.cs     | 55 +++++++++++++------
 .../teleportation/handheld-teleporter.ftl     |  1 +
 2 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 Resources/Locale/en-US/teleportation/handheld-teleporter.ftl

diff --git a/Content.Server/Teleportation/HandTeleporterSystem.cs b/Content.Server/Teleportation/HandTeleporterSystem.cs
index 3d988b091614..d4c6753c4b52 100644
--- a/Content.Server/Teleportation/HandTeleporterSystem.cs
+++ b/Content.Server/Teleportation/HandTeleporterSystem.cs
@@ -1,7 +1,9 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Popups;
 using Content.Shared.DoAfter;
 using Content.Shared.Database;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Popups;
 using Content.Shared.Teleportation.Components;
 using Content.Shared.Teleportation.Systems;
 using Robust.Server.Audio;
@@ -18,6 +20,7 @@ public sealed class HandTeleporterSystem : EntitySystem
     [Dependency] private readonly LinkedEntitySystem _link = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doafter = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -92,6 +95,16 @@ private void HandlePortalUpdating(EntityUid uid, HandTeleporterComponent compone
         }
         else if (Deleted(component.SecondPortal))
         {
+            if (xform.ParentUid != xform.GridUid) // Still, don't portal.
+                return;
+
+            if (xform.ParentUid != Transform(component.FirstPortal!.Value).ParentUid)
+            {
+                // Whoops. Fizzle time. Crime time too because yippee I'm not refactoring this logic right now (I started to, I'm not going to.)
+                FizzlePortals(uid, component, user, true);
+                return;
+            }
+
             var timeout = EnsureComp<PortalTimeoutComponent>(user);
             timeout.EnteredPortal = null;
             component.SecondPortal = Spawn(component.SecondPortalPrototype, Transform(user).Coordinates);
@@ -101,22 +114,32 @@ private void HandlePortalUpdating(EntityUid uid, HandTeleporterComponent compone
         }
         else
         {
-            // Logging
-            var portalStrings = "";
-            portalStrings += ToPrettyString(component.FirstPortal!.Value);
-            if (portalStrings != "")
-                portalStrings += " and ";
-            portalStrings += ToPrettyString(component.SecondPortal!.Value);
-            if (portalStrings != "")
-                _adminLogger.Add(LogType.EntityDelete, LogImpact.Low, $"{ToPrettyString(user):player} closed {portalStrings} with {ToPrettyString(uid)}");
-
-            // Clear both portals
-            QueueDel(component.FirstPortal!.Value);
-            QueueDel(component.SecondPortal!.Value);
-
-            component.FirstPortal = null;
-            component.SecondPortal = null;
-            _audio.PlayPvs(component.ClearPortalsSound, uid);
+            FizzlePortals(uid, component, user, false);
         }
     }
+
+    private void FizzlePortals(EntityUid uid, HandTeleporterComponent component, EntityUid user, bool instability)
+    {
+        // Logging
+        var portalStrings = "";
+        portalStrings += ToPrettyString(component.FirstPortal);
+        if (portalStrings != "")
+            portalStrings += " and ";
+        portalStrings += ToPrettyString(component.SecondPortal);
+        if (portalStrings != "")
+            _adminLogger.Add(LogType.EntityDelete, LogImpact.Low, $"{ToPrettyString(user):player} closed {portalStrings} with {ToPrettyString(uid)}");
+
+        // Clear both portals
+        if (!Deleted(component.FirstPortal))
+            QueueDel(component.FirstPortal.Value);
+        if (!Deleted(component.SecondPortal))
+            QueueDel(component.SecondPortal.Value);
+
+        component.FirstPortal = null;
+        component.SecondPortal = null;
+        _audio.PlayPvs(component.ClearPortalsSound, uid);
+
+        if (instability)
+            _popup.PopupEntity(Loc.GetString("handheld-teleporter-instability-fizzle"), uid, user, PopupType.MediumCaution);
+    }
 }
diff --git a/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
new file mode 100644
index 000000000000..28f526f0d52d
--- /dev/null
+++ b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
@@ -0,0 +1 @@
+handheld-teleporter-instability-fizzle = The portal fizzles as you try to place it, destroying both ends!

From 9df7f5cd2f8739a26f8c51c2bf971aa0e10bbe74 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 30 May 2024 20:46:22 +0000
Subject: [PATCH 146/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6614ad87359f..12aed60d453a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: icekot8
-  changes:
-  - message: Foxes are now neutral and deal 8 piercing damage
-    type: Tweak
-  id: 6145
-  time: '2024-03-13T15:02:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25992
 - author: Mangohydra
   changes:
   - message: The lawyer now spawns with their own lawyer stamp for stamping very important
@@ -3864,3 +3857,10 @@
   id: 6644
   time: '2024-05-30T17:25:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28415
+- author: moonheart08
+  changes:
+  - message: The hand teleporter can no longer create portal links between grids.
+    type: Remove
+  id: 6645
+  time: '2024-05-30T20:45:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28423

From c6b22fb01c159a3c1612860af49e862ada8f3bda Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 30 May 2024 17:25:13 -0700
Subject: [PATCH 147/568] Fix TryGetActionData error triggering when run on
 deleting entities (#27839)

* Fix TryGetActionData error triggering when run on deleting entities

* Only get metadata once
---
 Content.Shared/Actions/SharedActionsSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index c92d67ba8129..bf86d2c1e492 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -112,7 +112,7 @@ public bool TryGetActionData(
         bool logError = true)
     {
         result = null;
-        if (!Exists(uid))
+        if (uid == null || TerminatingOrDeleted(uid.Value))
             return false;
 
         var ev = new GetActionDataEvent();

From abfa12e3152173715a369e6efa81c48079e91ded Mon Sep 17 00:00:00 2001
From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Date: Thu, 30 May 2024 20:28:12 -0400
Subject: [PATCH 148/568] Create sale console computer board (#28425)

---
 .../Prototypes/Catalog/Fills/Lockers/heads.yml      |  1 +
 .../Objects/Devices/Circuitboards/computer.yml      | 13 ++++++++++++-
 .../Structures/Machines/Computers/computers.yml     |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index e38d57e6d827..11863ea51db6 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -7,6 +7,7 @@
     contents:
       - id: BoxFolderQmClipboard
       - id: CargoRequestComputerCircuitboard
+      - id: CargoSaleComputerCircuitboard
       - id: CargoShuttleComputerCircuitboard
       - id: CargoShuttleConsoleCircuitboard
       - id: SalvageShuttleConsoleCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 93aff069f001..d3c58a0fe78f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -84,6 +84,17 @@
     - type: StaticPrice
       price: 750
 
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: CargoSaleComputerCircuitboard
+  name: cargo sale computer board
+  description: A computer printed circuit board for a cargo sale computer.
+  components:
+    - type: Sprite
+      state: cpu_supply
+    - type: ComputerBoard
+      prototype: ComputerPalletConsole
+
 - type: entity
   id: CargoBountyComputerCircuitboard
   parent: BaseComputerCircuitboard
@@ -394,4 +405,4 @@
     - type: Sprite
       state: cpu_science
     - type: ComputerBoard
-      prototype: ComputerRoboticsControl
+      prototype: ComputerRoboticsControl
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index b5c7a1a19c35..abb12f93132a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -993,7 +993,7 @@
       enum.CargoPalletConsoleUiKey.Sale:
         type: CargoPalletConsoleBoundUserInterface
   - type: Computer
-    board: CargoRequestComputerCircuitboard
+    board: CargoSaleComputerCircuitboard
   - type: PointLight
     radius: 1.5
     energy: 1.6
@@ -1114,4 +1114,4 @@
   - type: AccessReader # only used for dangerous things
     access: [["ResearchDirector"]]
   - type: Lock
-    unlockOnClick: false
+    unlockOnClick: false
\ No newline at end of file

From 75ef8e4fec7cb1e2395fe93138e6ebc592c106e7 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 00:29:18 +0000
Subject: [PATCH 149/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 12aed60d453a..17018395a243 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Mangohydra
-  changes:
-  - message: The lawyer now spawns with their own lawyer stamp for stamping very important
-      documents.
-    type: Add
-  id: 6146
-  time: '2024-03-13T15:05:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26012
 - author: Errant
   changes:
   - message: Clothes with alternate sprites for vox once again show the alternate
@@ -3864,3 +3856,10 @@
   id: 6645
   time: '2024-05-30T20:45:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28423
+- author: Ghagliiarghii
+  changes:
+  - message: Cargo Sale Computer now correctly uses its own computer board
+    type: Fix
+  id: 6646
+  time: '2024-05-31T00:28:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28425

From d90cbee7f21e115b3b364bcb86c0085208c5b0d9 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 31 May 2024 11:55:01 +1000
Subject: [PATCH 150/568] Fix verb categories shuffling (#28368)

If it's an extra category we leave it in its default spot.
---
 .../Verbs/UI/VerbMenuUIController.cs          | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs
index c3fc8c835677..e9c3f90641f0 100644
--- a/Content.Client/Verbs/UI/VerbMenuUIController.cs
+++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs
@@ -8,6 +8,7 @@
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Collections;
 using Robust.Shared.Input;
 using Robust.Shared.Utility;
 
@@ -115,6 +116,13 @@ public void OpenVerbMenu(NetEntity target, bool force = false, ContextMenuPopup?
         private void FillVerbPopup(ContextMenuPopup popup)
         {
             HashSet<string> listedCategories = new();
+            var extras = new ValueList<string>(ExtraCategories.Count);
+
+            foreach (var cat in ExtraCategories)
+            {
+                extras.Add(cat.Text);
+            }
+
             foreach (var verb in CurrentVerbs)
             {
                 if (verb.Category == null)
@@ -122,17 +130,15 @@ private void FillVerbPopup(ContextMenuPopup popup)
                     var element = new VerbMenuElement(verb);
                     _context.AddElement(popup, element);
                 }
-                else if (listedCategories.Add(verb.Category.Text))
+                // Add the category if it's not an extra (this is to avoid shuffling if we're filling from server verbs response).
+                else if (!extras.Contains(verb.Category.Text) && listedCategories.Add(verb.Category.Text))
                     AddVerbCategory(verb.Category, popup);
             }
 
-            if (ExtraCategories != null)
+            foreach (var category in ExtraCategories)
             {
-                foreach (var category in ExtraCategories)
-                {
-                    if (listedCategories.Add(category.Text))
-                        AddVerbCategory(category, popup);
-                }
+                if (listedCategories.Add(category.Text))
+                    AddVerbCategory(category, popup);
             }
 
             popup.InvalidateMeasure();

From 6b19d0a62c415302a2333b0d387529f074da04ad Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 01:56:07 +0000
Subject: [PATCH 151/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 17018395a243..e54095c43ca4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Errant
-  changes:
-  - message: Clothes with alternate sprites for vox once again show the alternate
-      sprites, instead of the defaults.
-    type: Fix
-  id: 6147
-  time: '2024-03-13T15:06:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25989
 - author: Gyrandola
   changes:
   - message: Fireaxe and Shotgun cabinets can now be destroyed.
@@ -3863,3 +3855,10 @@
   id: 6646
   time: '2024-05-31T00:28:12.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28425
+- author: metalgearsloth
+  changes:
+  - message: Fix verb categories shuffling around.
+    type: Fix
+  id: 6647
+  time: '2024-05-31T01:55:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28368

From 7e8e145d075c96705d4678c237b2876225e0da45 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 30 May 2024 18:59:25 -0700
Subject: [PATCH 152/568] Reflow the player tab to show more of the names
 (#28029)

---
 .../Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml   | 7 ++++---
 .../Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
index 8ac90305ca91..f9ed57792ed2 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
@@ -15,16 +15,17 @@
                ClipText="True"/>
         <customControls:VSeparator/>
         <Label Name="JobLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
         <Label Name="AntagonistLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"/>
+        <customControls:VSeparator/>
         <Label Name="OverallPlaytimeLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"/>
     </BoxContainer>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
index 2fd3f31b9032..e0356e515e8d 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
@@ -19,20 +19,21 @@
                MouseFilter="Pass"/>
         <cc:VSeparator/>
         <Label Name="JobLabel"
-               SizeFlagsStretchRatio="3"
+               SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-job}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
         <Label Name="AntagonistLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-antagonist}"
                MouseFilter="Pass"/>
+        <cc:VSeparator/>
         <Label Name="PlaytimeLabel"
-               SizeFlagsStretchRatio="2"
+               SizeFlagsStretchRatio="1"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-playtime}"

From 716fda3af3a1ee91855f6736b7c26ca3d6dde532 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 02:00:31 +0000
Subject: [PATCH 153/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e54095c43ca4..45634249a7de 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Gyrandola
-  changes:
-  - message: Fireaxe and Shotgun cabinets can now be destroyed.
-    type: Add
-  id: 6148
-  time: '2024-03-13T15:09:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25962
 - author: lzk228
   changes:
   - message: Surgery tools can be placed in medical belt.
@@ -3862,3 +3855,11 @@
   id: 6647
   time: '2024-05-31T01:55:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28368
+- author: ShadowCommander
+  changes:
+  - message: Tweaked the player tab column widths so that usernames and character
+      names are more visible.
+    type: Tweak
+  id: 6648
+  time: '2024-05-31T01:59:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28029

From 8422eaa07335dc4041b95ab7501253174b907b82 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 30 May 2024 22:06:21 -0400
Subject: [PATCH 154/568] Fix latejoin antag preferences not being respected
 (#28430)

* Fix latejoin antag preferences not being respected

* thank fuck for tests
---
 .../Antag/AntagSelectionSystem.API.cs         | 31 ++++++++++++++++
 Content.Server/Antag/AntagSelectionSystem.cs  | 36 ++++++++++---------
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index 16d83c4f3fc4..23e77c210280 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -5,6 +5,7 @@
 using Content.Server.Objectives;
 using Content.Shared.Chat;
 using Content.Shared.Mind;
+using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Enums;
@@ -156,6 +157,36 @@ public List<EntityUid> GetAntagMindEntityUids(Entity<AntagSelectionComponent?> e
         return ent.Comp.SelectedMinds.Select(p => p.Item1).ToList();
     }
 
+    /// <summary>
+    /// Checks if a given session has the primary antag preferences for a given definition
+    /// </summary>
+    public bool HasPrimaryAntagPreference(ICommonSession? session, AntagSelectionDefinition def)
+    {
+        if (session == null)
+            return true;
+
+        if (def.PrefRoles.Count == 0)
+            return false;
+
+        var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
+        return pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p));
+    }
+
+    /// <summary>
+    /// Checks if a given session has the fallback antag preferences for a given definition
+    /// </summary>
+    public bool HasFallbackAntagPreference(ICommonSession? session, AntagSelectionDefinition def)
+    {
+        if (session == null)
+            return true;
+
+        if (def.FallbackRoles.Count == 0)
+            return false;
+
+        var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
+        return pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p));
+    }
+
     /// <summary>
     /// Returns all the antagonists for this rule who are currently alive
     /// </summary>
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index b42831cbde81..47da1b6475f3 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -18,7 +18,7 @@
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
-using Content.Shared.Preferences;
+using Content.Shared.Whitelist;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -42,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 _whitelist = default!;
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -121,12 +122,15 @@ private void OnSpawnComplete(PlayerSpawnCompleteEvent args)
         // something to figure out later.
 
         var query = QueryActiveRules();
+        var rules = new List<(EntityUid, AntagSelectionComponent)>();
         while (query.MoveNext(out var uid, out _, out var antag, out _))
         {
-            // TODO ANTAG
-            // what why aasdiuhasdopiuasdfhksad
-            // stop this insanity please
-            // probability of antag assignment shouldn't depend on the order in which rules are returned by the query.
+            rules.Add((uid, antag));
+        }
+        RobustRandom.Shuffle(rules);
+
+        foreach (var (uid, antag) in rules)
+        {
             if (!RobustRandom.Prob(LateJoinRandomChance))
                 continue;
 
@@ -232,13 +236,13 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
     /// <summary>
     /// Tries to makes a given player into the specified antagonist.
     /// </summary>
-    public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false)
+    public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false, bool checkPref = true)
     {
-        if (!IsSessionValid(ent, session, def) ||
-            !IsEntityValid(session?.AttachedEntity, def))
-        {
+        if (checkPref && !HasPrimaryAntagPreference(session, def))
+            return false;
+
+        if (!IsSessionValid(ent, session, def) || !IsEntityValid(session?.AttachedEntity, def))
             return false;
-        }
 
         MakeAntag(ent, session, def, ignoreSpawner);
         return true;
@@ -338,16 +342,14 @@ public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> en
         var fallbackList = new List<ICommonSession>();
         foreach (var session in sessions)
         {
-            if (!IsSessionValid(ent, session, def) ||
-                !IsEntityValid(session.AttachedEntity, def))
+            if (!IsSessionValid(ent, session, def) || !IsEntityValid(session.AttachedEntity, def))
                 continue;
 
-            var pref = (HumanoidCharacterProfile) _pref.GetPreferences(session.UserId).SelectedCharacter;
-            if (def.PrefRoles.Count != 0 && pref.AntagPreferences.Any(p => def.PrefRoles.Contains(p)))
+            if (HasPrimaryAntagPreference(session, def))
             {
                 preferredList.Add(session);
             }
-            else if (def.FallbackRoles.Count != 0 && pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p)))
+            else if (HasFallbackAntagPreference(session, def))
             {
                 fallbackList.Add(session);
             }
@@ -418,13 +420,13 @@ public bool IsEntityValid(EntityUid? entity, AntagSelectionDefinition def)
 
         if (def.Whitelist != null)
         {
-            if (!def.Whitelist.IsValid(entity.Value, EntityManager))
+            if (!_whitelist.IsValid(def.Whitelist, entity.Value))
                 return false;
         }
 
         if (def.Blacklist != null)
         {
-            if (def.Blacklist.IsValid(entity.Value, EntityManager))
+            if (_whitelist.IsValid(def.Blacklist, entity.Value))
                 return false;
         }
 

From dee9634c017eb6583c05952591fb89c9e09f1a00 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 02:07:27 +0000
Subject: [PATCH 155/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 45634249a7de..03741c17147d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: lzk228
-  changes:
-  - message: Surgery tools can be placed in medical belt.
-    type: Tweak
-  - message: Lantern can be placed in utility belt.
-    type: Tweak
-  - message: Hand labeler can be placed in utility and botanical belt
-    type: Tweak
-  id: 6149
-  time: '2024-03-13T18:55:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26085
 - author: wafehling
   changes:
   - message: The trading outpost now has dedicated buy-only and sell-only pallets.
@@ -3863,3 +3852,11 @@
   id: 6648
   time: '2024-05-31T01:59:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28029
+- author: EmoGarbage404
+  changes:
+  - message: Fixed latejoin antagonists not respecting antag preferences (for real
+      this time)
+    type: Fix
+  id: 6649
+  time: '2024-05-31T02:06:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28430

From 54337911d3995075caf4bbc6b6d768a93e8c1d0a 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 156/568] 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          | 118 +++++++++++++++++-
 .../ReagentEffectConditions/OrganType.cs      |  12 +-
 .../Damage/Systems/DamageOnLandSystem.cs      |   2 +-
 .../Electrocution/ElectrocutionSystem.cs      |   4 +-
 .../ExplosionSystem.Processing.cs             |   2 +-
 .../Projectiles/ProjectileSystem.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 +-
 16 files changed, 189 insertions(+), 34 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
index c1b58f7a7728..0d622f3067ad 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 c1e1de2baad8..b79e083bd467 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 e83d3c32a25f..7e58c24f7e4a 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 a46294beb4d9..4e6c02edbd64 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -1,16 +1,21 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos;
 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.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
+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 JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Body.Systems;
@@ -26,9 +31,12 @@ public sealed class RespiratorSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageableSys = default!;
     [Dependency] private readonly LungSystem _lungSystem = 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()
     {
         base.Initialize();
@@ -109,7 +117,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);
 
@@ -164,6 +172,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 4ae13b6a6e48..986c3d79c8d2 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 8f01e791ead4..2e72e76e6d83 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 8291e97efe44..67e60c9de466 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -166,7 +166,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);
@@ -183,7 +183,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 a93157a17537..bce3dc21c233 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -396,7 +396,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/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index f8c8ef64b791..970536f42b02 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -51,7 +51,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
 
         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));
             }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 05f5cc58bcf5..f175565a5a0e 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -204,7 +204,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 838311c1aacc..9da7606bcc58 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 986cac98ddf4..7247109e37fd 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -237,7 +237,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 a676ed672045..0f1efba97666 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 8ab9116a975e..7f505b807f77 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 acf00f7c6bf2..f352c9db63e9 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -142,7 +142,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 7fc440db4794..2d9993096bc5 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -499,7 +499,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);
 
-        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 27e63f5919b36102683420cabd0152ef83e18122 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 157/568] 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                  |  3 +
 Content.IntegrationTests/Pair/TestPair.cs     |  4 ++
 Content.IntegrationTests/PoolManager.cs       |  2 +
 .../Tests/GameRules/NukeOpsTest.cs            |  2 -
 .../Administration/Systems/AdminSystem.cs     | 13 ++++
 6 files changed, 91 insertions(+), 2 deletions(-)
 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 000000000000..81df31fc9a33
--- /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 c0f4b3b745f5..8d1e425553b3 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -40,6 +40,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");
@@ -132,6 +134,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());
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 916a94c9c4c0..7ee5dbd55c7a 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 3b49ffcf8477..21c93ea8aeb5 100644
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -270,6 +270,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 3a77834b7259..ea19a30005ee 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -50,7 +50,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
@@ -200,7 +199,6 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         }
 
         ticker.SetGamePreset((GamePresetPrototype?)null);
-        server.CfgMan.SetCVar(CCVars.GridFill, false);
         await pair.SetAntagPref("NukeopsCommander", false);
         await pair.CleanReturnAsync();
     }
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index b7ca4e915b5d..a1a6b33ebcb7 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -292,6 +292,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 07866e47644e010733a2d1be025a27ba4b775bf3 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 31 May 2024 15:11:21 +1200
Subject: [PATCH 158/568] Prevent Identity.Name NRE exception (#28433)

Fix Identity.Name exception
---
 Content.Client/Inventory/StrippableBoundUserInterface.cs | 5 ++++-
 Content.Shared/IdentityManagement/Identity.cs            | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 33f38688edf6..7e50eb1c68a5 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -21,7 +21,6 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 using static Content.Client.Inventory.ClientInventorySystem;
 using static Robust.Client.UserInterface.Control;
 
@@ -53,9 +52,13 @@ public StrippableBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, u
             _inv = EntMan.System<InventorySystem>();
             _cuffable = EntMan.System<SharedCuffableSystem>();
 
+            // TODO update name when identity changes
             var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
             _strippingMenu = new StrippingMenu(title, this);
             _strippingMenu.OnClose += Close;
+
+            // TODO use global entity
+            // BUIs are opened and closed while applying comp sates, so spawning entities here is probably not the best idea.
             _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace);
         }
 
diff --git a/Content.Shared/IdentityManagement/Identity.cs b/Content.Shared/IdentityManagement/Identity.cs
index 20220e0326ad..2fb53e3d5a9b 100644
--- a/Content.Shared/IdentityManagement/Identity.cs
+++ b/Content.Shared/IdentityManagement/Identity.cs
@@ -15,7 +15,11 @@ public static class Identity
     /// </summary>
     public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer=null)
     {
-        var uidName = ent.GetComponent<MetaDataComponent>(uid).EntityName;
+        var meta = ent.GetComponent<MetaDataComponent>(uid);
+        if (meta.EntityLifeStage <= EntityLifeStage.Initializing)
+            return meta.EntityName; // Identity component and such will not yet have initialized and may throw NREs
+
+        var uidName = meta.EntityName;
 
         if (!ent.TryGetComponent<IdentityComponent>(uid, out var identity))
             return uidName;
@@ -34,7 +38,7 @@ public static string Name(EntityUid uid, IEntityManager ent, EntityUid? viewer=n
             return uidName;
         }
 
-        return uidName + $" ({identName})";
+        return $"{uidName} ({identName})";
     }
 
     /// <summary>

From dbcdefc5fdf2fba6559619ef0526729bcf73b19c Mon Sep 17 00:00:00 2001
From: Flesh <62557990+PolterTzi@users.noreply.github.com>
Date: Fri, 31 May 2024 05:37:04 +0200
Subject: [PATCH 159/568] Fix trailing periods in some plant metabolism
 descriptions (#28428)

fxied tpyos
---
 Resources/Locale/en-US/guidebook/chemistry/effects.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 1dacebd1349e..ba005e6bf983 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -373,10 +373,10 @@ reagent-effect-guidebook-plant-diethylamine =
     { $chance ->
         [1] Increases
         *[other] increase
-    } the plant's lifespan and/or base health with 10% chance for each.
+    } the plant's lifespan and/or base health with 10% chance for each
 
 reagent-effect-guidebook-plant-robust-harvest =
     { $chance ->
         [1] Increases
         *[other] increase
-    } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance.
+    } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance

From 3ed1ee6a5bd6a7fc3409bdc06079465a3f9d3cbf Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Thu, 30 May 2024 23:28:08 -0700
Subject: [PATCH 160/568] Add search filter to the admin menu player tab
 (#28030)

---
 .../UI/Bwoink/BwoinkWindow.xaml.cs            |  15 ++-
 .../CustomControls/PlayerListControl.xaml.cs  |   9 +-
 .../UI/Tabs/PlayerTab/PlayerTab.xaml          |  26 ++---
 .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs       | 104 +++++++++++++-----
 .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml     |   8 +-
 .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs  |  26 +++--
 .../UI/Tabs/PlayerTab/PlayerTabHeader.xaml    |   3 +-
 .../UserInterface/Controls/ListContainer.cs   |  39 +++++--
 .../Controls/SearchListContainer.cs           |  68 ++++++++++++
 .../Systems/Admin/AdminUIController.cs        |   9 +-
 .../Locale/en-US/administration/bwoink.ftl    |   2 +
 .../administration/ui/tabs/player-tab.ftl     |   3 +
 12 files changed, 234 insertions(+), 78 deletions(-)
 create mode 100644 Content.Client/UserInterface/Controls/SearchListContainer.cs

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
index f8d06f758f40..999eba4d29dc 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
@@ -16,14 +16,17 @@ public BwoinkWindow()
 
             Bwoink.ChannelSelector.OnSelectionChanged += sel =>
             {
-                if (sel is not null)
+                if (sel is null)
                 {
-                    Title = $"{sel.CharacterName} / {sel.Username}";
+                    Title = Loc.GetString("bwoink-none-selected");
+                    return;
+                }
+
+                Title = $"{sel.CharacterName} / {sel.Username}";
 
-                    if (sel.OverallPlaytime != null)
-                    {
-                        Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
-                    }
+                if (sel.OverallPlaytime != null)
+                {
+                    Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
                 }
             };
 
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index fdf935d7c048..12522d552d71 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -20,7 +20,7 @@ public sealed partial class PlayerListControl : BoxContainer
         private List<PlayerInfo> _playerList = new();
         private readonly List<PlayerInfo> _sortedPlayerList = new();
 
-        public event Action<PlayerInfo>? OnSelectionChanged;
+        public event Action<PlayerInfo?>? OnSelectionChanged;
         public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
 
         public Func<PlayerInfo, string, string>? OverrideText;
@@ -41,12 +41,19 @@ public PlayerListControl()
             PlayerListContainer.ItemPressed += PlayerListItemPressed;
             PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown;
             PlayerListContainer.GenerateItem += GenerateButton;
+            PlayerListContainer.NoItemSelected += PlayerListNoItemSelected;
             PopulateList(_adminSystem.PlayerList);
             FilterLineEdit.OnTextChanged += _ => FilterList();
             _adminSystem.PlayerListChanged += PopulateList;
             BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
         }
 
+        private void PlayerListNoItemSelected()
+        {
+            _selectedPlayer = null;
+            OnSelectionChanged?.Invoke(null);
+        }
+
         private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
         {
             if (args == null || data is not PlayerListData {Info: var selectedPlayer})
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
index 3071bf8358b3..25a96df1d377 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
@@ -1,21 +1,19 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:pt="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
-         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+         xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Name="PlayerCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
-                   Text="{Loc Player Count}" />
-            <Button Name="ShowDisconnectedButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"
-                    Text="{Loc player-tab-show-disconnected}" ToggleMode="True"/>
-            <Button Name="OverlayButton" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"
-                    Text="{Loc player-tab-overlay}" ToggleMode="True"/>
+            <Label Name="PlayerCount" HorizontalExpand="True" Text="{Loc Player Count}" />
+            <LineEdit Name="SearchLineEdit" HorizontalExpand="True"
+                      PlaceHolder="{Loc player-tab-filter-line-edit-placeholder}" />
+            <Button Name="ShowDisconnectedButton" HorizontalExpand="True"
+                    Text="{Loc player-tab-show-disconnected}" ToggleMode="True" />
+            <Button Name="OverlayButton" HorizontalExpand="True" Text="{Loc player-tab-overlay}" ToggleMode="True" />
         </BoxContainer>
-        <Control MinSize="0 5" />
-        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical" Name="PlayerList">
-                <pt:PlayerTabHeader Name="ListHeader" />
-                <cc:HSeparator />
-            </BoxContainer>
-        </ScrollContainer>
+        <Control MinSize="0 5"/>
+        <pt:PlayerTabHeader Name="ListHeader"/>
+        <cc:HSeparator/>
+        <co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 33a1d2361f28..a8bfaddecf45 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Administration.Systems;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -28,15 +29,14 @@ public sealed partial class PlayerTab : Control
         private bool _ascending = true;
         private bool _showDisconnected;
 
-        public event Action<PlayerTabEntry, GUIBoundKeyEventArgs>? OnEntryKeyBindDown;
+        public event Action<GUIBoundKeyEventArgs, ListData>? OnEntryKeyBindDown;
 
         public PlayerTab()
         {
             IoCManager.InjectDependencies(this);
-            _adminSystem = _entManager.System<AdminSystem>();
             RobustXamlLoader.Load(this);
-            RefreshPlayerList(_adminSystem.PlayerList);
 
+            _adminSystem = _entManager.System<AdminSystem>();
             _adminSystem.PlayerListChanged += RefreshPlayerList;
             _adminSystem.OverlayEnabled += OverlayEnabled;
             _adminSystem.OverlayDisabled += OverlayDisabled;
@@ -46,8 +46,17 @@ public PlayerTab()
 
             ListHeader.BackgroundColorPanel.PanelOverride = new StyleBoxFlat(_altColor);
             ListHeader.OnHeaderClicked += HeaderClicked;
+
+            SearchList.SearchBar = SearchLineEdit;
+            SearchList.GenerateItem += GenerateButton;
+            SearchList.DataFilterCondition += DataFilterCondition;
+            SearchList.ItemKeyBindDown += (args, data) => OnEntryKeyBindDown?.Invoke(args, data);
+
+            RefreshPlayerList(_adminSystem.PlayerList);
         }
 
+        #region Antag Overlay
+
         private void OverlayEnabled()
         {
             OverlayButton.Pressed = true;
@@ -70,6 +79,8 @@ private void OverlayButtonPressed(ButtonEventArgs args)
             }
         }
 
+        #endregion
+
         private void ShowDisconnectedPressed(ButtonEventArgs args)
         {
             _showDisconnected = args.Button.Pressed;
@@ -92,14 +103,10 @@ protected override void Dispose(bool disposing)
             }
         }
 
+        #region ListContainer
+
         private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
         {
-            foreach (var child in PlayerList.Children.ToArray())
-            {
-                if (child is PlayerTabEntry)
-                    child.Dispose();
-            }
-
             _players = players;
             PlayerCount.Text = $"Players: {_playerMan.PlayerCount}";
 
@@ -108,29 +115,66 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
 
             UpdateHeaderSymbols();
 
-            var useAltColor = false;
-            foreach (var player in sortedPlayers)
+            SearchList.PopulateList(sortedPlayers.Select(info => new PlayerListData(info,
+                    $"{info.Username} {info.CharacterName} {info.IdentityName} {info.StartingJob}"))
+                .ToList());
+        }
+
+        private void GenerateButton(ListData data, ListContainerButton button)
+        {
+            if (data is not PlayerListData { Info: var player})
+                return;
+
+            var entry = new PlayerTabEntry(player, new StyleBoxFlat(button.Index % 2 == 0 ? _altColor : _defaultColor));
+            button.AddChild(entry);
+            button.ToolTip = $"{player.Username}, {player.CharacterName}, {player.IdentityName}, {player.StartingJob}";
+        }
+
+        /// <summary>
+        /// Determines whether <paramref name="filter"/> is contained in <paramref name="listData"/>.FilteringString.
+        /// If all characters are lowercase, the comparison ignores case.
+        /// If there is an uppercase character, the comparison is case sensitive.
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <param name="listData"></param>
+        /// <returns>Whether <paramref name="filter"/> is contained in <paramref name="listData"/>.FilteringString.</returns>
+        private bool DataFilterCondition(string filter, ListData listData)
+        {
+            if (listData is not PlayerListData {Info: var info, FilteringString: var playerString})
+                return false;
+
+            if (!_showDisconnected && !info.Connected)
+                return false;
+
+            if (IsAllLower(filter))
             {
-                if (!_showDisconnected && !player.Connected)
-                    continue;
-
-                var entry = new PlayerTabEntry(player.Username,
-                    player.CharacterName,
-                    player.IdentityName,
-                    player.StartingJob,
-                    player.Antag ? "YES" : "NO",
-                    new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
-                    player.Connected,
-                    player.PlaytimeString);
-                entry.PlayerEntity = player.NetEntity;
-                entry.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(entry, args);
-                entry.ToolTip = Loc.GetString("player-tab-entry-tooltip");
-                PlayerList.AddChild(entry);
-
-                useAltColor ^= true;
+                if (!playerString.Contains(filter, StringComparison.CurrentCultureIgnoreCase))
+                    return false;
             }
+            else
+            {
+                if (!playerString.Contains(filter))
+                    return false;
+            }
+
+            return true;
         }
 
+        private bool IsAllLower(string input)
+        {
+            foreach (var c in input)
+            {
+                if (char.IsLetter(c) && !char.IsLower(c))
+                    return false;
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region Header
+
         private void UpdateHeaderSymbols()
         {
             ListHeader.ResetHeaderText();
@@ -174,5 +218,9 @@ private void HeaderClicked(Header header)
 
             RefreshPlayerList(_adminSystem.PlayerList);
         }
+
+        #endregion
     }
+
+    public record PlayerListData(PlayerInfo Info, string FilteringString) : ListData;
 }
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
index f9ed57792ed2..e1371ec6f73b 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.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">
@@ -29,4 +29,4 @@
                HorizontalExpand="True"
                ClipText="True"/>
     </BoxContainer>
-</ContainerButton>
+</PanelContainer>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index 80a68f4cd2d5..89c5808afc7a 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -1,4 +1,5 @@
-using Robust.Client.AutoGenerated;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -6,23 +7,24 @@
 namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 
 [GenerateTypedNameReferences]
-public sealed partial class PlayerTabEntry : ContainerButton
+public sealed partial class PlayerTabEntry : PanelContainer
 {
     public NetEntity? PlayerEntity;
 
-    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected, string overallPlaytime)
+    public PlayerTabEntry(PlayerInfo player, StyleBoxFlat styleBoxFlat)
     {
         RobustXamlLoader.Load(this);
 
-        UsernameLabel.Text = username;
-        if (!connected)
+        UsernameLabel.Text = player.Username;
+        if (!player.Connected)
             UsernameLabel.StyleClasses.Add("Disabled");
-        JobLabel.Text = job;
-        CharacterLabel.Text = character;
-        if (identity != character)
-            CharacterLabel.Text += $" [{identity}]";
-        AntagonistLabel.Text = antagonist;
-        BackgroundColorPanel.PanelOverride = styleBox;
-        OverallPlaytimeLabel.Text = overallPlaytime;
+        JobLabel.Text = player.StartingJob;
+        CharacterLabel.Text = player.CharacterName;
+        if (player.IdentityName != player.CharacterName)
+            CharacterLabel.Text += $" [{player.IdentityName}]";
+        AntagonistLabel.Text = Loc.GetString(player.Antag ? "player-tab-is-antag-yes" : "player-tab-is-antag-no");
+        BackgroundColorPanel.PanelOverride = styleBoxFlat;
+        OverallPlaytimeLabel.Text = player.PlaytimeString;
+        PlayerEntity = player.NetEntity;
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
index e0356e515e8d..05007b0fea1b 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
@@ -37,6 +37,7 @@
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-playtime}"
-               MouseFilter="Pass"/>
+               MouseFilter="Pass"
+               ToolTip="{Loc player-tab-entry-tooltip}"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/UserInterface/Controls/ListContainer.cs b/Content.Client/UserInterface/Controls/ListContainer.cs
index 05ae0a4bb155..e1b3b948f045 100644
--- a/Content.Client/UserInterface/Controls/ListContainer.cs
+++ b/Content.Client/UserInterface/Controls/ListContainer.cs
@@ -8,7 +8,8 @@
 
 namespace Content.Client.UserInterface.Controls;
 
-public sealed class ListContainer : Control
+[Virtual]
+public class ListContainer : Control
 {
     public const string StylePropertySeparation = "separation";
     public const string StyleClassListContainerButton = "list-container-button";
@@ -21,9 +22,26 @@ public bool Group
         set => _buttonGroup = value ? new ButtonGroup() : null;
     }
     public bool Toggle { get; set; }
+
+    /// <summary>
+    /// Called when creating a button on the UI.
+    /// The provided <see cref="ListContainerButton"/> is the generated button that Controls should be parented to.
+    /// </summary>
     public Action<ListData, ListContainerButton>? GenerateItem;
-    public Action<BaseButton.ButtonEventArgs?, ListData?>? ItemPressed;
-    public Action<GUIBoundKeyEventArgs, ListData?>? ItemKeyBindDown;
+
+    /// <inheritdoc cref="BaseButton.OnPressed"/>
+    public Action<BaseButton.ButtonEventArgs, ListData>? ItemPressed;
+
+    /// <summary>
+    /// Invoked when a KeyBind is pressed on a ListContainerButton.
+    /// </summary>
+    public Action<GUIBoundKeyEventArgs, ListData>? ItemKeyBindDown;
+
+    /// <summary>
+    /// Invoked when the selected item does not exist in the new data when PopulateList is called.
+    /// </summary>
+    public Action? NoItemSelected;
+
     public IReadOnlyList<ListData> Data => _data;
 
     private const int DefaultSeparation = 3;
@@ -72,11 +90,11 @@ public ListContainer()
         _vScrollBar.OnValueChanged += ScrollValueChanged;
     }
 
-    public void PopulateList(IReadOnlyList<ListData> data)
+    public virtual void PopulateList(IReadOnlyList<ListData> data)
     {
         if ((_itemHeight == 0 || _data is {Count: 0}) && data.Count > 0)
         {
-            ListContainerButton control = new(data[0]);
+            ListContainerButton control = new(data[0], 0);
             GenerateItem?.Invoke(data[0], control);
             control.Measure(Vector2Helpers.Infinity);
             _itemHeight = control.DesiredSize.Y;
@@ -97,7 +115,7 @@ public void PopulateList(IReadOnlyList<ListData> data)
         if (_selected != null && !data.Contains(_selected))
         {
             _selected = null;
-            ItemPressed?.Invoke(null, null);
+            NoItemSelected?.Invoke();
         }
     }
 
@@ -116,7 +134,7 @@ public void Select(ListData data)
         if (_buttons.TryGetValue(data, out var button) && Toggle)
             button.Pressed = true;
         _selected = data;
-        button ??= new ListContainerButton(data);
+        button ??= new ListContainerButton(data, _data.IndexOf(data));
         OnItemPressed(new BaseButton.ButtonEventArgs(button,
             new GUIBoundKeyEventArgs(EngineKeyFunctions.UIClick, BoundKeyState.Up,
                 new ScreenCoordinates(0, 0, WindowId.Main), true, Vector2.Zero, Vector2.Zero)));
@@ -260,7 +278,7 @@ protected override Vector2 ArrangeOverride(Vector2 finalSize)
                         toRemove.Remove(data);
                     else
                     {
-                        button = new ListContainerButton(data);
+                        button = new ListContainerButton(data, i);
                         button.OnPressed += OnItemPressed;
                         button.OnKeyBindDown += args => OnItemKeyBindDown(button, args);
                         button.ToggleMode = Toggle;
@@ -360,11 +378,14 @@ protected override void MouseWheel(GUIMouseWheelEventArgs args)
 public sealed class ListContainerButton : ContainerButton, IEntityControl
 {
     public readonly ListData Data;
+
+    public readonly int Index;
     // public PanelContainer Background;
 
-    public ListContainerButton(ListData data)
+    public ListContainerButton(ListData data, int index)
     {
         Data = data;
+        Index = index;
         // AddChild(Background = new PanelContainer
         // {
         //     HorizontalExpand = true,
diff --git a/Content.Client/UserInterface/Controls/SearchListContainer.cs b/Content.Client/UserInterface/Controls/SearchListContainer.cs
new file mode 100644
index 000000000000..603d7f184c0e
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/SearchListContainer.cs
@@ -0,0 +1,68 @@
+using System.Linq;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface.Controls;
+
+public sealed class SearchListContainer : ListContainer
+{
+    private LineEdit? _searchBar;
+    private List<ListData> _unfilteredData = new();
+
+    /// <summary>
+    /// The <see cref="LineEdit"/> that is used to filter the list data.
+    /// </summary>
+    public LineEdit? SearchBar
+    {
+        get => _searchBar;
+        set
+        {
+            if (_searchBar is not null)
+                _searchBar.OnTextChanged -= FilterList;
+
+            _searchBar = value;
+
+            if (_searchBar is null)
+                return;
+
+            _searchBar.OnTextChanged += FilterList;
+        }
+    }
+
+    /// <summary>
+    /// Runs over the ListData to determine if it should pass the filter.
+    /// </summary>
+    public Func<string, ListData, bool>? DataFilterCondition = null;
+
+    public override void PopulateList(IReadOnlyList<ListData> data)
+    {
+        _unfilteredData = data.ToList();
+        FilterList();
+    }
+
+    private void FilterList(LineEdit.LineEditEventArgs obj)
+    {
+        FilterList();
+    }
+
+    private void FilterList()
+    {
+        var filterText = SearchBar?.Text;
+
+        if (DataFilterCondition is null || string.IsNullOrEmpty(filterText))
+        {
+            base.PopulateList(_unfilteredData);
+            return;
+        }
+
+        var filteredData = new List<ListData>();
+        foreach (var data in _unfilteredData)
+        {
+            if (!DataFilterCondition(filterText, data))
+                continue;
+
+            filteredData.Add(data);
+        }
+
+        base.PopulateList(filteredData);
+    }
+}
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index cccd9201a292..a7397aff38d8 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -177,12 +177,15 @@ private void Toggle()
         }
     }
 
-    private void PlayerTabEntryKeyBindDown(PlayerTabEntry entry, GUIBoundKeyEventArgs args)
+    private void PlayerTabEntryKeyBindDown(GUIBoundKeyEventArgs args, ListData? data)
     {
-        if (entry.PlayerEntity == null)
+        if (data is not PlayerListData {Info: var info})
             return;
 
-        var entity = entry.PlayerEntity.Value;
+        if (info.NetEntity == null)
+            return;
+
+        var entity = info.NetEntity.Value;
         var function = args.Function;
 
         if (function == EngineKeyFunctions.UIClick)
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 94d3328bde2c..474af89c268c 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -12,3 +12,5 @@ bwoink-system-typing-indicator = {$players} {$count ->
 } typing...
 
 admin-bwoink-play-sound = Bwoink?
+
+bwoink-title-none-selected = None selected
diff --git a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
index e0dd7a03b158..f9f9f6b5c9ff 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl
@@ -6,3 +6,6 @@ player-tab-playtime = Playtime
 player-tab-show-disconnected = Show Disconnected
 player-tab-overlay = Overlay
 player-tab-entry-tooltip = Playtime is displayed in days:hours:minutes.
+player-tab-filter-line-edit-placeholder = Filter
+player-tab-is-antag-yes = YES
+player-tab-is-antag-no = NO

From 7a1849c4ba57ba6b5e800f469fe834b8c5700f08 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 06:29:15 +0000
Subject: [PATCH 161/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 0c0c7aece812..cd6a9a51c365 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -255,5 +255,15 @@ Entries:
   id: 31
   time: '2024-05-28T18:00:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28319
+- author: ShadowCommander
+  changes:
+  - message: Added a search bar to the admin menu player tab.
+    type: Add
+  - message: Changed the player tab entry tooltip to be the player name, character
+      name, identity, and job. Moved the time tooltip to the header.
+    type: Tweak
+  id: 32
+  time: '2024-05-31T06:28:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28030
 Name: Admin
 Order: 1

From ec28a077a2f140b2d65cd700d692bfcae63da621 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Fri, 31 May 2024 17:37:47 +1000
Subject: [PATCH 162/568] Give botanists a roundstart plant clipper (#28439)

add
---
 Resources/Prototypes/Catalog/Fills/Items/belt.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 66f52b74ebe4..89923d14f638 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -119,6 +119,7 @@
     contents:
     - id: HydroponicsToolMiniHoe
     - id: HydroponicsToolSpade
+    - id: HydroponicsToolClippers
     - id: RobustHarvestChemistryBottle
 
 - type: entity

From fe5e20fa31432b5f867362ea2d23ffe5870b6a36 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 07:38:53 +0000
Subject: [PATCH 163/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 03741c17147d..7f9364147d1c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: wafehling
-  changes:
-  - message: The trading outpost now has dedicated buy-only and sell-only pallets.
-      No more accidentally selling orders you just bought. Cargonians rejoice!
-    type: Tweak
-  id: 6150
-  time: '2024-03-13T23:26:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25955
 - author: maylokana
   changes:
   - message: Entities can no longer drink from closed containers
@@ -3860,3 +3852,10 @@
   id: 6649
   time: '2024-05-31T02:06:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28430
+- author: Ubaser
+  changes:
+  - message: Botanists now spawn with a plant clipper.
+    type: Tweak
+  id: 6650
+  time: '2024-05-31T07:37:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28439

From 3e26491fbd26fd8f6c1a09683ec071b01916cfc5 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 31 May 2024 08:39:08 +0000
Subject: [PATCH 164/568] atlas update (#28442)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/atlas.yml | 95 ++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 33 deletions(-)

diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index cb7dc8e778bd..2db45c0308f1 100644
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -19143,16 +19143,16 @@ entities:
     - type: Transform
       pos: 13.450137,-7.468577
       parent: 30
-- proto: chem_master
+- proto: ChemDispenser
   entities:
-  - uid: 2470
+  - uid: 2469
     components:
     - type: Transform
-      pos: -1.5,-4.5
+      pos: -3.5,-4.5
       parent: 30
     - type: ContainerContainer
       containers:
-        ChemMaster-beaker: !type:ContainerSlot
+        ReagentDispenser-beaker: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
@@ -19168,20 +19168,23 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-        outputSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: ChemDispenser
+- proto: ChemistryHotplate
   entities:
-  - uid: 2469
+  - uid: 575
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      pos: -3.5,-6.5
+      parent: 30
+- proto: ChemMaster
+  entities:
+  - uid: 2470
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
       parent: 30
     - type: ContainerContainer
       containers:
-        ReagentDispenser-beaker: !type:ContainerSlot
+        ChemMaster-beaker: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
@@ -19197,13 +19200,10 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: ChemistryHotplate
-  entities:
-  - uid: 575
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 30
+        outputSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: ChurchOrganInstrument
   entities:
   - uid: 1016
@@ -20881,10 +20881,10 @@ entities:
       parent: 30
 - proto: DefaultStationBeaconBridge
   entities:
-  - uid: 7515
+  - uid: 2719
     components:
     - type: Transform
-      pos: 32.5,2.5
+      pos: 38.5,2.5
       parent: 30
 - proto: DefaultStationBeaconBrig
   entities:
@@ -24002,8 +24002,6 @@ entities:
     - type: Transform
       pos: 33.5,0.5
       parent: 30
-    - type: ItemCabinet
-      opened: True
   - uid: 5936
     components:
     - type: Transform
@@ -41963,13 +41961,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -55.5,-1.5
       parent: 30
-  - uid: 2719
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 30
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 2920
     components:
     - type: Transform
@@ -42211,6 +42202,12 @@ entities:
     - type: Transform
       pos: -40.5,13.5
       parent: 30
+  - uid: 7515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 30
   - uid: 7762
     components:
     - type: Transform
@@ -46055,7 +46052,7 @@ entities:
     - type: Transform
       pos: 23.41242,-1.4073458
       parent: 30
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 5622
     components:
@@ -47216,6 +47213,38 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: HoP Line
+  - uid: 8512
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,9.5
+      parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: ce's room
+  - uid: 8513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,22.5
+      parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: hos' room
+  - uid: 8514
+    components:
+    - type: Transform
+      pos: -27.5,19.5
+      parent: 30
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: qm's room
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 574
@@ -54904,10 +54933,10 @@ entities:
   - uid: 7579
     components:
     - type: Transform
-      pos: 32.5,2.5
+      pos: 38.5,2.5
       parent: 30
     - type: WarpPoint
-      location: bridge
+      location: Bridge
   - uid: 7580
     components:
     - type: Transform

From b7ac36593f1ee792baa454f7ec4e22cf3d8812bb Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 31 May 2024 08:39:14 +0000
Subject: [PATCH 165/568] saltern update (#28443)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/saltern.yml | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 3f2bd76d4fc7..42315996240a 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -783,7 +783,7 @@ entities:
             2: 57344
           8,5:
             0: 272
-            4: 17472
+            3: 17472
           8,6:
             2: 65345
           8,7:
@@ -824,10 +824,10 @@ entities:
             0: 53759
           11,2:
             0: 4319
-            3: 49152
+            4: 49152
           11,3:
             0: 61457
-            3: 204
+            4: 204
           11,-1:
             0: 30583
           11,4:
@@ -839,9 +839,9 @@ entities:
             0: 28791
           12,2:
             0: 119
-            3: 28672
+            4: 28672
           12,3:
-            3: 119
+            4: 119
             0: 61440
           12,-1:
             0: 29311
@@ -1260,16 +1260,16 @@ entities:
             2: 65534
           9,5:
             5: 4368
-            3: 17472
+            4: 17472
           9,6:
             2: 7936
           10,5:
-            3: 4368
+            4: 4368
             6: 17472
           10,6:
             2: 3840
           11,5:
-            3: 21840
+            4: 21840
           11,6:
             2: 3856
           12,5:
@@ -1429,7 +1429,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1444,7 +1444,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -31676,13 +31676,6 @@ entities:
     - type: Transform
       pos: 29.614664,-1.306627
       parent: 31
-- proto: Dresser
-  entities:
-  - uid: 9049
-    components:
-    - type: Transform
-      pos: 7.5,16.5
-      parent: 31
 - proto: DresserCaptainFilled
   entities:
   - uid: 11383
@@ -31706,10 +31699,10 @@ entities:
       parent: 31
 - proto: DresserHeadOfPersonnelFilled
   entities:
-  - uid: 11384
+  - uid: 7085
     components:
     - type: Transform
-      pos: 9.5,16.5
+      pos: 7.5,16.5
       parent: 31
 - proto: DresserHeadOfSecurityFilled
   entities:
@@ -32398,8 +32391,6 @@ entities:
     - type: Transform
       pos: 9.5,12.5
       parent: 31
-    - type: ItemCabinet
-      opened: True
   - uid: 4916
     components:
     - type: Transform

From ae3a22398ef69ec774aa98d73ede9a5f2f7cbf80 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Fri, 31 May 2024 18:44:21 +1000
Subject: [PATCH 166/568] Give janitors a roundstart light replacer (#28441)

add
---
 Resources/Prototypes/Catalog/Fills/Items/belt.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 89923d14f638..1449c9757b91 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -79,6 +79,7 @@
       - id: CleanerGrenade
         amount: 2
       - id: FlashlightLantern
+      - id: LightReplacer
 
 - type: entity
   id: ClothingBeltMedicalFilled

From 2ae0c562446c4dfc5560cb385f2ff6f9e77127b3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 08:45:27 +0000
Subject: [PATCH 167/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7f9364147d1c..eb912bc04e96 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: maylokana
-  changes:
-  - message: Entities can no longer drink from closed containers
-    type: Fix
-  id: 6151
-  time: '2024-03-14T04:10:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26103
 - author: Dutch-VanDerLinde
   changes:
   - message: Gunpowder can now be made by chemists with 6 parts potassium, 2 parts
@@ -3859,3 +3852,10 @@
   id: 6650
   time: '2024-05-31T07:37:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28439
+- author: Ubaser
+  changes:
+  - message: Janitors now spawn with a light replacer.
+    type: Tweak
+  id: 6651
+  time: '2024-05-31T08:44:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28441

From 46d57f8a0f34020b66d90d78dce5359d07e074b4 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Fri, 31 May 2024 07:44:21 -0700
Subject: [PATCH 168/568] Fixed grammar for solution transfers! (#28437)

Fixed grammar for solution transfer
---
 .../chemistry/components/solution-transfer-component.ftl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
index 74e38f00ab98..601392069b09 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
@@ -5,8 +5,8 @@ comp-solution-transfer-fill-fully = You fill {THE($target)} to the brim with {$a
 comp-solution-transfer-transfer-solution = You transfer {$amount}u to {THE($target)}.
 
 ## Displayed when trying to transfer to a solution, but either the giver is empty or the taker is full
-comp-solution-transfer-is-empty = {THE($target)} is empty!
-comp-solution-transfer-is-full = {THE($target)} is full!
+comp-solution-transfer-is-empty = {CAPITALIZE(THE($target))} is empty!
+comp-solution-transfer-is-full = {CAPITALIZE(THE($target))} is full!
 
 ## Displayed in change transfer amount verb's name
 comp-solution-transfer-verb-custom-amount = Custom

From 9eb3239fcc343a8c86c63a95b9bc935b110c9775 Mon Sep 17 00:00:00 2001
From: NazrinNya <137837419+NazrinNya@users.noreply.github.com>
Date: Fri, 31 May 2024 17:49:00 +0300
Subject: [PATCH 169/568] make it so you cant build disposal pipes in
 impassable objects (#28447)

make it so you cant build disposal pipes in impassable objects (like walls)
---
 Resources/Prototypes/Recipes/Construction/utilities.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 1647e98bceae..19f2fee18375 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -178,7 +178,7 @@
   targetNode: pipe
   category: construction-category-utilities
   placementMode: SnapgridCenter
-  canBuildInImpassable: true
+  canBuildInImpassable: false
   icon:
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-s

From 3c00eef877771c79a7b8b73271d7a147b9380ea0 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 14:50:06 +0000
Subject: [PATCH 170/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index eb912bc04e96..7c1ebab4f635 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,17 +1,4 @@
 Entries:
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Gunpowder can now be made by chemists with 6 parts potassium, 2 parts
-      sulfur and charcoal.
-    type: Add
-  - message: Pipebombs may now be crafted with a pipe, gunpowder and LV cable.
-    type: Add
-  - message: IEDs have been reworked, they are now called "fire bombs" and generate
-      a weak explosion that ignites nearby objects.
-    type: Tweak
-  id: 6152
-  time: '2024-03-14T04:27:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25705
 - author: PJB3005
   changes:
   - message: You must now wait 30 seconds before attempting to reconnect to a full
@@ -3859,3 +3846,11 @@
   id: 6651
   time: '2024-05-31T08:44:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28441
+- author: NazrinNya
+  changes:
+  - message: Disposal pipes are now blocked from constructing underneath impassable
+      objects.
+    type: Fix
+  id: 6652
+  time: '2024-05-31T14:49:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28447

From 42de8df51915896c3703c5f7acac7b123a246397 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Fri, 31 May 2024 07:56:20 -0700
Subject: [PATCH 171/568] Add firelock warnings popup when opening on access
 allowed (#28420)

---
 .../Doors/Systems/SharedFirelockSystem.cs     | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
index 4afe26039ba4..03350d2e6444 100644
--- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs
@@ -56,23 +56,34 @@ private void OnBeforeDoorOpened(EntityUid uid, FirelockComponent component, Befo
 
         if (!component.Powered || (!overrideAccess && component.IsLocked))
             args.Cancel();
+        else if (args.User != null)
+            WarnPlayer((uid, component), args.User.Value);
     }
 
     private void OnDoorGetPryTimeModifier(EntityUid uid, FirelockComponent component, ref GetPryTimeModifierEvent args)
     {
-        if (component.Temperature)
+        WarnPlayer((uid, component), args.User);
+
+        if (component.IsLocked)
+            args.PryTimeModifier *= component.LockedPryTimeModifier;
+    }
+
+    private void WarnPlayer(Entity<FirelockComponent> ent, EntityUid user)
+    {
+        if (ent.Comp.Temperature)
         {
             _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-fire-message"),
-                uid, args.User, PopupType.MediumCaution);
+                ent.Owner,
+                user,
+                PopupType.MediumCaution);
         }
-        else if (component.Pressure)
+        else if (ent.Comp.Pressure)
         {
             _popupSystem.PopupClient(Loc.GetString("firelock-component-is-holding-pressure-message"),
-                uid, args.User, PopupType.MediumCaution);
+                ent.Owner,
+                user,
+                PopupType.MediumCaution);
         }
-
-        if (component.IsLocked)
-            args.PryTimeModifier *= component.LockedPryTimeModifier;
     }
 
     private void OnAfterPried(EntityUid uid, FirelockComponent component, ref PriedEvent args)

From 6e278a12fb9f183a23637180708bdab4203733c2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 14:57:26 +0000
Subject: [PATCH 172/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7c1ebab4f635..527df3dd39f2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: You must now wait 30 seconds before attempting to reconnect to a full
-      server.
-    type: Tweak
-  id: 6153
-  time: '2024-03-14T08:00:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/20972
 - author: Crotalus
   changes:
   - message: Sort agents by success rate in end game summary
@@ -3854,3 +3846,11 @@
   id: 6652
   time: '2024-05-31T14:49:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28447
+- author: ShadowCommander
+  changes:
+  - message: Opening a firelock when temperature or pressure warnings are active,
+      now always shows the warning popup.
+    type: Tweak
+  id: 6653
+  time: '2024-05-31T14:56:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28420

From 5da2151924f372bf8c88ddda191886a0da62e0f1 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 31 May 2024 15:08:26 +0000
Subject: [PATCH 173/568] dragon antag refactor (#28217)

* remove dragon system usage of GenericAntag

* add AntagRandomSpawn for making antags spawn at a random tile

* add AntagSpawner to make an antag spawner just spawn an entity

* add antag prototype for dragon since it never had one

* make dragon spawner a GhostRoleAntagSpawner, remove GenericAntag

* make dragon rule use AntagSelection and stuff

* remove dragon GenericAntag rule

* add back to spawn menu

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Server/Antag/AntagRandomSpawnRule.cs  | 22 +++++++++++++++
 Content.Server/Antag/AntagSpawnerSystem.cs    | 21 ++++++++++++++
 .../Components/AntagRandomSpawnComponent.cs   |  8 ++++++
 .../Antag/Components/AntagSpawnerComponent.cs | 17 +++++++++++
 Content.Server/Dragon/DragonSystem.cs         | 14 ----------
 .../Locale/en-US/prototypes/roles/antags.ftl  |  3 ++
 .../Entities/Markers/Spawners/ghost_roles.yml | 28 +++++++++----------
 .../Entities/Mobs/Player/dragon.yml           |  3 +-
 Resources/Prototypes/GameRules/events.yml     | 22 +++++++++++++--
 Resources/Prototypes/GameRules/midround.yml   | 12 --------
 Resources/Prototypes/Roles/Antags/dragon.yml  |  5 ++++
 11 files changed, 110 insertions(+), 45 deletions(-)
 create mode 100644 Content.Server/Antag/AntagRandomSpawnRule.cs
 create mode 100644 Content.Server/Antag/AntagSpawnerSystem.cs
 create mode 100644 Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
 create mode 100644 Content.Server/Antag/Components/AntagSpawnerComponent.cs
 create mode 100644 Resources/Prototypes/Roles/Antags/dragon.yml

diff --git a/Content.Server/Antag/AntagRandomSpawnRule.cs b/Content.Server/Antag/AntagRandomSpawnRule.cs
new file mode 100644
index 000000000000..499761a8df28
--- /dev/null
+++ b/Content.Server/Antag/AntagRandomSpawnRule.cs
@@ -0,0 +1,22 @@
+using Content.Server.Antag.Components;
+using Content.Server.GameTicking.Rules;
+
+namespace Content.Server.Antag;
+
+public sealed class AntagRandomSpawnSystem : GameRuleSystem<AntagRandomSpawnComponent>
+{
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagRandomSpawnComponent, AntagSelectLocationEvent>(OnSelectLocation);
+    }
+
+    private void OnSelectLocation(Entity<AntagRandomSpawnComponent> ent, ref AntagSelectLocationEvent args)
+    {
+        if (TryFindRandomTile(out _, out _, out _, out var coords))
+            args.Coordinates.Add(_transform.ToMapCoordinates(coords));
+    }
+}
diff --git a/Content.Server/Antag/AntagSpawnerSystem.cs b/Content.Server/Antag/AntagSpawnerSystem.cs
new file mode 100644
index 000000000000..f8a036749a16
--- /dev/null
+++ b/Content.Server/Antag/AntagSpawnerSystem.cs
@@ -0,0 +1,21 @@
+using Content.Server.Antag.Components;
+
+namespace Content.Server.Antag;
+
+/// <summary>
+/// Spawns an entity when creating an antag for <see cref="AntagSpawnerComponent"/>.
+/// </summary>
+public sealed class AntagSpawnerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AntagSpawnerComponent, AntagSelectEntityEvent>(OnSelectEntity);
+    }
+
+    private void OnSelectEntity(Entity<AntagSpawnerComponent> ent, ref AntagSelectEntityEvent args)
+    {
+        args.Entity = Spawn(ent.Comp.Prototype);
+    }
+}
diff --git a/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
new file mode 100644
index 000000000000..16edd256a2ee
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagRandomSpawnComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Spawns this rule's antags at random tiles on a station using <c>TryGetRandomTile</c>.
+/// Requires <see cref="AntagSelectionComponent"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class AntagRandomSpawnComponent : Component;
diff --git a/Content.Server/Antag/Components/AntagSpawnerComponent.cs b/Content.Server/Antag/Components/AntagSpawnerComponent.cs
new file mode 100644
index 000000000000..7153babc76da
--- /dev/null
+++ b/Content.Server/Antag/Components/AntagSpawnerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Server.Antag;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Antag.Components;
+
+/// <summary>
+/// Spawns a prototype for antags created with a spawner.
+/// </summary>
+[RegisterComponent, Access(typeof(AntagSpawnerSystem))]
+public sealed partial class AntagSpawnerComponent : Component
+{
+    /// <summary>
+    /// The entity to spawn.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Prototype = string.Empty;
+}
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 1e29b80ebafb..62d1f61a35b4 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.GenericAntag;
 using Content.Server.Objectives.Components;
 using Content.Server.Objectives.Systems;
 using Content.Server.Popups;
@@ -55,7 +54,6 @@ public override void Initialize()
         SubscribeLocalEvent<DragonComponent, DragonSpawnRiftActionEvent>(OnSpawnRift);
         SubscribeLocalEvent<DragonComponent, RefreshMovementSpeedModifiersEvent>(OnDragonMove);
         SubscribeLocalEvent<DragonComponent, MobStateChangedEvent>(OnMobStateChanged);
-        SubscribeLocalEvent<DragonComponent, GenericAntagCreatedEvent>(OnCreated);
         SubscribeLocalEvent<DragonComponent, EntityZombifiedEvent>(OnZombified);
     }
 
@@ -192,18 +190,6 @@ private void OnMobStateChanged(EntityUid uid, DragonComponent component, MobStat
         DeleteRifts(uid, false, component);
     }
 
-    private void OnCreated(EntityUid uid, DragonComponent comp, ref GenericAntagCreatedEvent args)
-    {
-        var mindId = args.MindId;
-        var mind = args.Mind;
-
-        _role.MindAddRole(mindId, new DragonRoleComponent(), mind);
-        _role.MindAddRole(mindId, new RoleBriefingComponent()
-        {
-            Briefing = Loc.GetString("dragon-role-briefing")
-        }, mind);
-    }
-
     private void OnZombified(Entity<DragonComponent> ent, ref EntityZombifiedEvent args)
     {
         // prevent carp attacking zombie dragon
diff --git a/Resources/Locale/en-US/prototypes/roles/antags.ftl b/Resources/Locale/en-US/prototypes/roles/antags.ftl
index 5c514dba8ecc..f0038b0eb96d 100644
--- a/Resources/Locale/en-US/prototypes/roles/antags.ftl
+++ b/Resources/Locale/en-US/prototypes/roles/antags.ftl
@@ -30,3 +30,6 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
+
+roles-antag-dragon-name = Space Dragon
+roles-antag-dragon-objective = Create a carp army to take over this quadrant.
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 7942d26f3212..b21792579f45 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
@@ -83,18 +94,13 @@
 
 - type: entity
   noSpawn: true
+  parent: BaseAntagSpawner
   id: SpawnPointLoneNukeOperative
-  name: ghost role spawn point
-  suffix: loneops
-  parent: MarkerBase
   components:
   - type: GhostRole
     name: ghost-role-information-loneop-name
     description: ghost-role-information-loneop-description
     rules: ghost-role-information-loneop-rules
-    raffle:
-      settings: default
-  - type: GhostRoleAntagSpawner
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
@@ -130,20 +136,14 @@
     description: roles-antag-nuclear-operative-objective
 
 - type: entity
-  parent: MarkerBase
-  id: SpawnPointGhostDragon
   noSpawn: true
-  name: ghost role spawn point
-  suffix: dragon
+  parent: BaseAntagSpawner
+  id: SpawnPointGhostDragon
   components:
   - type: GhostRole
     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
     layers:
     - state: green
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index cb9dc1c911a2..258488af9b46 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -142,11 +142,10 @@
 - type: entity
   parent: BaseMobDragon
   id: MobDragon
+  suffix: No role or objectives
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
-  - type: GenericAntag
-    rule: Dragon
   - type: ActionGun
     action: ActionDragonsBreath
     gunProto: DragonsBreathGun
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index b1b48258bade..9dabc14a344e 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -86,12 +86,28 @@
   components:
   - type: StationEvent
     weight: 6.5
-    duration: 1
     earliestStart: 40
     reoccurrenceDelay: 20
     minimumPlayers: 20
-  - type: RandomSpawnRule
-    prototype: SpawnPointGhostDragon
+  - type: AntagRandomSpawn
+  - type: AntagSpawner
+    prototype: MobDragon
+  - type: AntagObjectives
+    objectives:
+    - CarpRiftsObjective
+    - DragonSurviveObjective
+  - type: AntagSelection
+    agentName: dragon-round-end-agent-name
+    definitions:
+    - spawnerPrototype: SpawnPointGhostDragon
+      min: 1
+      max: 1
+      pickPlayer: false
+      mindComponents:
+      - type: DragonRole
+        prototype: Dragon
+      - type: RoleBriefing
+        briefing: dragon-role-briefing
 
 - type: entity
   parent: BaseGameRule
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 1b58ada64855..fe5af117e68b 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -17,18 +17,6 @@
   - type: NinjaRule
     threats: NinjaThreats
 
-# stores configuration for dragon
-- type: entity
-  noSpawn: true
-  parent: BaseGameRule
-  id: Dragon
-  components:
-  - type: GenericAntagRule
-    agentName: dragon-round-end-agent-name
-    objectives:
-    - CarpRiftsObjective
-    - DragonSurviveObjective
-
 - type: entity
   noSpawn: true
   parent: BaseGameRule
diff --git a/Resources/Prototypes/Roles/Antags/dragon.yml b/Resources/Prototypes/Roles/Antags/dragon.yml
new file mode 100644
index 000000000000..6630b812e3bc
--- /dev/null
+++ b/Resources/Prototypes/Roles/Antags/dragon.yml
@@ -0,0 +1,5 @@
+- type: antag
+  id: Dragon
+  name: roles-antag-dragon-name
+  antagonist: true
+  objective: roles-antag-dragon-objective

From 478768fa1d020d52943302db5bd5bd8dd611c3e1 Mon Sep 17 00:00:00 2001
From: ShadeAware <57020074+ShadeAware@users.noreply.github.com>
Date: Fri, 31 May 2024 11:59:52 -0400
Subject: [PATCH 174/568] Pizza Parties no longer flood the station with more
 than it could ever eat. (#28448)

Removes pizza flood
---
 Resources/Prototypes/GameRules/cargo_gifts.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 3787f4e60341..62ec96d6a6df 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -13,7 +13,7 @@
     sender: cargo-gift-default-sender
     dest: cargo-gift-dest-bar
     gifts:
-      FoodPizzaLarge: 1              # 16 pizzas
+      FoodPizza: 1              # 4 pizzas
       FoodBarSupply: 1
       FoodSoftdrinks: 1
       CrateVendingMachineRestockRobustSoftdrinks: 1
@@ -28,12 +28,13 @@
       startDelay: 10
       duration: 240
       earliestStart: 20
+      minimumPlayers: 40
     - type: CargoGiftsRule
       description: cargo-gift-pizza-large
       sender: cargo-gift-default-sender
       dest: cargo-gift-dest-bar
       gifts:
-        FoodPizzaLarge: 4              # 64 pizzas
+        FoodPizzaLarge: 1              # 16 pizzas
         FoodBarSupply: 1
         FoodSoftdrinksLarge: 1
 

From baf561845e4fc8abe16c07aeffe281de4d37a279 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sat, 1 Jun 2024 03:24:42 +1000
Subject: [PATCH 175/568] Update Core (#28444)

* update

* i forgot 1 thing
---
 Resources/Maps/core.yml | 18591 ++++++++++++++++++++------------------
 1 file changed, 9707 insertions(+), 8884 deletions(-)

diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index ff45f58110c5..b94e800e41ef 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -28,10 +28,12 @@ tilemap:
   56: FloorGreenCircuit
   59: FloorHullReinforced
   60: FloorHydro
+  3: FloorJungleAstroGrass
   64: FloorLino
   66: FloorMetalDiamond
   67: FloorMime
   69: FloorMiningDark
+  4: FloorMowedAstroGrass
   78: FloorRGlass
   79: FloorReinforced
   91: FloorSnow
@@ -79,139 +81,139 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: DgAAAAABDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAAADgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAABDgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAA
+          tiles: DgAAAAADDgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAABXQAAAAAAXQAAAAABaAAAAAABbAAAAAAAbAAAAAAAXQAAAAACaAAAAAADJAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAADJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADXQAAAAABXQAAAAAAaAAAAAADbAAAAAAAbAAAAAAAXQAAAAAAaAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAABJAAAAAADJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: fgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAJAAAAAADJAAAAAAAJAAAAAABXQAAAAABJAAAAAACXQAAAAACXQAAAAABaAAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAADfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABaAAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAJAAAAAACJAAAAAACJAAAAAADXQAAAAACJAAAAAADXQAAAAABXQAAAAAAaAAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: XQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABaAAAAAABaAAAAAACTgAAAAADTgAAAAAAaAAAAAADTgAAAAABTgAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAADfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAaAAAAAACaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADJAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAABTgAAAAAATgAAAAADTgAAAAAAXQAAAAAAXQAAAAAATgAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAaAAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAAC
+          tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABaAAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAACTgAAAAAATgAAAAABaAAAAAABTgAAAAABTgAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAaAAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAACaAAAAAADXQAAAAACXQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAJAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACXQAAAAACTgAAAAACTgAAAAABTgAAAAABXQAAAAAAXQAAAAACTgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABXQAAAAACaAAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAC
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAADaAAAAAADXQAAAAADXQAAAAACaAAAAAABXQAAAAAAXQAAAAADXQAAAAAAaAAAAAAAXQAAAAADaAAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAATgAAAAAATgAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACJAAAAAACfgAAAAAAHwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAegAAAAADegAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAHwAAAAACfgAAAAAAHwAAAAADJAAAAAADJAAAAAADJAAAAAADJAAAAAADXQAAAAADXQAAAAAAJAAAAAADfgAAAAAAJAAAAAAAaAAAAAADaAAAAAADaAAAAAABXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAATgAAAAADTgAAAAADJAAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAADXQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAABXQAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAADXQAAAAADaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAABXQAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAXQAAAAADXQAAAAADaAAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABXQAAAAADfgAAAAAAJAAAAAACJAAAAAABJAAAAAAAXQAAAAABXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAJAAAAAACHwAAAAACHwAAAAABXQAAAAADXQAAAAAAaAAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADXQAAAAACXQAAAAACaAAAAAAD
+          tiles: aAAAAAADaAAAAAAAXQAAAAAAXQAAAAADaAAAAAAAXQAAAAADXQAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTgAAAAABTgAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAAAJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAAAegAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACegAAAAACegAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAABXQAAAAACHwAAAAABfgAAAAAAHwAAAAAAJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAACJAAAAAACfgAAAAAAJAAAAAAAaAAAAAACaAAAAAADaAAAAAAAXQAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAATgAAAAABTgAAAAACJAAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACXQAAAAAAXQAAAAABXQAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAACXQAAAAADXQAAAAAAaAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAAAXQAAAAACHwAAAAABHwAAAAACfgAAAAAAHwAAAAADXQAAAAADXQAAAAACaAAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACaAAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAACXQAAAAAAXQAAAAABaAAAAAAC
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAABXQAAAAACaAAAAAADXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAHwAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABHwAAAAADfgAAAAAAHwAAAAADJAAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAHwAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAAAaAAAAAABHwAAAAAAHwAAAAACHwAAAAABJAAAAAACHwAAAAABfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAHwAAAAACaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAABHwAAAAACfgAAAAAAHwAAAAAAJAAAAAACHwAAAAADfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAACJAAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAHwAAAAABfgAAAAAAMwAAAAAAMwAAAAAAXQAAAAAAaAAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAACXQAAAAACaAAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAHwAAAAACfgAAAAAAHwAAAAABJAAAAAADHwAAAAADfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAAAaAAAAAABaAAAAAAAaAAAAAAAXQAAAAABaAAAAAAAHwAAAAAAHwAAAAACHwAAAAACJAAAAAAAHwAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAADHwAAAAADfgAAAAAAHwAAAAACJAAAAAABHwAAAAABfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAABHwAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAABJAAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAHwAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAA
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: EgAAAAACXQAAAAADegAAAAABegAAAAACXQAAAAADfgAAAAAAJAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAEgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAACfgAAAAAAXQAAAAACTgAAAAAATgAAAAAAaAAAAAACTgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADEgAAAAAAXQAAAAACegAAAAAAegAAAAABXQAAAAADfgAAAAAAXQAAAAABTgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAADXQAAAAAAXQAAAAAAXQAAAAADEgAAAAADXQAAAAAAegAAAAABegAAAAADXQAAAAACaAAAAAAAXQAAAAADaAAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACEgAAAAAAXQAAAAACegAAAAABegAAAAABXQAAAAAAaAAAAAACXQAAAAACTgAAAAAAXQAAAAABXQAAAAAAaAAAAAADHwAAAAADHwAAAAAAJgAAAAADJgAAAAABJgAAAAAAEgAAAAACXQAAAAABegAAAAADegAAAAABXQAAAAABfgAAAAAAXQAAAAAATgAAAAACXQAAAAACXQAAAAADaAAAAAADHwAAAAADHwAAAAABTgAAAAABTgAAAAAATgAAAAABXQAAAAACXQAAAAABKAAAAAACKAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADaAAAAAACHwAAAAADHwAAAAAAJgAAAAABJgAAAAAAJgAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAegAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAegAAAAACegAAAAACegAAAAABegAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAA
+          tiles: EgAAAAAAXQAAAAAAegAAAAADegAAAAACXQAAAAAAfgAAAAAAJAAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAaAAAAAABXQAAAAABXQAAAAACXQAAAAACEgAAAAACXQAAAAADegAAAAACegAAAAAAXQAAAAABfgAAAAAAXQAAAAABTgAAAAACTgAAAAAAaAAAAAAATgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAABaAAAAAACEgAAAAADXQAAAAACegAAAAABegAAAAABXQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAaAAAAAABXQAAAAADXQAAAAABXQAAAAACEgAAAAADXQAAAAACegAAAAADegAAAAADXQAAAAACaAAAAAADXQAAAAACaAAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAADegAAAAACegAAAAACXQAAAAABaAAAAAACXQAAAAACTgAAAAAAXQAAAAACXQAAAAABaAAAAAADHwAAAAADHwAAAAADJgAAAAADJgAAAAABJgAAAAAAEgAAAAADXQAAAAACegAAAAACegAAAAADXQAAAAABfgAAAAAAXQAAAAAATgAAAAABXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADTgAAAAACTgAAAAACTgAAAAADXQAAAAAAXQAAAAADKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAABaAAAAAACHwAAAAADHwAAAAADJgAAAAABJgAAAAADJgAAAAACKAAAAAACKAAAAAADKAAAAAAAKAAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACegAAAAACegAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: egAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACaAAAAAABXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAegAAAAACegAAAAACegAAAAACewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAABKAAAAAACTgAAAAADTgAAAAAAaAAAAAACXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAAAewAAAAABbAAAAAAATgAAAAABTgAAAAACKAAAAAAATgAAAAAATgAAAAABaAAAAAABXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADewAAAAACewAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAADaAAAAAACXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAABewAAAAAAewAAAAADfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAewAAAAACewAAAAACewAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAADKAAAAAACKAAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAADXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAABXwAAAAABJAAAAAADXwAAAAADXwAAAAAAXwAAAAABXwAAAAAAXQAAAAADXQAAAAABXQAAAAADaAAAAAACegAAAAABegAAAAADegAAAAADegAAAAABegAAAAAAHwAAAAADHwAAAAABXwAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAABegAAAAACegAAAAAAegAAAAADegAAAAADegAAAAABHwAAAAABHwAAAAAAXwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAACegAAAAADegAAAAADegAAAAABegAAAAABegAAAAACHwAAAAACHwAAAAADXwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABaAAAAAABegAAAAACegAAAAADegAAAAAAegAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAABegAAAAABegAAAAAAegAAAAACegAAAAADegAAAAAD
+          tiles: egAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAADaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAegAAAAAAegAAAAABegAAAAADewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAACKAAAAAACTgAAAAABTgAAAAACaAAAAAADXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABewAAAAABewAAAAADbAAAAAAATgAAAAAATgAAAAABKAAAAAAATgAAAAABTgAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAACewAAAAADewAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAACegAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAABewAAAAADewAAAAACfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAewAAAAACewAAAAAAewAAAAACfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAABQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAABKAAAAAACKAAAAAABfgAAAAAAXQAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAXQAAAAACfgAAAAAAKAAAAAACKAAAAAACKAAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAACXwAAAAABJAAAAAAAXwAAAAADXwAAAAACXwAAAAADXwAAAAACXQAAAAAAXQAAAAABXQAAAAAAaAAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADHwAAAAAAHwAAAAAAXwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABXQAAAAABXQAAAAADXQAAAAAAaAAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAACHwAAAAACHwAAAAACXwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAACegAAAAADegAAAAAAegAAAAABegAAAAABegAAAAADHwAAAAAAHwAAAAADXwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAACegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAaAAAAAACegAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAD
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAaAAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAADaAAAAAACbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAXQAAAAABXQAAAAACJAAAAAAAJAAAAAAAJAAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABfgAAAAAAJAAAAAAAJAAAAAADJAAAAAABXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAJAAAAAAAJAAAAAABJAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAJAAAAAACJAAAAAABJAAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADaAAAAAAAaAAAAAAAfgAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADaAAAAAAAaAAAAAAAHQAAAAADaAAAAAAAaAAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAADaAAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADaAAAAAABaAAAAAAAXQAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADaAAAAAABaAAAAAADfgAAAAAAaAAAAAADaAAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAAATgAAAAADaAAAAAADaAAAAAADbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAACXQAAAAACXQAAAAABJAAAAAABJAAAAAACJAAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAJAAAAAABJAAAAAADJAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABaAAAAAADaAAAAAADfgAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADaAAAAAACaAAAAAACHQAAAAAAaAAAAAACaAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABaAAAAAACaAAAAAAAXQAAAAAAaAAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACaAAAAAADaAAAAAADXQAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADaAAAAAACaAAAAAACfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAA
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: HwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAewAAAAACfgAAAAAAewAAAAABHwAAAAABHwAAAAABMwAAAAAAHwAAAAACHwAAAAACewAAAAABfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACewAAAAADewAAAAACewAAAAABHwAAAAADHwAAAAADMwAAAAAAHwAAAAADHwAAAAABewAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACewAAAAACfgAAAAAAewAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACewAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADewAAAAAAewAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADXQAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABXQAAAAADXQAAAAABegAAAAACJAAAAAABfgAAAAAAHwAAAAABXQAAAAAAXQAAAAACXQAAAAABegAAAAADegAAAAABegAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABTgAAAAABTgAAAAACaAAAAAACTgAAAAADTgAAAAADaAAAAAAAaAAAAAACTgAAAAACaAAAAAADTgAAAAACTgAAAAAATgAAAAADaAAAAAADTgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAACaAAAAAACXQAAAAADXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: HwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABewAAAAABfgAAAAAAewAAAAABHwAAAAACHwAAAAAAMwAAAAAAHwAAAAAAHwAAAAAAewAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAACewAAAAACewAAAAACewAAAAACHwAAAAACHwAAAAACMwAAAAAAHwAAAAACHwAAAAADewAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADewAAAAAAfgAAAAAAewAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAABewAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADewAAAAACewAAAAABewAAAAACewAAAAACewAAAAAAewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABXQAAAAACXQAAAAABegAAAAABJAAAAAADfgAAAAAAHwAAAAABXQAAAAACXQAAAAACXQAAAAAAegAAAAAAegAAAAACegAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAaAAAAAABXQAAAAAATgAAAAADTgAAAAABaAAAAAACTgAAAAACTgAAAAACaAAAAAABaAAAAAADTgAAAAACaAAAAAABTgAAAAACTgAAAAABTgAAAAADaAAAAAADTgAAAAAAaAAAAAADaAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABaAAAAAADXQAAAAACXQAAAAACXQAAAAABaAAAAAABXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAdQAAAAABdQAAAAADcAAAAAADJAAAAAADJAAAAAABJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAdQAAAAABdQAAAAACcAAAAAAC
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAdQAAAAABdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAACfgAAAAAAdQAAAAAAdQAAAAACcAAAAAACJAAAAAABJAAAAAACJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAAAcAAAAAAD
           version: 6
         -2,0:
           ind: -2,0
-          tiles: aAAAAAACaAAAAAACaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAABegAAAAACegAAAAABegAAAAACegAAAAAAegAAAAADaAAAAAADaAAAAAACXwAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABaAAAAAACegAAAAACegAAAAABegAAAAABegAAAAABegAAAAABaAAAAAAAaAAAAAADXwAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAegAAAAABegAAAAABegAAAAABegAAAAABegAAAAABaAAAAAACaAAAAAAAaAAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAACegAAAAABegAAAAADewAAAAAAewAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADMwAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAAAewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAMwAAAAAAegAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAJAAAAAADHwAAAAABHwAAAAADewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAABXQAAAAACXQAAAAABMwAAAAAAegAAAAAAJAAAAAACJAAAAAACJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAHwAAAAACewAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAADXQAAAAAAMwAAAAAAegAAAAACJAAAAAABJAAAAAABJAAAAAACfgAAAAAAJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAAAaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAeQAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABaAAAAAAAXQAAAAADeQAAAAACeQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADLgAAAAAALgAAAAAAAQAAAAAAaAAAAAAAaAAAAAAAAQAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAJAAAAAABeQAAAAACeQAAAAACeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAAAXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAXQAAAAAAXQAAAAAAPAAAAAAAAQAAAAAAXQAAAAABXQAAAAADaAAAAAADXQAAAAADXQAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABfgAAAAAAfgAAAAAA
+          tiles: aAAAAAABaAAAAAADaAAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAABegAAAAABegAAAAADegAAAAABegAAAAACaAAAAAACaAAAAAAAXwAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAAAaAAAAAABaAAAAAAAXwAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAABegAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACaAAAAAACegAAAAAAegAAAAACegAAAAACegAAAAAAegAAAAACewAAAAABewAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACXQAAAAADXQAAAAAAXQAAAAABHwAAAAACewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAADXQAAAAABAwAAAAAAegAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAJAAAAAACHwAAAAACHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAAAXQAAAAABAwAAAAAAegAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAABewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABXQAAAAADAwAAAAAAegAAAAACJAAAAAACJAAAAAABJAAAAAACfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACXQAAAAACXQAAAAABXQAAAAAAaAAAAAABXQAAAAACeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADeQAAAAAAeQAAAAACLgAAAAAALgAAAAAAAQAAAAABaAAAAAAAaAAAAAABAQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAJAAAAAACeQAAAAACeQAAAAACeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAACXQAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAADfgAAAAAALgAAAAAAXQAAAAACXQAAAAACPAAAAAAAAQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAABXQAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: bQAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAJAAAAAACJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAACJAAAAAADJAAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAJAAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAACHwAAAAACfgAAAAAAHwAAAAACTgAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAACXQAAAAABfgAAAAAAHwAAAAACaAAAAAADaAAAAAAAaAAAAAABaAAAAAAAaAAAAAACHwAAAAACfgAAAAAAHwAAAAAC
+          tiles: bQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAJAAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAADaAAAAAADXQAAAAABXQAAAAADXQAAAAABfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADTgAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAABfgAAAAAAHwAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAA
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAAAaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAACJAAAAAADfgAAAAAAXQAAAAAAXQAAAAACHwAAAAADHwAAAAAAHwAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABaAAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADaAAAAAADaAAAAAADaAAAAAADaAAAAAABTgAAAAABaAAAAAAATgAAAAACaAAAAAAB
+          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADJAAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAAAaAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACaAAAAAACaAAAAAADJAAAAAABfgAAAAAAXQAAAAABXQAAAAABHwAAAAADHwAAAAADHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAACHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACaAAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAADaAAAAAABTgAAAAADaAAAAAACTgAAAAABaAAAAAAA
           version: 6
         1,1:
           ind: 1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACJAAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAACaAAAAAAAaAAAAAADaAAAAAACXQAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAACXQAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABXQAAAAADaAAAAAABXQAAAAACXQAAAAACXQAAAAAAJAAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACdQAAAAADdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADJAAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAADXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAABXQAAAAAAaAAAAAAAaAAAAAADaAAAAAADXQAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAACXQAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAABaAAAAAADaAAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAABJAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAACaAAAAAADXQAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABdQAAAAABdAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAcAAAAAADcAAAAAADdQAAAAAAdAAAAAAAdAAAAAAAdAAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAACdQAAAAABdAAAAAACdAAAAAAAdAAAAAACfgAAAAAAXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAACdQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAACcAAAAAAAaAAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAAAcAAAAAAAdQAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAAAcAAAAAAAdQAAAAACdAAAAAABdAAAAAADdAAAAAADfgAAAAAAXQAAAAAAXQAAAAABHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAABaAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAACaAAAAAABaAAAAAADaAAAAAABTgAAAAADTgAAAAABaAAAAAACTgAAAAACTgAAAAABaAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACHwAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAHwAAAAABHwAAAAACXQAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAACJAAAAAADJAAAAAACXQAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAABTgAAAAADTgAAAAAAHwAAAAACTgAAAAABTgAAAAADTgAAAAADHwAAAAAATgAAAAACTgAAAAABHwAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABJAAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABJAAAAAACJAAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABTgAAAAADTgAAAAABaAAAAAADTgAAAAABTgAAAAABaAAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABHwAAAAADHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAADJAAAAAACJAAAAAAAXQAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAATgAAAAADTgAAAAACHwAAAAACTgAAAAAATgAAAAAATgAAAAABHwAAAAAATgAAAAADTgAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAJAAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADJAAAAAADJAAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAAD
           version: 6
         -2,1:
           ind: -2,1
-          tiles: AQAAAAAAAQAAAAAAAQAAAAAAJAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABKAAAAAADKAAAAAACKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABXwAAAAADXwAAAAAAXwAAAAACXwAAAAADXwAAAAADXwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABXwAAAAADXwAAAAACXwAAAAAAXwAAAAADXwAAAAAAXwAAAAACaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABJAAAAAABKAAAAAACKAAAAAADKAAAAAACKAAAAAACKAAAAAABKAAAAAACXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAC
+          tiles: AQAAAAADAQAAAAAAAQAAAAADJAAAAAADfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAADfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAACKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABXwAAAAAAXwAAAAADXwAAAAAAXwAAAAAAXwAAAAADXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAADaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABXwAAAAACXwAAAAACXwAAAAAAXwAAAAACXwAAAAADXwAAAAABaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACJAAAAAACKAAAAAADKAAAAAADKAAAAAADKAAAAAADKAAAAAACKAAAAAADXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADegAAAAADegAAAAADegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAC
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAABJAAAAAABJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAACJgAAAAADJgAAAAACJgAAAAABJgAAAAABJgAAAAAAJgAAAAAAJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJAAAAAACJAAAAAABJAAAAAABJgAAAAAAJgAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABJgAAAAABJgAAAAADJAAAAAABJAAAAAADJAAAAAABJgAAAAADJgAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADJgAAAAACJgAAAAACJAAAAAABHwAAAAAAHwAAAAACJAAAAAABJAAAAAADHwAAAAAAHwAAAAABJAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAAAHwAAAAADHwAAAAAAJAAAAAABJAAAAAABHwAAAAACHwAAAAABHwAAAAAAJgAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAACJgAAAAADHwAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJgAAAAACJgAAAAADJgAAAAACJgAAAAACJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAABJgAAAAACJgAAAAADJgAAAAACJgAAAAABJAAAAAAAJAAAAAABJAAAAAABJgAAAAAAJgAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAJgAAAAADJgAAAAAAJAAAAAADJAAAAAADJAAAAAAAJgAAAAAAJgAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAABJgAAAAAAJgAAAAACJAAAAAABHwAAAAABHwAAAAAAJAAAAAAAJAAAAAABHwAAAAABHwAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAHwAAAAABHwAAAAACJAAAAAADJAAAAAABHwAAAAAAHwAAAAADHwAAAAACJgAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABJgAAAAABHwAAAAAA
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: HwAAAAACHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAACHwAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAADXQAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAJAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAaAAAAAAAXQAAAAACXQAAAAACJAAAAAADfgAAAAAAXQAAAAAATgAAAAAATgAAAAACaAAAAAAATgAAAAAATgAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAB
+          tiles: HwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAAAaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAACJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAACXQAAAAABJAAAAAAAfgAAAAAAXQAAAAAATgAAAAABTgAAAAADaAAAAAABTgAAAAABTgAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAAB
           version: 6
         3,-3:
           ind: 3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAHCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAABJAAAAAACJAAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAADOAAAAAAAHwAAAAACOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAALCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAGJAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAEBwAAAAAHJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAAAHwAAAAABOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAC
           version: 6
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABJAAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAABKAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAewAAAAAAewAAAAABfgAAAAAAegAAAAAAegAAAAABegAAAAAAKAAAAAAAKAAAAAABKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAewAAAAABewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAADKAAAAAADKAAAAAABKAAAAAABKAAAAAAAKAAAAAABKAAAAAACKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAAAKAAAAAAAKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAABJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAKAAAAAADKAAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADJAAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAKAAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAegAAAAABegAAAAADegAAAAABKAAAAAABKAAAAAACKAAAAAACKAAAAAACKAAAAAABKAAAAAABKAAAAAAAKAAAAAACfgAAAAAAfgAAAAAAewAAAAAAewAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAACfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAADKAAAAAAAKAAAAAADKAAAAAACKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADegAAAAABegAAAAACegAAAAABegAAAAADJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAABKAAAAAADKAAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAADKAAAAAADXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
           version: 6
         -3,-1:
           ind: -3,-1
-          tiles: HwAAAAABfgAAAAAAewAAAAABewAAAAACewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAADegAAAAAAegAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAAATgAAAAADKAAAAAABTgAAAAAATgAAAAACKAAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAACTgAAAAABKAAAAAADTgAAAAABTgAAAAACKAAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAACfgAAAAAAewAAAAADewAAAAAAewAAAAAAfgAAAAAAaAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAKAAAAAADKAAAAAADKAAAAAABfgAAAAAAaAAAAAAAKAAAAAABMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAACZQAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAABfgAAAAAAXQAAAAADXQAAAAADMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXwAAAAAAXwAAAAADXwAAAAAAXwAAAAADXwAAAAACJAAAAAAAXwAAAAABXwAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAABXwAAAAAAHwAAAAADHwAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAABJAAAAAADXQAAAAADXQAAAAABfgAAAAAAXwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACXwAAAAABHwAAAAAAHwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAACfgAAAAAAXwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAADXwAAAAABHwAAAAAAHwAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAC
+          tiles: HwAAAAABfgAAAAAAewAAAAABewAAAAABewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAABegAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABTgAAAAABTgAAAAACKAAAAAABTgAAAAAATgAAAAABKAAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAAAKAAAAAAATgAAAAAATgAAAAAAKAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAAAZQAAAAABfgAAAAAAKAAAAAABKAAAAAACKAAAAAACfgAAAAAAaAAAAAAAKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAKAAAAAADKAAAAAADKAAAAAACfgAAAAAAXQAAAAADXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAXwAAAAACXwAAAAAAXwAAAAAAXwAAAAABXwAAAAACJAAAAAAAXwAAAAAAXwAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAADXwAAAAAAHwAAAAAAHwAAAAADJAAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAAAXQAAAAADXQAAAAABfgAAAAAAXwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABXwAAAAACHwAAAAACHwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAABfgAAAAAAXwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAACXwAAAAADHwAAAAAAHwAAAAACJAAAAAACJAAAAAAAJAAAAAABJAAAAAACJAAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAD
           version: 6
         -3,0:
           ind: -3,0
-          tiles: ZQAAAAAAZQAAAAACZQAAAAADZQAAAAAAZQAAAAAAXQAAAAADaAAAAAABaAAAAAADXQAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAXQAAAAADTgAAAAAATgAAAAABaAAAAAAATgAAAAAATgAAAAACaAAAAAACaAAAAAAAaAAAAAACXQAAAAACXQAAAAAAXwAAAAACaAAAAAACaAAAAAADaAAAAAAAXwAAAAAAaAAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAADXQAAAAADaAAAAAABaAAAAAABXQAAAAACXQAAAAACXwAAAAAAaAAAAAACaAAAAAACaAAAAAADXwAAAAABaAAAAAACJAAAAAACJAAAAAABJAAAAAADJAAAAAACJAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAABMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABewAAAAADewAAAAACewAAAAAAewAAAAACewAAAAADJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAAAXQAAAAADXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAewAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAgAAAAAAJAAAAAABJAAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAA
+          tiles: ZQAAAAABZQAAAAADZQAAAAAAZQAAAAACZQAAAAADXQAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAAATgAAAAACTgAAAAABaAAAAAABTgAAAAADTgAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAAAXwAAAAADaAAAAAADaAAAAAABaAAAAAAAXwAAAAAAaAAAAAAAZQAAAAAAZQAAAAAAZQAAAAADZQAAAAADZQAAAAABXQAAAAABaAAAAAACaAAAAAABXQAAAAAAXQAAAAAAXwAAAAACaAAAAAACaAAAAAAAaAAAAAACXwAAAAAAaAAAAAACJAAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAACewAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAADXQAAAAADXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAACHwAAAAABHwAAAAADbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAAAewAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACAgAAAAAAJAAAAAADJAAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAADPAAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAA
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAADegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAABgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAAfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAADfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAACegAAAAADegAAAAABfgAAAAAAegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAADgQAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAAGegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAABgQAAAAAAFQAAAAADfgAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAEfgAAAAAAgQAAAAAAegAAAAACegAAAAABegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABFQAAAAACegAAAAABegAAAAABfgAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: aAAAAAABaAAAAAACaAAAAAACaAAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABegAAAAAAegAAAAABXQAAAAADEgAAAAABEgAAAAACEgAAAAAAEgAAAAAAEgAAAAACfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACegAAAAACegAAAAABXQAAAAABEgAAAAACEgAAAAACEgAAAAACEgAAAAABEgAAAAADMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADegAAAAACegAAAAACXQAAAAADEgAAAAAAEgAAAAADEgAAAAABEgAAAAABEgAAAAAAMwAAAAAAMwAAAAAAJAAAAAABaAAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAADegAAAAACegAAAAACXQAAAAAAEgAAAAABEgAAAAADEgAAAAACEgAAAAACEgAAAAADMwAAAAAAMwAAAAAAJAAAAAACaAAAAAADaAAAAAAAXQAAAAACaAAAAAACXQAAAAADegAAAAADegAAAAACXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAABEgAAAAAAEgAAAAADMwAAAAAAMwAAAAAAJAAAAAAAaAAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAegAAAAADegAAAAADXQAAAAADEgAAAAABEgAAAAAAEgAAAAADEgAAAAACEgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAKAAAAAADKAAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAKAAAAAABKAAAAAACKAAAAAABKAAAAAABKAAAAAACKAAAAAAAKAAAAAABKAAAAAABaAAAAAABaAAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAAAewAAAAACewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAADewAAAAACewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAA
+          tiles: aAAAAAADaAAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAABEgAAAAABEgAAAAADEgAAAAAAEgAAAAAAEgAAAAADfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAAAEgAAAAADEgAAAAAAEgAAAAACEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAADaAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAADegAAAAADegAAAAACXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAACEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAAAaAAAAAACXQAAAAAAaAAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAACEgAAAAACEgAAAAABEgAAAAAAEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAADaAAAAAAAaAAAAAADXQAAAAABaAAAAAAAXQAAAAADegAAAAACegAAAAABXQAAAAABEgAAAAADEgAAAAADEgAAAAADEgAAAAABEgAAAAABAwAAAAAAAwAAAAAAJAAAAAABaAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAABegAAAAAAegAAAAACXQAAAAACEgAAAAABEgAAAAAAEgAAAAAAEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAABKAAAAAACKAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAAAaAAAAAABaAAAAAADaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAKAAAAAADKAAAAAADKAAAAAADKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAADewAAAAABewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAAD
           version: 6
         -3,-3:
           ind: -3,-3
-          tiles: XQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACaAAAAAABXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAAATgAAAAACTgAAAAADaAAAAAACaAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAJAAAAAADJAAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAaAAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAfgAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAACKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAADKAAAAAACKAAAAAABaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAKAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAD
+          tiles: XQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAADTgAAAAABTgAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAJfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAADTgAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAADXQAAAAADXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAABKAAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAABaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAAAKAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAC
           version: 6
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAADXQAAAAAAZQAAAAABZQAAAAACZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABaAAAAAADTgAAAAADTgAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADJAAAAAADJAAAAAACJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADXQAAAAAAJAAAAAADJAAAAAACJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAADZQAAAAAAZQAAAAADZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAADTgAAAAABTgAAAAACaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAAAXQAAAAADZQAAAAAAZQAAAAADZQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAJAAAAAABJAAAAAABJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAACXQAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADJAAAAAACJAAAAAABJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAACMwAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAXQAAAAABJAAAAAABJAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACJAAAAAABJAAAAAABJAAAAAAAJAAAAAAD
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAXQAAAAADaAAAAAABJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAABaAAAAAACJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAACaAAAAAADJAAAAAAAMwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACaAAAAAABJAAAAAADMwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAaAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAADXQAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAD
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAaAAAAAACJAAAAAADAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAABaAAAAAACJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABaAAAAAADJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADaAAAAAADJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACHwAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAACaAAAAAADXQAAAAACaAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAABXQAAAAABaAAAAAADaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAB
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAABTgAAAAABTgAAAAACaAAAAAAATgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXgAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXgAAAAABXgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADYQAAAAAAYQAAAAACXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAABaAAAAAACTgAAAAACTgAAAAADaAAAAAACTgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXgAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAAAXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABYQAAAAABYQAAAAADXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAB
           version: 6
         2,0:
           ind: 2,0
-          tiles: HwAAAAADHwAAAAABHwAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACaAAAAAABXQAAAAACdQAAAAACdQAAAAADdQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAJAAAAAADXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAAAXQAAAAAATgAAAAAAXQAAAAACdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABTgAAAAABTgAAAAADaAAAAAADaAAAAAACaAAAAAADTgAAAAADTgAAAAAAXQAAAAAAdQAAAAAAdQAAAAACaAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADaAAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAADdQAAAAAAdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAACcAAAAAABcAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAdQAAAAAAdQAAAAABcAAAAAACcAAAAAADcAAAAAABcAAAAAACcAAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAATgAAAAACcAAAAAADdQAAAAADcAAAAAADTgAAAAADdQAAAAACXQAAAAAAXQAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAACcAAAAAACcAAAAAABcAAAAAABcAAAAAABdQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAACJAAAAAAAcAAAAAACcAAAAAADcAAAAAACfgAAAAAAXQAAAAABegAAAAADegAAAAACegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAACcAAAAAABcAAAAAAAcAAAAAACJAAAAAABXQAAAAABXQAAAAABegAAAAAAegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAAAfgAAAAAAXQAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAADfgAAAAAAXQAAAAABegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAAA
+          tiles: HwAAAAAAHwAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABaAAAAAAAXQAAAAABdQAAAAABdQAAAAAAdQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADXQAAAAABXQAAAAABTgAAAAABXQAAAAABdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAABTgAAAAAATgAAAAADaAAAAAACaAAAAAABaAAAAAAATgAAAAAATgAAAAACXQAAAAADdQAAAAAAdQAAAAADaAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAaAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABdQAAAAACdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAADcAAAAAAAcAAAAAAAcAAAAAADcAAAAAADcAAAAAABdQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAACTgAAAAADcAAAAAACdQAAAAAAcAAAAAABTgAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAADcAAAAAAAcAAAAAADcAAAAAAAcAAAAAADdQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACdQAAAAADdQAAAAADdQAAAAABdAAAAAABdQAAAAADfgAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAABdQAAAAABdQAAAAACdAAAAAAAJAAAAAACXQAAAAACXQAAAAAAegAAAAABegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAADfgAAAAAAXQAAAAABegAAAAACegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAADHwAAAAAAJAAAAAADfgAAAAAAXQAAAAADegAAAAABegAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAAATwAAAAAATwAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
@@ -219,63 +221,63 @@ entities:
           version: 6
         0,2:
           ind: 0,2
-          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAdAAAAAADdAAAAAABdQAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAdAAAAAACdAAAAAADdQAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HwAAAAACHwAAAAAAewAAAAACewAAAAACewAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABJAAAAAABJAAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAewAAAAADewAAAAAAewAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAACHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACewAAAAAAewAAAAACewAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAACXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAHwAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAAAdAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABgQAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAD
+          tiles: HwAAAAADHwAAAAACewAAAAADewAAAAADewAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACJAAAAAADJAAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAADewAAAAADewAAAAADewAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACewAAAAAAewAAAAAAewAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAACdAAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACgQAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAJAAAAAABJAAAAAADJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAA
           version: 6
         -2,2:
           ind: -2,2
-          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAABXQAAAAACXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACJAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,3:
           ind: 0,3
-          tiles: XQAAAAACHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABHwAAAAADHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABTgAAAAABTgAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABTgAAAAABTgAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADaAAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAABTgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAADTgAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAaAAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
-          tiles: fgAAAAAAdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAfgAAAAAAdQAAAAABdQAAAAACdQAAAAACcAAAAAACdQAAAAACcAAAAAABfgAAAAAAcAAAAAACcAAAAAACdQAAAAABdQAAAAADdQAAAAADfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAACdQAAAAADdQAAAAABcAAAAAABdQAAAAAAcAAAAAAAcAAAAAADcAAAAAAAcAAAAAABdQAAAAADdQAAAAACdQAAAAABdQAAAAADdQAAAAACdQAAAAACcAAAAAAAcAAAAAADcAAAAAAAdQAAAAADcAAAAAABdQAAAAADcAAAAAACcAAAAAAAcAAAAAACcAAAAAAAdQAAAAACdQAAAAADdQAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAACdQAAAAABdQAAAAACdQAAAAACcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAcAAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAACdQAAAAADdQAAAAAAcAAAAAACdQAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACcAAAAAADfgAAAAAAcAAAAAADcAAAAAADcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAACdQAAAAADcAAAAAACcAAAAAADcAAAAAADdQAAAAABdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAADdQAAAAAAcAAAAAACfgAAAAAAcAAAAAADdQAAAAABdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAdQAAAAABcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAcAAAAAACdQAAAAACcAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAABHwAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAAAcAAAAAADcAAAAAAAcAAAAAACHwAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABcAAAAAAAfgAAAAAAcAAAAAACHwAAAAABHwAAAAADHwAAAAABfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAADdQAAAAADdQAAAAADcAAAAAABcAAAAAABcAAAAAACdQAAAAAAcAAAAAACcAAAAAABcAAAAAAAcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAAAdQAAAAACdQAAAAADcAAAAAACfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAADdQAAAAAAdQAAAAACcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAcAAAAAADcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAAAdQAAAAABdQAAAAADdQAAAAACcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAADdQAAAAADdQAAAAABdQAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAAAcAAAAAADcAAAAAABdQAAAAABcAAAAAABdQAAAAABcAAAAAADcAAAAAADcAAAAAADcAAAAAADdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAAAcAAAAAACdQAAAAAAcAAAAAABfgAAAAAAcAAAAAACcAAAAAABdQAAAAACdQAAAAACdQAAAAABfgAAAAAAcAAAAAACcAAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAABcAAAAAADdQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADcAAAAAABfgAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABdQAAAAADcAAAAAACcAAAAAACcAAAAAACdQAAAAADdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAABcAAAAAACfgAAAAAAcAAAAAAAdQAAAAABdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABdQAAAAADcAAAAAAAdQAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAJAAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAACdQAAAAACcAAAAAADcAAAAAACcAAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAcAAAAAAAfgAAAAAAcAAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAADdQAAAAACcAAAAAACcAAAAAAAcAAAAAACdQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABdQAAAAACdQAAAAADdQAAAAACcAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         3,1:
           ind: 3,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAADdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAAAfgAAAAAAegAAAAAAegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAADXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-4:
           ind: -4,-4
-          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAAAJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABJAAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAA
+          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAJAAAAAADJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAADdQAAAAADcAAAAAAAfgAAAAAAdQAAAAACdQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAABcAAAAAACbQAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAACcAAAAAABcAAAAAAAcAAAAAADdQAAAAACdQAAAAADfgAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAABbQAAAAAAfgAAAAAAcAAAAAABcAAAAAADdQAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAACdQAAAAADdQAAAAADfgAAAAAAcAAAAAADdQAAAAAAdQAAAAADdQAAAAAAcAAAAAACcAAAAAAAdQAAAAAAcAAAAAABcAAAAAACcAAAAAAAdQAAAAADdQAAAAADdQAAAAAAdQAAAAADdQAAAAACfgAAAAAAcAAAAAACcAAAAAACdQAAAAABcAAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAACcAAAAAADcAAAAAADdQAAAAABdQAAAAAAdQAAAAABdQAAAAABdQAAAAADfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAABfgAAAAAAdQAAAAABdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAADdQAAAAACcAAAAAAAcAAAAAADdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABdQAAAAACdQAAAAADcAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAACcAAAAAACcAAAAAABdQAAAAABdQAAAAABfgAAAAAAcAAAAAABdQAAAAADdQAAAAABdQAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAACdQAAAAACcAAAAAABfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAABcAAAAAABcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAADcAAAAAACaAAAAAABaAAAAAADaAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABdQAAAAABcAAAAAABcAAAAAADcAAAAAAAdQAAAAACcAAAAAADcAAAAAAAcAAAAAABaAAAAAADaAAAAAABaAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAADdQAAAAACcAAAAAACcAAAAAAAdQAAAAACdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         4,0:
           ind: 4,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: XQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAADfgAAAAAAXQAAAAACbQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAADbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACfgAAAAAAXQAAAAACbQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACXQAAAAABXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,1:
           ind: 4,1
@@ -283,27 +285,27 @@ entities:
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADJAAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAADJAAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAACHwAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAABegAAAAADegAAAAACXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAADXQAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAAAegAAAAADegAAAAADXQAAAAADXQAAAAADJAAAAAACfgAAAAAAaAAAAAACXQAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAACegAAAAACegAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAJAAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAACbQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAbQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACbQAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAABJAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAACegAAAAABegAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAaAAAAAACXQAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAACegAAAAADegAAAAABXQAAAAADXQAAAAABJAAAAAACfgAAAAAAaAAAAAABXQAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAABegAAAAACegAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABJAAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABbQAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAATgAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAA
           version: 6
         5,-1:
           ind: 5,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         5,-2:
           ind: 5,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAABaAAAAAABaAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAXQAAAAABXQAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAADXQAAAAABJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAaAAAAAABaAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACXQAAAAADXQAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         4,-3:
           ind: 4,-3
-          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAABwAAAAAKBwAAAAAABwAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAAJBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAADfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAFBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAA
           version: 6
         -5,-3:
           ind: -5,-3
@@ -311,7 +313,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -323,11 +325,11 @@ entities:
           version: 6
         5,-3:
           ind: 5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAFWwAAAAAAWwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAGWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
-          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-4:
           ind: -2,-4
@@ -335,15 +337,15 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAADfwAAAAAABwAAAAAABwAAAAAIBwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACBwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAACBwAAAAAHBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAJBwAAAAAKBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAABBwAAAAAFBwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAKfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
           version: 6
         4,-4:
           ind: 4,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -370,20 +372,20 @@ entities:
             color: '#32CD32FF'
             id: Arrows
           decals:
-            1734: 53,14
+            1684: 53,14
         - node:
             angle: 1.5707963267948966 rad
             color: '#32CD32FF'
             id: Arrows
           decals:
-            1735: 55,14
+            1685: 55,14
         - node:
             angle: 4.71238898038469 rad
             color: '#DE3A3A96'
             id: Arrows
           decals:
-            1195: 3,31
-            1196: 3,30
+            1170: 3,31
+            1171: 3,30
         - node:
             angle: 1.5707963267948966 rad
             color: '#EFB34196'
@@ -392,72 +394,82 @@ entities:
             104: 2,-13
             105: 2,-12
         - node:
+            angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1889: 69,-28
-            1890: 70,-28
-            6152: -44.266167,24.17379
-            6153: -43.71579,24.16156
-            6847: 7.80612,-46.838108
-            6848: 8.233204,-46.827694
+            6929: 46,14
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            1829: 69,-28
+            1830: 70,-28
+            6024: -44.266167,24.17379
+            6025: -43.71579,24.16156
+            6689: 7.80612,-46.838108
+            6690: 8.233204,-46.827694
+            6924: 43.669937,12.024849
+            6925: 43.669937,12.431099
+            6926: 44.341812,12.009224
+            6927: 44.341812,12.399849
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
             350: 44,-22
-            1269: 22,15
-            1327: -18,28
-            1783: 62,-25
-            1784: 62,-24
-            1953: 61,-18
-            1954: 61,-20
-            1978: 22,-38
-            1979: 22,-37
-            6150: -45.159,22.681658
-            6151: -45.17123,23.256496
+            1244: 22,15
+            1302: -18,28
+            1723: 62,-25
+            1724: 62,-24
+            1893: 61,-18
+            1894: 61,-20
+            1918: 22,-38
+            1919: 22,-37
+            6022: -45.159,22.681658
+            6023: -45.17123,23.256496
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            2980: -25,37
+            2920: -25,37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1273: 25,23
-            1274: 29,23
-            1810: 68.96644,-11.160069
-            1811: 69.96644,-11.15081
-            1812: 67.97107,-11.15544
-            6148: -43.71579,21.837746
-            6149: -44.32732,21.837746
-            6669: -33,-12
+            1248: 25,23
+            1249: 29,23
+            1750: 68.96644,-11.160069
+            1751: 69.96644,-11.15081
+            1752: 67.97107,-11.15544
+            6020: -43.71579,21.837746
+            6021: -44.32732,21.837746
+            6513: -33,-12
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1272: 25,12
-            6146: -42.87188,22.669428
-            6147: -42.85965,23.219805
+            1247: 25,12
+            6018: -42.87188,22.669428
+            6019: -42.85965,23.219805
         - node:
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
             309: 26,-21
-            2230: 26,1
-            6876: 54.43144,-23.18127
+            2170: 26,1
+            6718: 54.43144,-23.18127
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
-            3021: 80.98914,-5.89228
+            2961: 80.98914,-5.89228
         - node:
             color: '#FFFFFFFF'
             id: Basalt2
@@ -468,63 +480,63 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt2
           decals:
-            3023: 79.36655,-6.805498
+            2963: 79.36655,-6.805498
         - node:
             color: '#FFFFFFFF'
             id: Basalt3
           decals:
             312: 26,-24
-            1747: 57,19
+            1697: 57,19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt3
           decals:
-            3020: 80.410225,-6.9767265
+            2960: 80.410225,-6.9767265
         - node:
             color: '#FFFFFFFF'
             id: Basalt4
           decals:
             315: 26,-24
-            941: -48,-27
-            1939: 56,-23
+            916: -48,-27
+            1879: 56,-23
         - node:
             color: '#FFFFFFFF'
             id: Basalt5
           decals:
             311: 26,-22
             314: 25,-23
-            940: -48,-28
-            1937: 54,-21
-            2231: 25,1
-            6875: 54.08898,-21.835905
-            6877: 56.437256,-22.899967
+            915: -48,-28
+            1877: 54,-21
+            2171: 25,1
+            6717: 54.08898,-21.835905
+            6719: 56.437256,-22.899967
         - node:
             color: '#FFFFFFFF'
             id: Basalt6
           decals:
-            939: -48,-29
+            914: -48,-29
         - node:
             color: '#FFFFFFFF'
             id: Basalt7
           decals:
             310: 25,-22
-            938: -49,-29
-            1748: 57,18
-            1938: 57,-23
+            913: -49,-29
+            1698: 57,18
+            1878: 57,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt7
           decals:
-            3022: 80.88314,-7.8817906
+            2962: 80.88314,-7.8817906
         - node:
             color: '#FFFFFFFF'
             id: Basalt8
           decals:
             34: -4,-12
-            942: -47,-30
-            6878: 56.755253,-20.832996
+            917: -47,-30
+            6720: 56.755253,-20.832996
         - node:
             color: '#FFFFFFFF'
             id: Basalt9
@@ -536,31 +548,31 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt9
           decals:
-            3024: 79.17086,-7.824714
+            2964: 79.17086,-7.824714
         - node:
             color: '#D4D4D428'
             id: Bot
           decals:
-            2185: -36,-58
-            2186: -36,-59
-            2187: -36,-60
-            2188: -36,-61
-            2189: -36,-62
-            2190: -36,-63
-            2191: -36,-64
-            2192: -60,-58
-            2193: -60,-59
-            2194: -60,-60
-            2195: -60,-61
-            2196: -60,-62
-            2197: -60,-63
-            2198: -60,-64
+            2125: -36,-58
+            2126: -36,-59
+            2127: -36,-60
+            2128: -36,-61
+            2129: -36,-62
+            2130: -36,-63
+            2131: -36,-64
+            2132: -60,-58
+            2133: -60,-59
+            2134: -60,-60
+            2135: -60,-61
+            2136: -60,-62
+            2137: -60,-63
+            2138: -60,-64
         - node:
             color: '#DE3A3A41'
             id: Bot
           decals:
-            6599: -38,-45
-            6600: -38,-45
+            6443: -38,-45
+            6444: -38,-45
         - node:
             color: '#EFB34196'
             id: Bot
@@ -621,6 +633,14 @@ entities:
             288: 18,-21
             289: 15,-22
             290: 15,-21
+            6916: 41,13
+            6917: 41,12
+            6918: 41,11
+            6919: 47,11
+            6920: 45,11
+            6921: 45,12
+            6922: 43,11
+            6923: 43,12
         - node:
             color: '#EFB341FF'
             id: Bot
@@ -633,19 +653,19 @@ entities:
             color: '#FFFFFF4A'
             id: Bot
           decals:
-            6718: 18,-56
-            6719: 19,-56
+            6560: 18,-56
+            6561: 19,-56
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            1785: 63,-25
-            1786: 63,-24
-            1787: 65,-25
-            1788: 65,-24
-            2153: -10,-41
-            2154: -10,-40
+            1725: 63,-25
+            1726: 63,-24
+            1727: 65,-25
+            1728: 65,-24
+            2093: -10,-41
+            2094: -10,-40
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -664,431 +684,467 @@ entities:
             414: -21,-26
             479: -35,-5
             480: -30,-5
-            742: -38,-34
-            743: -37,-34
-            744: -36,-34
-            787: -19,-35
-            885: -52,3
-            886: -52,-1
-            1084: 33,-3
-            1085: 34,-3
-            1109: 39,-28
-            1110: -26,-32
-            1111: 49,-22
-            1112: 35,2
-            1113: 21,21
-            1114: 34,-37
-            1115: -62,-29
-            1125: -5,31
-            1126: -6,31
-            1127: -6,32
-            1128: -5,32
-            1131: 2,26
-            1232: -1,27
-            1233: 7,30
-            1234: 7,31
-            1235: 7,32
-            1236: 7,33
-            1237: 6,33
-            1238: 2,32
-            1249: -4,48
-            1266: 23,15
-            1267: 23,13
-            1275: 23,8
-            1276: 23,7
-            1277: 23,6
-            1278: 24,6
-            1279: 24,7
-            1280: 24,8
-            1281: 25,6
-            1288: 25,7
-            1289: 25,8
-            1290: 26,20
-            1291: 25,20
-            1292: 24,20
-            1293: 24,19
-            1294: 25,19
-            1295: 26,19
-            1296: 28,20
-            1297: 29,20
-            1298: 30,20
-            1299: 28,19
-            1300: 29,19
-            1301: 30,19
-            1308: 29,17
-            1319: -10,34
-            1320: -9,34
-            1321: -8,34
-            1322: -7,34
-            1326: -18,25
-            1329: 33,17
-            1431: 58,-33
-            1438: 57,-35
-            1449: 47,12
-            1481: 44,11
-            1765: 61,-12
-            1766: 57,-15
-            1767: 57,-14
-            1771: 64,-24
-            1772: 64,-25
-            1807: 71,-11
-            1808: 71,-12
-            1809: 71,-13
-            1869: 63,-19
-            1874: 70,-22
-            1903: 69,-13
-            1958: 22,-39
-            1977: 22,-36
-            2018: 28,-36
-            2019: 29,-36
-            2020: 28,-47
-            2075: 12,-46
-            2076: 13,-46
-            2117: -2,-35
-            2118: -1,-35
-            2119: 3,-38
-            2120: 3,-37
-            2125: 10,-41
-            2131: 12,-38
-            2150: -6,-34
-            2151: -5,-34
-            2152: -4,-34
-            2202: 41,-10
-            2203: -23,12
-            2819: 66,-23
-            2851: -27,30
-            2864: 57,15
-            3147: 75,-13
-            3148: 75,-15
-            3153: 75,-19
-            3154: 75,-17
-            6383: 48,-10
-            6384: 51,5
-            6385: 53,10
-            6527: -36,-65
-            6528: -60,-65
-            6657: -34,-11
-            6658: -34,-10
-            6659: -32,-11
-            6660: -32,-10
-            6679: 61,-21
-            6686: -24,-42
-            6696: 3,48
-            6716: 62,-7
-            6717: 62,-8
-            6803: 54,-33
-            6807: 22,-59
-            6808: 15,-59
-            6811: -19,-38
-            6837: 7,-48
-            6838: 7,-49
-            6839: 9,-48
-            6840: 9,-49
-            6849: 7,-45
-            6850: 9,-45
-            6851: 76,-23
-            6852: 80,-25
-            6853: 76,-25
-            6864: 76,-23
-            6865: 58,-27
-            6866: 58,-26
-            6879: 49,17
-            6880: 50,17
-            6881: 53,17
-            6882: 54,17
-            6883: 55,17
-            6884: 69,6
-            6885: 68,4
-            6886: 69,4
-            6887: 67,0
-            6888: 65,-4
-            6889: 65,-5
-            6890: 79,-11
-            6891: 80,-11
-            6892: 81,-11
-            6893: 21,-41
-            6894: 5,-42
-            6895: 5,-43
-            6896: 5,-40
-            6897: 5,-39
-            6898: -12,-34
-            6899: -11,-34
-            6900: -10,-34
-            6901: -14,-34
-            6902: -15,-34
-            6903: -62,-32
-            6904: -63,-32
-            6905: -64,-32
-            6906: -46,-12
-            6907: -45,-12
-            6908: -41,17
-            6909: -40,17
-            6910: -39,17
-            6911: -21,31
-            6912: -20,31
-            6913: -7,38
-            6914: -6,38
-            6915: -5,38
-            6916: 3,38
-            6917: -11,17
-            6918: -10,17
-            6919: -9,17
-            6920: -12,17
-            6921: -13,17
-            6922: 1,16
-            6923: 2,16
-            6924: 3,16
-            6925: 10,16
-            6926: 11,16
-            6927: 15,4
-            6928: 17,1
-            6929: -14,-12
-            6930: -14,-11
-            6931: 39,-7
-            6932: 39,-8
-            6933: 39,-9
-            6934: 39,-10
-            6935: 39,-11
-            6936: 73,-21
-            6937: 73,-22
-            6938: 45,-10
-            6939: 45,-11
-            6940: 15,1
-            6941: -17,17
-            6942: 45,-17
-            6945: 45,-16
-            6947: 45,-15
-            6948: -37,-42
-            6949: -37,-40
-            6950: -37,-41
-            7107: -29,15
+            717: -38,-34
+            718: -37,-34
+            719: -36,-34
+            762: -19,-35
+            860: -52,3
+            861: -52,-1
+            1059: 33,-3
+            1060: 34,-3
+            1084: 39,-28
+            1085: -26,-32
+            1086: 49,-22
+            1087: 35,2
+            1088: 21,21
+            1089: 34,-37
+            1090: -62,-29
+            1100: -5,31
+            1101: -6,31
+            1102: -6,32
+            1103: -5,32
+            1106: 2,26
+            1207: -1,27
+            1208: 7,30
+            1209: 7,31
+            1210: 7,32
+            1211: 7,33
+            1212: 6,33
+            1213: 2,32
+            1224: -4,48
+            1241: 23,15
+            1242: 23,13
+            1250: 23,8
+            1251: 23,7
+            1252: 23,6
+            1253: 24,6
+            1254: 24,7
+            1255: 24,8
+            1256: 25,6
+            1263: 25,7
+            1264: 25,8
+            1265: 26,20
+            1266: 25,20
+            1267: 24,20
+            1268: 24,19
+            1269: 25,19
+            1270: 26,19
+            1271: 28,20
+            1272: 29,20
+            1273: 30,20
+            1274: 28,19
+            1275: 29,19
+            1276: 30,19
+            1283: 29,17
+            1294: -10,34
+            1295: -9,34
+            1296: -8,34
+            1297: -7,34
+            1301: -18,25
+            1304: 33,17
+            1406: 58,-33
+            1413: 57,-35
+            1705: 61,-12
+            1706: 57,-15
+            1707: 57,-14
+            1711: 64,-24
+            1712: 64,-25
+            1747: 71,-11
+            1748: 71,-12
+            1749: 71,-13
+            1809: 63,-19
+            1814: 70,-22
+            1843: 69,-13
+            1898: 22,-39
+            1917: 22,-36
+            1958: 28,-36
+            1959: 29,-36
+            1960: 28,-47
+            2015: 12,-46
+            2016: 13,-46
+            2057: -2,-35
+            2058: -1,-35
+            2059: 3,-38
+            2060: 3,-37
+            2065: 10,-41
+            2071: 12,-38
+            2090: -6,-34
+            2091: -5,-34
+            2092: -4,-34
+            2142: 41,-10
+            2143: -23,12
+            2759: 66,-23
+            2791: -27,30
+            2804: 57,15
+            3082: 75,-13
+            3083: 75,-15
+            3088: 75,-19
+            3089: 75,-17
+            6227: 48,-10
+            6228: 51,5
+            6229: 53,10
+            6371: -36,-65
+            6372: -60,-65
+            6501: -34,-11
+            6502: -34,-10
+            6503: -32,-11
+            6504: -32,-10
+            6523: 61,-21
+            6530: -24,-42
+            6540: 3,48
+            6645: 54,-33
+            6649: 22,-59
+            6650: 15,-59
+            6653: -19,-38
+            6679: 7,-48
+            6680: 7,-49
+            6681: 9,-48
+            6682: 9,-49
+            6691: 7,-45
+            6692: 9,-45
+            6693: 76,-23
+            6694: 80,-25
+            6695: 76,-25
+            6706: 76,-23
+            6707: 58,-27
+            6708: 58,-26
+            6721: 49,17
+            6722: 50,17
+            6723: 53,17
+            6724: 54,17
+            6725: 55,17
+            6726: 69,6
+            6727: 68,4
+            6728: 69,4
+            6729: 67,0
+            6730: 65,-4
+            6731: 65,-5
+            6732: 79,-11
+            6733: 80,-11
+            6734: 81,-11
+            6735: 21,-41
+            6736: 5,-42
+            6737: 5,-43
+            6738: 5,-40
+            6739: 5,-39
+            6740: -12,-34
+            6741: -11,-34
+            6742: -10,-34
+            6743: -14,-34
+            6744: -15,-34
+            6745: -62,-32
+            6746: -63,-32
+            6747: -64,-32
+            6748: -46,-12
+            6749: -45,-12
+            6750: -41,17
+            6751: -40,17
+            6752: -39,17
+            6753: -21,31
+            6754: -20,31
+            6755: -7,38
+            6756: -6,38
+            6757: -5,38
+            6758: 3,38
+            6759: -11,17
+            6760: -10,17
+            6761: -9,17
+            6762: -12,17
+            6763: -13,17
+            6764: 1,16
+            6765: 2,16
+            6766: 3,16
+            6767: 10,16
+            6768: 11,16
+            6769: 15,4
+            6770: 17,1
+            6771: -14,-12
+            6772: -14,-11
+            6773: 39,-7
+            6774: 39,-8
+            6775: 39,-9
+            6776: 39,-10
+            6777: 39,-11
+            6778: 73,-21
+            6779: 73,-22
+            6780: 45,-10
+            6781: 45,-11
+            6782: 15,1
+            6783: -17,17
+            6784: 45,-17
+            6785: 45,-16
+            6786: 45,-15
+            6787: -37,-42
+            6788: -37,-40
+            6789: -37,-41
+            6828: -29,15
+            6901: 47,12
+            6930: 45,15
+            6972: 82,-11
+            6980: 59,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            2948: -25,34
-            2949: -25,35
-            2950: -30,35
-            2951: -30,34
-            2977: -23,38
-            2978: -10,38
-            2979: -9,38
-            3025: 78,-8
-            3026: 79,-8
+            2888: -25,34
+            2889: -25,35
+            2890: -30,35
+            2891: -30,34
+            2917: -23,38
+            2918: -10,38
+            2919: -9,38
+            2965: 78,-8
+            2966: 79,-8
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            6545: 91,-19
-            6546: 91,-18
-            6547: 92,-18
-            6548: 92,-19
-            6549: 87,-19
-            6550: 88,-19
-            6551: 88,-18
-            6552: 87,-18
+            6389: 91,-19
+            6390: 91,-18
+            6391: 92,-18
+            6392: 92,-19
+            6393: 87,-19
+            6394: 88,-19
+            6395: 88,-18
+            6396: 87,-18
         - node:
             color: '#52B4E996'
             id: BotGreyscale
           decals:
-            6288: 55,8
-            6289: 55,8
-            6290: 56,8
-            6291: 56,8
-            6305: 57,1
-            6306: 57,1
-            6307: 56,1
-            6308: 56,1
-            6309: 55,4
-            6310: 55,4
-            6311: 56,4
-            6312: 56,4
-            6313: 57,4
-            6314: 57,4
+            6132: 55,8
+            6133: 55,8
+            6134: 56,8
+            6135: 56,8
+            6149: 57,1
+            6150: 57,1
+            6151: 56,1
+            6152: 56,1
+            6153: 55,4
+            6154: 55,4
+            6155: 56,4
+            6156: 56,4
+            6157: 57,4
+            6158: 57,4
         - node:
             cleanable: True
             color: '#D4D4D428'
             id: BotGreyscale
           decals:
-            2998: 78,-30
+            2938: 78,-30
+        - node:
+            color: '#EFB34196'
+            id: BotLeft
+          decals:
+            6932: 43,14
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeft
           decals:
-            6086: 6,-14
-            6088: 6,-14
+            5958: 6,-14
+            5960: 6,-14
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            1867: 74,-13
-            1868: 74,-12
-            1959: 23,-39
-            1960: 24,-39
-            1961: 25,-39
-            2129: 12,-39
-            6507: -3,33
-            7108: -33,12
-            7109: -34,12
-            7110: -35,12
-            7111: -35,11
-            7112: -34,11
-            7113: -33,11
+            1807: 74,-13
+            1808: 74,-12
+            1899: 23,-39
+            1900: 24,-39
+            1901: 25,-39
+            2069: 12,-39
+            6351: -3,33
+            6829: -33,12
+            6830: -34,12
+            6831: -35,12
+            6832: -35,11
+            6833: -34,11
+            6834: -33,11
+            6979: 60,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            6083: 6,-14
+            5955: 6,-14
         - node:
             color: '#D4D4D496'
             id: BotLeftGreyscale
           decals:
-            6856: 77,-30
-            6857: 76,-30
+            6698: 77,-30
+            6699: 76,-30
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotLeftGreyscale
           decals:
-            6587: -1,-20
-            6588: -1,-21
+            6431: -1,-20
+            6432: -1,-21
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeftGreyscale
           decals:
-            6087: 6,-14
+            5959: 6,-14
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotRight
           decals:
-            6589: -2,-21
-            6590: -2,-20
+            6433: -2,-21
+            6434: -2,-20
+        - node:
+            color: '#EFB34196'
+            id: BotRight
+          decals:
+            6931: 47,14
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRight
           decals:
-            6089: 6,-15
+            5961: 6,-15
         - node:
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            1865: 73,-12
-            1866: 73,-13
-            1962: 23,-36
-            1963: 24,-36
-            1964: 25,-36
-            2130: 12,-40
-            6508: -3,34
-            7114: -35,16
-            7115: -34,16
-            7116: -33,16
-            7117: -33,17
-            7118: -34,17
-            7119: -35,17
+            1805: 73,-12
+            1806: 73,-13
+            1902: 23,-36
+            1903: 24,-36
+            1904: 25,-36
+            2070: 12,-40
+            6352: -3,34
+            6835: -35,16
+            6836: -34,16
+            6837: -33,16
+            6838: -33,17
+            6839: -34,17
+            6840: -35,17
+            6978: 58,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            6084: 6,-15
+            5956: 6,-15
         - node:
             color: '#D4D4D496'
             id: BotRightGreyscale
           decals:
-            6854: 79,-30
-            6855: 80,-30
+            6696: 79,-30
+            6697: 80,-30
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRightGreyscale
           decals:
-            6085: 6,-15
+            5957: 6,-15
+        - node:
+            color: '#EFB34196'
+            id: Box
+          decals:
+            6928: 45,14
         - node:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            1086: 33,0
-            1087: 34,0
-            1116: -57,-24
-            1117: -56,-24
-            1992: 19,-37
-            1993: 19,-36
-            6572: 92,-20
-            6960: -21,10
-            7104: -31,17
-            7105: -30,17
-            7106: -29,16
-            7120: -31,12
-            7121: -30,12
-            7122: -30,11
-            7123: -31,11
+            1061: 33,0
+            1062: 34,0
+            1091: -57,-24
+            1092: -56,-24
+            1932: 19,-37
+            1933: 19,-36
+            6416: 92,-20
+            6825: -31,17
+            6826: -30,17
+            6827: -29,16
+            6841: -31,12
+            6842: -30,12
+            6843: -30,11
+            6844: -31,11
+            6894: 47,16
+            6981: 60,-8
+            6982: 61,-8
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlaySW
+          decals:
+            6991: 57,-8
+        - node:
+            color: '#52B4E996'
+            id: BrickLineOverlayS
+          decals:
+            6992: 58,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickLineOverlayS
+          decals:
+            6983: 58,-5
+            6984: 59,-5
+            6985: 60,-5
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            795: -31,-36
-            1067: 28,-29
-            1430: 58,-34
-            1882: 69,-29
-            2099: 22,-53
-            6836: 9,-48
+            770: -31,-36
+            1042: 28,-29
+            1405: 58,-34
+            1822: 69,-29
+            2039: 22,-53
+            6678: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
             128: 0,-21
-            794: -33,-36
-            1065: 24,-29
-            1427: 56,-34
-            1881: 70,-29
-            2102: 15,-53
-            6835: 7,-48
+            769: -33,-36
+            1040: 24,-29
+            1402: 56,-34
+            1821: 70,-29
+            2042: 15,-53
+            6677: 7,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
-            793: -31,-38
-            994: 46,-34
-            1066: 28,-34
-            1428: 58,-36
-            1884: 69,-30
-            2077: 17,-53
-            2101: 22,-60
-            6834: 9,-49
+            768: -31,-38
+            969: 46,-34
+            1041: 28,-34
+            1403: 58,-36
+            1824: 69,-30
+            2017: 17,-53
+            2041: 22,-60
+            6676: 9,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
-            792: -33,-38
-            993: 34,-34
-            1068: 24,-34
-            1429: 56,-36
-            1883: 70,-30
-            2078: 20,-53
-            2100: 15,-60
-            6833: 7,-49
+            767: -33,-38
+            968: 34,-34
+            1043: 24,-34
+            1404: 56,-36
+            1823: 70,-30
+            2018: 20,-53
+            2040: 15,-60
+            6675: 7,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
             119: -4,-16
-            629: -39,-16
-            1152: -4,21
-            1422: 56,-36
-            1806: 70,-11
-            1861: 74,-17
-            1864: 74,-14
-            2093: 15,-60
-            2098: 22,-53
-            2105: 21,-53
-            2106: 22,-54
+            604: -39,-16
+            1127: -4,21
+            1397: 56,-36
+            1746: 70,-11
+            1801: 74,-17
+            1804: 74,-14
+            2033: 15,-60
+            2038: 22,-53
+            2045: 21,-53
+            2046: 22,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
@@ -1096,35 +1152,35 @@ entities:
             46: -12,-19
             81: -5,-15
             231: 0,-22
-            1151: -1,21
-            1421: 58,-36
-            1805: 68,-11
-            2094: 22,-60
-            2097: 15,-53
-            2103: 16,-53
-            2104: 15,-54
+            1126: -1,21
+            1396: 58,-36
+            1745: 68,-11
+            2034: 22,-60
+            2037: 15,-53
+            2043: 16,-53
+            2044: 15,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            628: -39,-13
-            1157: -4,27
-            1420: 56,-34
-            1862: 74,-15
-            1863: 74,-19
-            2092: 15,-53
-            2095: 22,-60
-            2107: 21,-60
+            603: -39,-13
+            1132: -4,27
+            1395: 56,-34
+            1802: 74,-15
+            1803: 74,-19
+            2032: 15,-53
+            2035: 22,-60
+            2047: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
             45: -12,-14
             478: -25,-1
-            1419: 58,-34
-            2091: 22,-53
-            2096: 15,-60
-            2108: 16,-60
+            1394: 58,-34
+            2031: 22,-53
+            2036: 15,-60
+            2048: 16,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -1158,76 +1214,76 @@ entities:
             492: -34,2
             493: -34,1
             500: -30,2
-            612: -39,-15
-            613: -39,-14
-            704: -41,-34
-            705: -41,-33
-            706: -41,-32
-            707: -41,-31
-            708: -41,-30
-            709: -41,-29
-            710: -41,-28
-            711: -41,-27
-            712: -41,-26
-            713: -41,-25
-            732: -37,-15
-            733: -37,-14
-            734: -34,-15
-            735: -34,-14
-            736: -31,-15
-            737: -31,-14
-            738: -28,-15
-            739: -28,-14
-            782: -27,-38
-            783: -27,-37
-            790: -32,-40
-            791: -32,-39
-            799: -31,-37
-            800: -52,-2
-            801: -52,-3
-            802: -52,4
-            803: -52,5
-            920: -48,12
-            921: -48,13
-            968: -48,9
-            969: -48,10
-            970: -46,11
-            1047: 42,-34
-            1051: 28,-33
-            1052: 28,-32
-            1053: 28,-31
-            1058: 28,-30
-            1147: -4,23
-            1148: -4,24
-            1149: -4,24
-            1150: -4,25
-            1169: -3,36
-            1170: -3,37
-            1171: -3,38
-            1242: 0,45
-            1243: 0,46
-            1244: 0,47
-            1255: 0,48
-            1416: 56,-35
-            1423: 58,-35
-            1877: 69,-30
-            1878: 69,-29
-            1955: 22,-39
-            1956: 22,-38
-            1957: 22,-37
-            1998: 27,-47
-            1999: 27,-46
-            2000: 27,-45
-            2001: 27,-44
-            2002: 27,-43
-            2003: 27,-42
-            2087: 15,-58
-            2088: 15,-57
-            2089: 15,-55
-            2090: 15,-54
-            2113: 16,-60
-            6386: 53,12
-            6387: 53,11
+            587: -39,-15
+            588: -39,-14
+            679: -41,-34
+            680: -41,-33
+            681: -41,-32
+            682: -41,-31
+            683: -41,-30
+            684: -41,-29
+            685: -41,-28
+            686: -41,-27
+            687: -41,-26
+            688: -41,-25
+            707: -37,-15
+            708: -37,-14
+            709: -34,-15
+            710: -34,-14
+            711: -31,-15
+            712: -31,-14
+            713: -28,-15
+            714: -28,-14
+            757: -27,-38
+            758: -27,-37
+            765: -32,-40
+            766: -32,-39
+            774: -31,-37
+            775: -52,-2
+            776: -52,-3
+            777: -52,4
+            778: -52,5
+            895: -48,12
+            896: -48,13
+            943: -48,9
+            944: -48,10
+            945: -46,11
+            1022: 42,-34
+            1026: 28,-33
+            1027: 28,-32
+            1028: 28,-31
+            1033: 28,-30
+            1122: -4,23
+            1123: -4,24
+            1124: -4,24
+            1125: -4,25
+            1144: -3,36
+            1145: -3,37
+            1146: -3,38
+            1217: 0,45
+            1218: 0,46
+            1219: 0,47
+            1230: 0,48
+            1391: 56,-35
+            1398: 58,-35
+            1817: 69,-30
+            1818: 69,-29
+            1895: 22,-39
+            1896: 22,-38
+            1897: 22,-37
+            1938: 27,-47
+            1939: 27,-46
+            1940: 27,-45
+            1941: 27,-44
+            1942: 27,-43
+            1943: 27,-42
+            2027: 15,-58
+            2028: 15,-57
+            2029: 15,-55
+            2030: 15,-54
+            2053: 16,-60
+            6230: 53,12
+            6231: 53,11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -1251,87 +1307,87 @@ entities:
             247: 8,-29
             248: 9,-29
             249: 23,-22
-            601: -38,-16
-            602: -37,-16
-            603: -36,-16
-            604: -35,-16
-            605: -34,-16
-            606: -32,-16
-            607: -33,-16
-            608: -31,-16
-            609: -29,-16
-            610: -30,-16
-            611: -28,-16
-            796: -32,-36
-            981: 35,-38
-            982: 36,-38
-            983: 37,-38
-            984: 38,-38
-            985: 39,-38
-            986: 40,-38
-            987: 41,-38
-            988: 42,-38
-            989: 43,-38
-            990: 44,-38
-            1014: 46,-38
-            1019: 31,-35
-            1020: 32,-35
-            1021: 33,-35
-            1022: 47,-35
-            1023: 48,-35
-            1024: 49,-35
-            1062: 25,-29
-            1063: 26,-29
-            1064: 27,-29
-            1081: 30,-2
-            1082: 31,-2
-            1083: 32,-2
-            1098: -46,-16
-            1099: -45,-16
-            1100: -44,-16
-            1153: -2,21
-            1154: -3,21
-            1245: -3,51
-            1246: -2,51
-            1247: 1,51
-            1248: 2,51
-            1418: 57,-36
-            1425: 57,-34
-            1501: -52,-49
-            1502: -51,-49
-            1503: -50,-49
-            1504: -48,-49
-            1505: -49,-49
-            1506: -48,-49
-            1507: -48,-49
-            1508: -47,-49
-            1509: -46,-49
-            1510: -45,-49
-            1511: -44,-49
-            1803: 67,-11
-            1804: 71,-11
-            1887: 71,-29
-            1888: 68,-29
-            2012: 28,-43
-            2013: 29,-43
-            2081: 16,-60
-            2082: 21,-60
-            2109: 15,-57
-            2110: 22,-57
-            6073: -14,-23
-            6074: -15,-23
-            6075: -16,-23
-            6560: 87,-20
-            6561: 88,-20
-            6562: 89,-20
-            6563: 90,-20
-            6564: 91,-20
-            6565: 92,-20
-            6822: 33,-2
-            6823: 34,-2
-            6830: 7,-48
-            6831: 8,-48
-            6832: 9,-48
+            576: -38,-16
+            577: -37,-16
+            578: -36,-16
+            579: -35,-16
+            580: -34,-16
+            581: -32,-16
+            582: -33,-16
+            583: -31,-16
+            584: -29,-16
+            585: -30,-16
+            586: -28,-16
+            771: -32,-36
+            956: 35,-38
+            957: 36,-38
+            958: 37,-38
+            959: 38,-38
+            960: 39,-38
+            961: 40,-38
+            962: 41,-38
+            963: 42,-38
+            964: 43,-38
+            965: 44,-38
+            989: 46,-38
+            994: 31,-35
+            995: 32,-35
+            996: 33,-35
+            997: 47,-35
+            998: 48,-35
+            999: 49,-35
+            1037: 25,-29
+            1038: 26,-29
+            1039: 27,-29
+            1056: 30,-2
+            1057: 31,-2
+            1058: 32,-2
+            1073: -46,-16
+            1074: -45,-16
+            1075: -44,-16
+            1128: -2,21
+            1129: -3,21
+            1220: -3,51
+            1221: -2,51
+            1222: 1,51
+            1223: 2,51
+            1393: 57,-36
+            1400: 57,-34
+            1451: -52,-49
+            1452: -51,-49
+            1453: -50,-49
+            1454: -48,-49
+            1455: -49,-49
+            1456: -48,-49
+            1457: -48,-49
+            1458: -47,-49
+            1459: -46,-49
+            1460: -45,-49
+            1461: -44,-49
+            1743: 67,-11
+            1744: 71,-11
+            1827: 71,-29
+            1828: 68,-29
+            1952: 28,-43
+            1953: 29,-43
+            2021: 16,-60
+            2022: 21,-60
+            2049: 15,-57
+            2050: 22,-57
+            5945: -14,-23
+            5946: -15,-23
+            5947: -16,-23
+            6404: 87,-20
+            6405: 88,-20
+            6406: 89,-20
+            6407: 90,-20
+            6408: 91,-20
+            6409: 92,-20
+            6664: 33,-2
+            6665: 34,-2
+            6672: 7,-48
+            6673: 8,-48
+            6674: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1361,95 +1417,92 @@ entities:
             476: -27,-1
             477: -26,-1
             488: -37,-1
-            598: -29,-18
-            599: -30,-18
-            600: -28,-18
-            614: -38,-13
-            615: -37,-13
-            616: -35,-13
-            617: -36,-13
-            618: -35,-13
-            619: -34,-13
-            620: -33,-13
-            621: -32,-13
-            622: -31,-13
-            623: -31,-13
-            624: -30,-13
-            625: -28,-13
-            626: -28,-13
-            627: -29,-13
-            797: -32,-38
-            972: 31,-25
-            973: 32,-25
-            974: 33,-25
-            975: 47,-25
-            976: 49,-25
-            977: 48,-25
-            991: 35,-34
-            992: 45,-34
-            1004: 39,-35
-            1059: 25,-34
-            1060: 26,-34
-            1061: 27,-34
-            1118: -57,-27
-            1119: -56,-27
-            1120: -55,-27
-            1121: -54,-27
-            1155: -3,27
-            1156: -2,27
-            1417: 57,-34
-            1426: 57,-36
-            1512: -56,-54
-            1513: -55,-54
-            1514: -54,-54
-            1515: -41,-54
-            1516: -40,-54
-            1885: 68,-30
-            1886: 71,-30
-            2014: 28,-46
-            2015: 29,-46
-            2079: 16,-53
-            2080: 21,-53
-            2111: 22,-55
-            2112: 15,-55
-            2136: 10,-40
-            2137: 11,-40
-            2201: -42,-54
-            6070: -14,-25
-            6071: -15,-25
-            6072: -16,-25
-            6155: -3,43
-            6156: -2,43
-            6157: -1,43
-            6188: 45,14
-            6189: 47,14
-            6190: 46,14
-            6360: 49,-11
-            6361: 52,-11
-            6524: -29,-17
-            6566: 87,-21
-            6567: 89,-21
-            6568: 88,-21
-            6569: 90,-21
-            6570: 91,-21
-            6571: 92,-21
-            6827: 7,-49
-            6828: 8,-49
-            6829: 9,-49
+            573: -29,-18
+            574: -30,-18
+            575: -28,-18
+            589: -38,-13
+            590: -37,-13
+            591: -35,-13
+            592: -36,-13
+            593: -35,-13
+            594: -34,-13
+            595: -33,-13
+            596: -32,-13
+            597: -31,-13
+            598: -31,-13
+            599: -30,-13
+            600: -28,-13
+            601: -28,-13
+            602: -29,-13
+            772: -32,-38
+            947: 31,-25
+            948: 32,-25
+            949: 33,-25
+            950: 47,-25
+            951: 49,-25
+            952: 48,-25
+            966: 35,-34
+            967: 45,-34
+            979: 39,-35
+            1034: 25,-34
+            1035: 26,-34
+            1036: 27,-34
+            1093: -57,-27
+            1094: -56,-27
+            1095: -55,-27
+            1096: -54,-27
+            1130: -3,27
+            1131: -2,27
+            1392: 57,-34
+            1401: 57,-36
+            1462: -56,-54
+            1463: -55,-54
+            1464: -54,-54
+            1465: -41,-54
+            1466: -40,-54
+            1825: 68,-30
+            1826: 71,-30
+            1954: 28,-46
+            1955: 29,-46
+            2019: 16,-53
+            2020: 21,-53
+            2051: 22,-55
+            2052: 15,-55
+            2076: 10,-40
+            2077: 11,-40
+            2141: -42,-54
+            5942: -14,-25
+            5943: -15,-25
+            5944: -16,-25
+            6027: -3,43
+            6028: -2,43
+            6029: -1,43
+            6204: 49,-11
+            6205: 52,-11
+            6368: -29,-17
+            6410: 87,-21
+            6411: 89,-21
+            6412: 88,-21
+            6413: 90,-21
+            6414: 91,-21
+            6415: 92,-21
+            6669: 7,-49
+            6670: 8,-49
+            6671: 9,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            2952: -30,36
-            2953: -29,36
-            2954: -28,36
-            2955: -27,36
-            2956: -26,36
-            2976: -30,36
-            2995: 77,-25
-            2996: 78,-25
-            2997: 79,-25
+            2892: -30,36
+            2893: -29,36
+            2894: -28,36
+            2895: -27,36
+            2896: -26,36
+            2916: -30,36
+            2935: 77,-25
+            2936: 78,-25
+            2937: 79,-25
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -1482,104 +1535,104 @@ entities:
             497: -34,2
             498: -30,1
             499: -30,2
-            714: -28,-34
-            715: -28,-33
-            716: -28,-32
-            717: -28,-31
-            718: -28,-30
-            719: -28,-29
-            720: -28,-28
-            721: -28,-28
-            722: -28,-28
-            723: -28,-27
-            724: -28,-26
-            725: -28,-25
-            726: -35,-15
-            727: -35,-14
-            728: -32,-15
-            729: -32,-14
-            730: -29,-15
-            731: -29,-14
-            740: -38,-15
-            741: -38,-14
-            788: -33,-40
-            789: -33,-39
-            798: -33,-37
-            808: -43,3
-            809: -43,4
-            810: -43,5
-            811: -43,-1
-            812: -43,-2
-            813: -43,-3
-            917: -48,10
-            918: -48,12
-            919: -48,13
-            967: -48,9
-            971: -50,11
-            1046: 38,-34
-            1054: 24,-33
-            1055: 24,-32
-            1056: 24,-31
-            1057: 24,-30
-            1144: -1,23
-            1145: -1,24
-            1146: -1,25
-            1166: -1,36
-            1167: -1,37
-            1168: -1,38
-            1239: -4,45
-            1240: -4,46
-            1241: -4,47
-            1285: 26,6
-            1286: 26,7
-            1287: 26,8
-            1415: 58,-35
-            1424: 56,-35
-            1879: 70,-30
-            1880: 70,-29
-            2083: 22,-58
-            2084: 22,-57
-            2085: 22,-55
-            2086: 22,-54
-            2114: 21,-60
+            689: -28,-34
+            690: -28,-33
+            691: -28,-32
+            692: -28,-31
+            693: -28,-30
+            694: -28,-29
+            695: -28,-28
+            696: -28,-28
+            697: -28,-28
+            698: -28,-27
+            699: -28,-26
+            700: -28,-25
+            701: -35,-15
+            702: -35,-14
+            703: -32,-15
+            704: -32,-14
+            705: -29,-15
+            706: -29,-14
+            715: -38,-15
+            716: -38,-14
+            763: -33,-40
+            764: -33,-39
+            773: -33,-37
+            783: -43,3
+            784: -43,4
+            785: -43,5
+            786: -43,-1
+            787: -43,-2
+            788: -43,-3
+            892: -48,10
+            893: -48,12
+            894: -48,13
+            942: -48,9
+            946: -50,11
+            1021: 38,-34
+            1029: 24,-33
+            1030: 24,-32
+            1031: 24,-31
+            1032: 24,-30
+            1119: -1,23
+            1120: -1,24
+            1121: -1,25
+            1141: -1,36
+            1142: -1,37
+            1143: -1,38
+            1214: -4,45
+            1215: -4,46
+            1216: -4,47
+            1260: 26,6
+            1261: 26,7
+            1262: 26,8
+            1390: 58,-35
+            1399: 56,-35
+            1819: 70,-30
+            1820: 70,-29
+            2023: 22,-58
+            2024: 22,-57
+            2025: 22,-55
+            2026: 22,-54
+            2054: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
           decals:
             213: 7,-19
-            1158: -6,28
+            1133: -6,28
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
-            7100: -29,12
+            6821: -29,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNe
           decals:
-            703: -39,-34
-            1948: 57,-21
-            6664: -33,-12
+            678: -39,-34
+            1888: 57,-21
+            6508: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
-            702: -30,-34
-            1947: 54,-21
-            6663: -33,-12
+            677: -30,-34
+            1887: 54,-21
+            6507: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
           decals:
-            701: -39,-25
-            1949: 57,-23
+            676: -39,-25
+            1889: 57,-23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
-            700: -30,-25
-            1414: 44,5
-            1950: 54,-23
+            675: -30,-25
+            1389: 44,5
+            1890: 54,-23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
@@ -1590,32 +1643,37 @@ entities:
             210: 7,-22
             211: 7,-21
             212: 7,-20
-            587: -34,-21
-            588: -34,-20
-            589: -34,-19
-            590: -34,-18
-            662: -39,-33
-            663: -39,-32
-            664: -39,-31
-            665: -39,-30
-            666: -39,-29
-            667: -39,-29
-            668: -39,-28
-            669: -39,-27
-            670: -39,-26
-            753: -39,-33
-            754: -39,-26
-            804: -52,0
-            805: -52,2
-            1164: -6,27
-            1165: -6,26
-            1856: 74,-15
-            1857: 74,-14
-            1858: 74,-17
-            1859: 74,-18
-            1860: 74,-19
-            7097: -29,13
-            7098: -29,14
+            565: -34,-21
+            637: -39,-33
+            638: -39,-32
+            639: -39,-31
+            640: -39,-30
+            641: -39,-29
+            642: -39,-29
+            643: -39,-28
+            644: -39,-27
+            645: -39,-26
+            728: -39,-33
+            729: -39,-26
+            779: -52,0
+            780: -52,2
+            1139: -6,27
+            1140: -6,26
+            1796: 74,-15
+            1797: 74,-14
+            1798: 74,-17
+            1799: 74,-18
+            1800: 74,-19
+            6818: -29,13
+            6819: -29,14
+            6964: -34,-18
+            6965: -34,-21
+            6966: -34,-20
+            6967: -34,-19
+            6968: -34,-18
+            6969: -34,-19
+            6970: -34,-20
+            6971: -34,-21
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
@@ -1626,446 +1684,432 @@ entities:
             386: -21,12
             387: -20,12
             388: -19,12
-            693: -35,-34
-            694: -35,-34
-            695: -34,-34
-            696: -33,-34
-            697: -32,-34
-            698: -31,-34
-            699: -31,-34
-            943: -50,-26
-            944: -46,-26
-            961: -50,-26
-            962: -46,-26
-            1074: 37,-4
-            1075: 38,-4
-            1076: 39,-4
-            1077: 36,-4
-            1159: -7,28
-            1160: -8,28
-            1161: -9,28
-            1162: -10,28
-            1163: -11,28
-            1875: 69,-28
-            1876: 70,-28
-            2115: 0,-37
-            2116: 1,-37
-            2121: 2,-37
-            2848: -27,27
-            2849: -26,27
-            2850: -25,27
-            6661: -34,-12
-            6662: -32,-12
-            6955: -22,10
-            7094: -32,16
-            7095: -31,16
-            7096: -30,16
+            668: -35,-34
+            669: -35,-34
+            670: -34,-34
+            671: -33,-34
+            672: -32,-34
+            673: -31,-34
+            674: -31,-34
+            918: -50,-26
+            919: -46,-26
+            936: -50,-26
+            937: -46,-26
+            1049: 37,-4
+            1050: 38,-4
+            1051: 39,-4
+            1052: 36,-4
+            1134: -7,28
+            1135: -8,28
+            1136: -9,28
+            1137: -10,28
+            1138: -11,28
+            1815: 69,-28
+            1816: 70,-28
+            2055: 0,-37
+            2056: 1,-37
+            2061: 2,-37
+            2788: -27,27
+            2789: -26,27
+            2790: -25,27
+            6505: -34,-12
+            6506: -32,-12
+            6815: -32,16
+            6816: -31,16
+            6817: -30,16
+            6962: -22,10
+            6963: -21,10
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineS
           decals:
-            6091: 83,-35
+            5963: 83,-35
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            683: -38,-25
-            684: -36,-25
-            685: -36,-25
-            686: -37,-25
-            687: -36,-25
-            688: -35,-25
-            689: -34,-25
-            690: -33,-25
-            691: -31,-25
-            692: -32,-25
-            945: -50,-31
-            946: -46,-31
-            959: -50,-31
-            960: -46,-31
-            1071: 36,-1
-            1072: 37,-1
-            1073: 39,-1
-            1078: 38,-1
-            1101: -48,-16
-            1102: -49,-16
-            1103: -50,-16
-            1104: -51,-16
-            1411: 40,5
-            1412: 42,5
-            1413: 43,5
-            1476: 41,5
-            3030: 51,22
-            3031: 50,22
-            3032: 52,22
-            6522: -34,-17
-            6523: -33,-17
-            6958: -22,10
-            7099: -32,12
+            658: -38,-25
+            659: -36,-25
+            660: -36,-25
+            661: -37,-25
+            662: -36,-25
+            663: -35,-25
+            664: -34,-25
+            665: -33,-25
+            666: -31,-25
+            667: -32,-25
+            920: -50,-31
+            921: -46,-31
+            934: -50,-31
+            935: -46,-31
+            1046: 36,-1
+            1047: 37,-1
+            1048: 39,-1
+            1053: 38,-1
+            1076: -48,-16
+            1077: -49,-16
+            1078: -50,-16
+            1079: -51,-16
+            1386: 40,5
+            1387: 42,5
+            1388: 43,5
+            1427: 41,5
+            2970: 51,22
+            2971: 50,22
+            2972: 52,22
+            6366: -34,-17
+            6367: -33,-17
+            6820: -32,12
+            6960: -22,10
+            6961: -21,10
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineW
           decals:
-            6090: 81,-34
+            5962: 81,-34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
-            671: -30,-33
-            672: -30,-32
-            673: -30,-31
-            674: -30,-31
-            675: -30,-30
-            676: -30,-30
-            677: -30,-29
-            678: -30,-29
-            679: -30,-28
-            680: -30,-27
-            681: -30,-27
-            682: -30,-26
-            755: -30,-26
-            756: -30,-33
-            806: -43,0
-            807: -43,2
-            1122: 3,23
-            1123: 3,24
-            1124: 3,25
-            1129: -6,33
-            1130: -6,34
-            1408: 44,1
-            1409: 44,2
-            1410: 44,3
-            1446: 44,4
-            7090: -35,13
-            7091: -35,14
-            7092: -35,14
-            7093: -35,15
+            646: -30,-33
+            647: -30,-32
+            648: -30,-31
+            649: -30,-31
+            650: -30,-30
+            651: -30,-30
+            652: -30,-29
+            653: -30,-29
+            654: -30,-28
+            655: -30,-27
+            656: -30,-27
+            657: -30,-26
+            730: -30,-26
+            731: -30,-33
+            781: -43,0
+            782: -43,2
+            1097: 3,23
+            1098: 3,24
+            1099: 3,25
+            1104: -6,33
+            1105: -6,34
+            1383: 44,1
+            1384: 44,2
+            1385: 44,3
+            1421: 44,4
+            6811: -35,13
+            6812: -35,14
+            6813: -35,14
+            6814: -35,15
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNe
           decals:
-            1349: 28,15
-            1382: 28,8
-            1399: 36,22
-            1400: 27,14
+            1324: 28,15
+            1357: 28,8
+            1374: 36,22
+            1375: 27,14
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNe
           decals:
-            1791: 60,-13
-            1813: 70,-12
+            1731: 60,-13
+            1753: 70,-12
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            6653: 52,-26
+            6497: 52,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2825: -4,14
+            2765: -4,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2961: -25,38
+            2901: -25,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNw
           decals:
-            1398: 33,22
-            1403: 26,14
+            1373: 33,22
+            1378: 26,14
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerNw
           decals:
-            1792: 58,-13
-            1816: 68,-12
+            1732: 58,-13
+            1756: 68,-12
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            6652: 51,-26
+            6496: 51,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2181: -54,9
-            2824: -2,14
+            2121: -54,9
+            2764: -2,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2960: -30,38
+            2900: -30,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSe
           decals:
-            1348: 28,10
-            1381: 28,6
-            1397: 36,17
-            1401: 27,11
+            1323: 28,10
+            1356: 28,6
+            1372: 36,17
+            1376: 27,11
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerSe
           decals:
-            1793: 60,-14
-            1814: 70,-14
+            1733: 60,-14
+            1754: 70,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            6651: 52,-27
+            6495: 52,-27
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSw
           decals:
-            1402: 26,11
+            1377: 26,11
         - node:
             color: '#D381C996'
             id: BrickTileWhiteCornerSw
           decals:
-            1794: 58,-14
-            1815: 68,-14
+            1734: 58,-14
+            1755: 68,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            6654: 51,-27
+            6498: 51,-27
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteEndE
           decals:
-            2847: 63,9
+            2787: 63,9
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
           decals:
-            1013: 46,-38
-            1015: 46,-38
-            1050: 37,-34
+            988: 46,-38
+            990: 46,-38
+            1025: 37,-34
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNe
           decals:
-            1478: 41,5
-            1756: 57,-7
-            6334: 48,-1
-            6351: 49,-7
+            1429: 41,5
+            6178: 48,-1
+            6195: 49,-7
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerNe
           decals:
-            1384: 26,8
+            1359: 26,8
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerNe
           decals:
-            1325: -18,27
-        - node:
-            color: '#EFB34196'
-            id: BrickTileWhiteInnerNe
-          decals:
-            1461: 41,11
+            1300: -18,27
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNw
           decals:
-            1045: 43,-34
+            1020: 43,-34
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNw
           decals:
-            1477: 45,5
-            6333: 52,-1
-            6350: 51,-7
-        - node:
-            color: '#EFB34196'
-            id: BrickTileWhiteInnerNw
-          decals:
-            1460: 47,11
+            1428: 45,5
+            6177: 52,-1
+            6194: 51,-7
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerSe
           decals:
-            1008: 46,-37
+            983: 46,-37
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSe
           decals:
-            1480: 45,4
-            6332: 48,-8
-            6349: 49,-2
-            6353: 50,-8
+            1431: 45,4
+            6176: 48,-8
+            6193: 49,-2
+            6197: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSe
           decals:
-            1379: 31,23
-            1383: 26,6
+            1354: 31,23
+            1358: 26,6
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerSe
           decals:
-            1211: -15,26
-            1212: -11,26
-            1213: -7,26
-            1254: -4,45
-            1324: -18,29
-        - node:
-            color: '#EFB34196'
-            id: BrickTileWhiteInnerSe
-          decals:
-            1459: 41,13
+            1186: -15,26
+            1187: -11,26
+            1188: -7,26
+            1229: -4,45
+            1299: -18,29
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSw
           decals:
-            6331: 52,-8
-            6348: 51,-2
-            6352: 50,-8
+            6175: 52,-8
+            6192: 51,-2
+            6196: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSw
           decals:
-            1380: 30,17
+            1355: 30,17
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerSw
           decals:
-            1209: -13,26
-            1210: -9,26
-            1253: 0,45
+            1184: -13,26
+            1185: -9,26
+            1228: 0,45
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSw
           decals:
             183: 5,-24
-            1458: 47,13
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
           decals:
-            1009: 46,-37
-            1010: 46,-36
-            1011: 46,-35
-            1012: 46,-34
+            984: 46,-37
+            985: 46,-36
+            986: 46,-35
+            987: 46,-34
         - node:
             color: '#52B4E93E'
             id: BrickTileWhiteLineE
           decals:
-            6804: 51,6
-            6805: 51,6
-            6806: 51,6
+            6646: 51,6
+            6647: 51,6
+            6648: 51,6
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
           decals:
-            1753: 57,-6
-            1754: 57,-5
-            1755: 57,-4
-            6237: 42,9
-            6238: 42,7
-            6244: 47,9
-            6245: 47,8
-            6246: 47,7
-            6262: 51,1
-            6263: 51,2
-            6264: 51,3
-            6265: 51,4
-            6266: 51,7
-            6267: 51,8
-            6268: 51,9
-            6269: 51,10
-            6270: 51,11
-            6271: 51,12
-            6272: 51,13
-            6273: 51,14
-            6274: 51,15
-            6279: 56,10
-            6280: 56,11
-            6281: 56,12
-            6285: 56,6
-            6286: 56,7
-            6287: 56,8
-            6323: 52,-1
-            6324: 52,-2
-            6325: 52,-3
-            6326: 52,-4
-            6327: 52,-5
-            6328: 52,-6
-            6329: 52,-7
-            6330: 52,-8
-            6344: 49,-6
-            6345: 49,-5
-            6346: 49,-4
-            6347: 49,-3
+            6081: 42,9
+            6082: 42,7
+            6088: 47,9
+            6089: 47,8
+            6090: 47,7
+            6106: 51,1
+            6107: 51,2
+            6108: 51,3
+            6109: 51,4
+            6110: 51,7
+            6111: 51,8
+            6112: 51,9
+            6113: 51,10
+            6114: 51,11
+            6115: 51,12
+            6116: 51,13
+            6117: 51,14
+            6118: 51,15
+            6123: 56,10
+            6124: 56,11
+            6125: 56,12
+            6129: 56,6
+            6130: 56,7
+            6131: 56,8
+            6167: 52,-1
+            6168: 52,-2
+            6169: 52,-3
+            6170: 52,-4
+            6171: 52,-5
+            6172: 52,-6
+            6173: 52,-7
+            6174: 52,-8
+            6188: 49,-6
+            6189: 49,-5
+            6190: 49,-4
+            6191: 49,-3
+            6987: 61,-7
+            6988: 61,-6
+            6989: 61,-5
+            6990: 61,-4
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineE
           decals:
-            1736: 61,17
-            1737: 61,16
-            1738: 61,15
-            1739: 61,14
+            1686: 61,17
+            1687: 61,16
+            1688: 61,15
+            1689: 61,14
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineE
           decals:
-            1332: 28,7
-            1341: 28,14
-            1342: 28,13
-            1343: 28,12
-            1344: 28,11
-            1361: 31,22
-            1362: 31,21
-            1363: 31,20
-            1364: 31,19
-            1365: 31,18
-            1366: 31,17
-            1367: 31,16
-            1368: 31,15
-            1369: 31,14
-            1370: 31,13
-            1371: 31,12
-            1387: 36,19
-            1388: 36,20
-            1389: 36,21
-            1394: 36,18
-            1404: 27,13
-            1405: 27,12
+            1307: 28,7
+            1316: 28,14
+            1317: 28,13
+            1318: 28,12
+            1319: 28,11
+            1336: 31,22
+            1337: 31,21
+            1338: 31,20
+            1339: 31,19
+            1340: 31,18
+            1341: 31,17
+            1342: 31,16
+            1343: 31,15
+            1344: 31,14
+            1345: 31,13
+            1346: 31,12
+            1362: 36,19
+            1363: 36,20
+            1364: 36,21
+            1369: 36,18
+            1379: 27,13
+            1380: 27,12
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineE
           decals:
-            1817: 70,-13
-            1821: 65,-21
-            1822: 65,-20
-            1823: 65,-19
-            1824: 65,-18
-            1825: 65,-17
-            1826: 65,-16
-            1827: 65,-15
-            1828: 65,-14
-            1829: 65,-13
-            1830: 65,-12
-            1904: 71,-27
-            1905: 71,-26
+            1757: 70,-13
+            1761: 65,-21
+            1762: 65,-20
+            1763: 65,-19
+            1764: 65,-18
+            1765: 65,-17
+            1766: 65,-16
+            1767: 65,-15
+            1768: 65,-14
+            1769: 65,-13
+            1770: 65,-12
+            1844: 71,-27
+            1845: 71,-26
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
           decals:
-            1134: -1,23
-            1135: -1,24
-            1142: -1,25
-            1323: -18,28
-            6591: -37,-44
-            6592: -37,-45
-            6605: -37,-46
+            1109: -1,23
+            1110: -1,24
+            1117: -1,25
+            1298: -18,28
+            6435: -37,-44
+            6436: -37,-45
+            6449: -37,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
@@ -2073,77 +2117,70 @@ entities:
             177: 2,-22
             235: 10,-23
             236: 10,-22
-            1457: 41,12
-            1467: 47,13
-            1468: 47,11
-            2158: -4,-37
-            2159: -4,-35
-            2862: -39,-38
+            2098: -4,-37
+            2099: -4,-35
+            2802: -39,-38
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineE
           decals:
-            2959: -25,37
-            2966: -32,38
-            2967: -32,37
-            2968: -32,36
-            2969: -32,35
-            2970: -32,34
+            2899: -25,37
+            2906: -32,38
+            2907: -32,37
+            2908: -32,36
+            2909: -32,35
+            2910: -32,34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
           decals:
-            1264: 2,40
+            1239: 2,40
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineN
           decals:
-            1016: 39,-34
-            1017: 40,-34
-            1018: 41,-34
-            1048: 38,-34
-            1049: 42,-34
-            1971: 19,-36
-            1972: 20,-36
-            1976: 21,-36
-            2006: 24,-46
+            991: 39,-34
+            992: 40,-34
+            993: 41,-34
+            1023: 38,-34
+            1024: 42,-34
+            1911: 19,-36
+            1912: 20,-36
+            1916: 21,-36
+            1946: 24,-46
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineN
           decals:
-            1214: -16,24
-            1215: -15,24
-            1216: -14,24
-            1217: -12,24
-            1218: -11,24
-            1219: -10,24
-            1220: -8,24
-            1221: -7,24
-            1222: -6,24
+            1189: -16,24
+            1190: -15,24
+            1191: -14,24
+            1192: -12,24
+            1193: -11,24
+            1194: -10,24
+            1195: -8,24
+            1196: -7,24
+            1197: -6,24
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineN
           decals:
-            1473: 43,5
-            1474: 42,5
-            1475: 44,5
-            1720: 59,4
-            1721: 60,4
-            1749: 58,-7
-            1750: 59,-7
-            1751: 60,-7
-            1752: 61,-7
-            6296: 53,3
-            6297: 54,3
-            6298: 55,3
-            6299: 57,3
-            6335: 51,-1
-            6336: 50,-1
-            6337: 49,-1
-            6357: 49,-10
-            6358: 50,-10
-            6359: 51,-10
+            1424: 43,5
+            1425: 42,5
+            1426: 44,5
+            1670: 59,4
+            1671: 60,4
+            6140: 53,3
+            6141: 54,3
+            6142: 55,3
+            6143: 57,3
+            6179: 51,-1
+            6180: 50,-1
+            6181: 49,-1
+            6201: 49,-10
+            6202: 50,-10
+            6203: 51,-10
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineN
@@ -2153,49 +2190,49 @@ entities:
             color: '#9FED5896'
             id: BrickTileWhiteLineN
           decals:
-            1262: -1,53
-            1263: 0,53
-            2004: 24,-43
+            1237: -1,53
+            1238: 0,53
+            1944: 24,-43
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineN
           decals:
-            1330: 27,8
-            1338: 25,15
-            1339: 26,15
-            1340: 27,15
-            1395: 34,22
-            1396: 35,22
+            1305: 27,8
+            1313: 25,15
+            1314: 26,15
+            1315: 27,15
+            1370: 34,22
+            1371: 35,22
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineN
           decals:
-            1773: 63,-23
-            1774: 64,-23
-            1775: 65,-23
-            1780: 61,-23
-            1781: 62,-23
-            1795: 59,-13
-            1819: 69,-12
-            1842: 77,-13
-            1843: 75,-13
-            1844: 77,-17
-            1845: 75,-17
-            3149: 76,-13
-            3152: 76,-17
+            1713: 63,-23
+            1714: 64,-23
+            1715: 65,-23
+            1720: 61,-23
+            1721: 62,-23
+            1735: 59,-13
+            1759: 69,-12
+            1782: 77,-13
+            1783: 75,-13
+            1784: 77,-17
+            1785: 75,-17
+            3084: 76,-13
+            3087: 76,-17
         - node:
             color: '#D4D4D496'
             id: BrickTileWhiteLineN
           decals:
-            2005: 25,-43
+            1945: 25,-43
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineN
           decals:
-            1203: -3,32
-            1204: -2,32
-            1205: -1,32
-            2007: 25,-46
+            1178: -3,32
+            1179: -2,32
+            1180: -1,32
+            1947: 25,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
@@ -2212,32 +2249,32 @@ entities:
             284: 19,-21
             285: 20,-21
             286: 21,-21
-            1450: 42,11
-            1451: 43,11
-            1452: 46,11
-            1453: 45,11
-            2155: 0,-35
-            2156: 1,-35
-            2182: -53,9
-            2860: -62,-21
-            2861: -61,-21
+            2095: 0,-35
+            2096: 1,-35
+            2122: -53,9
+            2800: -62,-21
+            2801: -61,-21
+            6905: 43,13
+            6906: 44,13
+            6907: 45,13
+            6934: 47,13
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineN
           decals:
-            2962: -29,38
-            2963: -28,38
-            2964: -27,38
-            2965: -26,38
+            2902: -29,38
+            2903: -28,38
+            2904: -27,38
+            2905: -26,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
           decals:
-            2212: 13,25
-            2213: 14,25
-            2214: 15,25
-            6136: 14,22
+            2152: 13,25
+            2153: 14,25
+            2154: 15,25
+            6008: 14,22
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineS
@@ -2248,43 +2285,43 @@ entities:
             356: 47,-22
             357: 48,-22
             358: 49,-22
-            1973: 19,-39
-            1974: 20,-39
-            1975: 21,-39
-            6632: 52,-37
-            6633: 51,-37
+            1913: 19,-39
+            1914: 20,-39
+            1915: 21,-39
+            6476: 52,-37
+            6477: 51,-37
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineS
           decals:
-            1223: -12,23
-            1224: -11,23
-            1225: -10,23
-            1226: -14,23
-            1227: -15,23
-            1228: -16,23
-            1229: -8,23
-            1230: -6,23
-            1231: -7,23
+            1198: -12,23
+            1199: -11,23
+            1200: -10,23
+            1201: -14,23
+            1202: -15,23
+            1203: -16,23
+            1204: -8,23
+            1205: -6,23
+            1206: -7,23
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
           decals:
-            1479: 46,4
-            1718: 60,0
-            1719: 59,0
-            2010: 24,-46
-            6300: 57,2
-            6301: 56,2
-            6302: 55,2
-            6303: 54,2
-            6304: 53,2
-            6338: 49,-8
-            6339: 51,-8
-            6354: 48,-11
-            6355: 51,-11
-            6356: 53,-11
-            6362: 50,-11
+            1430: 46,4
+            1668: 60,0
+            1669: 59,0
+            1950: 24,-46
+            6144: 57,2
+            6145: 56,2
+            6146: 55,2
+            6147: 54,2
+            6148: 53,2
+            6182: 49,-8
+            6183: 51,-8
+            6198: 48,-11
+            6199: 51,-11
+            6200: 53,-11
+            6206: 50,-11
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineS
@@ -2294,59 +2331,59 @@ entities:
             color: '#9FED5896'
             id: BrickTileWhiteLineS
           decals:
-            1256: -3,50
-            1257: -1,50
-            1258: -2,50
-            1259: 0,50
-            1260: 1,50
-            1261: 2,50
+            1231: -3,50
+            1232: -1,50
+            1233: -2,50
+            1234: 0,50
+            1235: 1,50
+            1236: 2,50
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineS
           decals:
-            1331: 27,6
-            1345: 25,10
-            1346: 26,10
-            1347: 27,10
-            1350: 23,17
-            1351: 24,17
-            1352: 25,17
-            1353: 26,17
-            1354: 27,17
-            1355: 28,17
-            1385: 34,17
-            1386: 35,17
-            2008: 24,-43
+            1306: 27,6
+            1320: 25,10
+            1321: 26,10
+            1322: 27,10
+            1325: 23,17
+            1326: 24,17
+            1327: 25,17
+            1328: 26,17
+            1329: 27,17
+            1330: 28,17
+            1360: 34,17
+            1361: 35,17
+            1948: 24,-43
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineS
           decals:
-            1776: 63,-27
-            1777: 64,-27
-            1778: 65,-27
-            1779: 66,-27
-            1796: 59,-14
-            1797: 58,-15
-            1798: 59,-15
-            1799: 60,-15
-            1818: 69,-14
-            1846: 75,-19
-            1847: 77,-19
-            1848: 75,-15
-            1849: 77,-15
-            2011: 25,-43
-            3150: 76,-15
-            3151: 76,-19
+            1716: 63,-27
+            1717: 64,-27
+            1718: 65,-27
+            1719: 66,-27
+            1736: 59,-14
+            1737: 58,-15
+            1738: 59,-15
+            1739: 60,-15
+            1758: 69,-14
+            1786: 75,-19
+            1787: 77,-19
+            1788: 75,-15
+            1789: 77,-15
+            1951: 25,-43
+            3085: 76,-15
+            3086: 76,-19
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
           decals:
-            1206: -10,26
-            1207: -14,26
-            1208: -6,26
-            1250: -3,45
-            1251: -2,45
-            1252: -1,45
+            1181: -10,26
+            1182: -14,26
+            1183: -6,26
+            1225: -3,45
+            1226: -2,45
+            1227: -1,45
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
@@ -2366,138 +2403,142 @@ entities:
             237: 7,-25
             282: 21,-23
             283: 20,-23
-            1454: 44,13
-            1455: 45,13
-            1456: 46,13
-            2009: 25,-46
-            2128: 9,-41
-            2836: 61,-31
-            2837: 62,-31
-            2838: 63,-31
-            6164: 42,13
+            1949: 25,-46
+            2068: 9,-41
+            2776: 61,-31
+            2777: 62,-31
+            2778: 63,-31
+            6902: 43,13
+            6903: 44,13
+            6904: 45,13
+            6933: 47,13
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
           decals:
-            1443: 45,4
-            1444: 46,4
-            1445: 44,4
+            1418: 45,4
+            1419: 46,4
+            1420: 44,4
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineW
           decals:
-            1005: 34,-34
-            1006: 34,-35
-            1007: 34,-36
-            1439: 54,-36
-            1440: 54,-35
-            1441: 54,-34
-            1442: 54,-33
+            980: 34,-34
+            981: 34,-35
+            982: 34,-36
+            1414: 54,-36
+            1415: 54,-35
+            1416: 54,-34
+            1417: 54,-33
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
-            6239: 46,7
-            6240: 46,9
-            6241: 41,9
-            6242: 41,8
-            6243: 41,7
-            6247: 49,1
-            6248: 49,2
-            6249: 49,3
-            6250: 49,4
-            6251: 49,5
-            6252: 49,6
-            6253: 49,7
-            6254: 49,8
-            6255: 49,9
-            6256: 49,10
-            6257: 49,11
-            6258: 49,12
-            6259: 49,13
-            6260: 49,14
-            6261: 49,15
-            6282: 53,6
-            6283: 53,7
-            6284: 53,8
-            6315: 48,-8
-            6316: 48,-7
-            6317: 48,-6
-            6318: 48,-5
-            6319: 48,-4
-            6320: 48,-3
-            6321: 48,-2
-            6322: 48,-1
-            6340: 51,-6
-            6341: 51,-5
-            6342: 51,-4
-            6343: 51,-3
+            6083: 46,7
+            6084: 46,9
+            6085: 41,9
+            6086: 41,8
+            6087: 41,7
+            6091: 49,1
+            6092: 49,2
+            6093: 49,3
+            6094: 49,4
+            6095: 49,5
+            6096: 49,6
+            6097: 49,7
+            6098: 49,8
+            6099: 49,9
+            6100: 49,10
+            6101: 49,11
+            6102: 49,12
+            6103: 49,13
+            6104: 49,14
+            6105: 49,15
+            6126: 53,6
+            6127: 53,7
+            6128: 53,8
+            6159: 48,-8
+            6160: 48,-7
+            6161: 48,-6
+            6162: 48,-5
+            6163: 48,-4
+            6164: 48,-3
+            6165: 48,-2
+            6166: 48,-1
+            6184: 51,-6
+            6185: 51,-5
+            6186: 51,-4
+            6187: 51,-3
+            6986: 57,-7
+            6994: 57,-6
+            6995: 57,-5
+            6996: 57,-4
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
           decals:
-            1740: 57,16
-            1741: 57,17
+            1690: 57,16
+            1691: 57,17
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineW
           decals:
-            1333: 30,7
-            1334: 30,8
-            1335: 30,9
-            1336: 30,10
-            1337: 30,6
-            1356: 30,16
-            1357: 30,15
-            1358: 30,14
-            1359: 30,13
-            1360: 30,12
-            1372: 33,15
-            1373: 33,14
-            1374: 33,13
-            1375: 33,12
-            1390: 33,18
-            1391: 33,19
-            1392: 33,20
-            1393: 33,21
-            1406: 26,12
-            1407: 26,13
+            1308: 30,7
+            1309: 30,8
+            1310: 30,9
+            1311: 30,10
+            1312: 30,6
+            1331: 30,16
+            1332: 30,15
+            1333: 30,14
+            1334: 30,13
+            1335: 30,12
+            1347: 33,15
+            1348: 33,14
+            1349: 33,13
+            1350: 33,12
+            1365: 33,18
+            1366: 33,19
+            1367: 33,20
+            1368: 33,21
+            1381: 26,12
+            1382: 26,13
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineW
           decals:
-            1820: 68,-13
-            1831: 63,-21
-            1832: 63,-20
-            1833: 63,-19
-            1834: 63,-17
-            1835: 63,-18
-            1836: 63,-16
-            1837: 63,-15
-            1838: 63,-14
-            1839: 63,-13
-            1840: 63,-12
-            1899: 68,-23
-            1900: 68,-22
-            1901: 68,-21
-            1902: 68,-24
-            1906: 68,-27
-            1907: 68,-26
+            1760: 68,-13
+            1771: 63,-21
+            1772: 63,-20
+            1773: 63,-19
+            1774: 63,-17
+            1775: 63,-18
+            1776: 63,-16
+            1777: 63,-15
+            1778: 63,-14
+            1779: 63,-13
+            1780: 63,-12
+            1839: 68,-23
+            1840: 68,-22
+            1841: 68,-21
+            1842: 68,-24
+            1846: 68,-27
+            1847: 68,-26
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
           decals:
-            1132: -4,23
-            1133: -4,24
-            1143: -4,25
+            1107: -4,23
+            1108: -4,24
+            1118: -4,25
         - node:
             color: '#EFB34131'
             id: BrickTileWhiteLineW
           decals:
-            6777: 14,39
-            6778: 14,40
-            6779: 14,41
-            6780: 14,42
+            6619: 14,39
+            6620: 14,40
+            6621: 14,41
+            6622: 14,42
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -2511,75 +2552,72 @@ entities:
             182: 5,-25
             216: 4,-19
             220: 4,-22
-            1469: 41,11
-            1470: 41,12
-            1471: 41,13
-            2126: 8,-40
-            2127: 8,-39
-            2157: -2,-36
-            2160: -6,-37
-            2161: -6,-36
-            2162: -6,-35
-            2171: 39,-15
-            2172: 39,-17
-            2173: 39,-16
-            2854: -22,34
-            2855: -22,35
+            2066: 8,-40
+            2067: 8,-39
+            2097: -2,-36
+            2100: -6,-37
+            2101: -6,-36
+            2102: -6,-35
+            2111: 39,-15
+            2112: 39,-17
+            2113: 39,-16
+            2794: -22,34
+            2795: -22,35
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineW
           decals:
-            2957: -30,36
-            2958: -30,37
-            2971: -34,34
-            2972: -34,35
-            2973: -34,36
-            2974: -34,37
-            2975: -34,38
+            2897: -30,36
+            2898: -30,37
+            2911: -34,34
+            2912: -34,35
+            2913: -34,36
+            2914: -34,37
+            2915: -34,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
           decals:
-            1265: -6,40
+            1240: -6,40
         - node:
             color: '#FFFFFFFF'
             id: BushAOne
           decals:
             559: -24,5
-            864: -48,4
-            870: -51,-2
-            1487: -52,-49
-            1726: 59,19
-            1744: 57,18
+            839: -48,4
+            845: -51,-2
+            1437: -52,-49
+            1676: 59,19
+            1694: 57,18
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
           decals:
             526: -39,7
-            865: -50,-2
-            928: -49,-30
+            840: -50,-2
+            903: -49,-30
         - node:
             color: '#FFFFFFFF'
             id: BushATwo
           decals:
-            6867: 57.061016,-21.004225
+            6709: 57.061016,-21.004225
         - node:
             color: '#FFFFFFFF'
             id: BushCOne
           decals:
-            862: -45,4
-            1929: 56,-21
+            837: -45,4
+            1869: 56,-21
         - node:
             color: '#FFFFFFFF'
             id: BushCThree
           decals:
             320: 26,-24
             527: -40,6
-            866: -48,-2
-            1105: 42,-30
-            1483: -49,-49
-            2226: 24,1
+            841: -48,-2
+            1080: 42,-30
+            1433: -49,-49
+            2166: 24,1
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
@@ -2587,82 +2625,82 @@ entities:
             36: -4,-12
             321: 26,-23
             525: -38,6
-            1484: -46,-49
-            1930: 56,-22
+            1434: -46,-49
+            1870: 56,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            3001: 81,-8
+            2941: 81,-8
         - node:
             color: '#FFFFFFFF'
             id: BushDThree
           decals:
-            6869: 54.199055,-22.34959
+            6711: 54.199055,-22.34959
         - node:
             color: '#FFFFFFFF'
             id: BushDTwo
           decals:
-            871: -49,4
+            846: -49,4
         - node:
             color: '#FFFFFFFF'
             id: Busha1
           decals:
             523: -39,5
-            925: -48,-28
-            1932: 57,-23
-            1951: 54,-23
+            900: -48,-28
+            1872: 57,-23
+            1891: 54,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Busha1
           decals:
-            3002: 82,-6
+            2942: 82,-6
         - node:
             color: '#FFFFFFFF'
             id: Busha2
           decals:
             531: -30,7
-            926: -47,-29
-            1725: 58,19
-            1931: 55,-23
+            901: -47,-29
+            1675: 58,19
+            1871: 55,-23
         - node:
             color: '#FFFFFFFF'
             id: Busha3
           decals:
             319: 25,-24
             529: -30,5
-            863: -47,4
-            1486: -44,-49
+            838: -47,4
+            1436: -44,-49
         - node:
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
             316: 25,-21
-            868: -46,-2
-            869: -44,-2
+            843: -46,-2
+            844: -44,-2
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
-            2999: 81,-7
+            2939: 81,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushb2
           decals:
             558: -24,7
-            916: -47,-8
-            1743: 57,19
-            1927: 54,-21
+            891: -47,-8
+            1693: 57,19
+            1867: 54,-21
         - node:
             color: '#FFFFFFFF'
             id: Bushb3
           decals:
             317: 26,-22
-            861: -50,4
-            927: -48,-30
+            836: -50,4
+            902: -48,-30
         - node:
             color: '#FFFFFFFF'
             id: Bushc1
@@ -2670,45 +2708,45 @@ entities:
             318: 25,-23
             524: -39,6
             530: -29,6
-            867: -45,-2
-            929: -49,-27
-            1928: 55,-22
+            842: -45,-2
+            904: -49,-27
+            1868: 55,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushc1
           decals:
-            3000: 82,-7
+            2940: 82,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushc2
           decals:
             528: -28,6
-            1485: -47,-49
-            2228: 25,1
+            1435: -47,-49
+            2168: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Bushc3
           decals:
             35: -5,-12
-            1482: -51,-49
-            2227: 26,1
+            1432: -51,-49
+            2167: 26,1
         - node:
             color: '#FFFFFFFF'
             id: Bushd2
           decals:
-            873: -49,-2
+            848: -49,-2
         - node:
             color: '#FFFFFFFF'
             id: Bushd4
           decals:
-            872: -44,4
-            6868: 56.804173,-21.505678
+            847: -44,4
+            6710: 56.804173,-21.505678
         - node:
             color: '#FFFFFFFF'
             id: Bushg2
           decals:
-            6870: 56.804173,-21.884827
+            6712: 56.804173,-21.884827
         - node:
             color: '#FFFFFFFF'
             id: Bushh1
@@ -2726,58 +2764,58 @@ entities:
           decals:
             534: -29,5
             560: -24,4
-            875: -47,-2
-            930: -48,-29
-            1489: -48,-49
-            1727: 60,19
-            6871: 57.220013,-21.982672
+            850: -47,-2
+            905: -48,-29
+            1439: -48,-49
+            1677: 60,19
+            6713: 57.220013,-21.982672
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            3005: 80,-7
+            2945: 80,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
           decals:
             322: 25,-22
-            876: -51,4
-            913: -48,-8
-            914: -51,-9
-            1933: 54,-22
-            1952: 53.45864,-23.10261
-            2229: 24,1
+            851: -51,4
+            888: -48,-8
+            889: -51,-9
+            1873: 54,-22
+            1892: 53.45864,-23.10261
+            2169: 24,1
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
             532: -38,5
-            931: -47,-27
-            1488: -50,-49
+            906: -47,-27
+            1438: -50,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            3003: 82,-8
+            2943: 82,-8
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
             533: -40,7
-            874: -46,4
-            915: -46,-7
-            1106: 42,-31
-            1490: -45,-49
-            1934: 56,-23
-            1940: 57.568016,-22.290323
+            849: -46,4
+            890: -46,-7
+            1081: 42,-31
+            1440: -45,-49
+            1874: 56,-23
+            1880: 57.568016,-22.290323
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            3004: 81,-6
+            2944: 81,-6
         - node:
             color: '#FFFFFFFF'
             id: Bushj3
@@ -2797,82 +2835,71 @@ entities:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1984: 24,-37
-            1988: 23,-37
-            1989: 25,-37
+            1924: 24,-37
+            1928: 23,-37
+            1929: 25,-37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1985: 24,-38
-            1986: 23,-38
-            1987: 25,-38
-        - node:
-            color: '#EFB34196'
-            id: CheckerNESW
-          decals:
-            1462: 42,12
-            1463: 43,12
-            1464: 44,12
-            1465: 45,12
-            1466: 46,12
-            6167: 46,15
-            6168: 46,14
+            1925: 24,-38
+            1926: 23,-38
+            1927: 25,-38
         - node:
             color: '#334E6DC8'
             id: CheckerNWSE
           decals:
-            1980: 20,-37
-            1981: 21,-37
-            1982: 21,-38
-            1983: 20,-38
+            1920: 20,-37
+            1921: 21,-37
+            1922: 21,-38
+            1923: 20,-38
         - node:
             color: '#474F528F'
             id: CheckerNWSE
           decals:
-            2204: -17,11
-            2205: -16,11
-            2206: -16,12
-            2207: -17,12
-            2208: -17,13
-            2209: -16,13
-            2210: -16,14
-            2211: -17,14
+            2144: -17,11
+            2145: -16,11
+            2146: -16,12
+            2147: -17,12
+            2148: -17,13
+            2149: -16,13
+            2150: -16,14
+            2151: -17,14
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
           decals:
-            1759: 55,-5
-            1760: 55,-4
-            1761: 56,-4
-            1762: 56,-5
-            1763: 53,-5
-            1764: 53,-4
+            1699: 55,-5
+            1700: 55,-4
+            1701: 56,-4
+            1702: 56,-5
+            1703: 53,-5
+            1704: 53,-4
         - node:
             color: '#D381C996'
             id: CheckerNWSE
           decals:
-            1841: 66,-21
+            1781: 66,-21
         - node:
             color: '#DE3A3A41'
             id: CheckerNWSE
           decals:
-            6593: -36,-46
-            6594: -36,-45
-            6595: -36,-44
-            6596: -35,-44
-            6597: -35,-45
-            6598: -35,-46
+            6437: -36,-46
+            6438: -36,-45
+            6439: -36,-44
+            6440: -35,-44
+            6441: -35,-45
+            6442: -35,-46
         - node:
             color: '#EFB34131'
             id: CheckerNWSE
           decals:
-            6728: 13,40
-            6729: 13,39
-            6730: 13,41
-            6731: 13,42
-            6776: 15,40
+            6570: 13,40
+            6571: 13,39
+            6572: 13,41
+            6573: 13,42
+            6618: 15,40
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -2883,90 +2910,88 @@ entities:
             149: -2,-27
             150: -3,-27
             151: -3,-28
-            2166: 37,-15
-            2167: 37,-16
-            2168: 37,-17
-            2169: 38,-16
-            2170: 38,-15
-            2174: 38,-17
-            2175: 38,6
-            2176: 38,7
-            2177: -54,10
-            2178: -53,10
-            2179: -55,10
-            2180: -55,9
-            2820: -4,15
-            2821: -3,15
-            2822: -2,15
-            2823: -3,14
-            2826: -38,-54
-            2827: -38,-53
-            2828: -37,-53
-            2829: -37,-54
-            2830: 61,-32
-            2831: 62,-32
-            2832: 63,-32
-            2833: 63,-33
-            2834: 62,-33
-            2835: 61,-33
-            2839: 63,10
-            2840: 64,10
-            2841: 65,10
-            2842: 65,9
-            2843: 65,8
-            2844: 64,8
-            2845: 63,8
-            2846: 64,9
-            2852: -23,34
-            2853: -23,35
-            2856: 14,-39
-            2857: 15,-39
-            2858: -61,-20
-            2859: -62,-20
-            2863: -38,-38
-            6643: 51,-30
-            6644: 51,-29
-            6645: 52,-29
-            6646: 52,-30
+            2106: 37,-15
+            2107: 37,-16
+            2108: 37,-17
+            2109: 38,-16
+            2110: 38,-15
+            2114: 38,-17
+            2115: 38,6
+            2116: 38,7
+            2117: -54,10
+            2118: -53,10
+            2119: -55,10
+            2120: -55,9
+            2760: -4,15
+            2761: -3,15
+            2762: -2,15
+            2763: -3,14
+            2766: -38,-54
+            2767: -38,-53
+            2768: -37,-53
+            2769: -37,-54
+            2770: 61,-32
+            2771: 62,-32
+            2772: 63,-32
+            2773: 63,-33
+            2774: 62,-33
+            2775: 61,-33
+            2779: 63,10
+            2780: 64,10
+            2781: 65,10
+            2782: 65,9
+            2783: 65,8
+            2784: 64,8
+            2785: 63,8
+            2786: 64,9
+            2792: -23,34
+            2793: -23,35
+            2796: 14,-39
+            2797: 15,-39
+            2798: -61,-20
+            2799: -62,-20
+            2803: -38,-38
+            6487: 51,-30
+            6488: 51,-29
+            6489: 52,-29
+            6490: 52,-30
         - node:
             color: '#D4D4D496'
             id: Delivery
           decals:
-            6529: 0,30
-            6530: 0,31
+            6373: 0,30
+            6374: 0,31
         - node:
             color: '#DE3A3A41'
             id: Delivery
           decals:
-            6601: -38,-46
-            6602: -38,-46
-            6603: -38,-44
-            6604: -38,-44
+            6445: -38,-46
+            6446: -38,-46
+            6447: -38,-44
+            6448: -38,-44
         - node:
             color: '#DE3A3A96'
             id: Delivery
           decals:
-            1136: -3,25
-            1137: -2,25
-            1199: 4,31
-            1200: 5,31
-            1201: 2,31
-            1202: 2,30
+            1111: -3,25
+            1112: -2,25
+            1174: 4,31
+            1175: 5,31
+            1176: 2,31
+            1177: 2,30
         - node:
             color: '#EFB34131'
             id: Delivery
           decals:
-            6772: 15,41
-            6773: 15,41
-            6774: 15,41
-            6775: 15,41
+            6614: 15,41
+            6615: 15,41
+            6616: 15,41
+            6617: 15,41
         - node:
             color: '#EFB34196'
             id: Delivery
           decals:
             60: -7,-20
-            6179: 47,16
-            6180: 47,16
         - node:
             color: '#EFB341FF'
             id: Delivery
@@ -3005,3576 +3030,3563 @@ entities:
             409: -23,-28
             410: -23,-27
             411: -23,-26
-            1268: 23,14
-            1270: 24,12
-            1282: 25,6
-            1283: 24,6
-            1284: 23,6
-            1302: 24,21
-            1303: 25,21
-            1304: 26,21
-            1305: 28,21
-            1306: 29,21
-            1307: 30,21
-            1447: 46,3
-            1448: 46,3
-            1768: 60,-12
-            1990: 26,-37
-            1991: 26,-38
-            1994: 31,-37
-            1995: 31,-38
-            2138: 8,-41
-            3043: 3,20
-            3044: -9,19
-            3045: -9,20
-            3046: -9,21
-            3047: -17,21
-            3048: -17,20
-            3049: -17,19
-            3050: 3,21
-            3051: 3,19
-            3052: 17,19
-            3053: 17,20
-            3054: 17,21
-            3055: 19,17
-            3056: 21,17
-            3057: 20,17
-            3058: 21,6
-            3059: 20,6
-            3060: 19,6
-            3061: 29,2
-            3062: 29,4
-            3063: 29,3
-            3064: 39,2
-            3065: 39,3
-            3066: 39,4
-            3067: 43,0
-            3068: 42,0
-            3069: 41,0
-            3070: 43,-14
-            3071: 42,-14
-            3072: 41,-14
-            3073: 46,-21
-            3074: 46,-19
-            3075: 46,-20
-            3076: 38,-19
-            3077: 38,-21
-            3078: 38,-20
-            3079: 30,-21
-            3080: 30,-20
-            3081: 30,-19
-            3082: 30,-20
-            3083: 21,-28
-            3084: 20,-28
-            3085: 19,-28
-            3086: 18,-32
-            3087: 18,-33
-            3088: 18,-34
-            3089: 10,-34
-            3090: 10,-33
-            3091: 10,-32
-            3092: 4,-32
-            3093: 4,-31
-            3094: 4,-30
-            3095: -9,-32
-            3096: -9,-31
-            3097: -9,-30
-            3098: -20,-32
-            3099: -20,-30
-            3100: -20,-31
-            3101: -24,-22
-            3102: -25,-22
-            3103: -26,-22
-            3104: -42,-29
-            3105: -42,-28
-            3106: -27,-29
-            3107: -27,-28
-            3108: -26,-12
-            3109: -25,-12
-            3110: -24,-12
-            3111: -23,-6
-            3112: -24,-6
-            3113: -25,-6
-            3114: -25,10
-            3115: -26,10
-            3116: -27,10
-            3117: -42,0
-            3118: -42,1
-            3119: -42,2
-            3120: -53,-5
-            3121: -54,-5
-            3122: -55,-5
-            3123: -55,-19
-            3124: -54,-19
-            3125: -53,-19
-            3126: -49,-34
-            3127: -47,-34
-            3128: -48,-34
-            3129: -47,-45
-            3130: -48,-45
-            3131: -49,-45
-            3132: -41,-49
-            3133: -42,-49
-            3134: -40,-49
-            3135: -54,-49
-            3136: -55,-49
-            3137: -56,-49
-            3138: -56,-55
-            3139: -55,-55
-            3140: -54,-55
-            3141: -42,-55
-            3142: -41,-55
-            3143: -40,-55
-            6531: 60,-24
-            6532: 60,-23
-            6631: 32,21
+            1243: 23,14
+            1245: 24,12
+            1257: 25,6
+            1258: 24,6
+            1259: 23,6
+            1277: 24,21
+            1278: 25,21
+            1279: 26,21
+            1280: 28,21
+            1281: 29,21
+            1282: 30,21
+            1422: 46,3
+            1423: 46,3
+            1708: 60,-12
+            1930: 26,-37
+            1931: 26,-38
+            1934: 31,-37
+            1935: 31,-38
+            2078: 8,-41
+            2978: 3,20
+            2979: -9,19
+            2980: -9,20
+            2981: -9,21
+            2982: -17,21
+            2983: -17,20
+            2984: -17,19
+            2985: 3,21
+            2986: 3,19
+            2987: 17,19
+            2988: 17,20
+            2989: 17,21
+            2990: 19,17
+            2991: 21,17
+            2992: 20,17
+            2993: 21,6
+            2994: 20,6
+            2995: 19,6
+            2996: 29,2
+            2997: 29,4
+            2998: 29,3
+            2999: 39,2
+            3000: 39,3
+            3001: 39,4
+            3002: 43,0
+            3003: 42,0
+            3004: 41,0
+            3005: 43,-14
+            3006: 42,-14
+            3007: 41,-14
+            3008: 46,-21
+            3009: 46,-19
+            3010: 46,-20
+            3011: 38,-19
+            3012: 38,-21
+            3013: 38,-20
+            3014: 30,-21
+            3015: 30,-20
+            3016: 30,-19
+            3017: 30,-20
+            3018: 21,-28
+            3019: 20,-28
+            3020: 19,-28
+            3021: 18,-32
+            3022: 18,-33
+            3023: 18,-34
+            3024: 10,-34
+            3025: 10,-33
+            3026: 10,-32
+            3027: 4,-32
+            3028: 4,-31
+            3029: 4,-30
+            3030: -9,-32
+            3031: -9,-31
+            3032: -9,-30
+            3033: -20,-32
+            3034: -20,-30
+            3035: -20,-31
+            3036: -24,-22
+            3037: -25,-22
+            3038: -26,-22
+            3039: -42,-29
+            3040: -42,-28
+            3041: -27,-29
+            3042: -27,-28
+            3043: -26,-12
+            3044: -25,-12
+            3045: -24,-12
+            3046: -23,-6
+            3047: -24,-6
+            3048: -25,-6
+            3049: -25,10
+            3050: -26,10
+            3051: -27,10
+            3052: -42,0
+            3053: -42,1
+            3054: -42,2
+            3055: -53,-5
+            3056: -54,-5
+            3057: -55,-5
+            3058: -55,-19
+            3059: -54,-19
+            3060: -53,-19
+            3061: -49,-34
+            3062: -47,-34
+            3063: -48,-34
+            3064: -47,-45
+            3065: -48,-45
+            3066: -49,-45
+            3067: -41,-49
+            3068: -42,-49
+            3069: -40,-49
+            3070: -54,-49
+            3071: -55,-49
+            3072: -56,-49
+            3073: -56,-55
+            3074: -55,-55
+            3075: -54,-55
+            3076: -42,-55
+            3077: -41,-55
+            3078: -40,-55
+            6375: 60,-24
+            6376: 60,-23
+            6475: 32,21
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            2981: 24,5
-            2982: 25,5
-            2983: 26,5
-            2984: 14,1
-            2985: 14,-12
-            2986: 0,14
-            2987: -6,14
+            2921: 24,5
+            2922: 25,5
+            2923: 26,5
+            2924: 14,1
+            2925: 14,-12
+            2926: 0,14
+            2927: -6,14
         - node:
             color: '#52B4E996'
             id: DeliveryGreyscale
           decals:
-            1757: 59,-5
-            1758: 61,-5
-            6292: 48,2
-            6293: 48,2
-            6294: 48,1
-            6295: 48,1
-            6525: 50,-5
-            6526: 50,-5
+            6136: 48,2
+            6137: 48,2
+            6138: 48,1
+            6139: 48,1
+            6369: 50,-5
+            6370: 50,-5
         - node:
             color: '#DE3A3A96'
             id: DeliveryGreyscale
           decals:
-            1197: 4,31
-            1198: 5,31
+            1172: 4,31
+            1173: 5,31
         - node:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            2215: 9,23
-            2216: 9,24
+            2155: 9,23
+            2156: 9,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: Dirt
           decals:
-            2866: -37,28
-            2867: -36,27
-            2868: -37,27
-            2869: -37,25
-            2870: -37,24
-            2871: -36,25
-            2872: -36,24
-            2873: -36,25
-            2874: -38,28
-            2875: -39,29
-            2876: -40,28
-            2877: -38,28
-            2878: -37,27
-            2879: -37,28
-            2880: -37,27
-            2881: -36,25
-            2882: -36,24
-            2883: -34,24
-            2884: -34,23
-            2885: -34,22
-            2886: -36,22
-            2887: -37,22
-            2888: -36,24
-            2889: -37,24
-            2890: -36,23
-            2891: -37,25
-            2892: -36,25
-            2893: -37,26
-            2894: -38,27
-            2895: -38,28
-            2896: -39,27
-            2897: -39,26
-            2898: -39,26
+            2806: -37,28
+            2807: -36,27
+            2808: -37,27
+            2809: -37,25
+            2810: -37,24
+            2811: -36,25
+            2812: -36,24
+            2813: -36,25
+            2814: -38,28
+            2815: -39,29
+            2816: -40,28
+            2817: -38,28
+            2818: -37,27
+            2819: -37,28
+            2820: -37,27
+            2821: -36,25
+            2822: -36,24
+            2823: -34,24
+            2824: -34,23
+            2825: -34,22
+            2826: -36,22
+            2827: -37,22
+            2828: -36,24
+            2829: -37,24
+            2830: -36,23
+            2831: -37,25
+            2832: -36,25
+            2833: -37,26
+            2834: -38,27
+            2835: -38,28
+            2836: -39,27
+            2837: -39,26
+            2838: -39,26
         - node:
             cleanable: True
             color: '#A4610696'
             id: Dirt
           decals:
-            5427: -34,-26
-            5428: -37,-25
-            5429: -39,-28
-            5430: -40,-28
-            5431: -40,-31
-            5432: -39,-33
-            5433: -37,-33
-            5434: -32,-33
-            5435: -29,-33
-            5436: -29,-31
-            5437: -30,-28
-            5438: -29,-27
-            5439: -25,-30
-            5440: -25,-27
-            5441: -25,-26
-            5442: -25,-23
-            5443: -24,-21
-            5444: -25,-18
-            5445: -29,-20
-            5446: -29,-19
-            5447: -33,-19
-            5448: -33,-20
-            5449: -31,-14
-            5450: -29,-15
-            5451: -33,-16
-            5452: -29,-13
-            5453: -29,-11
-            5454: -38,-11
-            5455: -37,-15
-            5456: -36,-16
-            5457: -40,-10
-            5458: -38,-17
-            5459: -47,-8
-            5460: -45,0
-            5461: -47,0
-            5462: -44,2
-            5463: -48,-2
-            5464: -47,-1
-            5465: -49,3
-            5466: -50,-1
-            5467: -45,1
-            5468: -53,4
-            5469: -48,5
-            5470: -50,6
-            5471: -47,1
-            5472: -38,-1
-            5473: -36,1
-            5474: -35,-1
-            5475: -32,-1
-            5476: -33,0
-            5477: -33,-3
-            5478: -24,-2
-            5479: -28,3
-            5480: -26,3
-            5481: -26,8
-            5482: -27,13
-            5483: -26,14
-            5484: -26,18
-            5488: -22,13
-            5489: -20,12
-            5490: -22,13
-            5491: -24,19
-            5492: -20,20
-            5493: -18,19
-            5494: -16,20
-            5495: -13,19
-            5496: -15,24
-            5497: -14,24
-            5498: -13,27
-            5499: -14,28
-            5500: -13,27
-            5501: -5,28
-            5502: -20,28
-            5503: -18,25
-            5504: -13,31
-            5505: -15,32
-            5506: -14,34
-            5507: -17,32
-            5508: -8,32
-            5509: -8,32
-            5510: -6,33
-            5511: -6,27
-            5512: -3,28
-            5513: -1,30
-            5514: -2,33
-            5515: -2,33
-            5516: -2,36
-            5517: -2,43
-            5518: -7,42
-            5519: -5,45
-            5520: -3,47
-            5521: 0,45
-            5522: -2,47
-            5523: -1,47
-            5524: -2,51
-            5525: 1,51
-            5526: -1,52
-            5527: 1,52
-            5528: 2,45
-            5529: 2,47
-            5530: 2,42
-            5531: 1,40
-            5532: 6,41
-            5533: 8,39
-            5534: 6,41
-            5535: 5,31
-            5536: 3,31
-            5537: 5,30
-            5538: 4,30
-            5539: 3,26
-            5540: 2,27
-            5541: 4,25
-            5542: 3,23
-            5543: 2,24
-            5544: 1,23
-            5545: -2,24
-            5546: 1,21
-            5547: -1,19
-            5548: 4,20
-            5549: 9,20
-            5550: 9,20
-            5551: 15,19
-            5552: 11,24
-            5553: 14,23
-            5554: 14,25
-            5555: 15,24
-            5556: 14,29
-            5557: 14,31
-            5558: 17,25
-            5559: 17,23
-            5560: 16,20
-            5561: 20,20
-            5562: 20,18
-            5563: 20,15
-            5564: 21,15
-            5565: 20,12
-            5566: 22,12
-            5567: 20,11
-            5568: 27,12
-            5569: 27,11
-            5570: 26,14
-            5571: 25,19
-            5572: 30,19
-            5573: 31,16
-            5574: 31,12
-            5575: 35,14
-            5576: 35,14
-            5577: 35,14
-            5578: 32,8
-            5579: 34,9
-            5580: 32,7
-            5581: 26,7
-            5582: 24,7
-            5583: 24,3
-            5584: 24,2
-            5585: 23,2
-            5586: 20,6
-            5587: 20,9
-            5588: 23,3
-            5589: 32,3
-            5590: 34,2
-            5591: 32,-2
-            5592: 32,-2
-            5593: 32,-4
-            5594: 37,-4
-            5595: 36,3
-            5596: 42,2
-            5597: 38,-2
-            5598: 42,-5
-            5599: 42,-2
-            5600: 42,-4
-            5601: 43,6
-            5602: 44,12
-            5603: 43,11
-            5604: 46,12
-            5605: 44,12
-            5606: 52,12
-            5607: 50,14
-            5608: 50,7
-            5609: 53,14
-            5610: 59,15
-            5611: 60,17
-            5612: 55,7
-            5613: 54,7
-            5614: 50,7
-            5615: 49,0
-            5616: 45,-1
-            5617: 46,-5
-            5618: 46,-8
-            5619: 50,-4
-            5620: 50,-7
-            5621: 55,-5
-            5622: 53,-5
-            5623: 58,-6
-            5624: 61,-5
-            5625: 59,-7
-            5626: 59,-7
-            5627: 60,-6
-            5628: 59,-14
-            5629: 60,-14
-            5630: 59,-14
-            5631: 59,-18
-            5632: 59,-20
-            5633: 60,-18
-            5634: 60,-17
-            5635: 64,-13
-            5636: 64,-17
-            5637: 65,-19
-            5638: 64,-19
-            5639: 64,-25
-            5640: 65,-24
-            5641: 63,-26
-            5642: 63,-24
-            5643: 62,-26
-            5644: 64,-26
-            5645: 70,-28
-            5646: 71,-26
-            5647: 69,-27
-            5648: 69,-23
-            5649: 70,-24
-            5650: 69,-22
-            5651: 66,-18
-            5652: 70,-18
-            5653: 71,-17
-            5654: 69,-13
-            5655: 71,-14
-            5656: 69,-12
-            5657: 70,-14
-            5658: 76,-17
-            5659: 77,-18
-            5660: 74,-15
-            5661: 76,-14
-            5662: 74,-14
-            5663: 68,-8
-            5664: 70,-10
-            5665: 76,-6
-            5666: 48,-25
-            5667: 48,-26
-            5668: 48,-27
-            5669: 48,-30
-            5670: 48,-31
-            5671: 47,-31
-            5672: 49,-34
-            5673: 47,-36
-            5674: 46,-36
-            5675: 44,-37
-            5676: 42,-35
-            5677: 42,-36
-            5678: 38,-36
-            5679: 38,-35
-            5680: 37,-37
-            5681: 32,-35
-            5682: 32,-36
-            5683: 32,-33
-            5684: 33,-31
-            5685: 32,-31
-            5686: 33,-27
-            5687: 32,-25
-            5688: 33,-24
-            5689: 35,-26
-            5690: 37,-26
-            5691: 41,-25
-            5692: 40,-26
-            5693: 41,-29
-            5694: 40,-29
-            5695: 40,-31
-            5696: 43,-29
-            5697: 44,-31
-            5698: 45,-30
-            5699: 27,-34
-            5700: 25,-34
-            5701: 24,-32
-            5702: 26,-29
-            5703: 23,-29
-            5704: 23,-31
-            5705: 25,-38
-            5706: 24,-37
-            5707: 22,-38
-            5708: 21,-37
-            5709: 21,-38
-            5710: 29,-39
-            5711: 28,-41
-            5712: 29,-44
-            5713: 28,-42
-            5714: 28,-45
-            5715: 26,-45
-            5716: 27,-44
-            5717: 24,-43
-            5718: 25,-46
-            5719: 27,-45
-            5720: 25,-46
-            5721: 32,-30
-            5722: 33,-28
-            5723: 36,-26
-            5724: 35,-26
-            5725: 36,-23
-            5726: 36,-30
-            5727: 42,-28
-            5728: 43,-29
-            5729: 52,-31
-            5730: 52,-35
-            5731: 55,-29
-            5732: 55,-30
-            5733: 57,-30
-            5734: 55,-34
-            5735: 55,-34
-            5736: 55,-36
-            5737: 57,-34
-            5738: 20,-45
-            5739: 17,-44
-            5740: 18,-45
-            5741: 19,-46
-            5742: 18,-48
-            5743: 19,-49
-            5744: 18,-50
-            5745: 20,-53
-            5746: 18,-54
-            5747: 17,-54
-            5748: 16,-54
-            5749: 16,-58
-            5750: 16,-59
-            5751: 19,-58
-            5752: 21,-58
-            5753: 21,-59
-            5754: 13,-47
-            5755: 14,-47
-            5756: 13,-48
-            5757: 13,-45
-            5758: 12,-45
-            5759: 10,-39
-            5760: 11,-39
-            5761: 0,-37
-            5762: 0,-36
-            5763: 1,-36
-            5764: 2,-38
-            5765: 0,-36
-            5766: -1,-37
-            5767: -2,-36
-            5768: -5,-36
-            5769: -4,-36
-            5770: -6,-36
-            5771: -7,-32
-            5772: -8,-32
-            5773: -7,-30
-            5774: -11,-31
-            5775: -12,-32
-            5776: -15,-32
-            5777: -16,-32
-            5778: -13,-30
-            5779: -16,-30
-            5780: -17,-30
-            5781: -22,-30
-            5782: -23,-30
-            5783: -24,-30
-            5784: -24,-29
-            5785: -24,-28
-            5786: -22,-32
-            5787: -24,-32
-            5788: -25,-32
-            5789: -26,-30
-            5790: -26,-28
-            5791: -26,-26
-            5792: -26,-24
-            5793: -24,-24
-            5794: -24,-22
-            5795: -24,-19
-            5796: -26,-21
-            5797: -26,-18
-            5798: -26,-17
-            5799: -24,-14
-            5800: -25,-15
-            5801: -27,-15
-            5802: -30,-15
-            5803: -30,-15
-            5804: -34,-15
-            5805: -35,-14
-            5806: -37,-15
-            5807: -38,-14
-            5808: -35,-15
-            5809: -34,-14
-            5810: -37,-10
-            5811: -38,-10
-            5812: -36,-9
-            5813: -29,-10
-            5814: -29,-11
-            5815: -33,-20
-            5816: -34,-20
-            5817: -33,-18
-            5818: -32,-20
-            5819: -34,-19
-            5820: -33,-18
-            5821: -29,-19
-            5822: -30,-21
-            5823: -29,-19
-            5824: -30,-20
-            5825: -37,-18
-            5826: -40,-18
-            5827: -39,-20
-            5828: -37,-19
-            5829: -39,-19
-            5830: -32,-26
-            5831: -35,-25
-            5832: -39,-26
-            5833: -39,-26
-            5834: -39,-27
-            5835: -40,-28
-            5836: -38,-30
-            5837: -39,-32
-            5838: -39,-33
-            5839: -37,-33
-            5840: -34,-33
-            5841: -31,-33
-            5842: -34,-34
-            5843: -30,-33
-            5844: -30,-31
-            5845: -31,-28
-            5846: -29,-27
-            5847: -29,-30
-            5848: -43,-30
-            5849: -44,-28
-            5850: -45,-31
-            5851: -46,-27
-            5852: -45,-25
-            5853: -45,-25
-            5854: -47,-25
-            5855: -49,-25
-            5856: -51,-26
-            5857: -50,-29
-            5858: -51,-30
-            5859: -51,-30
-            5860: -50,-32
-            5861: -47,-32
-            5862: -48,-33
-            5863: -44,-31
-            5864: -44,-29
-            5865: -55,-25
-            5866: -56,-25
-            5867: -55,-29
-            5868: -56,-29
-            5869: -55,-29
-            5870: -60,-27
-            5871: -60,-29
-            5872: -62,-27
-            5873: -61,-21
-            5874: -61,-21
-            5875: -54,-21
-            5876: -54,-21
-            5877: -55,-16
-            5878: -53,-14
-            5879: -54,-13
-            5880: -53,-10
-            5881: -54,-7
-            5882: -53,-5
-            5883: -55,-2
-            5884: -54,0
-            5885: -53,1
-            5886: -53,-4
-            5887: -54,-3
-            5888: -54,-4
-            5889: -54,-9
-            5890: -46,-4
-            5891: -47,-4
-            5892: -48,-3
-            5893: -50,0
-            5894: -45,1
-            5895: -47,1
-            5896: -44,1
-            5897: -47,1
-            5898: -46,7
-            5899: -49,7
-            5900: -49,11
-            5901: -46,11
-            5902: -49,10
-            5903: -48,13
-            5904: -45,11
-            5905: -54,10
-            5906: -54,9
-            5907: -53,10
-            5908: -39,1
-            5909: -37,0
-            5910: -39,-1
-            5911: -34,-1
-            5912: -37,-1
-            5913: -36,0
-            5914: -35,2
-            5915: -31,2
-            5916: -31,2
-            5917: -33,1
-            5918: -28,0
-            5919: -30,-1
-            5920: -27,-1
-            5921: -33,-4
-            5922: -27,-5
-            5923: -24,-3
-            5924: -24,1
-            5925: -22,3
-            5926: -23,-2
-            5927: -22,-3
-            5928: -17,-3
-            5929: -19,-3
-            5930: -17,-3
-            5931: -18,-4
-            5932: -14,-4
-            5933: -18,-4
-            5934: -17,-4
-            5935: -17,-4
-            5936: -19,-4
-            5937: -19,-2
-            5938: -19,-2
-            5939: -20,-3
-            5940: -20,-5
-            5941: -16,0
-            5942: -16,1
-            5943: -16,3
-            5944: -15,0
-            5945: -15,6
-            5946: -17,5
-            5947: -15,7
-            5948: -21,5
-            5949: -21,6
-            5950: -20,7
-            5951: -22,8
-            5952: -24,9
-            5953: -21,9
-            5954: -23,8
-            5955: -22,8
-            5956: -23,8
-            5957: -21,13
-            5958: -22,11
-            5959: -20,13
-            5960: -22,14
-            5961: -26,12
-            5962: -26,16
-            5963: -26,17
-            5964: -26,20
-            5965: -19,20
-            5966: -25,20
-            5967: -22,19
-            5968: -24,26
-            5969: -25,26
-            5970: -26,26
-            5971: -25,29
-            5972: -26,29
-            5973: -26,26
-            5974: -26,27
-            5975: -25,29
-            5976: -29,26
-            5977: -29,26
-            5978: -19,26
-            5979: -21,26
-            5980: -19,28
-            5981: -18,26
-            5982: -14,28
-            5983: -14,26
-            5984: -13,28
-            5985: -11,23
-            5986: -7,32
-            5987: -9,32
-            5988: -14,32
-            5989: -15,33
-            5990: -18,32
-            5991: -3,28
-            5992: -4,27
-            5993: -1,29
-            5994: -2,23
-            5995: -1,19
-            5996: -3,14
-            5997: -3,14
-            5998: -2,15
-            5999: -4,15
-            6000: -3,15
-            6001: 2,-14
-            6002: 2,-16
-            6003: -1,-17
-            6004: -2,-14
-            6005: -7,-17
-            6006: -6,-16
-            6007: -7,-19
-            6008: -7,-19
-            6009: -7,-23
-            6010: -1,-24
-            6011: 4,-20
-            6012: 6,-23
-            6013: 6,-20
-            6014: 7,-22
-            6015: 7,-20
-            6016: 11,-18
-            6017: 13,-18
-            6018: 13,-22
-            6019: 13,-22
-            6020: 12,-22
-            6021: 15,-26
-            6022: 12,-26
-            6023: 12,-29
-            6024: 7,-30
-            6025: 8,-32
-            6026: 7,-32
-            6027: 10,-34
-            6028: 13,-33
-            6029: 16,-32
-            6030: 21,-37
-            6031: 20,-38
-            6032: 24,-38
-            6033: 25,-37
-            6034: 28,-34
-            6035: 25,-34
-            6036: 27,-29
-            6037: 24,-29
-            6038: 33,-34
-            6039: 32,-37
-            6040: 35,-37
-            6041: 38,-36
-            6042: 40,-36
-            6043: 39,-30
-            6044: 44,-25
-            6045: 43,-25
-            6046: 42,-20
-            6047: 42,-18
-            6048: 41,-16
-            6049: 38,-16
-            6050: 37,-17
-            6051: 37,-15
-            6052: 37,-17
-            6053: 37,-16
-            6054: 37,-16
-            6055: 37,-16
-            6056: 38,-4
-            6057: 33,-3
-            6058: 33,-3
-            6059: 38,7
-            6060: 36,13
-            6061: 37,13
-            6062: 35,13
-            6063: 34,13
-            6064: 34,14
-            6065: 36,13
-            6066: 36,13
-            6067: 34,14
-            6068: 35,18
-            6069: 36,18
+            5313: -34,-26
+            5314: -37,-25
+            5315: -39,-28
+            5316: -40,-28
+            5317: -40,-31
+            5318: -39,-33
+            5319: -37,-33
+            5320: -32,-33
+            5321: -29,-33
+            5322: -29,-31
+            5323: -30,-28
+            5324: -29,-27
+            5325: -25,-30
+            5326: -25,-27
+            5327: -25,-26
+            5328: -25,-23
+            5329: -24,-21
+            5330: -25,-18
+            5331: -29,-20
+            5332: -29,-19
+            5333: -33,-19
+            5334: -33,-20
+            5335: -31,-14
+            5336: -29,-15
+            5337: -33,-16
+            5338: -29,-13
+            5339: -29,-11
+            5340: -38,-11
+            5341: -37,-15
+            5342: -36,-16
+            5343: -40,-10
+            5344: -38,-17
+            5345: -47,-8
+            5346: -45,0
+            5347: -47,0
+            5348: -44,2
+            5349: -48,-2
+            5350: -47,-1
+            5351: -49,3
+            5352: -50,-1
+            5353: -45,1
+            5354: -53,4
+            5355: -48,5
+            5356: -50,6
+            5357: -47,1
+            5358: -38,-1
+            5359: -36,1
+            5360: -35,-1
+            5361: -32,-1
+            5362: -33,0
+            5363: -33,-3
+            5364: -24,-2
+            5365: -28,3
+            5366: -26,3
+            5367: -26,8
+            5368: -27,13
+            5369: -26,14
+            5370: -26,18
+            5371: -22,13
+            5372: -20,12
+            5373: -22,13
+            5374: -24,19
+            5375: -20,20
+            5376: -18,19
+            5377: -16,20
+            5378: -13,19
+            5379: -15,24
+            5380: -14,24
+            5381: -13,27
+            5382: -14,28
+            5383: -13,27
+            5384: -5,28
+            5385: -20,28
+            5386: -18,25
+            5387: -13,31
+            5388: -15,32
+            5389: -14,34
+            5390: -17,32
+            5391: -8,32
+            5392: -8,32
+            5393: -6,33
+            5394: -6,27
+            5395: -3,28
+            5396: -1,30
+            5397: -2,33
+            5398: -2,33
+            5399: -2,36
+            5400: -2,43
+            5401: -7,42
+            5402: -5,45
+            5403: -3,47
+            5404: 0,45
+            5405: -2,47
+            5406: -1,47
+            5407: -2,51
+            5408: 1,51
+            5409: -1,52
+            5410: 1,52
+            5411: 2,45
+            5412: 2,47
+            5413: 2,42
+            5414: 1,40
+            5415: 6,41
+            5416: 8,39
+            5417: 6,41
+            5418: 5,31
+            5419: 3,31
+            5420: 5,30
+            5421: 4,30
+            5422: 3,26
+            5423: 2,27
+            5424: 4,25
+            5425: 3,23
+            5426: 2,24
+            5427: 1,23
+            5428: -2,24
+            5429: 1,21
+            5430: -1,19
+            5431: 4,20
+            5432: 9,20
+            5433: 9,20
+            5434: 15,19
+            5435: 11,24
+            5436: 14,23
+            5437: 14,25
+            5438: 15,24
+            5439: 14,29
+            5440: 14,31
+            5441: 17,25
+            5442: 17,23
+            5443: 16,20
+            5444: 20,20
+            5445: 20,18
+            5446: 20,15
+            5447: 21,15
+            5448: 20,12
+            5449: 22,12
+            5450: 20,11
+            5451: 27,12
+            5452: 27,11
+            5453: 26,14
+            5454: 25,19
+            5455: 30,19
+            5456: 31,16
+            5457: 31,12
+            5458: 35,14
+            5459: 35,14
+            5460: 35,14
+            5461: 32,8
+            5462: 34,9
+            5463: 32,7
+            5464: 26,7
+            5465: 24,7
+            5466: 24,3
+            5467: 24,2
+            5468: 23,2
+            5469: 20,6
+            5470: 20,9
+            5471: 23,3
+            5472: 32,3
+            5473: 34,2
+            5474: 32,-2
+            5475: 32,-2
+            5476: 32,-4
+            5477: 37,-4
+            5478: 36,3
+            5479: 42,2
+            5480: 38,-2
+            5481: 42,-5
+            5482: 42,-2
+            5483: 42,-4
+            5484: 43,6
+            5485: 52,12
+            5486: 50,14
+            5487: 50,7
+            5488: 53,14
+            5489: 59,15
+            5490: 60,17
+            5491: 55,7
+            5492: 54,7
+            5493: 50,7
+            5494: 49,0
+            5495: 45,-1
+            5496: 46,-5
+            5497: 46,-8
+            5498: 50,-4
+            5499: 50,-7
+            5500: 55,-5
+            5501: 53,-5
+            5502: 59,-14
+            5503: 60,-14
+            5504: 59,-14
+            5505: 59,-18
+            5506: 59,-20
+            5507: 60,-18
+            5508: 60,-17
+            5509: 64,-13
+            5510: 64,-17
+            5511: 65,-19
+            5512: 64,-19
+            5513: 64,-25
+            5514: 65,-24
+            5515: 63,-26
+            5516: 63,-24
+            5517: 62,-26
+            5518: 64,-26
+            5519: 70,-28
+            5520: 71,-26
+            5521: 69,-27
+            5522: 69,-23
+            5523: 70,-24
+            5524: 69,-22
+            5525: 66,-18
+            5526: 70,-18
+            5527: 71,-17
+            5528: 69,-13
+            5529: 71,-14
+            5530: 69,-12
+            5531: 70,-14
+            5532: 76,-17
+            5533: 77,-18
+            5534: 74,-15
+            5535: 76,-14
+            5536: 74,-14
+            5537: 68,-8
+            5538: 70,-10
+            5539: 76,-6
+            5540: 48,-25
+            5541: 48,-26
+            5542: 48,-27
+            5543: 48,-30
+            5544: 48,-31
+            5545: 47,-31
+            5546: 49,-34
+            5547: 47,-36
+            5548: 46,-36
+            5549: 44,-37
+            5550: 42,-35
+            5551: 42,-36
+            5552: 38,-36
+            5553: 38,-35
+            5554: 37,-37
+            5555: 32,-35
+            5556: 32,-36
+            5557: 32,-33
+            5558: 33,-31
+            5559: 32,-31
+            5560: 33,-27
+            5561: 32,-25
+            5562: 33,-24
+            5563: 35,-26
+            5564: 37,-26
+            5565: 41,-25
+            5566: 40,-26
+            5567: 41,-29
+            5568: 40,-29
+            5569: 40,-31
+            5570: 43,-29
+            5571: 44,-31
+            5572: 45,-30
+            5573: 27,-34
+            5574: 25,-34
+            5575: 24,-32
+            5576: 26,-29
+            5577: 23,-29
+            5578: 23,-31
+            5579: 25,-38
+            5580: 24,-37
+            5581: 22,-38
+            5582: 21,-37
+            5583: 21,-38
+            5584: 29,-39
+            5585: 28,-41
+            5586: 29,-44
+            5587: 28,-42
+            5588: 28,-45
+            5589: 26,-45
+            5590: 27,-44
+            5591: 24,-43
+            5592: 25,-46
+            5593: 27,-45
+            5594: 25,-46
+            5595: 32,-30
+            5596: 33,-28
+            5597: 36,-26
+            5598: 35,-26
+            5599: 36,-23
+            5600: 36,-30
+            5601: 42,-28
+            5602: 43,-29
+            5603: 52,-31
+            5604: 52,-35
+            5605: 55,-29
+            5606: 55,-30
+            5607: 57,-30
+            5608: 55,-34
+            5609: 55,-34
+            5610: 55,-36
+            5611: 57,-34
+            5612: 20,-45
+            5613: 17,-44
+            5614: 18,-45
+            5615: 19,-46
+            5616: 18,-48
+            5617: 19,-49
+            5618: 18,-50
+            5619: 20,-53
+            5620: 18,-54
+            5621: 17,-54
+            5622: 16,-54
+            5623: 16,-58
+            5624: 16,-59
+            5625: 19,-58
+            5626: 21,-58
+            5627: 21,-59
+            5628: 13,-47
+            5629: 14,-47
+            5630: 13,-48
+            5631: 13,-45
+            5632: 12,-45
+            5633: 10,-39
+            5634: 11,-39
+            5635: 0,-37
+            5636: 0,-36
+            5637: 1,-36
+            5638: 2,-38
+            5639: 0,-36
+            5640: -1,-37
+            5641: -2,-36
+            5642: -5,-36
+            5643: -4,-36
+            5644: -6,-36
+            5645: -7,-32
+            5646: -8,-32
+            5647: -7,-30
+            5648: -11,-31
+            5649: -12,-32
+            5650: -15,-32
+            5651: -16,-32
+            5652: -13,-30
+            5653: -16,-30
+            5654: -17,-30
+            5655: -22,-30
+            5656: -23,-30
+            5657: -24,-30
+            5658: -24,-29
+            5659: -24,-28
+            5660: -22,-32
+            5661: -24,-32
+            5662: -25,-32
+            5663: -26,-30
+            5664: -26,-28
+            5665: -26,-26
+            5666: -26,-24
+            5667: -24,-24
+            5668: -24,-22
+            5669: -24,-19
+            5670: -26,-21
+            5671: -26,-18
+            5672: -26,-17
+            5673: -24,-14
+            5674: -25,-15
+            5675: -27,-15
+            5676: -30,-15
+            5677: -30,-15
+            5678: -34,-15
+            5679: -35,-14
+            5680: -37,-15
+            5681: -38,-14
+            5682: -35,-15
+            5683: -34,-14
+            5684: -37,-10
+            5685: -38,-10
+            5686: -36,-9
+            5687: -29,-10
+            5688: -29,-11
+            5689: -33,-20
+            5690: -33,-18
+            5691: -32,-20
+            5692: -33,-18
+            5693: -29,-19
+            5694: -30,-21
+            5695: -29,-19
+            5696: -30,-20
+            5697: -37,-18
+            5698: -40,-18
+            5699: -39,-20
+            5700: -37,-19
+            5701: -39,-19
+            5702: -32,-26
+            5703: -35,-25
+            5704: -39,-26
+            5705: -39,-26
+            5706: -39,-27
+            5707: -40,-28
+            5708: -38,-30
+            5709: -39,-32
+            5710: -39,-33
+            5711: -37,-33
+            5712: -34,-33
+            5713: -31,-33
+            5714: -34,-34
+            5715: -30,-33
+            5716: -30,-31
+            5717: -31,-28
+            5718: -29,-27
+            5719: -29,-30
+            5720: -43,-30
+            5721: -44,-28
+            5722: -45,-31
+            5723: -46,-27
+            5724: -45,-25
+            5725: -45,-25
+            5726: -47,-25
+            5727: -49,-25
+            5728: -51,-26
+            5729: -50,-29
+            5730: -51,-30
+            5731: -51,-30
+            5732: -50,-32
+            5733: -47,-32
+            5734: -48,-33
+            5735: -44,-31
+            5736: -44,-29
+            5737: -55,-25
+            5738: -56,-25
+            5739: -55,-29
+            5740: -56,-29
+            5741: -55,-29
+            5742: -60,-27
+            5743: -60,-29
+            5744: -62,-27
+            5745: -61,-21
+            5746: -61,-21
+            5747: -54,-21
+            5748: -54,-21
+            5749: -55,-16
+            5750: -53,-14
+            5751: -54,-13
+            5752: -53,-10
+            5753: -54,-7
+            5754: -53,-5
+            5755: -55,-2
+            5756: -54,0
+            5757: -53,1
+            5758: -53,-4
+            5759: -54,-3
+            5760: -54,-4
+            5761: -54,-9
+            5762: -46,-4
+            5763: -47,-4
+            5764: -48,-3
+            5765: -50,0
+            5766: -45,1
+            5767: -47,1
+            5768: -44,1
+            5769: -47,1
+            5770: -46,7
+            5771: -49,7
+            5772: -49,11
+            5773: -46,11
+            5774: -49,10
+            5775: -48,13
+            5776: -45,11
+            5777: -54,10
+            5778: -54,9
+            5779: -53,10
+            5780: -39,1
+            5781: -37,0
+            5782: -39,-1
+            5783: -34,-1
+            5784: -37,-1
+            5785: -36,0
+            5786: -35,2
+            5787: -31,2
+            5788: -31,2
+            5789: -33,1
+            5790: -28,0
+            5791: -30,-1
+            5792: -27,-1
+            5793: -33,-4
+            5794: -27,-5
+            5795: -24,-3
+            5796: -24,1
+            5797: -22,3
+            5798: -23,-2
+            5799: -22,-3
+            5800: -17,-3
+            5801: -19,-3
+            5802: -17,-3
+            5803: -18,-4
+            5804: -14,-4
+            5805: -18,-4
+            5806: -17,-4
+            5807: -17,-4
+            5808: -19,-4
+            5809: -19,-2
+            5810: -19,-2
+            5811: -20,-3
+            5812: -20,-5
+            5813: -16,0
+            5814: -16,1
+            5815: -16,3
+            5816: -15,0
+            5817: -15,6
+            5818: -17,5
+            5819: -15,7
+            5820: -21,5
+            5821: -21,6
+            5822: -20,7
+            5823: -22,8
+            5824: -24,9
+            5825: -21,9
+            5826: -23,8
+            5827: -22,8
+            5828: -23,8
+            5829: -21,13
+            5830: -22,11
+            5831: -20,13
+            5832: -22,14
+            5833: -26,12
+            5834: -26,16
+            5835: -26,17
+            5836: -26,20
+            5837: -19,20
+            5838: -25,20
+            5839: -22,19
+            5840: -24,26
+            5841: -25,26
+            5842: -26,26
+            5843: -25,29
+            5844: -26,29
+            5845: -26,26
+            5846: -26,27
+            5847: -25,29
+            5848: -29,26
+            5849: -29,26
+            5850: -19,26
+            5851: -21,26
+            5852: -19,28
+            5853: -18,26
+            5854: -14,28
+            5855: -14,26
+            5856: -13,28
+            5857: -11,23
+            5858: -7,32
+            5859: -9,32
+            5860: -14,32
+            5861: -15,33
+            5862: -18,32
+            5863: -3,28
+            5864: -4,27
+            5865: -1,29
+            5866: -2,23
+            5867: -1,19
+            5868: -3,14
+            5869: -3,14
+            5870: -2,15
+            5871: -4,15
+            5872: -3,15
+            5873: 2,-14
+            5874: 2,-16
+            5875: -1,-17
+            5876: -2,-14
+            5877: -7,-17
+            5878: -6,-16
+            5879: -7,-19
+            5880: -7,-19
+            5881: -7,-23
+            5882: -1,-24
+            5883: 4,-20
+            5884: 6,-23
+            5885: 6,-20
+            5886: 7,-22
+            5887: 7,-20
+            5888: 11,-18
+            5889: 13,-18
+            5890: 13,-22
+            5891: 13,-22
+            5892: 12,-22
+            5893: 15,-26
+            5894: 12,-26
+            5895: 12,-29
+            5896: 7,-30
+            5897: 8,-32
+            5898: 7,-32
+            5899: 10,-34
+            5900: 13,-33
+            5901: 16,-32
+            5902: 21,-37
+            5903: 20,-38
+            5904: 24,-38
+            5905: 25,-37
+            5906: 28,-34
+            5907: 25,-34
+            5908: 27,-29
+            5909: 24,-29
+            5910: 33,-34
+            5911: 32,-37
+            5912: 35,-37
+            5913: 38,-36
+            5914: 40,-36
+            5915: 39,-30
+            5916: 44,-25
+            5917: 43,-25
+            5918: 42,-20
+            5919: 42,-18
+            5920: 41,-16
+            5921: 38,-16
+            5922: 37,-17
+            5923: 37,-15
+            5924: 37,-17
+            5925: 37,-16
+            5926: 37,-16
+            5927: 37,-16
+            5928: 38,-4
+            5929: 33,-3
+            5930: 33,-3
+            5931: 38,7
+            5932: 36,13
+            5933: 37,13
+            5934: 35,13
+            5935: 34,13
+            5936: 34,14
+            5937: 36,13
+            5938: 36,13
+            5939: 34,14
+            5940: 35,18
+            5941: 36,18
         - node:
             cleanable: True
             color: '#D4D4D447'
             id: Dirt
           decals:
-            6701: 37,-3
-            6702: 37,-2
-            6703: 37,-2
-            6704: 38,-3
-            6705: 39,-2
-            6706: 39,-2
-            6707: 38,-3
-            6708: 38,-2
-            6709: 36,-3
-            6710: 36,-3
-            6711: 36,-2
-            6712: 36,-2
-            6713: 39,-3
-            6714: 37,-3
-            6715: 37,-3
+            6545: 37,-3
+            6546: 37,-2
+            6547: 37,-2
+            6548: 38,-3
+            6549: 39,-2
+            6550: 39,-2
+            6551: 38,-3
+            6552: 38,-2
+            6553: 36,-3
+            6554: 36,-3
+            6555: 36,-2
+            6556: 36,-2
+            6557: 39,-3
+            6558: 37,-3
+            6559: 37,-3
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: Dirt
           decals:
-            6610: 15,-30
-            6611: 15,-30
-            6612: 16,-27
-            6613: 16,-27
+            6454: 15,-30
+            6455: 15,-30
+            6456: 16,-27
+            6457: 16,-27
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            6081: 51,20
-            6082: 50,21
-            6119: 81,-34
-            6120: 83,-35
-            6121: 81,-34
-            6122: 81,-34
-            6123: 83,-35
-            6124: 81,-35
-            6125: 82,-35
-            6126: 82,-35
-            6127: 80,-35
-            6128: 83,-36
-            6133: 82,-34
-            6682: -25,-42
+            5953: 51,20
+            5954: 50,21
+            5991: 81,-34
+            5992: 83,-35
+            5993: 81,-34
+            5994: 81,-34
+            5995: 83,-35
+            5996: 81,-35
+            5997: 82,-35
+            5998: 82,-35
+            5999: 80,-35
+            6000: 83,-36
+            6005: 82,-34
+            6526: -25,-42
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            2992: -44,16
-            2993: -43,17
-            2994: -41,14
+            2932: -44,16
+            2933: -43,17
+            2934: -41,14
         - node:
             cleanable: True
             color: '#1D1D21FF'
             id: DirtHeavy
           decals:
-            2917: -39,26
-            2918: -40,29
-            2919: -38,28
-            2920: -36,29
-            2921: -35,27
-            2922: -35,26
-            2923: -35,26
-            2924: -37,26
-            2925: -37,26
-            2926: -37,25
-            2927: -39,26
-            2928: -34,25
-            2929: -34,25
-            2930: -36,24
+            2857: -39,26
+            2858: -40,29
+            2859: -38,28
+            2860: -36,29
+            2861: -35,27
+            2862: -35,26
+            2863: -35,26
+            2864: -37,26
+            2865: -37,26
+            2866: -37,25
+            2867: -39,26
+            2868: -34,25
+            2869: -34,25
+            2870: -36,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavy
           decals:
-            2909: -36,26
-            2910: -35,27
-            2911: -37,26
-            2912: -37,27
-            2913: -37,25
-            2914: -39,26
-            2915: -38,27
-            2916: -38,28
+            2849: -36,26
+            2850: -35,27
+            2851: -37,26
+            2852: -37,27
+            2853: -37,25
+            2854: -39,26
+            2855: -38,27
+            2856: -38,28
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            6575: 89,-20
-            6576: 87,-21
-            6577: 92,-21
+            6419: 89,-20
+            6420: 87,-21
+            6421: 92,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2937: -8,-40
-            2938: -7,-39
-            2939: -5,-40
-            2940: -6,-42
-            2941: -4,-39
-            2942: -6,-40
-            2943: -6,-40
-            2944: -7,-40
-            2945: -7,-39
-            2946: -7,-39
-            2947: -8,-39
-            3622: -60,-66
-            3623: -59,-65
-            3624: -59,-63
-            3625: -59,-61
-            3626: -59,-59
-            3627: -59,-57
-            3628: -60,-57
-            3629: -57,-57
-            3630: -58,-58
-            3631: -56,-57
-            3632: -56,-58
-            3633: -56,-60
-            3634: -56,-62
-            3635: -56,-64
-            3636: -56,-66
-            3637: -58,-66
-            3638: -55,-56
-            3639: -54,-54
-            3640: -54,-52
-            3641: -54,-50
-            3642: -56,-53
-            3643: -56,-52
-            3644: -56,-47
-            3645: -53,-48
-            3646: -52,-46
-            3647: -54,-46
-            3648: -51,-46
-            3649: -50,-48
-            3650: -47,-48
-            3651: -45,-48
-            3652: -43,-46
-            3653: -45,-46
-            3654: -43,-48
-            3655: -42,-48
-            3656: -40,-48
-            3657: -40,-50
-            3658: -40,-52
-            3659: -40,-54
-            3660: -42,-51
-            3661: -42,-53
-            3662: -42,-54
-            3663: -41,-56
-            3664: -39,-57
-            3665: -40,-58
-            3666: -37,-57
-            3667: -37,-58
-            3668: -37,-61
-            3669: -37,-64
-            3670: -37,-65
-            3671: -36,-65
-            3672: -36,-66
-            3673: -39,-66
-            3674: -40,-65
-            3675: -40,-63
-            3676: -40,-60
-            3677: -47,-44
-            3678: -47,-42
-            3679: -47,-39
-            3680: -47,-35
-            3681: -47,-33
-            3682: -49,-33
-            3683: -49,-37
-            3684: -49,-39
-            3685: -49,-41
-            3686: -49,-44
-            3687: -49,-44
-            3688: -49,-43
-            3689: -44,-32
-            3690: -44,-30
-            3691: -43,-31
-            3692: -43,-27
-            3693: -44,-26
-            3694: -43,-26
-            3695: -44,-25
-            3696: -52,-32
-            3697: -52,-30
-            3698: -52,-29
-            3699: -52,-25
-            3700: -52,-22
-            3701: -54,-22
-            3702: -55,-22
-            3703: -52,-20
-            3704: -50,-20
-            3705: -47,-20
-            3706: -46,-20
-            3707: -45,-20
-            3708: -44,-20
-            3709: -44,-22
-            3710: -51,-18
-            3711: -51,-17
-            3712: -49,-17
-            3713: -48,-15
-            3714: -48,-13
-            3715: -50,-13
-            3716: -51,-14
-            3717: -51,-15
-            3718: -44,-15
-            3719: -46,-15
-            3720: -46,-14
-            3721: -54,-24
-            3722: -56,-24
-            3723: -54,-30
-            3724: -56,-29
-            3725: -57,-28
-            3726: -54,-28
-            3727: -61,-29
-            3728: -59,-29
-            3729: -59,-27
-            3730: -59,-25
-            3731: -61,-25
-            3732: -55,-17
-            3733: -55,-15
-            3734: -55,-13
-            3735: -55,-10
-            3736: -53,-17
-            3737: -53,-14
-            3738: -53,-12
-            3739: -53,-11
-            3740: -53,-9
-            3741: -53,-7
-            3742: -53,-6
-            3743: -53,-4
-            3744: -55,-3
-            3745: -55,-7
-            3746: -55,-8
-            3747: -53,0
-            3748: -53,-2
-            3749: -51,-4
-            3750: -49,-4
-            3751: -50,-5
-            3752: -48,-5
-            3761: -53,2
-            3762: -53,4
-            3763: -53,6
-            3764: -53,7
-            3765: -55,7
-            3766: -55,5
-            3767: -55,-1
-            3768: -51,6
-            3769: -50,7
-            3770: -47,7
-            3771: -48,6
-            3772: -46,6
-            3773: -45,7
-            3774: -47,9
-            3775: -45,9
-            3776: -44,9
-            3777: -50,9
-            3778: -50,9
-            3779: -51,11
-            3780: -51,13
-            3781: -50,13
-            3782: -48,13
-            3783: -46,13
-            3784: -48,12
-            3785: -43,11
-            3786: -44,12
-            3787: -43,13
-            3788: -43,12
-            3789: -54,10
-            3790: -53,9
-            3791: -54,9
-            3814: -43,1
-            3815: -40,2
-            3816: -39,1
-            3817: -39,1
-            3818: -40,-1
-            3819: -38,-1
-            3820: -40,-2
-            3821: -39,-2
-            3822: -40,-4
-            3823: -39,-5
-            3824: -38,-5
-            3825: -37,-5
-            3826: -36,-5
-            3827: -38,-4
-            3828: -36,-3
-            3829: -36,-2
-            3830: -36,-4
-            3831: -34,-3
-            3832: -32,-4
-            3833: -34,-1
-            3834: -32,0
-            3835: -35,0
-            3836: -39,3
-            3837: -40,4
-            3838: -38,4
-            3839: -33,1
-            3840: -31,2
-            3841: -31,-1
-            3842: -29,0
-            3843: -32,-2
-            3844: -31,-3
-            3845: -33,-4
-            3846: -32,-5
-            3847: -31,-4
-            3848: -30,-3
-            3849: -28,-3
-            3850: -28,-4
-            3851: -26,-5
-            3852: -27,-2
-            3853: -27,-3
-            3854: -29,0
-            3855: -27,0
-            3856: -27,2
-            3857: -28,3
-            3858: -27,3
-            3859: -27,1
-            3860: -26,-1
-            3861: -32,-1
-            3862: -28,4
-            3863: -26,5
-            3864: -26,6
-            3865: -26,3
-            3866: -26,3
-            3867: -24,2
-            3868: -23,1
-            3869: -25,0
-            3870: -23,-2
-            3871: -25,-3
-            3872: -23,-3
-            3873: -25,-4
-            3874: -23,-5
-            3875: -25,-5
-            3876: -24,-1
-            3877: -25,-1
-            3878: -23,3
-            3879: -15,-1
-            3880: -16,-1
-            3881: -15,0
-            3882: -16,1
-            3883: -16,3
-            3884: -15,3
-            3885: -15,2
-            3886: -15,1
-            3887: -15,1
-            3888: -27,6
-            3889: -27,7
-            3890: -27,9
-            3891: -20,5
-            3892: -21,5
-            3897: -17,5
-            3898: -16,5
-            3899: -16,5
-            3900: -22,11
-            3901: -21,11
-            3902: -22,13
-            3903: -20,14
-            3904: -22,13
-            3905: -22,15
-            3906: -20,14
-            3907: -20,13
-            3908: -20,12
-            3909: -19,11
-            3910: -22,14
-            3911: -23,14
-            3912: -17,11
-            3913: -17,11
-            3914: -17,12
-            3915: -16,11
-            3916: -16,12
-            3917: -17,13
-            3918: -16,14
-            3919: -17,14
-            3920: -16,12
-            3921: -17,12
-            3922: -17,11
-            3942: -39,11
-            3945: -27,11
-            3946: -27,13
-            3947: -27,16
-            3948: -27,17
-            3949: -27,19
-            3950: -27,20
-            3951: -27,21
-            3952: -25,18
-            3953: -25,16
-            3954: -25,14
-            3955: -25,12
-            3956: -25,11
-            3957: -24,18
-            3958: -22,18
-            3959: -23,17
-            3960: -21,17
-            3961: -20,18
-            3962: -19,17
-            3963: -20,20
-            3964: -22,20
-            3965: -24,20
-            3966: -20,21
-            3967: -17,19
-            3968: -16,19
-            3969: -14,19
-            3970: -17,21
-            3971: -15,21
-            3972: -13,21
-            3973: -11,21
-            3974: -13,19
-            3975: -10,19
-            3976: -8,19
-            3977: -6,19
-            3978: -9,21
-            3979: -7,21
-            3980: -5,21
-            3981: -3,21
-            3982: 0,21
-            3983: -5,19
-            3984: -2,19
-            3985: 0,19
-            3986: 0,21
-            3987: 2,21
-            3988: 5,21
-            3989: 6,21
-            3990: 2,19
-            3991: 4,19
-            3992: 7,19
-            3993: 10,19
-            3994: 8,21
-            3995: 10,21
-            3996: 11,21
-            3997: 13,21
-            3998: 12,19
-            3999: 14,19
-            4000: 15,19
-            4001: 17,19
-            4002: 15,23
-            4003: 14,23
-            4004: 13,24
-            4005: 15,25
-            4006: 15,24
-            4007: 11,23
-            4008: 10,23
-            4009: 11,24
-            4010: 17,23
-            4011: 17,25
-            4012: 17,25
-            4013: 16,23
-            4014: 18,19
-            4015: 19,19
-            4016: 19,21
-            4017: 17,21
-            4018: 16,21
-            4019: 21,20
-            4020: 21,18
-            4021: 21,17
-            4022: 19,18
-            4023: 19,15
-            4024: 19,12
-            4025: 19,11
-            4026: 21,16
-            4027: 21,13
-            4028: 21,12
-            4029: 21,10
-            4030: 21,8
-            4031: 21,7
-            4032: 19,9
-            4033: 19,7
-            4034: 19,6
-            4035: 23,10
-            4036: 24,10
-            4037: 26,10
-            4038: 27,10
-            4039: 28,7
-            4040: 27,8
-            4041: 27,6
-            4042: 28,6
-            4043: 30,6
-            4044: 30,8
-            4045: 30,9
-            4046: 30,10
-            4047: 33,10
-            4048: 34,10
-            4049: 31,12
-            4050: 31,13
-            4051: 30,14
-            4052: 31,17
-            4053: 30,17
-            4054: 31,19
-            4055: 31,20
-            4056: 31,22
-            4057: 30,22
-            4058: 28,22
-            4059: 29,23
-            4060: 26,22
-            4061: 24,22
-            4062: 23,22
-            4063: 23,23
-            4064: 23,20
-            4065: 23,18
-            4066: 25,18
-            4067: 25,17
-            4068: 26,18
-            4069: 27,17
-            4070: 26,19
-            4071: 27,20
-            4072: 29,18
-            4073: 27,18
-            4074: 30,17
-            4075: 33,22
-            4076: 35,22
-            4077: 33,19
-            4078: 33,18
-            4079: 35,18
-            4080: 36,17
-            4081: 34,17
-            4082: 35,17
-            4083: 33,13
-            4084: 33,15
-            4085: 33,15
-            4086: 32,13
-            4087: 26,7
-            4088: 23,2
-            4089: 26,2
-            4090: 20,2
-            4091: 21,2
-            4092: 19,4
-            4098: 31,2
-            4099: 33,2
-            4100: 33,4
-            4101: 32,4
-            4102: 35,4
-            4103: 37,4
-            4104: 37,2
-            4105: 40,2
-            4106: 41,2
-            4107: 41,1
-            4108: 38,2
-            4109: 39,-4
-            4110: 37,-4
-            4111: 39,-5
-            4112: 33,-1
-            4113: 31,-1
-            4114: 31,0
-            4115: 33,0
-            4116: 32,1
-            4117: 38,7
-            4118: 46,11
-            4119: 47,13
-            4120: 44,11
-            4121: 44,13
-            4122: 42,12
-            4123: 42,11
-            4124: 44,12
-            4125: 54,14
-            4126: 58,14
-            4127: 59,14
-            4128: 60,14
-            4129: 58,16
-            4130: 55,10
-            4131: 55,12
-            4132: 54,12
-            4133: 54,6
-            4134: 59,3
-            4135: 60,4
-            4136: 59,0
-            4137: 55,-5
-            4138: 56,-4
-            4139: 57,-5
-            4140: 58,-7
-            4141: 59,-8
-            4142: 60,-7
-            4143: 41,-1
-            4144: 41,-3
-            4145: 41,-5
-            4146: 41,-7
-            4147: 41,-10
-            4148: 41,-11
-            4149: 43,-12
-            4150: 43,-14
-            4151: 43,-16
-            4152: 43,-17
-            4153: 41,-15
-            4154: 41,-16
-            4155: 41,-17
-            4156: 41,-19
-            4157: 40,-19
-            4158: 40,-21
-            4159: 42,-21
-            4160: 43,-21
-            4161: 45,-21
-            4166: 45,-19
-            4167: 47,-19
-            4168: 48,-19
-            4169: 51,-19
-            4170: 47,-21
-            4171: 49,-21
-            4172: 47,-22
-            4173: 51,-21
-            4174: 52,-21
-            4175: 52,-23
-            4176: 53,-24
-            4177: 56,-24
-            4178: 57,-24
-            4179: 58,-24
-            4180: 58,-23
-            4181: 59,-21
-            4182: 60,-21
-            4183: 61,-20
-            4184: 59,-19
-            4185: 61,-19
-            4186: 60,-17
-            4187: 60,-17
-            4188: 58,-18
-            4189: 58,-19
-            4190: 56,-19
-            4191: 55,-19
-            4192: 53,-19
-            4193: 60,-15
-            4194: 58,-15
-            4195: 59,-14
-            4196: 57,-13
-            4197: 57,-12
-            4198: 60,-13
-            4199: 60,-12
-            4200: 60,-14
-            4201: 61,-13
-            4202: 63,-13
-            4203: 64,-12
-            4204: 65,-14
-            4205: 63,-14
-            4206: 63,-16
-            4207: 65,-16
-            4208: 65,-18
-            4209: 65,-20
-            4210: 63,-18
-            4211: 63,-20
-            4212: 63,-21
-            4213: 65,-21
-            4214: 62,-23
-            4215: 61,-24
-            4216: 64,-24
-            4217: 63,-25
-            4218: 64,-26
-            4219: 65,-27
-            4220: 66,-26
-            4221: 65,-24
-            4222: 65,-23
-            4223: 65,-23
-            4227: 68,-21
-            4228: 69,-21
-            4229: 69,-23
-            4230: 69,-24
-            4232: 69,-27
-            4233: 70,-26
-            4234: 70,-26
-            4235: 71,-27
-            4236: 71,-28
-            4237: 70,-28
-            4238: 68,-28
-            4239: 69,-29
-            4240: 70,-30
-            4241: 69,-30
-            4242: 70,-29
-            4243: 70,-29
-            4244: 70,-29
-            4245: 71,-30
-            4246: 71,-17
-            4247: 68,-17
-            4248: 67,-19
-            4249: 70,-17
-            4250: 70,-19
-            4251: 71,-18
-            4252: 68,-18
-            4253: 69,-19
-            4273: 69,-9
-            4274: 68,-9
-            4275: 67,-9
-            4276: 70,-10
-            4277: 77,-18
-            4278: 75,-18
-            4279: 76,-19
-            4280: 77,-18
-            4281: 76,-17
-            4282: 76,-15
-            4283: 75,-15
-            4284: 76,-13
-            4285: 77,-14
-            4286: 74,-14
-            4287: 74,-16
-            4288: 73,-14
-            4289: 74,-17
-            4290: 74,-18
-            4291: 72,-17
-            4292: 73,-19
-            4293: 73,-17
-            4294: 74,-16
-            4295: 73,-15
-            4296: 74,-16
-            4297: 74,-15
-            4298: 76,-18
-            4299: 79,-14
-            4300: 80,-13
-            4301: 81,-14
-            4302: 79,-14
-            4303: 80,-15
-            4304: 81,-13
-            4305: 80,-19
-            4306: 79,-18
-            4307: 80,-18
-            4308: 80,-19
-            4309: 79,-19
-            4310: 80,-19
-            4311: 81,-19
-            4312: 80,-17
-            4313: 80,-18
-            4314: 79,-19
-            4315: 50,-13
-            4316: 51,-14
-            4317: 50,-13
-            4318: 51,-13
-            4319: 50,-14
-            4320: 50,-14
-            4321: 48,-13
-            4322: 48,-14
-            4323: 48,-13
-            4324: 53,-13
-            4325: 53,-14
-            4326: 53,-12
-            4327: 53,-14
-            4328: 53,-13
-            4329: 53,-14
-            4330: 50,-15
-            4331: 51,-15
-            4332: 50,-14
-            4333: 51,-13
-            4334: 50,-12
-            4335: 50,-12
-            4336: 48,-12
-            4337: 50,-12
-            4338: 51,-13
-            4339: 47,-24
-            4340: 49,-25
-            4341: 48,-26
-            4342: 47,-25
-            4343: 49,-25
-            4344: 48,-23
-            4345: 47,-28
-            4346: 49,-29
-            4347: 47,-30
-            4348: 48,-32
-            4349: 49,-31
-            4350: 48,-33
-            4351: 47,-33
-            4352: 49,-33
-            4353: 48,-34
-            4354: 47,-34
-            4355: 43,-36
-            4356: 40,-36
-            4357: 37,-35
-            4358: 36,-35
-            4359: 37,-36
-            4360: 40,-36
-            4361: 43,-35
-            4362: 43,-35
-            4363: 41,-35
-            4364: 43,-35
-            4365: 43,-34
-            4391: 33,-34
-            4392: 31,-34
-            4393: 33,-32
-            4394: 32,-32
-            4395: 32,-31
-            4396: 32,-30
-            4397: 33,-28
-            4398: 31,-29
-            4399: 33,-31
-            4400: 33,-31
-            4401: 35,-30
-            4402: 36,-30
-            4403: 36,-29
-            4404: 33,-25
-            4405: 31,-25
-            4406: 33,-25
-            4407: 31,-25
-            4408: 33,-25
-            4409: 32,-26
-            4410: 31,-25
-            4411: 32,-24
-            4412: 32,-25
-            4413: 31,-24
-            4414: 40,-25
-            4415: 39,-24
-            4416: 40,-26
-            4417: 42,-25
-            4418: 42,-25
-            4419: 44,-24
-            4420: 42,-25
-            4421: 44,-25
-            4422: 45,-25
-            4423: 42,-26
-            4424: 43,-25
-            4425: 43,-25
-            4426: 41,-25
-            4427: 40,-25
-            4428: 40,-25
-            4429: 40,-24
-            4430: 35,-23
-            4431: 37,-23
-            4432: 36,-23
-            4433: 35,-23
-            4434: 38,-21
-            4435: 35,-21
-            4436: 33,-21
-            4437: 33,-22
-            4438: 32,-22
-            4439: 32,-21
-            4440: 37,-19
-            4441: 34,-19
-            4442: 32,-19
-            4443: 31,-19
-            4444: 28,-19
-            4445: 27,-19
-            4446: 27,-20
-            4447: 27,-21
-            4448: 30,-21
-            4449: 29,-21
-            4450: 29,-23
-            4451: 29,-24
-            4452: 29,-25
-            4453: 29,-26
-            4454: 27,-22
-            4455: 27,-24
-            4456: 27,-25
-            4457: 26,-25
-            4458: 25,-25
-            4459: 29,-27
-            4460: 27,-27
-            4461: 25,-27
-            4462: 24,-27
-            4463: 21,-27
-            4464: 21,-25
-            4465: 20,-25
-            4466: 19,-25
-            4467: 19,-26
-            4468: 19,-28
-            4469: 19,-28
-            4470: 19,-30
-            4471: 19,-31
-            4472: 19,-32
-            4473: 21,-30
-            4474: 21,-33
-            4475: 21,-34
-            4476: 21,-34
-            4477: 19,-34
-            4478: 20,-36
-            4479: 20,-37
-            4480: 19,-37
-            4481: 20,-39
-            4482: 21,-38
-            4483: 22,-39
-            4484: 21,-37
-            4485: 24,-37
-            4486: 23,-38
-            4487: 25,-37
-            4488: 25,-38
-            4489: 24,-38
-            4490: 25,-38
-            4491: 17,-34
-            4492: 17,-35
-            4493: 16,-34
-            4494: 14,-34
-            4495: 17,-32
-            4496: 15,-32
-            4497: 13,-32
-            4498: 11,-32
-            4499: 10,-32
-            4500: 12,-34
-            4501: 9,-34
-            4502: 8,-34
-            4503: 7,-34
-            4504: 7,-32
-            4505: 7,-32
-            4506: 6,-32
-            4507: 9,-30
-            4508: 8,-29
-            4509: 7,-29
-            4510: 7,-29
-            4511: 6,-28
-            4512: 8,-27
-            4513: 9,-27
-            4514: 7,-28
-            4515: 6,-27
-            4516: 5,-29
-            4517: 7,-30
-            4518: 9,-30
-            4519: 3,-30
-            4520: 1,-30
-            4521: 3,-32
-            4522: 2,-32
-            4523: 2,-33
-            4524: 0,-33
-            4525: -1,-33
-            4526: -1,-32
-            4527: 0,-30
-            4528: -3,-30
-            4529: -4,-30
-            4530: -6,-30
-            4531: -7,-30
-            4532: -9,-30
-            4533: -6,-32
-            4534: -5,-32
-            4535: -3,-32
-            4536: -8,-32
-            4537: -8,-33
-            4538: -9,-32
-            4539: -10,-32
-            4540: -11,-32
-            4541: -13,-32
-            4542: -10,-30
-            4543: -11,-30
-            4544: -13,-30
-            4545: -15,-30
-            4546: -16,-30
-            4547: -12,-29
-            4548: -12,-30
-            4549: -16,-32
-            4550: -17,-33
-            4551: -17,-32
-            4552: -19,-32
-            4553: -18,-30
-            4554: -20,-30
-            4555: -22,-30
-            4556: -23,-30
-            4557: -23,-29
-            4558: -22,-32
-            4559: -24,-32
-            4560: -24,-32
-            4561: -26,-30
-            4562: -26,-29
-            4563: -26,-27
-            4564: -26,-25
-            4565: -24,-27
-            4566: -24,-26
-            4567: -24,-25
-            4568: -24,-24
-            4569: -26,-23
-            4570: -26,-22
-            4571: -26,-20
-            4572: -24,-21
-            4573: -24,-19
-            4574: -24,-18
-            4575: -24,-16
-            4576: -26,-17
-            4577: -26,-16
-            4578: -26,-14
-            4579: -26,-13
-            4580: -26,-12
-            4581: -26,-10
-            4582: -26,-9
-            4583: -25,-9
-            4584: -24,-11
-            4585: -23,-11
-            4586: -23,-10
-            4587: -23,-9
-            4588: -24,-5
-            4589: -24,-4
-            4590: -24,-2
-            4591: -19,-11
-            4592: -19,-10
-            4593: -20,-10
-            4594: -20,-9
-            4595: -19,-9
-            4596: -30,-21
-            4597: -30,-19
-            4598: -29,-19
-            4599: -30,-18
-            4600: -32,-21
-            4601: -32,-19
-            4602: -33,-18
-            4603: -34,-18
-            4604: -36,-15
-            4605: -36,-14
-            4606: -33,-14
-            4607: -33,-14
-            4608: -33,-15
-            4609: -30,-14
-            4610: -36,-10
-            4611: -37,-9
-            4612: -37,-10
-            4613: -29,-10
-            4614: -30,-11
-            4615: -30,-9
-            4616: -28,-10
-            4617: -40,-11
-            4618: -41,-10
-            4619: -41,-9
-            4620: -40,-9
-            4621: -41,-10
-            4622: -41,-10
-            4623: -49,-18
-            4624: -38,-33
-            4625: -36,-33
-            4626: -33,-33
-            4627: -32,-33
-            4628: -31,-33
-            4629: -31,-31
-            4630: -31,-29
-            4631: -31,-28
-            4632: -31,-26
-            4633: -33,-26
-            4634: -35,-26
-            4635: -36,-26
-            4636: -37,-26
-            4637: -38,-26
-            4638: -38,-27
-            4639: -38,-29
-            4640: -38,-30
-            4641: -38,-31
-            4642: -38,-29
-            4643: -38,-26
-            4644: -40,-26
-            4645: -40,-25
-            4646: -41,-25
-            4647: -41,-26
-            4648: -41,-28
-            4649: -41,-29
-            4650: -41,-30
-            4651: -41,-32
-            4652: -41,-33
-            4653: -41,-34
-            4654: -39,-33
-            4655: -40,-34
-            4656: -35,-34
-            4657: -34,-34
-            4658: -32,-34
-            4659: -31,-34
-            4660: -30,-34
-            4661: -30,-33
-            4662: -28,-34
-            4663: -28,-32
-            4664: -28,-31
-            4665: -28,-29
-            4666: -28,-27
-            4667: -28,-26
-            4668: -29,-25
-            4669: -30,-25
-            4670: -30,-26
-            4671: -32,-25
-            4672: -33,-26
-            4673: -35,-25
-            4674: -32,6
-            4675: -32,7
-            4676: -32,6
-            4677: -36,6
-            4678: -36,5
-            4679: -36,7
-            4680: -34,6
-            4681: -34,5
-            4682: -35,6
-            4683: -33,6
-            4684: -35,-4
-            4685: -35,-2
-            4686: -36,-5
-            4687: -35,-2
-            4688: -34,-2
-            4689: -35,-1
-            4701: -25,28
-            4702: -26,28
-            4703: -18,32
-            4704: -17,31
-            4705: -17,33
-            4706: -18,32
-            4707: -15,34
-            4708: -15,32
-            4709: -15,31
-            4710: -13,31
-            4711: -12,31
-            4712: -15,34
-            4713: -15,34
-            4714: -12,39
-            4715: -13,40
-            4716: -14,40
-            4717: -15,40
-            4718: -16,40
-            4719: -16,40
-            4720: -13,40
-            4721: -12,40
-            4722: -12,38
-            4723: -12,40
-            4729: -5,40
-            4730: -6,40
-            4731: -6,42
-            4732: -6,43
-            4733: -5,42
-            4734: -6,43
-            4735: -6,45
-            4736: -6,46
-            4737: -6,47
-            4738: -5,46
-            4739: -4,48
-            4740: -5,46
-            4741: -2,48
-            4742: -4,46
-            4743: -1,47
-            4744: -3,45
-            4745: 0,46
-            4746: -3,47
-            4747: -1,45
-            4748: -3,46
-            4749: 1,45
-            4750: 1,47
-            4751: 0,46
-            4752: 1,48
-            4753: 2,48
-            4754: 3,47
-            4755: 2,45
-            4756: 2,44
-            4757: 2,43
-            4758: 2,42
-            4759: 1,42
-            4760: 3,42
-            4761: -2,43
-            4762: -1,41
-            4763: -3,40
-            4764: -3,40
-            4765: 1,51
-            4766: -2,50
-            4767: -3,50
-            4768: -2,51
-            4769: 0,51
-            4770: -1,52
-            4771: -2,51
-            4772: -2,53
-            4773: 1,53
-            4774: 2,51
-            4775: 2,50
-            4776: 0,50
-            4777: -4,45
-            4778: -4,47
-            4805: 6,42
-            4806: 5,41
-            4807: 5,39
-            4808: 7,39
-            4809: 8,39
-            4810: 9,41
-            4811: 9,40
-            4812: 8,42
-            4813: 8,41
-            4814: 15,37
-            4815: 14,37
-            4816: 14,35
-            4817: 14,34
-            4818: 13,35
-            4819: 13,36
-            4820: 15,34
-            4821: 16,35
-            4822: 15,36
-            4823: 15,34
-            4824: 15,35
-            4825: 15,37
-            4826: 14,37
-            4827: 15,30
-            4828: 14,29
-            4829: 14,29
-            4830: 15,28
-            4831: 14,29
-            4832: 14,32
-            4833: 13,32
-            4834: 15,24
-            4858: 2,24
-            4859: 1,24
-            4860: 1,24
-            4861: 2,23
-            4862: 4,23
-            4863: 4,24
-            4864: 3,26
-            4865: 4,28
-            4866: 2,27
-            4867: 2,27
-            4868: 3,27
-            4869: -2,25
-            4870: -3,25
-            4871: -3,23
-            4872: -2,24
-            4873: -4,23
-            4874: -4,25
-            4910: -14,28
-            4911: -15,28
-            4912: -14,29
-            4913: -13,26
-            4914: -10,26
-            4915: -9,27
-            4916: -10,28
-            4917: -7,28
-            4918: -8,26
-            4919: -5,28
-            4920: -7,24
-            4921: -8,24
-            4922: -7,23
-            4923: -6,24
-            4924: -6,23
-            4925: -7,23
-            4926: -8,23
-            4927: -8,23
-            4928: -12,23
-            4929: -11,24
-            4930: -10,23
-            4931: -10,24
-            4932: -10,24
-            4933: -12,24
-            4934: -12,24
-            4935: -14,24
-            4936: -14,23
-            4937: -16,24
-            4938: -14,24
-            4939: -15,23
-            4940: -16,24
-            4941: -14,25
-            4942: -10,25
-            4943: -7,25
-            4944: -1,28
-            4945: -3,27
-            4946: -1,30
-            4947: -1,33
-            4948: -1,34
-            4949: -1,37
-            4950: -3,37
-            4951: -3,38
-            4952: -1,37
-            4953: -2,37
-            4954: -1,40
-            4955: -3,41
-            4956: -3,43
-            4957: -2,43
-            4958: -20,25
-            4959: -21,25
-            4960: -19,25
-            4961: -21,25
-            4962: -22,17
-            4963: -23,17
-            4964: -22,5
-            4965: -22,5
-            4966: -22,5
-            4967: -19,-28
-            4968: -16,-28
-            4969: -16,-27
-            4970: -15,-28
-            4971: -16,-26
-            4972: -15,-27
-            4973: -15,-28
-            4974: -15,-26
-            4975: -15,-26
-            4976: -14,-26
-            4987: -25,-34
-            4988: -23,-34
-            4989: -22,-34
-            4990: -21,-34
-            4991: -20,-34
-            4992: -20,-37
-            4993: -20,-36
-            4994: -19,-38
-            4995: -19,-36
-            4996: -22,-37
-            4997: -23,-37
-            4998: -23,-38
-            4999: -23,-36
-            5000: -24,-37
-            5001: -26,-37
-            5002: -26,-36
-            5003: -26,-37
-            5004: -28,-40
-            5005: -27,-40
-            5006: -25,-40
-            5007: -24,-40
-            5008: -23,-40
-            5009: -21,-40
-            5010: -19,-40
-            5011: -21,-40
-            5012: -24,-40
-            5013: -26,-40
-            5014: -32,-40
-            5015: -31,-40
-            5016: -33,-39
-            5017: -33,-40
-            5018: -32,-39
-            5019: -31,-39
-            5020: -34,-39
-            5021: -33,-40
-            5022: -39,-38
-            5023: -38,-38
-            5032: -38,-53
-            5033: -38,-54
-            5034: -37,-53
-            5035: -37,-54
-            5036: -14,-39
-            5037: -13,-38
-            5038: -13,-39
-            5039: -13,-40
-            5040: -13,-41
-            5041: -13,-39
-            5042: -13,-40
-            5043: -13,-41
-            5044: -13,-39
-            5045: -13,-40
-            5046: -13,-39
-            5047: -13,-40
-            5050: -5,-41
-            5051: -5,-40
-            5052: -6,-42
-            5053: -5,-36
-            5054: -6,-36
-            5055: -4,-35
-            5056: -4,-36
-            5057: 0,-36
-            5058: -2,-36
-            5059: 1,-35
-            5060: 1,-37
-            5061: 1,-38
-            5062: 2,-37
-            5063: 2,-38
-            5064: 0,-37
-            5065: 3,-37
-            5066: -1,-36
-            5070: -6,-28
-            5071: -6,-27
-            5072: -5,-27
-            5073: -6,-26
-            5074: -2,-27
-            5075: -3,-26
-            5076: -2,-28
-            5077: -1,-27
-            5078: 0,-27
-            5079: 0,-27
-            5080: -2,-27
-            5081: -2,-27
-            5082: 0,-24
-            5083: -2,-24
-            5084: -2,-23
-            5085: 0,-22
-            5086: 1,-22
-            5087: 1,-21
-            5088: -4,-19
-            5089: -5,-19
-            5090: -7,-19
-            5091: -9,-19
-            5092: -6,-19
-            5093: -7,-17
-            5094: -8,-17
-            5095: -9,-16
-            5096: -9,-16
-            5097: -5,-16
-            5098: -4,-14
-            5099: -5,-15
-            5100: -8,-16
-            5101: -8,-15
-            5102: -14,-14
-            5103: -12,-14
-            5104: -12,-16
-            5105: -13,-18
-            5106: -14,-16
-            5107: -13,-16
-            5108: -13,-19
-            5109: -14,-19
-            5110: -2,-17
-            5111: -2,-15
-            5112: -2,-13
-            5113: -2,-12
-            5114: -1,-15
-            5115: -1,-16
-            5116: -1,-17
-            5117: 1,-17
-            5118: -1,-18
-            5119: 2,-18
-            5120: 2,-16
-            5121: 2,-15
-            5122: 2,-13
-            5123: 1,-12
-            5124: 1,-14
-            5125: -1,-13
-            5126: 0,-14
-            5127: 2,-16
-            5128: -4,-14
-            5129: -7,-24
-            5130: -7,-22
-            5131: -8,-23
-            5132: -10,-23
-            5133: -9,-23
-            5134: -1,-24
-            5135: 8,-23
-            5136: 8,-22
-            5137: 10,-22
-            5138: 9,-23
-            5139: 8,-25
-            5140: 8,-21
-            5141: 8,-19
-            5142: 8,-18
-            5143: 6,-18
-            5144: 5,-18
-            5145: 0,-27
-            5146: 2,-27
-            5147: 10,-23
-            5148: 13,-23
-            5149: 12,-23
-            5150: 13,-21
-            5151: 14,-22
-            5152: 13,-18
-            5153: 14,-18
-            5154: 14,-17
-            5155: 12,-18
-            5156: 11,-18
-            5157: 11,-16
-            5158: 13,-17
-            5159: 11,-30
-            5160: 11,-28
-            5161: 11,-27
-            5162: 11,-26
-            5163: 17,-26
-            5164: 17,-28
-            5165: 17,-28
-            5166: 17,-30
-            5167: 17,-30
-            5168: 18,-23
-            5169: 20,-22
-            5170: 21,-23
-            5171: 19,-22
-            5172: 21,-22
-            5173: 20,-21
-            5174: 24,-22
-            5175: 23,-23
-            5176: 23,-21
-            5177: 23,-23
-            5178: 17,-16
-            5179: 19,-14
-            5180: 18,-13
-            5181: 20,-13
-            5182: 19,-12
-            5183: 22,-11
-            5184: 22,-13
-            5185: 20,-11
-            5186: 24,-13
-            5187: 26,-11
-            5188: 21,-11
-            5189: 20,-11
-            5190: 25,-13
-            5191: 22,-13
-            5192: 23,-12
-            5193: 26,-12
-            5194: 19,-12
-            5195: 23,-13
-            5196: 23,-11
-            5197: 19,-10
-            5198: 26,-11
-            5199: 28,-12
-            5200: 25,-12
-            5201: 23,-16
-            5202: 23,-16
-            5203: 13,-19
-            5204: 23,-34
-            5205: 23,-31
-            5206: 23,-30
-            5207: 23,-29
-            5208: 23,-32
-            5209: 29,-34
-            5210: 29,-33
-            5211: 29,-32
-            5212: 29,-30
-            5213: 29,-29
-            5214: 32,-34
-            5215: 32,-31
-            5216: 32,-30
-            5217: 36,-30
-            5218: 35,-29
-            5219: 33,-26
-            5220: 36,-21
-            5221: 38,-16
-            5222: 37,-15
-            5223: 39,-16
-            5224: 38,-17
-            5225: 38,-15
-            5226: 37,-15
-            5227: 62,-31
-            5228: 62,-33
-            5229: 61,-31
-            5230: 63,-33
-            5231: 63,-33
-            5232: 63,-32
-            5233: 62,-32
-            5234: 62,-32
-            5235: 64,8
-            5236: 63,9
-            5237: 65,9
-            5238: 64,8
-            5239: 64,9
-            5240: 64,10
-            5241: 67,6
-            5242: 68,4
-            5243: 68,6
-            5244: 67,5
-            5245: 68,0
-            5246: 68,1
-            5247: 68,2
-            5248: 67,0
-            5249: 68,-2
-            5250: 67,-3
-            5251: 68,-4
-            5252: 68,-3
-            5253: 68,-3
-            5254: 76,-6
-            5260: 54,-30
-            5261: 52,-31
-            5262: 51,-31
-            5263: 52,-33
-            5264: 52,-34
-            5265: 51,-33
-            5266: 51,-32
-            5267: 52,-35
-            5268: 51,-33
-            5269: 51,-31
-            5270: 52,-35
-            5271: 52,-35
-            5272: 55,-35
-            5273: 54,-34
-            5274: 56,-33
-            5275: 57,-33
-            5276: 55,-34
-            5277: 55,-36
-            5278: 54,-35
-            5279: 55,-34
-            5280: 54,-35
-            5281: 55,-35
-            5282: 55,-34
-            5283: 40,-31
-            5284: 40,-30
-            5285: 40,-30
-            5286: 41,-31
-            5287: 41,-29
-            5288: 42,-29
-            5289: 43,-29
-            5290: 44,-29
-            5291: 44,-31
-            5292: 43,-30
-            5293: 33,-29
-            5294: 15,-39
-            5295: 14,-39
-            5296: 14,-39
-            5297: 9,-40
-            5298: 9,-39
-            5299: 9,-41
-            5300: 8,-40
-            5301: 19,-45
-            5302: 17,-45
-            5303: 16,-44
-            5304: 16,-45
-            5305: 16,-43
-            5306: 19,-45
-            5307: 20,-44
-            5308: 20,-45
-            5309: 18,-44
-            5310: 21,-45
-            5311: 21,-43
-            5312: 15,-48
-            5313: 14,-48
-            5314: 12,-47
-            5315: 12,-48
-            5316: 14,-48
-            5317: 16,-47
-            5318: 14,-48
-            5319: 13,-48
-            5320: 15,-47
-            5327: 21,-54
-            5328: 20,-54
-            5329: 18,-54
-            5330: 16,-54
-            5331: 16,-55
-            5332: 18,-53
-            5333: 19,-53
-            5334: 21,-55
-            5335: 21,-58
-            5336: 21,-59
-            5337: 20,-58
-            5338: 18,-58
-            5339: 17,-58
-            5340: 16,-58
-            5341: 16,-59
-            5342: 19,-59
-            5343: 19,-59
-            5344: 18,-59
-            5345: 27,-46
-            5346: 26,-45
-            5347: 26,-44
-            5348: 27,-45
-            5349: 27,-45
-            5350: 28,-42
-            5351: 29,-42
-            5352: 29,-40
-            5353: 28,-39
-            5354: 28,-39
-            5355: 28,-40
-            5356: 29,-47
-            5357: 28,-47
-            5358: 66,-52
-            5359: 65,-51
-            5360: 66,-52
-            5361: 66,-51
-            5362: 65,-52
-            5363: 66,-51
-            5364: 27,15
-            5365: 28,15
-            5366: 27,14
-            5367: 27,12
-            5368: -23,34
-            5369: -23,35
-            5370: -22,34
-            5371: -27,36
-            5372: -27,34
-            5373: -28,35
-            5374: -27,35
-            5375: -29,36
-            5376: -30,37
-            5377: -30,38
-            5378: -28,35
-            5379: -28,34
-            5380: -29,35
-            5381: -26,36
-            5382: -25,38
-            5383: -26,37
-            5384: -32,36
-            5385: -33,35
-            5386: -33,37
-            5387: -33,35
-            5388: -34,36
-            5389: -33,38
-            5390: -33,35
-            5391: -36,5
-            5392: -42,6
-            5393: -43,4
-            5394: -43,6
-            5395: -42,7
-            5396: -51,9
-            5397: -49,13
-            5398: -42,-5
-            5399: -43,-5
-            5400: -42,-3
-            5401: -45,-4
-            5402: -45,-5
-            5403: -46,-4
-            5404: -43,-3
-            5405: -43,-2
-            5406: -42,-2
-            5407: -60,-29
-            5408: -60,-29
-            5409: -57,-36
-            5410: -58,-36
-            5411: -59,-36
-            5412: -57,-37
-            5413: -58,-35
-            5414: -58,-34
-            5415: -57,-35
-            5416: -59,-34
-            5417: -58,-34
-            5418: -59,-34
-            5419: -60,-34
-            5420: -60,-35
-            5421: -61,-21
-            5422: -62,-21
-            5423: -62,-20
-            5424: -61,-20
-            5425: -61,-20
-            5426: 13,35
-            6077: 52,20
-            6078: 51,21
-            6079: 53,20
-            6080: 53,21
-            6181: 46,14
-            6182: 45,15
-            6183: 46,16
-            6388: 49,-7
-            6389: 48,-6
-            6390: 48,-4
-            6391: 49,-4
-            6392: 52,-7
-            6393: 52,-5
-            6394: 51,-6
-            6395: 52,-2
-            6396: 52,-3
-            6397: 48,-1
-            6398: 48,-2
-            6418: 49,-12
-            6419: 49,-14
-            6420: 49,-15
-            6421: 49,-13
-            6422: 52,-14
-            6423: 52,-13
-            6424: 52,-12
-            6425: 52,-15
-            6426: 52,-15
-            6427: 52,-10
-            6428: 51,1
-            6429: 51,3
-            6430: 51,4
-            6431: 51,8
-            6432: 51,9
-            6433: 51,11
-            6434: 51,13
-            6435: 49,13
-            6436: 49,11
-            6437: 49,9
-            6438: 49,7
-            6439: 49,5
-            6440: 49,3
-            6441: 49,1
-            6454: 42,9
-            6455: 43,9
-            6456: 42,7
-            6457: 43,7
-            6458: 45,7
-            6459: 45,9
-            6460: 46,7
-            6461: 40,4
-            6462: 42,4
-            6463: 43,4
-            6464: 43,2
-            6465: 43,1
-            6466: 43,-2
-            6467: 43,-4
-            6468: 43,-7
-            6469: 43,-6
-            6470: 43,-10
-            6471: 43,-11
-            6472: 45,5
-            6473: 42,5
-            6474: 41,5
-            6553: 90,-18
-            6554: 89,-18
-            6634: 51,-39
-            6635: 52,-39
-            6636: 54,-39
-            6637: 52,-37
-            6647: 51,-30
-            6648: 52,-29
-            6670: -33,-12
-            6671: -33,-10
-            6687: -36,-45
-            6688: -35,-44
-            6689: -35,-46
-            6781: 14,39
-            6782: 13,40
-            6783: 15,42
-            6784: 15,41
-            6785: 16,39
-            6845: 8,-47
-            7124: -34,14
-            7125: -33,15
-            7126: -30,15
-            7127: -31,16
-            7128: -30,17
-            7129: -29,14
-            7130: -29,12
-            7131: -32,12
-            7132: -35,14
-            7133: -37,14
-            7134: -38,13
+            2877: -8,-40
+            2878: -7,-39
+            2879: -5,-40
+            2880: -6,-42
+            2881: -4,-39
+            2882: -6,-40
+            2883: -6,-40
+            2884: -7,-40
+            2885: -7,-39
+            2886: -7,-39
+            2887: -8,-39
+            3547: -60,-66
+            3548: -59,-65
+            3549: -59,-63
+            3550: -59,-61
+            3551: -59,-59
+            3552: -59,-57
+            3553: -60,-57
+            3554: -57,-57
+            3555: -58,-58
+            3556: -56,-57
+            3557: -56,-58
+            3558: -56,-60
+            3559: -56,-62
+            3560: -56,-64
+            3561: -56,-66
+            3562: -58,-66
+            3563: -55,-56
+            3564: -54,-54
+            3565: -54,-52
+            3566: -54,-50
+            3567: -56,-53
+            3568: -56,-52
+            3569: -56,-47
+            3570: -53,-48
+            3571: -52,-46
+            3572: -54,-46
+            3573: -51,-46
+            3574: -50,-48
+            3575: -47,-48
+            3576: -45,-48
+            3577: -43,-46
+            3578: -45,-46
+            3579: -43,-48
+            3580: -42,-48
+            3581: -40,-48
+            3582: -40,-50
+            3583: -40,-52
+            3584: -40,-54
+            3585: -42,-51
+            3586: -42,-53
+            3587: -42,-54
+            3588: -41,-56
+            3589: -39,-57
+            3590: -40,-58
+            3591: -37,-57
+            3592: -37,-58
+            3593: -37,-61
+            3594: -37,-64
+            3595: -37,-65
+            3596: -36,-65
+            3597: -36,-66
+            3598: -39,-66
+            3599: -40,-65
+            3600: -40,-63
+            3601: -40,-60
+            3602: -47,-44
+            3603: -47,-42
+            3604: -47,-39
+            3605: -47,-35
+            3606: -47,-33
+            3607: -49,-33
+            3608: -49,-37
+            3609: -49,-39
+            3610: -49,-41
+            3611: -49,-44
+            3612: -49,-44
+            3613: -49,-43
+            3614: -44,-32
+            3615: -44,-30
+            3616: -43,-31
+            3617: -43,-27
+            3618: -44,-26
+            3619: -43,-26
+            3620: -44,-25
+            3621: -52,-32
+            3622: -52,-30
+            3623: -52,-29
+            3624: -52,-25
+            3625: -52,-22
+            3626: -54,-22
+            3627: -55,-22
+            3628: -52,-20
+            3629: -50,-20
+            3630: -47,-20
+            3631: -46,-20
+            3632: -45,-20
+            3633: -44,-20
+            3634: -44,-22
+            3635: -51,-18
+            3636: -51,-17
+            3637: -49,-17
+            3638: -48,-15
+            3639: -48,-13
+            3640: -50,-13
+            3641: -51,-14
+            3642: -51,-15
+            3643: -44,-15
+            3644: -46,-15
+            3645: -46,-14
+            3646: -54,-24
+            3647: -56,-24
+            3648: -54,-30
+            3649: -56,-29
+            3650: -57,-28
+            3651: -54,-28
+            3652: -61,-29
+            3653: -59,-29
+            3654: -59,-27
+            3655: -59,-25
+            3656: -61,-25
+            3657: -55,-17
+            3658: -55,-15
+            3659: -55,-13
+            3660: -55,-10
+            3661: -53,-17
+            3662: -53,-14
+            3663: -53,-12
+            3664: -53,-11
+            3665: -53,-9
+            3666: -53,-7
+            3667: -53,-6
+            3668: -53,-4
+            3669: -55,-3
+            3670: -55,-7
+            3671: -55,-8
+            3672: -53,0
+            3673: -53,-2
+            3674: -51,-4
+            3675: -49,-4
+            3676: -50,-5
+            3677: -48,-5
+            3686: -53,2
+            3687: -53,4
+            3688: -53,6
+            3689: -53,7
+            3690: -55,7
+            3691: -55,5
+            3692: -55,-1
+            3693: -51,6
+            3694: -50,7
+            3695: -47,7
+            3696: -48,6
+            3697: -46,6
+            3698: -45,7
+            3699: -47,9
+            3700: -45,9
+            3701: -44,9
+            3702: -50,9
+            3703: -50,9
+            3704: -51,11
+            3705: -51,13
+            3706: -50,13
+            3707: -48,13
+            3708: -46,13
+            3709: -48,12
+            3710: -43,11
+            3711: -44,12
+            3712: -43,13
+            3713: -43,12
+            3714: -54,10
+            3715: -53,9
+            3716: -54,9
+            3739: -43,1
+            3740: -40,2
+            3741: -39,1
+            3742: -39,1
+            3743: -40,-1
+            3744: -38,-1
+            3745: -40,-2
+            3746: -39,-2
+            3747: -40,-4
+            3748: -39,-5
+            3749: -38,-5
+            3750: -37,-5
+            3751: -36,-5
+            3752: -38,-4
+            3753: -36,-3
+            3754: -36,-2
+            3755: -36,-4
+            3756: -34,-3
+            3757: -32,-4
+            3758: -34,-1
+            3759: -32,0
+            3760: -35,0
+            3761: -39,3
+            3762: -40,4
+            3763: -38,4
+            3764: -33,1
+            3765: -31,2
+            3766: -31,-1
+            3767: -29,0
+            3768: -32,-2
+            3769: -31,-3
+            3770: -33,-4
+            3771: -32,-5
+            3772: -31,-4
+            3773: -30,-3
+            3774: -28,-3
+            3775: -28,-4
+            3776: -26,-5
+            3777: -27,-2
+            3778: -27,-3
+            3779: -29,0
+            3780: -27,0
+            3781: -27,2
+            3782: -28,3
+            3783: -27,3
+            3784: -27,1
+            3785: -26,-1
+            3786: -32,-1
+            3787: -28,4
+            3788: -26,5
+            3789: -26,6
+            3790: -26,3
+            3791: -26,3
+            3792: -24,2
+            3793: -23,1
+            3794: -25,0
+            3795: -23,-2
+            3796: -25,-3
+            3797: -23,-3
+            3798: -25,-4
+            3799: -23,-5
+            3800: -25,-5
+            3801: -24,-1
+            3802: -25,-1
+            3803: -23,3
+            3804: -15,-1
+            3805: -16,-1
+            3806: -15,0
+            3807: -16,1
+            3808: -16,3
+            3809: -15,3
+            3810: -15,2
+            3811: -15,1
+            3812: -15,1
+            3813: -27,6
+            3814: -27,7
+            3815: -27,9
+            3816: -20,5
+            3817: -21,5
+            3822: -17,5
+            3823: -16,5
+            3824: -16,5
+            3825: -22,11
+            3826: -21,11
+            3827: -22,13
+            3828: -20,14
+            3829: -22,13
+            3830: -22,15
+            3831: -20,14
+            3832: -20,13
+            3833: -20,12
+            3834: -19,11
+            3835: -22,14
+            3836: -23,14
+            3837: -17,11
+            3838: -17,11
+            3839: -17,12
+            3840: -16,11
+            3841: -16,12
+            3842: -17,13
+            3843: -16,14
+            3844: -17,14
+            3845: -16,12
+            3846: -17,12
+            3847: -17,11
+            3850: -39,11
+            3851: -27,11
+            3852: -27,13
+            3853: -27,16
+            3854: -27,17
+            3855: -27,19
+            3856: -27,20
+            3857: -27,21
+            3858: -25,18
+            3859: -25,16
+            3860: -25,14
+            3861: -25,12
+            3862: -25,11
+            3863: -24,18
+            3864: -22,18
+            3865: -23,17
+            3866: -21,17
+            3867: -20,18
+            3868: -19,17
+            3869: -20,20
+            3870: -22,20
+            3871: -24,20
+            3872: -20,21
+            3873: -17,19
+            3874: -16,19
+            3875: -14,19
+            3876: -17,21
+            3877: -15,21
+            3878: -13,21
+            3879: -11,21
+            3880: -13,19
+            3881: -10,19
+            3882: -8,19
+            3883: -6,19
+            3884: -9,21
+            3885: -7,21
+            3886: -5,21
+            3887: -3,21
+            3888: 0,21
+            3889: -5,19
+            3890: -2,19
+            3891: 0,19
+            3892: 0,21
+            3893: 2,21
+            3894: 5,21
+            3895: 6,21
+            3896: 2,19
+            3897: 4,19
+            3898: 7,19
+            3899: 10,19
+            3900: 8,21
+            3901: 10,21
+            3902: 11,21
+            3903: 13,21
+            3904: 12,19
+            3905: 14,19
+            3906: 15,19
+            3907: 17,19
+            3908: 15,23
+            3909: 14,23
+            3910: 13,24
+            3911: 15,25
+            3912: 15,24
+            3913: 11,23
+            3914: 10,23
+            3915: 11,24
+            3916: 17,23
+            3917: 17,25
+            3918: 17,25
+            3919: 16,23
+            3920: 18,19
+            3921: 19,19
+            3922: 19,21
+            3923: 17,21
+            3924: 16,21
+            3925: 21,20
+            3926: 21,18
+            3927: 21,17
+            3928: 19,18
+            3929: 19,15
+            3930: 19,12
+            3931: 19,11
+            3932: 21,16
+            3933: 21,13
+            3934: 21,12
+            3935: 21,10
+            3936: 21,8
+            3937: 21,7
+            3938: 19,9
+            3939: 19,7
+            3940: 19,6
+            3941: 23,10
+            3942: 24,10
+            3943: 26,10
+            3944: 27,10
+            3945: 28,7
+            3946: 27,8
+            3947: 27,6
+            3948: 28,6
+            3949: 30,6
+            3950: 30,8
+            3951: 30,9
+            3952: 30,10
+            3953: 33,10
+            3954: 34,10
+            3955: 31,12
+            3956: 31,13
+            3957: 30,14
+            3958: 31,17
+            3959: 30,17
+            3960: 31,19
+            3961: 31,20
+            3962: 31,22
+            3963: 30,22
+            3964: 28,22
+            3965: 29,23
+            3966: 26,22
+            3967: 24,22
+            3968: 23,22
+            3969: 23,23
+            3970: 23,20
+            3971: 23,18
+            3972: 25,18
+            3973: 25,17
+            3974: 26,18
+            3975: 27,17
+            3976: 26,19
+            3977: 27,20
+            3978: 29,18
+            3979: 27,18
+            3980: 30,17
+            3981: 33,22
+            3982: 35,22
+            3983: 33,19
+            3984: 33,18
+            3985: 35,18
+            3986: 36,17
+            3987: 34,17
+            3988: 35,17
+            3989: 33,13
+            3990: 33,15
+            3991: 33,15
+            3992: 32,13
+            3993: 26,7
+            3994: 23,2
+            3995: 26,2
+            3996: 20,2
+            3997: 21,2
+            3998: 19,4
+            4004: 31,2
+            4005: 33,2
+            4006: 33,4
+            4007: 32,4
+            4008: 35,4
+            4009: 37,4
+            4010: 37,2
+            4011: 40,2
+            4012: 41,2
+            4013: 41,1
+            4014: 38,2
+            4015: 39,-4
+            4016: 37,-4
+            4017: 39,-5
+            4018: 33,-1
+            4019: 31,-1
+            4020: 31,0
+            4021: 33,0
+            4022: 32,1
+            4023: 38,7
+            4024: 54,14
+            4025: 58,14
+            4026: 59,14
+            4027: 60,14
+            4028: 58,16
+            4029: 55,10
+            4030: 55,12
+            4031: 54,12
+            4032: 54,6
+            4033: 59,3
+            4034: 60,4
+            4035: 59,0
+            4036: 55,-5
+            4037: 56,-4
+            4038: 41,-1
+            4039: 41,-3
+            4040: 41,-5
+            4041: 41,-7
+            4042: 41,-10
+            4043: 41,-11
+            4044: 43,-12
+            4045: 43,-14
+            4046: 43,-16
+            4047: 43,-17
+            4048: 41,-15
+            4049: 41,-16
+            4050: 41,-17
+            4051: 41,-19
+            4052: 40,-19
+            4053: 40,-21
+            4054: 42,-21
+            4055: 43,-21
+            4056: 45,-21
+            4061: 45,-19
+            4062: 47,-19
+            4063: 48,-19
+            4064: 51,-19
+            4065: 47,-21
+            4066: 49,-21
+            4067: 47,-22
+            4068: 51,-21
+            4069: 52,-21
+            4070: 52,-23
+            4071: 53,-24
+            4072: 56,-24
+            4073: 57,-24
+            4074: 58,-24
+            4075: 58,-23
+            4076: 59,-21
+            4077: 60,-21
+            4078: 61,-20
+            4079: 59,-19
+            4080: 61,-19
+            4081: 60,-17
+            4082: 60,-17
+            4083: 58,-18
+            4084: 58,-19
+            4085: 56,-19
+            4086: 55,-19
+            4087: 53,-19
+            4088: 60,-15
+            4089: 58,-15
+            4090: 59,-14
+            4091: 57,-13
+            4092: 57,-12
+            4093: 60,-13
+            4094: 60,-12
+            4095: 60,-14
+            4096: 61,-13
+            4097: 63,-13
+            4098: 64,-12
+            4099: 65,-14
+            4100: 63,-14
+            4101: 63,-16
+            4102: 65,-16
+            4103: 65,-18
+            4104: 65,-20
+            4105: 63,-18
+            4106: 63,-20
+            4107: 63,-21
+            4108: 65,-21
+            4109: 62,-23
+            4110: 61,-24
+            4111: 64,-24
+            4112: 63,-25
+            4113: 64,-26
+            4114: 65,-27
+            4115: 66,-26
+            4116: 65,-24
+            4117: 65,-23
+            4118: 65,-23
+            4122: 68,-21
+            4123: 69,-21
+            4124: 69,-23
+            4125: 69,-24
+            4127: 69,-27
+            4128: 70,-26
+            4129: 70,-26
+            4130: 71,-27
+            4131: 71,-28
+            4132: 70,-28
+            4133: 68,-28
+            4134: 69,-29
+            4135: 70,-30
+            4136: 69,-30
+            4137: 70,-29
+            4138: 70,-29
+            4139: 70,-29
+            4140: 71,-30
+            4141: 71,-17
+            4142: 68,-17
+            4143: 67,-19
+            4144: 70,-17
+            4145: 70,-19
+            4146: 71,-18
+            4147: 68,-18
+            4148: 69,-19
+            4168: 69,-9
+            4169: 68,-9
+            4170: 67,-9
+            4171: 70,-10
+            4172: 77,-18
+            4173: 75,-18
+            4174: 76,-19
+            4175: 77,-18
+            4176: 76,-17
+            4177: 76,-15
+            4178: 75,-15
+            4179: 76,-13
+            4180: 77,-14
+            4181: 74,-14
+            4182: 74,-16
+            4183: 73,-14
+            4184: 74,-17
+            4185: 74,-18
+            4186: 72,-17
+            4187: 73,-19
+            4188: 73,-17
+            4189: 74,-16
+            4190: 73,-15
+            4191: 74,-16
+            4192: 74,-15
+            4193: 76,-18
+            4194: 79,-14
+            4195: 80,-13
+            4196: 81,-14
+            4197: 79,-14
+            4198: 80,-15
+            4199: 81,-13
+            4200: 80,-19
+            4201: 79,-18
+            4202: 80,-18
+            4203: 80,-19
+            4204: 79,-19
+            4205: 80,-19
+            4206: 81,-19
+            4207: 80,-17
+            4208: 80,-18
+            4209: 79,-19
+            4210: 50,-13
+            4211: 51,-14
+            4212: 50,-13
+            4213: 51,-13
+            4214: 50,-14
+            4215: 50,-14
+            4216: 48,-13
+            4217: 48,-14
+            4218: 48,-13
+            4219: 53,-13
+            4220: 53,-14
+            4221: 53,-12
+            4222: 53,-14
+            4223: 53,-13
+            4224: 53,-14
+            4225: 50,-15
+            4226: 51,-15
+            4227: 50,-14
+            4228: 51,-13
+            4229: 50,-12
+            4230: 50,-12
+            4231: 48,-12
+            4232: 50,-12
+            4233: 51,-13
+            4234: 47,-24
+            4235: 49,-25
+            4236: 48,-26
+            4237: 47,-25
+            4238: 49,-25
+            4239: 48,-23
+            4240: 47,-28
+            4241: 49,-29
+            4242: 47,-30
+            4243: 48,-32
+            4244: 49,-31
+            4245: 48,-33
+            4246: 47,-33
+            4247: 49,-33
+            4248: 48,-34
+            4249: 47,-34
+            4250: 43,-36
+            4251: 40,-36
+            4252: 37,-35
+            4253: 36,-35
+            4254: 37,-36
+            4255: 40,-36
+            4256: 43,-35
+            4257: 43,-35
+            4258: 41,-35
+            4259: 43,-35
+            4260: 43,-34
+            4286: 33,-34
+            4287: 31,-34
+            4288: 33,-32
+            4289: 32,-32
+            4290: 32,-31
+            4291: 32,-30
+            4292: 33,-28
+            4293: 31,-29
+            4294: 33,-31
+            4295: 33,-31
+            4296: 35,-30
+            4297: 36,-30
+            4298: 36,-29
+            4299: 33,-25
+            4300: 31,-25
+            4301: 33,-25
+            4302: 31,-25
+            4303: 33,-25
+            4304: 32,-26
+            4305: 31,-25
+            4306: 32,-24
+            4307: 32,-25
+            4308: 31,-24
+            4309: 40,-25
+            4310: 39,-24
+            4311: 40,-26
+            4312: 42,-25
+            4313: 42,-25
+            4314: 44,-24
+            4315: 42,-25
+            4316: 44,-25
+            4317: 45,-25
+            4318: 42,-26
+            4319: 43,-25
+            4320: 43,-25
+            4321: 41,-25
+            4322: 40,-25
+            4323: 40,-25
+            4324: 40,-24
+            4325: 35,-23
+            4326: 37,-23
+            4327: 36,-23
+            4328: 35,-23
+            4329: 38,-21
+            4330: 35,-21
+            4331: 33,-21
+            4332: 33,-22
+            4333: 32,-22
+            4334: 32,-21
+            4335: 37,-19
+            4336: 34,-19
+            4337: 32,-19
+            4338: 31,-19
+            4339: 28,-19
+            4340: 27,-19
+            4341: 27,-20
+            4342: 27,-21
+            4343: 30,-21
+            4344: 29,-21
+            4345: 29,-23
+            4346: 29,-24
+            4347: 29,-25
+            4348: 29,-26
+            4349: 27,-22
+            4350: 27,-24
+            4351: 27,-25
+            4352: 26,-25
+            4353: 25,-25
+            4354: 29,-27
+            4355: 27,-27
+            4356: 25,-27
+            4357: 24,-27
+            4358: 21,-27
+            4359: 21,-25
+            4360: 20,-25
+            4361: 19,-25
+            4362: 19,-26
+            4363: 19,-28
+            4364: 19,-28
+            4365: 19,-30
+            4366: 19,-31
+            4367: 19,-32
+            4368: 21,-30
+            4369: 21,-33
+            4370: 21,-34
+            4371: 21,-34
+            4372: 19,-34
+            4373: 20,-36
+            4374: 20,-37
+            4375: 19,-37
+            4376: 20,-39
+            4377: 21,-38
+            4378: 22,-39
+            4379: 21,-37
+            4380: 24,-37
+            4381: 23,-38
+            4382: 25,-37
+            4383: 25,-38
+            4384: 24,-38
+            4385: 25,-38
+            4386: 17,-34
+            4387: 17,-35
+            4388: 16,-34
+            4389: 14,-34
+            4390: 17,-32
+            4391: 15,-32
+            4392: 13,-32
+            4393: 11,-32
+            4394: 10,-32
+            4395: 12,-34
+            4396: 9,-34
+            4397: 8,-34
+            4398: 7,-34
+            4399: 7,-32
+            4400: 7,-32
+            4401: 6,-32
+            4402: 9,-30
+            4403: 8,-29
+            4404: 7,-29
+            4405: 7,-29
+            4406: 6,-28
+            4407: 8,-27
+            4408: 9,-27
+            4409: 7,-28
+            4410: 6,-27
+            4411: 5,-29
+            4412: 7,-30
+            4413: 9,-30
+            4414: 3,-30
+            4415: 1,-30
+            4416: 3,-32
+            4417: 2,-32
+            4418: 2,-33
+            4419: 0,-33
+            4420: -1,-33
+            4421: -1,-32
+            4422: 0,-30
+            4423: -3,-30
+            4424: -4,-30
+            4425: -6,-30
+            4426: -7,-30
+            4427: -9,-30
+            4428: -6,-32
+            4429: -5,-32
+            4430: -3,-32
+            4431: -8,-32
+            4432: -8,-33
+            4433: -9,-32
+            4434: -10,-32
+            4435: -11,-32
+            4436: -13,-32
+            4437: -10,-30
+            4438: -11,-30
+            4439: -13,-30
+            4440: -15,-30
+            4441: -16,-30
+            4442: -12,-29
+            4443: -12,-30
+            4444: -16,-32
+            4445: -17,-33
+            4446: -17,-32
+            4447: -19,-32
+            4448: -18,-30
+            4449: -20,-30
+            4450: -22,-30
+            4451: -23,-30
+            4452: -23,-29
+            4453: -22,-32
+            4454: -24,-32
+            4455: -24,-32
+            4456: -26,-30
+            4457: -26,-29
+            4458: -26,-27
+            4459: -26,-25
+            4460: -24,-27
+            4461: -24,-26
+            4462: -24,-25
+            4463: -24,-24
+            4464: -26,-23
+            4465: -26,-22
+            4466: -26,-20
+            4467: -24,-21
+            4468: -24,-19
+            4469: -24,-18
+            4470: -24,-16
+            4471: -26,-17
+            4472: -26,-16
+            4473: -26,-14
+            4474: -26,-13
+            4475: -26,-12
+            4476: -26,-10
+            4477: -26,-9
+            4478: -25,-9
+            4479: -24,-11
+            4480: -23,-11
+            4481: -23,-10
+            4482: -23,-9
+            4483: -24,-5
+            4484: -24,-4
+            4485: -24,-2
+            4486: -19,-11
+            4487: -19,-10
+            4488: -20,-10
+            4489: -20,-9
+            4490: -19,-9
+            4491: -30,-21
+            4492: -30,-19
+            4493: -29,-19
+            4494: -30,-18
+            4495: -32,-21
+            4496: -32,-19
+            4497: -33,-18
+            4498: -36,-15
+            4499: -36,-14
+            4500: -33,-14
+            4501: -33,-14
+            4502: -33,-15
+            4503: -30,-14
+            4504: -36,-10
+            4505: -37,-9
+            4506: -37,-10
+            4507: -29,-10
+            4508: -30,-11
+            4509: -30,-9
+            4510: -28,-10
+            4511: -40,-11
+            4512: -41,-10
+            4513: -41,-9
+            4514: -40,-9
+            4515: -41,-10
+            4516: -41,-10
+            4517: -49,-18
+            4518: -38,-33
+            4519: -36,-33
+            4520: -33,-33
+            4521: -32,-33
+            4522: -31,-33
+            4523: -31,-31
+            4524: -31,-29
+            4525: -31,-28
+            4526: -31,-26
+            4527: -33,-26
+            4528: -35,-26
+            4529: -36,-26
+            4530: -37,-26
+            4531: -38,-26
+            4532: -38,-27
+            4533: -38,-29
+            4534: -38,-30
+            4535: -38,-31
+            4536: -38,-29
+            4537: -38,-26
+            4538: -40,-26
+            4539: -40,-25
+            4540: -41,-25
+            4541: -41,-26
+            4542: -41,-28
+            4543: -41,-29
+            4544: -41,-30
+            4545: -41,-32
+            4546: -41,-33
+            4547: -41,-34
+            4548: -39,-33
+            4549: -40,-34
+            4550: -35,-34
+            4551: -34,-34
+            4552: -32,-34
+            4553: -31,-34
+            4554: -30,-34
+            4555: -30,-33
+            4556: -28,-34
+            4557: -28,-32
+            4558: -28,-31
+            4559: -28,-29
+            4560: -28,-27
+            4561: -28,-26
+            4562: -29,-25
+            4563: -30,-25
+            4564: -30,-26
+            4565: -32,-25
+            4566: -33,-26
+            4567: -35,-25
+            4568: -32,6
+            4569: -32,7
+            4570: -32,6
+            4571: -36,6
+            4572: -36,5
+            4573: -36,7
+            4574: -34,6
+            4575: -34,5
+            4576: -35,6
+            4577: -33,6
+            4578: -35,-4
+            4579: -35,-2
+            4580: -36,-5
+            4581: -35,-2
+            4582: -34,-2
+            4583: -35,-1
+            4595: -25,28
+            4596: -26,28
+            4597: -18,32
+            4598: -17,31
+            4599: -17,33
+            4600: -18,32
+            4601: -15,34
+            4602: -15,32
+            4603: -15,31
+            4604: -13,31
+            4605: -12,31
+            4606: -15,34
+            4607: -15,34
+            4608: -12,39
+            4609: -13,40
+            4610: -14,40
+            4611: -15,40
+            4612: -16,40
+            4613: -16,40
+            4614: -13,40
+            4615: -12,40
+            4616: -12,38
+            4617: -12,40
+            4623: -5,40
+            4624: -6,40
+            4625: -6,42
+            4626: -6,43
+            4627: -5,42
+            4628: -6,43
+            4629: -6,45
+            4630: -6,46
+            4631: -6,47
+            4632: -5,46
+            4633: -4,48
+            4634: -5,46
+            4635: -2,48
+            4636: -4,46
+            4637: -1,47
+            4638: -3,45
+            4639: 0,46
+            4640: -3,47
+            4641: -1,45
+            4642: -3,46
+            4643: 1,45
+            4644: 1,47
+            4645: 0,46
+            4646: 1,48
+            4647: 2,48
+            4648: 3,47
+            4649: 2,45
+            4650: 2,44
+            4651: 2,43
+            4652: 2,42
+            4653: 1,42
+            4654: 3,42
+            4655: -2,43
+            4656: -1,41
+            4657: -3,40
+            4658: -3,40
+            4659: 1,51
+            4660: -2,50
+            4661: -3,50
+            4662: -2,51
+            4663: 0,51
+            4664: -1,52
+            4665: -2,51
+            4666: -2,53
+            4667: 1,53
+            4668: 2,51
+            4669: 2,50
+            4670: 0,50
+            4671: -4,45
+            4672: -4,47
+            4699: 6,42
+            4700: 5,41
+            4701: 5,39
+            4702: 7,39
+            4703: 8,39
+            4704: 9,41
+            4705: 9,40
+            4706: 8,42
+            4707: 8,41
+            4708: 15,37
+            4709: 14,37
+            4710: 14,35
+            4711: 14,34
+            4712: 13,35
+            4713: 13,36
+            4714: 15,34
+            4715: 16,35
+            4716: 15,36
+            4717: 15,34
+            4718: 15,35
+            4719: 15,37
+            4720: 14,37
+            4721: 15,30
+            4722: 14,29
+            4723: 14,29
+            4724: 15,28
+            4725: 14,29
+            4726: 14,32
+            4727: 13,32
+            4728: 15,24
+            4752: 2,24
+            4753: 1,24
+            4754: 1,24
+            4755: 2,23
+            4756: 4,23
+            4757: 4,24
+            4758: 3,26
+            4759: 4,28
+            4760: 2,27
+            4761: 2,27
+            4762: 3,27
+            4763: -2,25
+            4764: -3,25
+            4765: -3,23
+            4766: -2,24
+            4767: -4,23
+            4768: -4,25
+            4804: -14,28
+            4805: -15,28
+            4806: -14,29
+            4807: -13,26
+            4808: -10,26
+            4809: -9,27
+            4810: -10,28
+            4811: -7,28
+            4812: -8,26
+            4813: -5,28
+            4814: -7,24
+            4815: -8,24
+            4816: -7,23
+            4817: -6,24
+            4818: -6,23
+            4819: -7,23
+            4820: -8,23
+            4821: -8,23
+            4822: -12,23
+            4823: -11,24
+            4824: -10,23
+            4825: -10,24
+            4826: -10,24
+            4827: -12,24
+            4828: -12,24
+            4829: -14,24
+            4830: -14,23
+            4831: -16,24
+            4832: -14,24
+            4833: -15,23
+            4834: -16,24
+            4835: -14,25
+            4836: -10,25
+            4837: -7,25
+            4838: -1,28
+            4839: -3,27
+            4840: -1,30
+            4841: -1,33
+            4842: -1,34
+            4843: -1,37
+            4844: -3,37
+            4845: -3,38
+            4846: -1,37
+            4847: -2,37
+            4848: -1,40
+            4849: -3,41
+            4850: -3,43
+            4851: -2,43
+            4852: -20,25
+            4853: -21,25
+            4854: -19,25
+            4855: -21,25
+            4856: -22,17
+            4857: -23,17
+            4858: -22,5
+            4859: -22,5
+            4860: -22,5
+            4861: -19,-28
+            4862: -16,-28
+            4863: -16,-27
+            4864: -15,-28
+            4865: -16,-26
+            4866: -15,-27
+            4867: -15,-28
+            4868: -15,-26
+            4869: -15,-26
+            4870: -14,-26
+            4881: -25,-34
+            4882: -23,-34
+            4883: -22,-34
+            4884: -21,-34
+            4885: -20,-34
+            4886: -20,-37
+            4887: -20,-36
+            4888: -19,-38
+            4889: -19,-36
+            4890: -22,-37
+            4891: -23,-37
+            4892: -23,-38
+            4893: -23,-36
+            4894: -24,-37
+            4895: -26,-37
+            4896: -26,-36
+            4897: -26,-37
+            4898: -28,-40
+            4899: -27,-40
+            4900: -25,-40
+            4901: -24,-40
+            4902: -23,-40
+            4903: -21,-40
+            4904: -19,-40
+            4905: -21,-40
+            4906: -24,-40
+            4907: -26,-40
+            4908: -32,-40
+            4909: -31,-40
+            4910: -33,-39
+            4911: -33,-40
+            4912: -32,-39
+            4913: -31,-39
+            4914: -34,-39
+            4915: -33,-40
+            4916: -39,-38
+            4917: -38,-38
+            4918: -38,-53
+            4919: -38,-54
+            4920: -37,-53
+            4921: -37,-54
+            4922: -14,-39
+            4923: -13,-38
+            4924: -13,-39
+            4925: -13,-40
+            4926: -13,-41
+            4927: -13,-39
+            4928: -13,-40
+            4929: -13,-41
+            4930: -13,-39
+            4931: -13,-40
+            4932: -13,-39
+            4933: -13,-40
+            4936: -5,-41
+            4937: -5,-40
+            4938: -6,-42
+            4939: -5,-36
+            4940: -6,-36
+            4941: -4,-35
+            4942: -4,-36
+            4943: 0,-36
+            4944: -2,-36
+            4945: 1,-35
+            4946: 1,-37
+            4947: 1,-38
+            4948: 2,-37
+            4949: 2,-38
+            4950: 0,-37
+            4951: 3,-37
+            4952: -1,-36
+            4956: -6,-28
+            4957: -6,-27
+            4958: -5,-27
+            4959: -6,-26
+            4960: -2,-27
+            4961: -3,-26
+            4962: -2,-28
+            4963: -1,-27
+            4964: 0,-27
+            4965: 0,-27
+            4966: -2,-27
+            4967: -2,-27
+            4968: 0,-24
+            4969: -2,-24
+            4970: -2,-23
+            4971: 0,-22
+            4972: 1,-22
+            4973: 1,-21
+            4974: -4,-19
+            4975: -5,-19
+            4976: -7,-19
+            4977: -9,-19
+            4978: -6,-19
+            4979: -7,-17
+            4980: -8,-17
+            4981: -9,-16
+            4982: -9,-16
+            4983: -5,-16
+            4984: -4,-14
+            4985: -5,-15
+            4986: -8,-16
+            4987: -8,-15
+            4988: -14,-14
+            4989: -12,-14
+            4990: -12,-16
+            4991: -13,-18
+            4992: -14,-16
+            4993: -13,-16
+            4994: -13,-19
+            4995: -14,-19
+            4996: -2,-17
+            4997: -2,-15
+            4998: -2,-13
+            4999: -2,-12
+            5000: -1,-15
+            5001: -1,-16
+            5002: -1,-17
+            5003: 1,-17
+            5004: -1,-18
+            5005: 2,-18
+            5006: 2,-16
+            5007: 2,-15
+            5008: 2,-13
+            5009: 1,-12
+            5010: 1,-14
+            5011: -1,-13
+            5012: 0,-14
+            5013: 2,-16
+            5014: -4,-14
+            5015: -7,-24
+            5016: -7,-22
+            5017: -8,-23
+            5018: -10,-23
+            5019: -9,-23
+            5020: -1,-24
+            5021: 8,-23
+            5022: 8,-22
+            5023: 10,-22
+            5024: 9,-23
+            5025: 8,-25
+            5026: 8,-21
+            5027: 8,-19
+            5028: 8,-18
+            5029: 6,-18
+            5030: 5,-18
+            5031: 0,-27
+            5032: 2,-27
+            5033: 10,-23
+            5034: 13,-23
+            5035: 12,-23
+            5036: 13,-21
+            5037: 14,-22
+            5038: 13,-18
+            5039: 14,-18
+            5040: 14,-17
+            5041: 12,-18
+            5042: 11,-18
+            5043: 11,-16
+            5044: 13,-17
+            5045: 11,-30
+            5046: 11,-28
+            5047: 11,-27
+            5048: 11,-26
+            5049: 17,-26
+            5050: 17,-28
+            5051: 17,-28
+            5052: 17,-30
+            5053: 17,-30
+            5054: 18,-23
+            5055: 20,-22
+            5056: 21,-23
+            5057: 19,-22
+            5058: 21,-22
+            5059: 20,-21
+            5060: 24,-22
+            5061: 23,-23
+            5062: 23,-21
+            5063: 23,-23
+            5064: 17,-16
+            5065: 19,-14
+            5066: 18,-13
+            5067: 20,-13
+            5068: 19,-12
+            5069: 22,-11
+            5070: 22,-13
+            5071: 20,-11
+            5072: 24,-13
+            5073: 26,-11
+            5074: 21,-11
+            5075: 20,-11
+            5076: 25,-13
+            5077: 22,-13
+            5078: 23,-12
+            5079: 26,-12
+            5080: 19,-12
+            5081: 23,-13
+            5082: 23,-11
+            5083: 19,-10
+            5084: 26,-11
+            5085: 28,-12
+            5086: 25,-12
+            5087: 23,-16
+            5088: 23,-16
+            5089: 13,-19
+            5090: 23,-34
+            5091: 23,-31
+            5092: 23,-30
+            5093: 23,-29
+            5094: 23,-32
+            5095: 29,-34
+            5096: 29,-33
+            5097: 29,-32
+            5098: 29,-30
+            5099: 29,-29
+            5100: 32,-34
+            5101: 32,-31
+            5102: 32,-30
+            5103: 36,-30
+            5104: 35,-29
+            5105: 33,-26
+            5106: 36,-21
+            5107: 38,-16
+            5108: 37,-15
+            5109: 39,-16
+            5110: 38,-17
+            5111: 38,-15
+            5112: 37,-15
+            5113: 62,-31
+            5114: 62,-33
+            5115: 61,-31
+            5116: 63,-33
+            5117: 63,-33
+            5118: 63,-32
+            5119: 62,-32
+            5120: 62,-32
+            5121: 64,8
+            5122: 63,9
+            5123: 65,9
+            5124: 64,8
+            5125: 64,9
+            5126: 64,10
+            5127: 67,6
+            5128: 68,4
+            5129: 68,6
+            5130: 67,5
+            5131: 68,0
+            5132: 68,1
+            5133: 68,2
+            5134: 67,0
+            5135: 68,-2
+            5136: 67,-3
+            5137: 68,-4
+            5138: 68,-3
+            5139: 68,-3
+            5140: 76,-6
+            5146: 54,-30
+            5147: 52,-31
+            5148: 51,-31
+            5149: 52,-33
+            5150: 52,-34
+            5151: 51,-33
+            5152: 51,-32
+            5153: 52,-35
+            5154: 51,-33
+            5155: 51,-31
+            5156: 52,-35
+            5157: 52,-35
+            5158: 55,-35
+            5159: 54,-34
+            5160: 56,-33
+            5161: 57,-33
+            5162: 55,-34
+            5163: 55,-36
+            5164: 54,-35
+            5165: 55,-34
+            5166: 54,-35
+            5167: 55,-35
+            5168: 55,-34
+            5169: 40,-31
+            5170: 40,-30
+            5171: 40,-30
+            5172: 41,-31
+            5173: 41,-29
+            5174: 42,-29
+            5175: 43,-29
+            5176: 44,-29
+            5177: 44,-31
+            5178: 43,-30
+            5179: 33,-29
+            5180: 15,-39
+            5181: 14,-39
+            5182: 14,-39
+            5183: 9,-40
+            5184: 9,-39
+            5185: 9,-41
+            5186: 8,-40
+            5187: 19,-45
+            5188: 17,-45
+            5189: 16,-44
+            5190: 16,-45
+            5191: 16,-43
+            5192: 19,-45
+            5193: 20,-44
+            5194: 20,-45
+            5195: 18,-44
+            5196: 21,-45
+            5197: 21,-43
+            5198: 15,-48
+            5199: 14,-48
+            5200: 12,-47
+            5201: 12,-48
+            5202: 14,-48
+            5203: 16,-47
+            5204: 14,-48
+            5205: 13,-48
+            5206: 15,-47
+            5213: 21,-54
+            5214: 20,-54
+            5215: 18,-54
+            5216: 16,-54
+            5217: 16,-55
+            5218: 18,-53
+            5219: 19,-53
+            5220: 21,-55
+            5221: 21,-58
+            5222: 21,-59
+            5223: 20,-58
+            5224: 18,-58
+            5225: 17,-58
+            5226: 16,-58
+            5227: 16,-59
+            5228: 19,-59
+            5229: 19,-59
+            5230: 18,-59
+            5231: 27,-46
+            5232: 26,-45
+            5233: 26,-44
+            5234: 27,-45
+            5235: 27,-45
+            5236: 28,-42
+            5237: 29,-42
+            5238: 29,-40
+            5239: 28,-39
+            5240: 28,-39
+            5241: 28,-40
+            5242: 29,-47
+            5243: 28,-47
+            5244: 66,-52
+            5245: 65,-51
+            5246: 66,-52
+            5247: 66,-51
+            5248: 65,-52
+            5249: 66,-51
+            5250: 27,15
+            5251: 28,15
+            5252: 27,14
+            5253: 27,12
+            5254: -23,34
+            5255: -23,35
+            5256: -22,34
+            5257: -27,36
+            5258: -27,34
+            5259: -28,35
+            5260: -27,35
+            5261: -29,36
+            5262: -30,37
+            5263: -30,38
+            5264: -28,35
+            5265: -28,34
+            5266: -29,35
+            5267: -26,36
+            5268: -25,38
+            5269: -26,37
+            5270: -32,36
+            5271: -33,35
+            5272: -33,37
+            5273: -33,35
+            5274: -34,36
+            5275: -33,38
+            5276: -33,35
+            5277: -36,5
+            5278: -42,6
+            5279: -43,4
+            5280: -43,6
+            5281: -42,7
+            5282: -51,9
+            5283: -49,13
+            5284: -42,-5
+            5285: -43,-5
+            5286: -42,-3
+            5287: -45,-4
+            5288: -45,-5
+            5289: -46,-4
+            5290: -43,-3
+            5291: -43,-2
+            5292: -42,-2
+            5293: -60,-29
+            5294: -60,-29
+            5295: -57,-36
+            5296: -58,-36
+            5297: -59,-36
+            5298: -57,-37
+            5299: -58,-35
+            5300: -58,-34
+            5301: -57,-35
+            5302: -59,-34
+            5303: -58,-34
+            5304: -59,-34
+            5305: -60,-34
+            5306: -60,-35
+            5307: -61,-21
+            5308: -62,-21
+            5309: -62,-20
+            5310: -61,-20
+            5311: -61,-20
+            5312: 13,35
+            5949: 52,20
+            5950: 51,21
+            5951: 53,20
+            5952: 53,21
+            6232: 49,-7
+            6233: 48,-6
+            6234: 48,-4
+            6235: 49,-4
+            6236: 52,-7
+            6237: 52,-5
+            6238: 51,-6
+            6239: 52,-2
+            6240: 52,-3
+            6241: 48,-1
+            6242: 48,-2
+            6262: 49,-12
+            6263: 49,-14
+            6264: 49,-15
+            6265: 49,-13
+            6266: 52,-14
+            6267: 52,-13
+            6268: 52,-12
+            6269: 52,-15
+            6270: 52,-15
+            6271: 52,-10
+            6272: 51,1
+            6273: 51,3
+            6274: 51,4
+            6275: 51,8
+            6276: 51,9
+            6277: 51,11
+            6278: 51,13
+            6279: 49,13
+            6280: 49,11
+            6281: 49,9
+            6282: 49,7
+            6283: 49,5
+            6284: 49,3
+            6285: 49,1
+            6298: 42,9
+            6299: 43,9
+            6300: 42,7
+            6301: 43,7
+            6302: 45,7
+            6303: 45,9
+            6304: 46,7
+            6305: 40,4
+            6306: 42,4
+            6307: 43,4
+            6308: 43,2
+            6309: 43,1
+            6310: 43,-2
+            6311: 43,-4
+            6312: 43,-7
+            6313: 43,-6
+            6314: 43,-10
+            6315: 43,-11
+            6316: 45,5
+            6317: 42,5
+            6318: 41,5
+            6397: 90,-18
+            6398: 89,-18
+            6478: 51,-39
+            6479: 52,-39
+            6480: 54,-39
+            6481: 52,-37
+            6491: 51,-30
+            6492: 52,-29
+            6514: -33,-12
+            6515: -33,-10
+            6531: -36,-45
+            6532: -35,-44
+            6533: -35,-46
+            6623: 14,39
+            6624: 13,40
+            6625: 15,42
+            6626: 15,41
+            6627: 16,39
+            6687: 8,-47
+            6845: -34,14
+            6846: -33,15
+            6847: -30,15
+            6848: -31,16
+            6849: -30,17
+            6850: -29,14
+            6851: -29,12
+            6852: -32,12
+            6853: -35,14
+            6854: -37,14
+            6855: -38,13
+            6947: 43,13
+            6948: 42,11
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2991: -43,17
+            2931: -43,17
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavyMonotile
           decals:
-            2899: -38,29
-            2900: -36,28
-            2901: -34,26
-            2902: -34,24
-            2903: -36,22
-            2904: -37,25
-            2905: -37,26
-            2906: -37,27
-            2907: -38,27
-            2908: -36,26
+            2839: -38,29
+            2840: -36,28
+            2841: -34,26
+            2842: -34,24
+            2843: -36,22
+            2844: -37,25
+            2845: -37,26
+            2846: -37,27
+            2847: -38,27
+            2848: -36,26
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            6578: 88,-21
-            6579: 88,-20
-            6580: 91,-20
-            6583: 87,-20
-            6586: 88,-19
+            6422: 88,-21
+            6423: 88,-20
+            6424: 91,-20
+            6427: 87,-20
+            6430: 88,-19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            3155: 4,-31
-            3156: 0,-31
-            3157: -4,-31
-            3158: -8,-31
-            3159: -10,-31
-            3160: -13,-31
-            3161: -17,-31
-            3162: -18,-31
-            3163: -21,-31
-            3164: -25,-31
-            3165: -25,-27
-            3166: -25,-24
-            3167: -25,-22
-            3168: -25,-19
-            3169: -25,-18
-            3170: -25,-13
-            3171: -25,-11
-            3172: -24,-10
-            3173: -24,-8
-            3174: -22,-2
-            3175: -22,0
-            3176: -22,3
-            3177: -20,8
-            3178: -22,9
-            3179: -24,8
-            3180: -25,9
-            3181: -26,8
-            3182: -26,12
-            3183: -26,15
-            3184: -26,17
-            3185: -25,20
-            3186: -23,19
-            3187: -20,19
-            3188: -18,20
-            3189: -15,20
-            3190: -12,20
-            3191: -7,20
-            3192: -3,20
-            3193: -1,20
-            3194: 2,20
-            3195: 6,20
-            3196: 9,20
-            3197: 11,20
-            3198: 14,20
-            3199: 17,20
-            3200: 20,19
-            3201: 20,17
-            3202: 20,15
-            3203: 20,11
-            3204: 20,9
-            3205: 20,6
-            3206: 20,3
-            3207: 22,3
-            3208: 25,3
-            3209: 27,3
-            3210: 30,3
-            3211: 33,3
-            3212: 36,3
-            3213: 41,3
-            3214: 42,2
-            3215: 42,0
-            3216: 42,-3
-            3217: 42,-6
-            3218: 42,-9
-            3219: 42,-11
-            3220: 42,-15
-            3221: 42,-18
-            3222: 42,-20
-            3223: 44,-20
-            3224: 42,-13
-            3225: 42,-10
-            3226: 42,-7
-            3227: 42,-5
-            3228: 42,-2
-            3229: 42,1
-            3230: 39,3
-            3231: 37,3
-            3232: 35,3
-            3233: 32,3
-            3234: 31,3
-            3235: 26,3
-            3236: 22,3
-            3237: 20,6
-            3238: 20,9
-            3239: 20,12
-            3240: 20,15
-            3241: 20,19
-            3242: 19,20
-            3243: 12,20
-            3244: 8,20
-            3245: 5,20
-            3246: 2,20
-            3247: -1,20
-            3248: -5,20
-            3249: -9,20
-            3250: -12,20
-            3251: -16,20
-            3253: -19,19
-            3254: -26,20
-            3255: -26,16
-            3256: -26,11
-            3257: -26,8
-            3258: -23,8
-            3259: -22,9
-            3260: -21,8
-            3261: -20,9
-            3262: -22,3
-            3263: -22,0
-            3264: -22,-3
-            3265: -22,-5
-            3266: -23,-7
-            3267: -25,-7
-            3268: -23,-8
-            3269: -25,-10
-            3270: -25,-10
-            3271: -25,-14
-            3272: -25,-18
-            3273: -25,-21
-            3274: -25,-25
-            3275: -25,-28
-            3276: -23,-31
-            3277: -20,-31
-            3278: -15,-31
-            3279: -9,-31
-            3280: -5,-31
-            3281: 1,-31
-            3282: 1,-32
-            3283: 7,-31
-            3284: 5,-31
-            3285: 8,-32
-            3286: 9,-33
-            3287: 12,-33
-            3288: 15,-33
-            3289: 18,-33
-            3290: 19,-33
-            3291: 20,-29
-            3292: 20,-27
-            3293: 21,-26
-            3294: 24,-26
-            3295: 27,-26
-            3296: 28,-26
-            3297: 28,-22
-            3298: 28,-21
-            3299: 28,-20
-            3300: 32,-20
-            3301: 35,-20
-            3302: 39,-20
-            3303: 42,-20
-            3304: 40,-20
-            3305: 42,-17
-            3306: 42,-19
-            3307: 49,-20
-            3308: 52,-20
-            3309: 47,-20
-            3310: 53,-20
-            3311: 53,-22
-            3312: 53,-23
-            3313: 54,-20
-            3314: 56,-20
-            3315: 58,-20
-            3316: 58,-20
-            3317: 58,-22
-            3318: 58,-23
-            3319: 58,-22
-            3320: 49,-20
-            3321: 50,-20
-            3322: 44,-13
-            3323: 41,-13
-            3324: 39,-1
-            3325: 37,-1
-            3326: 36,-1
-            3327: 50,6
-            3328: 50,2
-            3329: 50,14
-            3330: 46,-7
-            3331: 45,-8
-            3332: 46,-4
-            3333: 46,-5
-            3334: 45,-1
-            3335: 46,-2
-            3336: 54,-1
-            3337: 55,-1
-            3338: 55,-7
-            3339: 58,-4
-            3340: 59,-6
-            3341: 60,-5
-            3342: 62,-6
-            3343: 61,-6
-            3344: 55,7
-            3345: 54,7
-            3346: 59,15
-            3347: 58,15
-            3348: 60,16
-            3349: 60,3
-            3350: 60,1
-            3351: 63,1
-            3352: 62,1
-            3353: 62,0
-            3354: 62,3
-            3355: 62,4
-            3356: 28,3
-            3357: 28,3
-            3358: 24,8
-            3359: 24,6
-            3360: 23,8
-            3361: 25,7
-            3362: 24,7
-            3363: 24,6
-            3364: 25,11
-            3365: 25,13
-            3366: 25,14
-            3367: 23,15
-            3368: 22,12
-            3369: 23,12
-            3370: 23,14
-            3371: 23,11
-            3372: 26,19
-            3373: 24,20
-            3374: 25,21
-            3375: 26,19
-            3376: 25,20
-            3377: 29,20
-            3378: 29,19
-            3379: 30,19
-            3380: 29,21
-            3381: -19,26
-            3382: -21,28
-            3383: -20,26
-            3384: -20,28
-            3385: -7,40
-            3386: 3,40
-            3387: -26,19
-            3388: -17,11
-            3389: -16,11
-            3390: -16,13
-            3391: -17,13
-            3399: -30,3
-            3400: -32,3
-            3401: -37,3
-            3402: -36,2
-            3403: -35,2
-            3404: -37,1
-            3405: -33,1
-            3406: -32,2
-            3407: -32,1
-            3408: -31,2
-            3409: -33,2
-            3410: -38,0
-            3411: -37,0
-            3412: -34,0
-            3413: -33,0
-            3414: -31,0
-            3415: -30,0
-            3416: -55,6
-            3417: -54,6
-            3418: -54,4
-            3419: -54,2
-            3420: -56,5
-            3421: -55,4
-            3422: -53,1
-            3423: -51,1
-            3424: -49,1
-            3425: -47,1
-            3426: -45,1
-            3427: -44,1
-            3428: -43,1
-            3429: -54,1
-            3430: -54,-4
-            3431: -55,-4
-            3432: -54,-8
-            3433: -54,-10
-            3434: -54,-12
-            3435: -54,-14
-            3436: -54,-16
-            3437: -54,-19
-            3438: -53,-21
-            3439: -51,-21
-            3440: -54,-21
-            3441: -54,-20
-            3442: -54,-18
-            3443: -48,-21
-            3444: -48,-23
-            3445: -48,-24
-            3446: -50,-25
-            3447: -47,-25
-            3448: -45,-25
-            3449: -45,-26
-            3450: -45,-29
-            3451: -44,-28
-            3452: -43,-28
-            3453: -45,-31
-            3454: -48,-32
-            3455: -49,-32
-            3456: -51,-32
-            3457: -51,-30
-            3458: -51,-28
-            3459: -51,-26
-            3460: -48,-33
-            3461: -54,-26
-            3462: -56,-25
-            3463: -55,-25
-            3464: -56,-26
-            3465: -57,-26
-            3466: -55,-26
-            3467: -56,-25
-            3468: -48,-36
-            3469: -48,-38
-            3470: -48,-40
-            3471: -48,-42
-            3472: -48,-44
-            3473: -48,-47
-            3474: -49,-47
-            3475: -51,-47
-            3476: -53,-47
-            3477: -54,-47
-            3478: -45,-47
-            3479: -45,-47
-            3480: -43,-47
-            3481: -41,-47
-            3482: -41,-47
-            3483: -41,-50
-            3484: -41,-51
-            3485: -41,-54
-            3486: -36,-58
-            3487: -36,-60
-            3488: -36,-63
-            3489: -36,-64
-            3490: -36,-56
-            3491: -37,-56
-            3492: -41,-61
-            3493: -42,-62
-            3494: -41,-64
-            3495: -41,-64
-            3496: -42,-62
-            3497: -41,-48
-            3498: -53,-47
-            3499: -55,-47
-            3500: -55,-49
-            3501: -55,-52
-            3502: -55,-54
-            3503: -60,-58
-            3504: -60,-60
-            3505: -60,-62
-            3506: -60,-63
-            3507: -60,-64
-            3508: -58,-56
-            3509: -60,-56
-            3510: -55,-64
-            3511: -55,-62
-            3512: -54,-61
-            3513: -54,-63
-            3514: -54,-64
-            3515: -8,-28
-            3516: -7,-26
-            3517: -8,-27
-            3518: -8,-27
-            3519: 7,-22
-            3520: 5,-22
-            3521: 4,-23
-            3522: 4,-20
-            3523: 4,-19
-            3524: 7,-20
-            3525: 7,-21
-            3526: 7,-24
-            3527: 7,-25
-            3528: 10,-16
-            3529: 10,-18
-            3530: 10,-18
-            3531: 12,-29
-            3532: 12,-28
-            3533: 12,-26
-            3534: 13,-25
-            3535: 14,-25
-            3536: 14,-26
-            3537: 15,-25
-            3538: 16,-26
-            3539: 16,-29
-            3540: -4,-36
-            3541: -4,-37
-            3542: -6,-37
-            3543: 34,-3
-            3544: 32,-2
-            3545: 32,-3
-            3546: 31,-2
-            3547: 31,-3
-            3548: 31,-35
-            3549: 33,-35
-            3550: 32,-37
-            3551: 33,-36
-            3552: 33,-38
-            3553: 32,-36
-            3554: 31,-38
-            3555: 47,-36
-            3556: 47,-35
-            3557: 49,-35
-            3558: 49,-37
-            3559: 47,-37
-            3560: 47,-38
-            3561: 49,-38
-            3562: 47,-39
-            3563: 24,-29
-            3564: 26,-29
-            3565: 27,-29
-            3566: 28,-29
-            3567: 25,-34
-            3568: 27,-34
-            3569: 28,-34
-            3570: 26,-34
-            3571: 28,-43
-            3572: 29,-43
-            3573: 28,-45
-            3574: 29,-45
-            3575: 28,-46
-            3576: 29,-46
-            3577: 19,-46
-            3578: 18,-46
-            3579: 18,-47
-            3580: 19,-49
-            3581: 19,-49
-            3582: 18,-50
-            3583: 19,-50
-            3584: 18,-48
-            3585: 16,-48
-            3586: 14,-48
-            3587: 12,-47
-            3588: 10,-40
-            3589: 11,-39
-            3590: 11,-40
-            3591: 11,-40
-            3592: 8,-31
-            3593: 8,-31
-            3594: 5,-14
-            3595: 6,-14
-            3596: 6,-15
-            3597: 5,-15
-            3598: 4,-15
-            3599: 4,-15
-            3600: 25,7
-            3601: 20,16
-            3602: 20,18
-            3603: 15,26
-            3604: 14,26
-            3605: 13,26
-            3606: 13,26
-            3607: -44,10
-            3608: -45,10
-            3609: -46,10
-            3610: -47,10
-            3611: -49,10
-            3612: -50,10
-            3613: -50,12
-            3614: -47,12
-            3615: -48,1
-            3616: -47,1
-            3617: -48,-41
-            3618: -38,-56
-            3619: -38,-56
-            3620: -42,-57
-            3621: -55,-57
-            3753: -50,0
-            3754: -50,2
-            3755: -48,2
-            3756: -46,2
-            3757: -45,2
-            3758: -44,0
-            3759: -46,0
-            3760: -48,0
-            3792: -51,3
-            3793: -49,3
-            3794: -47,3
-            3795: -45,3
-            3796: -44,5
-            3797: -46,5
-            3798: -48,5
-            3799: -50,5
-            3800: -50,-1
-            3801: -49,-1
-            3802: -47,-1
-            3803: -46,-1
-            3804: -44,-1
-            3805: -44,-3
-            3806: -46,-3
-            3807: -47,-3
-            3808: -49,-3
-            3809: -50,-3
-            3810: -48,-3
-            3811: -46,-3
-            3812: -48,3
-            3813: -46,3
-            3893: -21,6
-            3894: -21,7
-            3895: -22,6
-            3896: -21,7
-            4093: 19,1
-            4094: 21,1
-            4095: 22,1
-            4096: 23,1
-            4097: 23,1
-            4162: 40,-22
-            4163: 41,-22
-            4164: 43,-22
-            4165: 44,-22
-            4224: 61,-25
-            4225: 62,-25
-            4226: 62,-26
-            4231: 68,-23
-            4254: 68,-15
-            4255: 68,-13
-            4256: 68,-14
-            4257: 67,-12
-            4258: 70,-12
-            4259: 70,-14
-            4260: 68,-11
-            4261: 71,-12
-            4262: 70,-14
-            4263: 70,-15
-            4264: 71,-13
-            4265: 69,-13
-            4266: 69,-12
-            4267: 68,-10
-            4268: 67,-10
-            4269: 68,-8
-            4270: 69,-8
-            4271: 70,-9
-            4272: 70,-10
-            4366: 39,-34
-            4367: 40,-34
-            4368: 39,-34
-            4369: 42,-34
-            4370: 40,-34
-            4371: 41,-33
-            4372: 34,-36
-            4373: 34,-35
-            4374: 35,-36
-            4375: 38,-37
-            4376: 43,-37
-            4377: 43,-37
-            4378: 46,-37
-            4379: 46,-35
-            4380: 46,-37
-            4381: 47,-37
-            4382: 48,-36
-            4383: 48,-37
-            4384: 46,-39
-            4385: 44,-39
-            4386: 41,-39
-            4387: 37,-39
-            4388: 35,-39
-            4389: 39,-38
-            4390: 33,-38
-            4690: -20,6
-            4691: -20,7
-            4692: -21,6
-            4693: -20,7
-            4694: -20,6
-            4695: -21,12
-            4696: -25,29
-            4697: -25,28
-            4698: -26,30
-            4699: -26,28
-            4700: -26,29
-            4724: -16,40
-            4725: -17,41
-            4726: -15,39
-            4727: -13,41
-            4728: -12,39
-            4779: -2,46
-            4780: -4,46
-            4781: -1,48
-            4782: 0,47
-            4783: -3,50
-            4784: 0,51
-            4785: 2,47
-            4786: 2,45
-            4787: 2,43
-            4788: 2,40
-            4789: -6,40
-            4790: -7,40
-            4791: -7,40
-            4792: -4,46
-            4793: -5,45
-            4794: -6,46
-            4795: 7,41
-            4796: 6,42
-            4797: 9,40
-            4798: 6,39
-            4799: 8,40
-            4800: 6,39
-            4801: 8,39
-            4802: 7,42
-            4803: 7,41
-            4804: 5,41
-            4835: 14,34
-            4836: 13,36
-            4837: 14,37
-            4838: 16,37
-            4839: 14,36
-            4840: 5,30
-            4841: 4,30
-            4842: 3,32
-            4843: 5,32
-            4844: 5,32
-            4845: 4,31
-            4846: 4,31
-            4847: 3,32
-            4848: 3,28
-            4849: 2,27
-            4850: 1,28
-            4851: 3,27
-            4852: 4,26
-            4853: 3,25
-            4854: 4,24
-            4855: 3,23
-            4856: 1,24
-            4857: 2,23
-            4875: -3,25
-            4876: -4,23
-            4877: -2,23
-            4878: -3,24
-            4879: 0,24
-            4880: 0,23
-            4881: -16,29
-            4882: -15,26
-            4883: -15,28
-            4884: -13,28
-            4885: -13,29
-            4886: -9,28
-            4887: -10,26
-            4888: -9,27
-            4889: -11,28
-            4890: -8,29
-            4891: -9,26
-            4892: -6,27
-            4893: -6,26
-            4894: -6,28
-            4895: -3,29
-            4896: -4,27
-            4897: -1,28
-            4898: -3,29
-            4899: -2,30
-            4900: -3,32
-            4901: -2,33
-            4902: -2,34
-            4903: -8,33
-            4904: -7,32
-            4905: -8,32
-            4906: -9,33
-            4907: -6,34
-            4908: -6,33
-            4909: -13,34
-            4977: -17,-28
-            4978: -19,-28
-            4979: -20,-27
-            4980: -20,-26
-            4981: -20,-27
-            4982: -15,-28
-            4983: -14,-28
-            4984: -14,-27
-            4985: -14,-29
-            4986: -17,-29
-            5048: -14,-38
-            5049: -14,-38
-            5067: -6,-37
-            5068: -5,-37
-            5069: -4,-37
-            5255: 78,-28
-            5256: 79,-28
-            5257: 78,-28
-            5258: 78,-27
-            5259: 78,-29
-            5321: 13,-45
-            5322: 12,-45
-            5323: 12,-50
-            5324: 12,-49
-            5325: 16,-49
-            5326: 15,-49
-            6129: 81,-34
-            6130: 82,-35
-            6131: 81,-35
-            6132: 81,-35
-            6158: -2,41
-            6159: -2,42
-            6160: -3,42
-            6161: -3,42
-            6162: -1,43
-            6184: 46,15
-            6185: 47,15
-            6186: 47,15
-            6187: 45,16
-            6399: 49,-1
-            6400: 51,-1
-            6401: 50,-2
-            6402: 49,-3
-            6403: 49,-5
-            6404: 51,-5
-            6405: 51,-3
-            6406: 50,-8
-            6407: 49,-8
-            6408: 48,-7
-            6409: 52,-8
-            6410: 54,-7
-            6411: 49,-10
-            6412: 50,-11
-            6413: 48,-11
-            6414: 51,-10
-            6415: 51,-11
-            6416: 52,-11
-            6417: 53,-11
-            6442: 50,2
-            6443: 50,4
-            6444: 50,9
-            6445: 50,12
-            6446: 50,13
-            6447: 47,9
-            6448: 47,7
-            6449: 41,8
-            6450: 41,7
-            6451: 40,8
-            6452: 40,7
-            6453: 44,8
-            6475: 46,4
-            6476: 45,4
-            6477: 46,2
-            6478: 45,2
-            6479: 45,1
-            6480: 46,5
-            6481: 40,5
-            6482: 44,4
-            6483: 44,7
-            6484: 55,3
-            6485: 54,2
-            6486: 53,3
-            6487: 55,4
-            6488: 57,4
-            6489: 56,2
-            6490: 55,1
-            6491: 55,6
-            6492: 53,7
-            6493: 53,6
-            6494: 55,8
-            6495: 56,10
-            6496: 55,10
-            6497: 53,12
-            6498: 53,11
-            6499: 57,14
-            6509: -1,-23
-            6510: 0,-23
-            6511: -4,-23
-            6512: -5,-23
-            6513: 35,19
-            6514: 34,19
-            6515: 35,20
-            6516: -8,27
-            6517: -12,27
-            6518: -10,27
-            6519: -14,27
-            6520: -15,27
-            6521: -15,27
-            6555: 88,-18
-            6556: 87,-18
-            6557: 91,-19
-            6558: 91,-18
-            6559: 92,-19
-            6638: 51,-36
-            6639: 51,-37
-            6640: 53,-39
-            6641: 54,-40
-            6642: 51,-35
-            6649: 51,-29
-            6655: 51,-26
-            6656: 52,-27
-            6672: -32,-12
-            6673: -34,-11
-            6674: -32,-10
-            6675: -33,-9
-            6676: -34,-9
-            6680: 61,-21
-            6681: -24,-42
-            6683: -25,-42
-            6684: -22,-42
-            6685: -22,-42
-            6692: -37,-45
-            6693: -38,-44
-            6694: -38,-46
-            6695: -37,-46
-            6786: 13,41
-            6787: 15,39
-            6788: 16,41
-            6824: 33,-2
-            6825: 34,-2
-            6826: 34,-2
-            6844: 7,-47
-            6983: -21,10
-            6984: -21,10
-            6985: -22,10
-            6986: -20,10
-            6987: -24,13
-            7135: -35,12
-            7136: -33,11
-            7137: -32,13
-            7138: -31,13
-            7139: -32,16
-            7140: -34,16
-            7141: -34,17
-            7142: -32,17
-            7143: -30,17
-            7144: -29,16
-            7145: -29,13
-            7146: -29,11
-            7147: -32,12
-            7148: -37,14
-            7149: -38,13
-            7150: -39,14
-            7160: -35,17
-            7161: -35,11
-            7162: -34,11
-            7163: -31,11
-            7164: -30,11
-            7165: -33,16
-            7166: -38,10
-            7167: -29,15
-            7168: -29,15
-            7169: -29,16
-            7170: -29,17
-            7171: -32,17
+            3090: 4,-31
+            3091: 0,-31
+            3092: -4,-31
+            3093: -8,-31
+            3094: -10,-31
+            3095: -13,-31
+            3096: -17,-31
+            3097: -18,-31
+            3098: -21,-31
+            3099: -25,-31
+            3100: -25,-27
+            3101: -25,-24
+            3102: -25,-22
+            3103: -25,-19
+            3104: -25,-18
+            3105: -25,-13
+            3106: -25,-11
+            3107: -24,-10
+            3108: -24,-8
+            3109: -22,-2
+            3110: -22,0
+            3111: -22,3
+            3112: -20,8
+            3113: -22,9
+            3114: -24,8
+            3115: -25,9
+            3116: -26,8
+            3117: -26,12
+            3118: -26,15
+            3119: -26,17
+            3120: -25,20
+            3121: -23,19
+            3122: -20,19
+            3123: -18,20
+            3124: -15,20
+            3125: -12,20
+            3126: -7,20
+            3127: -3,20
+            3128: -1,20
+            3129: 2,20
+            3130: 6,20
+            3131: 9,20
+            3132: 11,20
+            3133: 14,20
+            3134: 17,20
+            3135: 20,19
+            3136: 20,17
+            3137: 20,15
+            3138: 20,11
+            3139: 20,9
+            3140: 20,6
+            3141: 20,3
+            3142: 22,3
+            3143: 25,3
+            3144: 27,3
+            3145: 30,3
+            3146: 33,3
+            3147: 36,3
+            3148: 41,3
+            3149: 42,2
+            3150: 42,0
+            3151: 42,-3
+            3152: 42,-6
+            3153: 42,-9
+            3154: 42,-11
+            3155: 42,-15
+            3156: 42,-18
+            3157: 42,-20
+            3158: 44,-20
+            3159: 42,-13
+            3160: 42,-10
+            3161: 42,-7
+            3162: 42,-5
+            3163: 42,-2
+            3164: 42,1
+            3165: 39,3
+            3166: 37,3
+            3167: 35,3
+            3168: 32,3
+            3169: 31,3
+            3170: 26,3
+            3171: 22,3
+            3172: 20,6
+            3173: 20,9
+            3174: 20,12
+            3175: 20,15
+            3176: 20,19
+            3177: 19,20
+            3178: 12,20
+            3179: 8,20
+            3180: 5,20
+            3181: 2,20
+            3182: -1,20
+            3183: -5,20
+            3184: -9,20
+            3185: -12,20
+            3186: -16,20
+            3188: -19,19
+            3189: -26,20
+            3190: -26,16
+            3191: -26,11
+            3192: -26,8
+            3193: -23,8
+            3194: -22,9
+            3195: -21,8
+            3196: -20,9
+            3197: -22,3
+            3198: -22,0
+            3199: -22,-3
+            3200: -22,-5
+            3201: -23,-7
+            3202: -25,-7
+            3203: -23,-8
+            3204: -25,-10
+            3205: -25,-10
+            3206: -25,-14
+            3207: -25,-18
+            3208: -25,-21
+            3209: -25,-25
+            3210: -25,-28
+            3211: -23,-31
+            3212: -20,-31
+            3213: -15,-31
+            3214: -9,-31
+            3215: -5,-31
+            3216: 1,-31
+            3217: 1,-32
+            3218: 7,-31
+            3219: 5,-31
+            3220: 8,-32
+            3221: 9,-33
+            3222: 12,-33
+            3223: 15,-33
+            3224: 18,-33
+            3225: 19,-33
+            3226: 20,-29
+            3227: 20,-27
+            3228: 21,-26
+            3229: 24,-26
+            3230: 27,-26
+            3231: 28,-26
+            3232: 28,-22
+            3233: 28,-21
+            3234: 28,-20
+            3235: 32,-20
+            3236: 35,-20
+            3237: 39,-20
+            3238: 42,-20
+            3239: 40,-20
+            3240: 42,-17
+            3241: 42,-19
+            3242: 49,-20
+            3243: 52,-20
+            3244: 47,-20
+            3245: 53,-20
+            3246: 53,-22
+            3247: 53,-23
+            3248: 54,-20
+            3249: 56,-20
+            3250: 58,-20
+            3251: 58,-20
+            3252: 58,-22
+            3253: 58,-23
+            3254: 58,-22
+            3255: 49,-20
+            3256: 50,-20
+            3257: 44,-13
+            3258: 41,-13
+            3259: 39,-1
+            3260: 37,-1
+            3261: 36,-1
+            3262: 50,6
+            3263: 50,2
+            3264: 50,14
+            3265: 46,-7
+            3266: 45,-8
+            3267: 46,-4
+            3268: 46,-5
+            3269: 45,-1
+            3270: 46,-2
+            3271: 54,-1
+            3272: 55,-1
+            3273: 55,-7
+            3274: 62,-6
+            3275: 61,-6
+            3276: 55,7
+            3277: 54,7
+            3278: 59,15
+            3279: 58,15
+            3280: 60,16
+            3281: 60,3
+            3282: 60,1
+            3283: 63,1
+            3284: 62,1
+            3285: 62,0
+            3286: 62,3
+            3287: 62,4
+            3288: 28,3
+            3289: 28,3
+            3290: 24,8
+            3291: 24,6
+            3292: 23,8
+            3293: 25,7
+            3294: 24,7
+            3295: 24,6
+            3296: 25,11
+            3297: 25,13
+            3298: 25,14
+            3299: 23,15
+            3300: 22,12
+            3301: 23,12
+            3302: 23,14
+            3303: 23,11
+            3304: 26,19
+            3305: 24,20
+            3306: 25,21
+            3307: 26,19
+            3308: 25,20
+            3309: 29,20
+            3310: 29,19
+            3311: 30,19
+            3312: 29,21
+            3313: -19,26
+            3314: -21,28
+            3315: -20,26
+            3316: -20,28
+            3317: -7,40
+            3318: 3,40
+            3319: -26,19
+            3320: -17,11
+            3321: -16,11
+            3322: -16,13
+            3323: -17,13
+            3324: -30,3
+            3325: -32,3
+            3326: -37,3
+            3327: -36,2
+            3328: -35,2
+            3329: -37,1
+            3330: -33,1
+            3331: -32,2
+            3332: -32,1
+            3333: -31,2
+            3334: -33,2
+            3335: -38,0
+            3336: -37,0
+            3337: -34,0
+            3338: -33,0
+            3339: -31,0
+            3340: -30,0
+            3341: -55,6
+            3342: -54,6
+            3343: -54,4
+            3344: -54,2
+            3345: -56,5
+            3346: -55,4
+            3347: -53,1
+            3348: -51,1
+            3349: -49,1
+            3350: -47,1
+            3351: -45,1
+            3352: -44,1
+            3353: -43,1
+            3354: -54,1
+            3355: -54,-4
+            3356: -55,-4
+            3357: -54,-8
+            3358: -54,-10
+            3359: -54,-12
+            3360: -54,-14
+            3361: -54,-16
+            3362: -54,-19
+            3363: -53,-21
+            3364: -51,-21
+            3365: -54,-21
+            3366: -54,-20
+            3367: -54,-18
+            3368: -48,-21
+            3369: -48,-23
+            3370: -48,-24
+            3371: -50,-25
+            3372: -47,-25
+            3373: -45,-25
+            3374: -45,-26
+            3375: -45,-29
+            3376: -44,-28
+            3377: -43,-28
+            3378: -45,-31
+            3379: -48,-32
+            3380: -49,-32
+            3381: -51,-32
+            3382: -51,-30
+            3383: -51,-28
+            3384: -51,-26
+            3385: -48,-33
+            3386: -54,-26
+            3387: -56,-25
+            3388: -55,-25
+            3389: -56,-26
+            3390: -57,-26
+            3391: -55,-26
+            3392: -56,-25
+            3393: -48,-36
+            3394: -48,-38
+            3395: -48,-40
+            3396: -48,-42
+            3397: -48,-44
+            3398: -48,-47
+            3399: -49,-47
+            3400: -51,-47
+            3401: -53,-47
+            3402: -54,-47
+            3403: -45,-47
+            3404: -45,-47
+            3405: -43,-47
+            3406: -41,-47
+            3407: -41,-47
+            3408: -41,-50
+            3409: -41,-51
+            3410: -41,-54
+            3411: -36,-58
+            3412: -36,-60
+            3413: -36,-63
+            3414: -36,-64
+            3415: -36,-56
+            3416: -37,-56
+            3417: -41,-61
+            3418: -42,-62
+            3419: -41,-64
+            3420: -41,-64
+            3421: -42,-62
+            3422: -41,-48
+            3423: -53,-47
+            3424: -55,-47
+            3425: -55,-49
+            3426: -55,-52
+            3427: -55,-54
+            3428: -60,-58
+            3429: -60,-60
+            3430: -60,-62
+            3431: -60,-63
+            3432: -60,-64
+            3433: -58,-56
+            3434: -60,-56
+            3435: -55,-64
+            3436: -55,-62
+            3437: -54,-61
+            3438: -54,-63
+            3439: -54,-64
+            3440: -8,-28
+            3441: -7,-26
+            3442: -8,-27
+            3443: -8,-27
+            3444: 7,-22
+            3445: 5,-22
+            3446: 4,-23
+            3447: 4,-20
+            3448: 4,-19
+            3449: 7,-20
+            3450: 7,-21
+            3451: 7,-24
+            3452: 7,-25
+            3453: 10,-16
+            3454: 10,-18
+            3455: 10,-18
+            3456: 12,-29
+            3457: 12,-28
+            3458: 12,-26
+            3459: 13,-25
+            3460: 14,-25
+            3461: 14,-26
+            3462: 15,-25
+            3463: 16,-26
+            3464: 16,-29
+            3465: -4,-36
+            3466: -4,-37
+            3467: -6,-37
+            3468: 34,-3
+            3469: 32,-2
+            3470: 32,-3
+            3471: 31,-2
+            3472: 31,-3
+            3473: 31,-35
+            3474: 33,-35
+            3475: 32,-37
+            3476: 33,-36
+            3477: 33,-38
+            3478: 32,-36
+            3479: 31,-38
+            3480: 47,-36
+            3481: 47,-35
+            3482: 49,-35
+            3483: 49,-37
+            3484: 47,-37
+            3485: 47,-38
+            3486: 49,-38
+            3487: 47,-39
+            3488: 24,-29
+            3489: 26,-29
+            3490: 27,-29
+            3491: 28,-29
+            3492: 25,-34
+            3493: 27,-34
+            3494: 28,-34
+            3495: 26,-34
+            3496: 28,-43
+            3497: 29,-43
+            3498: 28,-45
+            3499: 29,-45
+            3500: 28,-46
+            3501: 29,-46
+            3502: 19,-46
+            3503: 18,-46
+            3504: 18,-47
+            3505: 19,-49
+            3506: 19,-49
+            3507: 18,-50
+            3508: 19,-50
+            3509: 18,-48
+            3510: 16,-48
+            3511: 14,-48
+            3512: 12,-47
+            3513: 10,-40
+            3514: 11,-39
+            3515: 11,-40
+            3516: 11,-40
+            3517: 8,-31
+            3518: 8,-31
+            3519: 5,-14
+            3520: 6,-14
+            3521: 6,-15
+            3522: 5,-15
+            3523: 4,-15
+            3524: 4,-15
+            3525: 25,7
+            3526: 20,16
+            3527: 20,18
+            3528: 15,26
+            3529: 14,26
+            3530: 13,26
+            3531: 13,26
+            3532: -44,10
+            3533: -45,10
+            3534: -46,10
+            3535: -47,10
+            3536: -49,10
+            3537: -50,10
+            3538: -50,12
+            3539: -47,12
+            3540: -48,1
+            3541: -47,1
+            3542: -48,-41
+            3543: -38,-56
+            3544: -38,-56
+            3545: -42,-57
+            3546: -55,-57
+            3678: -50,0
+            3679: -50,2
+            3680: -48,2
+            3681: -46,2
+            3682: -45,2
+            3683: -44,0
+            3684: -46,0
+            3685: -48,0
+            3717: -51,3
+            3718: -49,3
+            3719: -47,3
+            3720: -45,3
+            3721: -44,5
+            3722: -46,5
+            3723: -48,5
+            3724: -50,5
+            3725: -50,-1
+            3726: -49,-1
+            3727: -47,-1
+            3728: -46,-1
+            3729: -44,-1
+            3730: -44,-3
+            3731: -46,-3
+            3732: -47,-3
+            3733: -49,-3
+            3734: -50,-3
+            3735: -48,-3
+            3736: -46,-3
+            3737: -48,3
+            3738: -46,3
+            3818: -21,6
+            3819: -21,7
+            3820: -22,6
+            3821: -21,7
+            3999: 19,1
+            4000: 21,1
+            4001: 22,1
+            4002: 23,1
+            4003: 23,1
+            4057: 40,-22
+            4058: 41,-22
+            4059: 43,-22
+            4060: 44,-22
+            4119: 61,-25
+            4120: 62,-25
+            4121: 62,-26
+            4126: 68,-23
+            4149: 68,-15
+            4150: 68,-13
+            4151: 68,-14
+            4152: 67,-12
+            4153: 70,-12
+            4154: 70,-14
+            4155: 68,-11
+            4156: 71,-12
+            4157: 70,-14
+            4158: 70,-15
+            4159: 71,-13
+            4160: 69,-13
+            4161: 69,-12
+            4162: 68,-10
+            4163: 67,-10
+            4164: 68,-8
+            4165: 69,-8
+            4166: 70,-9
+            4167: 70,-10
+            4261: 39,-34
+            4262: 40,-34
+            4263: 39,-34
+            4264: 42,-34
+            4265: 40,-34
+            4266: 41,-33
+            4267: 34,-36
+            4268: 34,-35
+            4269: 35,-36
+            4270: 38,-37
+            4271: 43,-37
+            4272: 43,-37
+            4273: 46,-37
+            4274: 46,-35
+            4275: 46,-37
+            4276: 47,-37
+            4277: 48,-36
+            4278: 48,-37
+            4279: 46,-39
+            4280: 44,-39
+            4281: 41,-39
+            4282: 37,-39
+            4283: 35,-39
+            4284: 39,-38
+            4285: 33,-38
+            4584: -20,6
+            4585: -20,7
+            4586: -21,6
+            4587: -20,7
+            4588: -20,6
+            4589: -21,12
+            4590: -25,29
+            4591: -25,28
+            4592: -26,30
+            4593: -26,28
+            4594: -26,29
+            4618: -16,40
+            4619: -17,41
+            4620: -15,39
+            4621: -13,41
+            4622: -12,39
+            4673: -2,46
+            4674: -4,46
+            4675: -1,48
+            4676: 0,47
+            4677: -3,50
+            4678: 0,51
+            4679: 2,47
+            4680: 2,45
+            4681: 2,43
+            4682: 2,40
+            4683: -6,40
+            4684: -7,40
+            4685: -7,40
+            4686: -4,46
+            4687: -5,45
+            4688: -6,46
+            4689: 7,41
+            4690: 6,42
+            4691: 9,40
+            4692: 6,39
+            4693: 8,40
+            4694: 6,39
+            4695: 8,39
+            4696: 7,42
+            4697: 7,41
+            4698: 5,41
+            4729: 14,34
+            4730: 13,36
+            4731: 14,37
+            4732: 16,37
+            4733: 14,36
+            4734: 5,30
+            4735: 4,30
+            4736: 3,32
+            4737: 5,32
+            4738: 5,32
+            4739: 4,31
+            4740: 4,31
+            4741: 3,32
+            4742: 3,28
+            4743: 2,27
+            4744: 1,28
+            4745: 3,27
+            4746: 4,26
+            4747: 3,25
+            4748: 4,24
+            4749: 3,23
+            4750: 1,24
+            4751: 2,23
+            4769: -3,25
+            4770: -4,23
+            4771: -2,23
+            4772: -3,24
+            4773: 0,24
+            4774: 0,23
+            4775: -16,29
+            4776: -15,26
+            4777: -15,28
+            4778: -13,28
+            4779: -13,29
+            4780: -9,28
+            4781: -10,26
+            4782: -9,27
+            4783: -11,28
+            4784: -8,29
+            4785: -9,26
+            4786: -6,27
+            4787: -6,26
+            4788: -6,28
+            4789: -3,29
+            4790: -4,27
+            4791: -1,28
+            4792: -3,29
+            4793: -2,30
+            4794: -3,32
+            4795: -2,33
+            4796: -2,34
+            4797: -8,33
+            4798: -7,32
+            4799: -8,32
+            4800: -9,33
+            4801: -6,34
+            4802: -6,33
+            4803: -13,34
+            4871: -17,-28
+            4872: -19,-28
+            4873: -20,-27
+            4874: -20,-26
+            4875: -20,-27
+            4876: -15,-28
+            4877: -14,-28
+            4878: -14,-27
+            4879: -14,-29
+            4880: -17,-29
+            4934: -14,-38
+            4935: -14,-38
+            4953: -6,-37
+            4954: -5,-37
+            4955: -4,-37
+            5141: 78,-28
+            5142: 79,-28
+            5143: 78,-28
+            5144: 78,-27
+            5145: 78,-29
+            5207: 13,-45
+            5208: 12,-45
+            5209: 12,-50
+            5210: 12,-49
+            5211: 16,-49
+            5212: 15,-49
+            6001: 81,-34
+            6002: 82,-35
+            6003: 81,-35
+            6004: 81,-35
+            6030: -2,41
+            6031: -2,42
+            6032: -3,42
+            6033: -3,42
+            6034: -1,43
+            6243: 49,-1
+            6244: 51,-1
+            6245: 50,-2
+            6246: 49,-3
+            6247: 49,-5
+            6248: 51,-5
+            6249: 51,-3
+            6250: 50,-8
+            6251: 49,-8
+            6252: 48,-7
+            6253: 52,-8
+            6254: 54,-7
+            6255: 49,-10
+            6256: 50,-11
+            6257: 48,-11
+            6258: 51,-10
+            6259: 51,-11
+            6260: 52,-11
+            6261: 53,-11
+            6286: 50,2
+            6287: 50,4
+            6288: 50,9
+            6289: 50,12
+            6290: 50,13
+            6291: 47,9
+            6292: 47,7
+            6293: 41,8
+            6294: 41,7
+            6295: 40,8
+            6296: 40,7
+            6297: 44,8
+            6319: 46,4
+            6320: 45,4
+            6321: 46,2
+            6322: 45,2
+            6323: 45,1
+            6324: 46,5
+            6325: 40,5
+            6326: 44,4
+            6327: 44,7
+            6328: 55,3
+            6329: 54,2
+            6330: 53,3
+            6331: 55,4
+            6332: 57,4
+            6333: 56,2
+            6334: 55,1
+            6335: 55,6
+            6336: 53,7
+            6337: 53,6
+            6338: 55,8
+            6339: 56,10
+            6340: 55,10
+            6341: 53,12
+            6342: 53,11
+            6343: 57,14
+            6353: -1,-23
+            6354: 0,-23
+            6355: -4,-23
+            6356: -5,-23
+            6357: 35,19
+            6358: 34,19
+            6359: 35,20
+            6360: -8,27
+            6361: -12,27
+            6362: -10,27
+            6363: -14,27
+            6364: -15,27
+            6365: -15,27
+            6399: 88,-18
+            6400: 87,-18
+            6401: 91,-19
+            6402: 91,-18
+            6403: 92,-19
+            6482: 51,-36
+            6483: 51,-37
+            6484: 53,-39
+            6485: 54,-40
+            6486: 51,-35
+            6493: 51,-29
+            6499: 51,-26
+            6500: 52,-27
+            6516: -32,-12
+            6517: -34,-11
+            6518: -32,-10
+            6519: -33,-9
+            6520: -34,-9
+            6524: 61,-21
+            6525: -24,-42
+            6527: -25,-42
+            6528: -22,-42
+            6529: -22,-42
+            6536: -37,-45
+            6537: -38,-44
+            6538: -38,-46
+            6539: -37,-46
+            6628: 13,41
+            6629: 15,39
+            6630: 16,41
+            6666: 33,-2
+            6667: 34,-2
+            6668: 34,-2
+            6686: 7,-47
+            6791: -20,10
+            6792: -24,13
+            6856: -35,12
+            6857: -33,11
+            6858: -32,13
+            6859: -31,13
+            6860: -32,16
+            6861: -34,16
+            6862: -34,17
+            6863: -32,17
+            6864: -30,17
+            6865: -29,16
+            6866: -29,13
+            6867: -29,11
+            6868: -32,12
+            6869: -37,14
+            6870: -38,13
+            6871: -39,14
+            6881: -35,17
+            6882: -35,11
+            6883: -34,11
+            6884: -31,11
+            6885: -30,11
+            6886: -33,16
+            6887: -38,10
+            6888: -29,15
+            6889: -29,15
+            6890: -29,16
+            6891: -29,17
+            6892: -32,17
+            6935: 44,11
+            6936: 45,12
+            6937: 44,14
+            6938: 43,15
+            6939: 44,16
+            6940: 47,14
+            6941: 41,12
+            6942: 41,13
+            6943: 41,11
+            6944: 41,11
+            6945: 47,11
+            6946: 47,12
+            6958: 44,15
+            6959: 44,15
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            2990: -44,17
-            6606: 13,-30
-            6607: 16,-30
-            6608: 12,-30
-            6609: 12,-30
+            2930: -44,17
+            6450: 13,-30
+            6451: 16,-30
+            6452: 12,-30
+            6453: 12,-30
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6581: 89,-21
-            6582: 90,-20
+            6425: 89,-21
+            6426: 90,-20
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6500: 57,4
-            6501: 57,2
-            6502: 54,3
-            6503: 56,1
-            6504: 49,-15
-            6505: 52,-15
-            6506: 43,4
-            6691: -36,-44
-            6789: 14,42
-            6790: 14,40
-            6791: 16,42
-            7151: -34,13
-            7152: -32,13
-            7153: -31,15
-            7154: -30,16
-            7155: -29,11
-            7156: -35,13
-            7157: -33,13
+            6344: 57,4
+            6345: 57,2
+            6346: 54,3
+            6347: 56,1
+            6348: 49,-15
+            6349: 52,-15
+            6350: 43,4
+            6535: -36,-44
+            6631: 14,42
+            6632: 14,40
+            6633: 16,42
+            6872: -34,13
+            6873: -32,13
+            6874: -31,15
+            6875: -30,16
+            6876: -29,11
+            6877: -35,13
+            6878: -33,13
+            6954: 44,13
+            6955: 46,13
+            6956: 46,12
+            6957: 42,11
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            2989: -44,16
+            2929: -44,16
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: DirtMedium
           decals:
-            6614: 11,-29
-            6615: 11,-29
+            6458: 11,-29
+            6459: 11,-29
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            6584: 91,-21
-            6585: 90,-21
+            6428: 91,-21
+            6429: 90,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            3923: -16,11
-            3924: -17,12
-            6650: 52,-30
-            6677: -32,-9
-            6678: -34,-12
-            6690: -36,-46
-            6792: 13,39
-            6793: 13,42
-            6794: 16,40
-            6795: 13,38
-            6796: 13,38
-            6846: 9,-47
-            6971: -33,15
-            7158: -30,13
-            7159: -38,14
+            3848: -16,11
+            3849: -17,12
+            6494: 52,-30
+            6521: -32,-9
+            6522: -34,-12
+            6534: -36,-46
+            6634: 13,39
+            6635: 13,42
+            6636: 16,40
+            6637: 13,38
+            6638: 13,38
+            6688: 9,-47
+            6790: -33,15
+            6879: -30,13
+            6880: -38,14
+            6949: 42,12
+            6950: 42,13
+            6951: 46,11
+            6952: 47,13
+            6953: 46,14
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            2988: -44,15
+            2928: -44,15
         - node:
             color: '#FFFFFFFF'
             id: FlowersBROne
           decals:
-            880: -47,-2
-            907: -50,-7
-            1936: 56,-22
+            855: -47,-2
+            882: -50,-7
+            1876: 56,-22
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRThree
@@ -6585,255 +6597,250 @@ entities:
             color: '#FFFFFFFF'
             id: FlowersBRThree
           decals:
-            3017: 80.70172,-6.173584
+            2957: 80.70172,-6.173584
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
           decals:
             562: -24,6
-            878: -45,4
+            853: -45,4
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr1
           decals:
-            911: -45,-7
-            932: -49,-29
-            1498: -51,-49
-            6874: 57.036556,-21.73806
+            886: -45,-7
+            907: -49,-29
+            1448: -51,-49
+            6716: 57.036556,-21.73806
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr3
           decals:
-            1108: 42,-31
+            1083: 42,-31
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            879: -49,-2
-            912: -51,-7
-            1499: -49,-49
+            854: -49,-2
+            887: -51,-7
+            1449: -49,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            3018: 80.04127,-7.0725327
+            2958: 80.04127,-7.0725327
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv3
           decals:
             540: -39,6
             561: -24,4
-            909: -48,-9
-            1107: 42,-30
-            1745: 57,18
+            884: -48,-9
+            1082: 42,-30
+            1695: 57,18
         - node:
             color: '#FFFFFFFF'
             id: Flowersy1
           decals:
-            1935: 55,-23
+            1875: 55,-23
         - node:
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
             539: -38,5
-            910: -45,-9
-            933: -48,-30
-            1500: -46,-49
+            885: -45,-9
+            908: -48,-30
+            1450: -46,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
-            3019: 81.08699,-7.6962934
+            2959: 81.08699,-7.6962934
         - node:
             color: '#FFFFFFFF'
             id: Flowersy3
           decals:
-            877: -50,4
-            908: -47,-7
-            2232: 25,1
+            852: -50,4
+            883: -47,-7
+            2172: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Flowersy4
           decals:
             542: -28,7
-            1728: 59,19
-        - node:
-            color: '#EFB34196'
-            id: FullTileOverlayGreyscale
-          decals:
-            6163: 43,13
+            1678: 59,19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassa2
           decals:
-            3007: 80,-6
+            2947: 80,-6
         - node:
             color: '#FFFFFFFF'
             id: Grassa3
           decals:
-            899: -51,-7
+            874: -51,-7
         - node:
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            1492: -47,-49
-            1942: 53.52114,-21.634073
+            1442: -47,-49
+            1882: 53.52114,-21.634073
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            3006: 80,-8
+            2946: 80,-8
         - node:
             color: '#FFFFFFFF'
             id: Grassa5
           decals:
-            898: -49,-7
-            1493: -45,-49
-            1943: 57.536766,-22.899698
+            873: -49,-7
+            1443: -45,-49
+            1883: 57.536766,-22.899698
         - node:
             color: '#FFFFFFFF'
             id: Grassb1
           decals:
-            902: -45,-8
+            877: -45,-8
         - node:
             color: '#FFFFFFFF'
             id: Grassb2
           decals:
-            937: -49,-28
-            1729: 60,19
+            912: -49,-28
+            1679: 60,19
         - node:
             color: '#FFFFFFFF'
             id: Grassb3
           decals:
-            900: -51,-8
-            901: -45,-7
+            875: -51,-8
+            876: -45,-7
         - node:
             color: '#FFFFFFFF'
             id: Grassb4
           decals:
-            897: -48,-9
-            1491: -50,-49
-            1941: 54.661766,-23.446573
+            872: -48,-9
+            1441: -50,-49
+            1881: 54.661766,-23.446573
         - node:
             color: '#FFFFFFFF'
             id: Grassb5
           decals:
-            903: -50,-9
-            6872: 56.88979,-22.312899
+            878: -50,-9
+            6714: 56.88979,-22.312899
         - node:
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
-            896: -46,-8
+            871: -46,-8
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
-            3009: 79.637665,-6.118546
+            2949: 79.637665,-6.118546
         - node:
             color: '#FFFFFFFF'
             id: Grassc2
           decals:
-            895: -47,-7
+            870: -47,-7
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassc2
           decals:
-            3010: 81.362175,-7.1642623
+            2950: 81.362175,-7.1642623
         - node:
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
-            893: -51,-9
-            894: -49,-8
+            868: -51,-9
+            869: -49,-8
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
-            3008: 79.56428,-7.366067
+            2948: 79.56428,-7.366067
         - node:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            889: -50,-8
-            892: -47,-9
+            864: -50,-8
+            867: -47,-9
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            3011: 79.14232,-8.063211
+            2951: 79.14232,-8.063211
         - node:
             color: '#FFFFFFFF'
             id: Grassd2
           decals:
-            891: -45,-9
-            1945: 53.52114,-22.368448
-            6873: 57.379013,-21.12653
+            866: -45,-9
+            1885: 53.52114,-22.368448
+            6715: 57.379013,-21.12653
         - node:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            890: -48,-7
-            935: -48,-27
-            1946: 57.73989,-21.884073
+            865: -48,-7
+            910: -48,-27
+            1886: 57.73989,-21.884073
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            3012: 79.05059,-6.320351
-            3013: 80.53661,-6.6872687
+            2952: 79.05059,-6.320351
+            2953: 80.53661,-6.6872687
         - node:
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            888: -46,-7
-            936: -47,-28
+            863: -46,-7
+            911: -47,-28
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            3016: 81.784134,-6.4304266
+            2956: 81.784134,-6.4304266
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse2
           decals:
-            3014: 80.518265,-8.02652
+            2954: 80.518265,-8.02652
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            887: -50,-7
-            934: -47,-30
-            1746: 57,19
-            1944: 55.95864,-23.352823
+            862: -50,-7
+            909: -47,-30
+            1696: 57,19
+            1884: 55.95864,-23.352823
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            3015: 80.72007,-6.0451627
+            2955: 80.72007,-6.0451627
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
           decals:
-            6233: 44,7
+            6077: 44,7
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
           decals:
-            1187: 4,30
-            1188: 5,30
+            1162: 4,30
+            1163: 5,30
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale
@@ -6845,35 +6852,35 @@ entities:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale180
           decals:
-            1025: 39,-35
-            1026: 36,-36
-            1027: 37,-36
-            1028: 38,-36
-            1029: 39,-36
-            1030: 40,-36
-            1031: 42,-36
-            1032: 41,-36
-            1033: 43,-36
-            1034: 44,-36
-            1037: 38,-35
-            1038: 37,-35
-            1039: 36,-35
-            1040: 41,-35
-            1041: 40,-35
-            1042: 42,-35
-            1043: 43,-35
-            1044: 44,-35
+            1000: 39,-35
+            1001: 36,-36
+            1002: 37,-36
+            1003: 38,-36
+            1004: 39,-36
+            1005: 40,-36
+            1006: 42,-36
+            1007: 41,-36
+            1008: 43,-36
+            1009: 44,-36
+            1012: 38,-35
+            1013: 37,-35
+            1014: 36,-35
+            1015: 41,-35
+            1016: 40,-35
+            1017: 42,-35
+            1018: 43,-35
+            1019: 44,-35
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
-            6234: 44,9
+            6078: 44,9
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
           decals:
-            1189: 4,32
-            1190: 5,32
+            1164: 4,32
+            1165: 5,32
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale180
@@ -6885,12 +6892,12 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            6235: 45,8
+            6079: 45,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            1186: 6,31
+            1161: 6,31
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
@@ -6900,12 +6907,12 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            6236: 43,8
+            6080: 43,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
           decals:
-            1185: 3,31
+            1160: 3,31
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
@@ -6936,70 +6943,79 @@ entities:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            6573: 89,-20
-            6574: 90,-20
+            6417: 89,-20
+            6418: 90,-20
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1789: 58,-24
-            1790: 58,-23
-            2165: -4,-36
-            2183: -56,-59
-            2184: -56,-66
+            1729: 58,-24
+            1730: 58,-23
+            2105: -4,-36
+            2123: -56,-59
+            2124: -56,-66
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             352: 39,-22
-            3145: 25,22
-            3146: 29,22
-            6142: -44,24
+            3080: 25,22
+            3081: 29,22
+            6014: -44,24
+            6893: 44,11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            2199: -40,-59
-            2200: -40,-66
-            6143: -45,23
+            2139: -40,-59
+            2140: -40,-66
+            6015: -45,23
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             351: 45,-22
-            1770: 63,-26
-            6144: -44,22
+            1710: 63,-26
+            6016: -44,22
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1271: 23,12
-            6145: -43,23
+            1246: 23,12
+            6017: -43,23
         - node:
             color: '#52B4E996'
             id: MiniTileCheckerAOverlay
           decals:
-            2217: 13,25
-            2218: 14,25
-            2219: 15,25
-            2220: 15,24
-            2221: 15,23
-            2222: 14,23
-            2223: 14,24
-            2224: 13,24
-            2225: 13,23
+            2157: 13,25
+            2158: 14,25
+            2159: 15,25
+            2160: 15,24
+            2161: 15,23
+            2162: 14,23
+            2163: 14,24
+            2164: 13,24
+            2165: 13,23
+        - node:
+            color: '#EFB34196'
+            id: MiniTileCheckerBOverlay
+          decals:
+            6912: 42,11
+            6913: 42,12
+            6914: 46,11
+            6915: 46,12
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            6720: 9,39
-            6721: 9,40
-            6722: 9,41
-            6723: 9,42
+            6562: 9,39
+            6563: 9,40
+            6564: 9,41
+            6565: 9,42
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
@@ -7014,7 +7030,7 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
           decals:
-            3252: -19,20
+            3187: -19,20
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
@@ -7029,1144 +7045,1144 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineW
           decals:
-            6724: 5,39
-            6725: 5,40
-            6726: 5,41
-            6727: 5,42
+            6566: 5,39
+            6567: 5,40
+            6568: 5,41
+            6569: 5,42
         - node:
             color: '#C6FF917F'
             id: MiniTileInnerOverlayNW
           decals:
-            7081: -29,12
+            6802: -29,12
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayE
           decals:
-            7073: -35,13
-            7074: -35,14
-            7075: -35,15
+            6794: -35,13
+            6795: -35,14
+            6796: -35,15
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayN
           decals:
-            7072: -32,12
+            6793: -32,12
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayS
           decals:
-            7076: -32,16
-            7077: -31,16
-            7078: -30,16
+            6797: -32,16
+            6798: -31,16
+            6799: -30,16
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayW
           decals:
-            7079: -29,13
-            7080: -29,14
+            6800: -29,13
+            6801: -29,14
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNe
           decals:
-            2403: -43,-25
-            2489: -40,-46
+            2343: -43,-25
+            2429: -40,-46
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNw
           decals:
-            2303: -26,-9
-            2347: -55,7
-            2488: -56,-46
-            2589: 27,-19
-            2799: -27,21
+            2243: -26,-9
+            2287: -55,7
+            2428: -56,-46
+            2529: 27,-19
+            2739: -27,21
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSe
           decals:
-            2291: -23,-11
-            2415: -46,-33
-            2419: -43,-32
+            2231: -23,-11
+            2355: -46,-33
+            2359: -43,-32
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSw
           decals:
-            2411: -52,-32
-            2414: -50,-33
-            2565: 7,-34
-            2669: 40,1
-            2698: 19,2
+            2351: -52,-32
+            2354: -50,-33
+            2505: 7,-34
+            2609: 40,1
+            2638: 19,2
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNe
           decals:
-            2266: -23,-30
-            2315: -25,9
-            2404: -44,-25
-            2534: -28,-30
-            2817: 77,-19
-            2818: 77,-15
+            2206: -23,-30
+            2255: -25,9
+            2344: -44,-25
+            2474: -28,-30
+            2757: 77,-19
+            2758: 77,-15
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNw
           decals:
-            2304: -25,-9
-            2533: -41,-30
-            2581: 27,-25
-            2633: 57,-19
+            2244: -25,-9
+            2473: -41,-30
+            2521: 27,-25
+            2573: 57,-19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSe
           decals:
-            2290: -24,-11
-            2416: -46,-32
-            2422: -47,-33
-            2487: -54,-48
-            2532: -28,-27
-            2637: 59,-21
-            2815: 77,-13
-            2816: 77,-17
+            2230: -24,-11
+            2356: -46,-32
+            2362: -47,-33
+            2427: -54,-48
+            2472: -28,-27
+            2577: 59,-21
+            2755: 77,-13
+            2756: 77,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSw
           decals:
-            2413: -50,-32
-            2423: -49,-33
-            2486: -42,-48
-            2531: -41,-27
-            2563: 7,-32
-            2642: 52,-21
-            2668: 41,1
-            2670: 40,2
-            2738: 19,19
+            2353: -50,-32
+            2363: -49,-33
+            2426: -42,-48
+            2471: -41,-27
+            2503: 7,-32
+            2582: 52,-21
+            2608: 41,1
+            2610: 40,2
+            2678: 19,19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineE
           decals:
-            2267: -23,-29
-            2268: -24,-25
-            2269: -24,-24
-            2270: -24,-23
-            2271: -24,-23
-            2272: -24,-20
-            2273: -24,-20
-            2274: -24,-20
-            2275: -24,-21
-            2276: -24,-21
-            2277: -24,-20
-            2278: -24,-19
-            2279: -24,-19
-            2280: -24,-19
-            2281: -24,-17
-            2282: -24,-17
-            2283: -24,-16
-            2284: -24,-16
-            2285: -24,-16
-            2286: -24,-15
-            2287: -24,-14
-            2288: -24,-14
-            2289: -24,-13
-            2292: -23,-10
-            2293: -23,-9
-            2294: -23,-8
-            2305: -25,4
-            2306: -25,5
-            2307: -25,6
-            2308: -25,7
-            2320: -43,0
-            2321: -43,1
-            2322: -43,2
-            2323: -43,3
-            2324: -43,-1
-            2363: -53,-6
-            2364: -53,-7
-            2365: -53,-7
-            2366: -53,-8
-            2367: -53,-9
-            2368: -53,-9
-            2369: -53,-10
-            2370: -53,-12
-            2378: -53,-13
-            2379: -53,-13
-            2380: -53,-15
-            2381: -53,-15
-            2382: -53,-15
-            2384: -53,-14
-            2385: -53,-16
-            2386: -53,-17
-            2387: -53,-18
-            2393: -44,-20
-            2394: -44,-21
-            2395: -44,-22
-            2396: -44,-22
-            2397: -44,-23
-            2398: -44,-23
-            2399: -44,-24
-            2400: -43,-25
-            2401: -43,-26
-            2402: -43,-27
-            2420: -43,-31
-            2421: -43,-30
-            2426: -47,-35
-            2427: -47,-36
-            2428: -47,-36
-            2429: -47,-38
-            2430: -47,-39
-            2431: -47,-40
-            2442: -47,-41
-            2443: -47,-42
-            2444: -47,-42
-            2445: -47,-43
-            2446: -47,-44
-            2447: -47,-44
-            2498: -40,-47
-            2499: -40,-48
-            2500: -40,-50
-            2501: -40,-50
-            2502: -40,-51
-            2503: -40,-51
-            2504: -40,-51
-            2505: -40,-52
-            2506: -40,-53
-            2507: -40,-53
-            2508: -40,-53
-            2509: -40,-54
-            2510: -54,-51
-            2511: -54,-51
-            2512: -54,-52
-            2513: -54,-52
-            2514: -54,-53
-            2515: -54,-53
-            2516: -54,-54
-            2527: -28,-29
-            2528: -28,-28
-            2638: 59,-22
-            2643: 43,-17
-            2644: 43,-16
-            2645: 43,-15
-            2646: 43,-15
-            2652: 43,-12
-            2653: 43,-11
-            2718: 21,10
-            2719: 21,11
-            2720: 21,11
-            2721: 21,12
-            2722: 21,12
-            2723: 21,12
-            2724: 21,13
-            2725: 21,14
-            2726: 21,15
-            2813: 77,-14
-            2814: 77,-18
-            3144: -54,-50
-            6809: -24,-18
+            2207: -23,-29
+            2208: -24,-25
+            2209: -24,-24
+            2210: -24,-23
+            2211: -24,-23
+            2212: -24,-20
+            2213: -24,-20
+            2214: -24,-20
+            2215: -24,-21
+            2216: -24,-21
+            2217: -24,-20
+            2218: -24,-19
+            2219: -24,-19
+            2220: -24,-19
+            2221: -24,-17
+            2222: -24,-17
+            2223: -24,-16
+            2224: -24,-16
+            2225: -24,-16
+            2226: -24,-15
+            2227: -24,-14
+            2228: -24,-14
+            2229: -24,-13
+            2232: -23,-10
+            2233: -23,-9
+            2234: -23,-8
+            2245: -25,4
+            2246: -25,5
+            2247: -25,6
+            2248: -25,7
+            2260: -43,0
+            2261: -43,1
+            2262: -43,2
+            2263: -43,3
+            2264: -43,-1
+            2303: -53,-6
+            2304: -53,-7
+            2305: -53,-7
+            2306: -53,-8
+            2307: -53,-9
+            2308: -53,-9
+            2309: -53,-10
+            2310: -53,-12
+            2318: -53,-13
+            2319: -53,-13
+            2320: -53,-15
+            2321: -53,-15
+            2322: -53,-15
+            2324: -53,-14
+            2325: -53,-16
+            2326: -53,-17
+            2327: -53,-18
+            2333: -44,-20
+            2334: -44,-21
+            2335: -44,-22
+            2336: -44,-22
+            2337: -44,-23
+            2338: -44,-23
+            2339: -44,-24
+            2340: -43,-25
+            2341: -43,-26
+            2342: -43,-27
+            2360: -43,-31
+            2361: -43,-30
+            2366: -47,-35
+            2367: -47,-36
+            2368: -47,-36
+            2369: -47,-38
+            2370: -47,-39
+            2371: -47,-40
+            2382: -47,-41
+            2383: -47,-42
+            2384: -47,-42
+            2385: -47,-43
+            2386: -47,-44
+            2387: -47,-44
+            2438: -40,-47
+            2439: -40,-48
+            2440: -40,-50
+            2441: -40,-50
+            2442: -40,-51
+            2443: -40,-51
+            2444: -40,-51
+            2445: -40,-52
+            2446: -40,-53
+            2447: -40,-53
+            2448: -40,-53
+            2449: -40,-54
+            2450: -54,-51
+            2451: -54,-51
+            2452: -54,-52
+            2453: -54,-52
+            2454: -54,-53
+            2455: -54,-53
+            2456: -54,-54
+            2467: -28,-29
+            2468: -28,-28
+            2578: 59,-22
+            2583: 43,-17
+            2584: 43,-16
+            2585: 43,-15
+            2586: 43,-15
+            2592: 43,-12
+            2593: 43,-11
+            2658: 21,10
+            2659: 21,11
+            2660: 21,11
+            2661: 21,12
+            2662: 21,12
+            2663: 21,12
+            2664: 21,13
+            2665: 21,14
+            2666: 21,15
+            2753: 77,-14
+            2754: 77,-18
+            3079: -54,-50
+            6651: -24,-18
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineN
           decals:
-            2260: -22,-30
-            2261: -21,-30
-            2262: -20,-30
-            2263: -20,-30
-            2264: -18,-30
-            2265: -19,-30
-            2309: -19,9
-            2310: -20,9
-            2311: -21,9
-            2312: -22,9
-            2313: -24,9
-            2314: -23,9
-            2334: -51,7
-            2335: -50,7
-            2336: -49,7
-            2337: -48,7
-            2338: -47,7
-            2339: -47,7
-            2340: -46,7
-            2341: -45,7
-            2342: -42,7
-            2343: -43,7
-            2344: -54,7
-            2345: -55,7
-            2346: -53,7
-            2448: -54,-46
-            2449: -51,-46
-            2450: -50,-46
-            2451: -50,-46
-            2452: -51,-46
-            2453: -53,-46
-            2454: -54,-46
-            2455: -54,-46
-            2456: -53,-46
-            2457: -52,-46
-            2458: -54,-46
-            2459: -55,-46
-            2460: -46,-46
-            2461: -45,-46
-            2462: -45,-46
-            2463: -44,-46
-            2464: -44,-46
-            2465: -43,-46
-            2466: -43,-46
-            2467: -42,-46
-            2468: -42,-46
-            2469: -41,-46
-            2553: -11,-30
-            2554: -10,-30
-            2555: -10,-30
-            2579: 25,-25
-            2580: 26,-25
-            2590: 28,-19
-            2591: 29,-19
-            2592: 29,-19
-            2593: 31,-19
-            2594: 31,-19
-            2595: 32,-19
-            2596: 32,-19
-            2597: 32,-19
-            2598: 34,-19
-            2599: 34,-19
-            2600: 34,-19
-            2601: 33,-19
-            2602: 35,-19
-            2603: 35,-19
-            2604: 36,-19
-            2605: 36,-19
-            2606: 37,-19
-            2607: 37,-19
-            2608: 39,-19
-            2609: 39,-19
-            2610: 40,-19
-            2611: 40,-19
-            2612: 40,-19
-            2613: 41,-19
-            2614: 42,-19
-            2615: 42,-19
-            2616: 43,-19
-            2617: 44,-19
-            2618: 44,-19
-            2619: 45,-19
-            2620: 47,-19
-            2621: 47,-19
-            2622: 48,-19
-            2623: 49,-19
-            2624: 49,-19
-            2625: 50,-19
-            2626: 51,-19
-            2627: 52,-19
-            2628: 52,-19
-            2629: 54,-19
-            2630: 55,-19
-            2631: 56,-19
-            2632: 53,-19
-            2675: 37,4
-            2676: 35,4
-            2677: 34,4
-            2678: 33,4
-            2679: 32,4
-            2680: 32,4
-            2681: 31,4
-            2741: 20,21
-            2742: 19,21
-            2743: 19,21
-            2744: 18,21
-            2745: 16,21
-            2746: 16,21
-            2747: 16,21
-            2748: 16,21
-            2749: 15,21
-            2750: 13,21
-            2751: 13,21
-            2752: 12,21
-            2753: 11,21
-            2754: 10,21
-            2755: 10,21
-            2756: 9,21
-            2757: 8,21
-            2796: -26,21
-            2806: 66,-17
-            2807: 68,-17
-            2808: 67,-17
-            2809: 69,-17
-            2810: 70,-17
-            2811: 70,-17
-            2812: 71,-17
+            2200: -22,-30
+            2201: -21,-30
+            2202: -20,-30
+            2203: -20,-30
+            2204: -18,-30
+            2205: -19,-30
+            2249: -19,9
+            2250: -20,9
+            2251: -21,9
+            2252: -22,9
+            2253: -24,9
+            2254: -23,9
+            2274: -51,7
+            2275: -50,7
+            2276: -49,7
+            2277: -48,7
+            2278: -47,7
+            2279: -47,7
+            2280: -46,7
+            2281: -45,7
+            2282: -42,7
+            2283: -43,7
+            2284: -54,7
+            2285: -55,7
+            2286: -53,7
+            2388: -54,-46
+            2389: -51,-46
+            2390: -50,-46
+            2391: -50,-46
+            2392: -51,-46
+            2393: -53,-46
+            2394: -54,-46
+            2395: -54,-46
+            2396: -53,-46
+            2397: -52,-46
+            2398: -54,-46
+            2399: -55,-46
+            2400: -46,-46
+            2401: -45,-46
+            2402: -45,-46
+            2403: -44,-46
+            2404: -44,-46
+            2405: -43,-46
+            2406: -43,-46
+            2407: -42,-46
+            2408: -42,-46
+            2409: -41,-46
+            2493: -11,-30
+            2494: -10,-30
+            2495: -10,-30
+            2519: 25,-25
+            2520: 26,-25
+            2530: 28,-19
+            2531: 29,-19
+            2532: 29,-19
+            2533: 31,-19
+            2534: 31,-19
+            2535: 32,-19
+            2536: 32,-19
+            2537: 32,-19
+            2538: 34,-19
+            2539: 34,-19
+            2540: 34,-19
+            2541: 33,-19
+            2542: 35,-19
+            2543: 35,-19
+            2544: 36,-19
+            2545: 36,-19
+            2546: 37,-19
+            2547: 37,-19
+            2548: 39,-19
+            2549: 39,-19
+            2550: 40,-19
+            2551: 40,-19
+            2552: 40,-19
+            2553: 41,-19
+            2554: 42,-19
+            2555: 42,-19
+            2556: 43,-19
+            2557: 44,-19
+            2558: 44,-19
+            2559: 45,-19
+            2560: 47,-19
+            2561: 47,-19
+            2562: 48,-19
+            2563: 49,-19
+            2564: 49,-19
+            2565: 50,-19
+            2566: 51,-19
+            2567: 52,-19
+            2568: 52,-19
+            2569: 54,-19
+            2570: 55,-19
+            2571: 56,-19
+            2572: 53,-19
+            2615: 37,4
+            2616: 35,4
+            2617: 34,4
+            2618: 33,4
+            2619: 32,4
+            2620: 32,4
+            2621: 31,4
+            2681: 20,21
+            2682: 19,21
+            2683: 19,21
+            2684: 18,21
+            2685: 16,21
+            2686: 16,21
+            2687: 16,21
+            2688: 16,21
+            2689: 15,21
+            2690: 13,21
+            2691: 13,21
+            2692: 12,21
+            2693: 11,21
+            2694: 10,21
+            2695: 10,21
+            2696: 9,21
+            2697: 8,21
+            2736: -26,21
+            2746: 66,-17
+            2747: 68,-17
+            2748: 67,-17
+            2749: 69,-17
+            2750: 70,-17
+            2751: 70,-17
+            2752: 71,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineS
           decals:
-            2250: -25,-32
-            2251: -23,-32
-            2252: -24,-32
-            2253: -22,-32
-            2254: -22,-32
-            2255: -21,-32
-            2256: -19,-32
-            2257: -19,-32
-            2258: -18,-32
-            2259: -18,-32
-            2325: -45,-5
-            2326: -46,-5
-            2327: -47,-5
-            2328: -48,-5
-            2329: -48,-5
-            2330: -50,-5
-            2331: -50,-5
-            2332: -49,-5
-            2333: -51,-5
-            2412: -51,-32
-            2417: -45,-32
-            2418: -44,-32
-            2470: -53,-48
-            2471: -52,-48
-            2472: -51,-48
-            2473: -50,-48
-            2474: -50,-48
-            2475: -49,-48
-            2476: -50,-48
-            2477: -50,-48
-            2478: -48,-48
-            2479: -48,-48
-            2480: -47,-48
-            2481: -47,-48
-            2482: -46,-48
-            2483: -45,-48
-            2484: -44,-48
-            2485: -43,-48
-            2535: -16,-32
-            2536: -14,-32
-            2537: -14,-32
-            2538: -14,-32
-            2539: -15,-32
-            2540: -14,-32
-            2541: -14,-32
-            2542: -13,-32
-            2543: -12,-32
-            2544: -12,-32
-            2545: -11,-32
-            2546: -11,-32
-            2547: -10,-32
-            2548: -10,-32
-            2549: -7,-32
-            2550: -6,-32
-            2551: -5,-32
-            2552: -5,-32
-            2556: -4,-32
-            2557: -3,-32
-            2558: -3,-32
-            2559: -3,-32
-            2560: -2,-32
-            2561: 3,-32
-            2562: 6,-32
-            2566: 8,-34
-            2567: 9,-34
-            2568: 9,-34
-            2569: 11,-34
-            2570: 11,-34
-            2571: 12,-34
-            2572: 12,-34
-            2573: 13,-34
-            2574: 13,-34
-            2575: 14,-34
-            2576: 15,-34
-            2577: 15,-34
-            2578: 16,-34
-            2636: 60,-21
-            2671: 38,2
-            2672: 36,2
-            2673: 37,2
-            2674: 38,2
-            2682: 34,2
-            2683: 33,2
-            2684: 32,2
-            2685: 31,2
-            2686: 31,2
-            2687: 27,2
-            2688: 26,2
-            2689: 26,2
-            2690: 25,2
-            2691: 24,2
-            2692: 23,2
-            2693: 23,2
-            2694: 21,2
-            2695: 21,2
-            2696: 22,2
-            2697: 20,2
-            2739: 18,19
-            2740: 16,19
-            2758: 14,19
-            2759: 13,19
-            2760: 12,19
-            2761: 11,19
-            2762: 10,19
-            2763: 10,19
-            2764: 9,19
-            2765: 9,19
-            2766: 8,19
-            2767: 6,19
-            2768: 6,19
-            2769: 7,19
-            2770: 5,19
-            2771: 0,19
-            2772: 0,19
-            2773: -1,19
-            2774: -1,19
-            2775: -2,19
-            2776: -3,19
-            2777: -3,19
-            2778: -4,19
-            2779: -5,19
-            2780: -6,19
-            2781: -6,19
-            2782: -7,19
-            2783: -7,19
-            2784: -8,19
-            2785: -8,19
-            2786: -8,19
-            2787: -11,19
-            2788: -11,19
-            2789: -13,19
-            2790: -13,19
-            2791: -14,19
-            2792: -12,19
-            2793: -16,19
-            2794: -16,19
-            2795: -18,19
-            2800: 66,-19
-            2801: 67,-19
-            2802: 68,-19
-            2803: 69,-19
-            2804: 70,-19
-            2805: 71,-19
-            3041: 1,19
-            3042: 2,19
+            2190: -25,-32
+            2191: -23,-32
+            2192: -24,-32
+            2193: -22,-32
+            2194: -22,-32
+            2195: -21,-32
+            2196: -19,-32
+            2197: -19,-32
+            2198: -18,-32
+            2199: -18,-32
+            2265: -45,-5
+            2266: -46,-5
+            2267: -47,-5
+            2268: -48,-5
+            2269: -48,-5
+            2270: -50,-5
+            2271: -50,-5
+            2272: -49,-5
+            2273: -51,-5
+            2352: -51,-32
+            2357: -45,-32
+            2358: -44,-32
+            2410: -53,-48
+            2411: -52,-48
+            2412: -51,-48
+            2413: -50,-48
+            2414: -50,-48
+            2415: -49,-48
+            2416: -50,-48
+            2417: -50,-48
+            2418: -48,-48
+            2419: -48,-48
+            2420: -47,-48
+            2421: -47,-48
+            2422: -46,-48
+            2423: -45,-48
+            2424: -44,-48
+            2425: -43,-48
+            2475: -16,-32
+            2476: -14,-32
+            2477: -14,-32
+            2478: -14,-32
+            2479: -15,-32
+            2480: -14,-32
+            2481: -14,-32
+            2482: -13,-32
+            2483: -12,-32
+            2484: -12,-32
+            2485: -11,-32
+            2486: -11,-32
+            2487: -10,-32
+            2488: -10,-32
+            2489: -7,-32
+            2490: -6,-32
+            2491: -5,-32
+            2492: -5,-32
+            2496: -4,-32
+            2497: -3,-32
+            2498: -3,-32
+            2499: -3,-32
+            2500: -2,-32
+            2501: 3,-32
+            2502: 6,-32
+            2506: 8,-34
+            2507: 9,-34
+            2508: 9,-34
+            2509: 11,-34
+            2510: 11,-34
+            2511: 12,-34
+            2512: 12,-34
+            2513: 13,-34
+            2514: 13,-34
+            2515: 14,-34
+            2516: 15,-34
+            2517: 15,-34
+            2518: 16,-34
+            2576: 60,-21
+            2611: 38,2
+            2612: 36,2
+            2613: 37,2
+            2614: 38,2
+            2622: 34,2
+            2623: 33,2
+            2624: 32,2
+            2625: 31,2
+            2626: 31,2
+            2627: 27,2
+            2628: 26,2
+            2629: 26,2
+            2630: 25,2
+            2631: 24,2
+            2632: 23,2
+            2633: 23,2
+            2634: 21,2
+            2635: 21,2
+            2636: 22,2
+            2637: 20,2
+            2679: 18,19
+            2680: 16,19
+            2698: 14,19
+            2699: 13,19
+            2700: 12,19
+            2701: 11,19
+            2702: 10,19
+            2703: 10,19
+            2704: 9,19
+            2705: 9,19
+            2706: 8,19
+            2707: 6,19
+            2708: 6,19
+            2709: 7,19
+            2710: 5,19
+            2711: 0,19
+            2712: 0,19
+            2713: -1,19
+            2714: -1,19
+            2715: -2,19
+            2716: -3,19
+            2717: -3,19
+            2718: -4,19
+            2719: -5,19
+            2720: -6,19
+            2721: -6,19
+            2722: -7,19
+            2723: -7,19
+            2724: -8,19
+            2725: -8,19
+            2726: -8,19
+            2727: -11,19
+            2728: -11,19
+            2729: -13,19
+            2730: -13,19
+            2731: -14,19
+            2732: -12,19
+            2733: -16,19
+            2734: -16,19
+            2735: -18,19
+            2740: 66,-19
+            2741: 67,-19
+            2742: 68,-19
+            2743: 69,-19
+            2744: 70,-19
+            2745: 71,-19
+            2976: 1,19
+            2977: 2,19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineW
           decals:
-            2233: -26,-21
-            2234: -26,-20
-            2235: -26,-18
-            2236: -26,-19
-            2237: -26,-17
-            2242: -26,-25
-            2243: -26,-24
-            2244: -26,-27
-            2245: -26,-26
-            2246: -26,-28
-            2247: -26,-29
-            2248: -26,-30
-            2249: -26,-31
-            2295: -25,-8
-            2296: -26,-10
-            2297: -26,-11
-            2298: -26,-16
-            2299: -26,-15
-            2300: -26,-15
-            2301: -26,-14
-            2302: -26,-13
-            2316: -27,7
-            2317: -27,8
-            2318: -27,6
-            2319: -27,5
-            2348: -55,5
-            2349: -55,3
-            2350: -55,2
-            2351: -55,1
-            2352: -55,0
-            2353: -55,-1
-            2354: -55,-3
-            2355: -55,-6
-            2356: -55,-6
-            2357: -55,-7
-            2358: -55,-7
-            2359: -55,-8
-            2360: -55,-9
-            2361: -55,-9
-            2362: -55,-11
-            2371: -55,-10
-            2372: -55,-11
-            2373: -55,-12
-            2374: -55,-13
-            2375: -55,-13
-            2376: -55,-15
-            2377: -55,-15
-            2383: -55,-14
-            2388: -55,-16
-            2389: -55,-17
-            2390: -55,-18
-            2391: -55,-20
-            2392: -55,-21
-            2405: -52,-28
-            2406: -52,-29
-            2407: -52,-30
-            2408: -52,-30
-            2409: -52,-31
-            2410: -52,-32
-            2424: -49,-35
-            2425: -49,-36
-            2432: -49,-38
-            2433: -49,-38
-            2434: -49,-39
-            2435: -49,-40
-            2436: -49,-40
-            2437: -49,-41
-            2438: -49,-42
-            2439: -49,-43
-            2440: -49,-43
-            2441: -49,-44
-            2490: -42,-50
-            2491: -42,-50
-            2492: -42,-51
-            2493: -42,-51
-            2494: -42,-52
-            2495: -42,-52
-            2496: -42,-53
-            2497: -42,-54
-            2517: -56,-54
-            2518: -56,-53
-            2519: -56,-52
-            2520: -56,-52
-            2521: -56,-51
-            2522: -56,-51
-            2523: -56,-48
-            2524: -56,-48
-            2525: -56,-47
-            2526: -56,-50
-            2529: -41,-29
-            2530: -41,-28
-            2564: 7,-33
-            2582: 27,-23
-            2583: 27,-23
-            2584: 27,-23
-            2585: 27,-22
-            2586: 27,-24
-            2587: 27,-21
-            2588: 27,-20
-            2634: 57,-18
-            2635: 57,-17
-            2639: 52,-24
-            2640: 52,-23
-            2641: 52,-22
-            2647: 41,-17
-            2648: 41,-16
-            2649: 41,-15
-            2650: 41,-12
-            2651: 41,-11
-            2654: 41,-9
-            2655: 41,-8
-            2656: 41,-7
-            2657: 41,-7
-            2658: 41,-6
-            2659: 41,-5
-            2660: 41,-5
-            2661: 41,-4
-            2662: 41,-3
-            2663: 41,-3
-            2664: 41,-1
-            2665: 41,-1
-            2666: 41,-1
-            2667: 41,-2
-            2699: 19,3
-            2700: 19,4
-            2701: 19,4
-            2702: 19,4
-            2703: 19,5
-            2704: 19,5
-            2705: 19,7
-            2706: 19,8
-            2707: 19,8
-            2708: 19,8
-            2709: 19,10
-            2710: 19,10
-            2711: 19,11
-            2712: 19,10
-            2713: 19,10
-            2714: 19,12
-            2715: 19,10
-            2716: 19,9
-            2717: 19,9
-            2727: 19,13
-            2728: 19,14
-            2729: 19,14
-            2730: 19,14
-            2731: 19,15
-            2732: 19,15
-            2733: 19,15
-            2734: 19,16
-            2735: 19,16
-            2736: 19,18
-            2737: 19,18
-            2797: -27,20
-            2798: -27,18
+            2173: -26,-21
+            2174: -26,-20
+            2175: -26,-18
+            2176: -26,-19
+            2177: -26,-17
+            2182: -26,-25
+            2183: -26,-24
+            2184: -26,-27
+            2185: -26,-26
+            2186: -26,-28
+            2187: -26,-29
+            2188: -26,-30
+            2189: -26,-31
+            2235: -25,-8
+            2236: -26,-10
+            2237: -26,-11
+            2238: -26,-16
+            2239: -26,-15
+            2240: -26,-15
+            2241: -26,-14
+            2242: -26,-13
+            2256: -27,7
+            2257: -27,8
+            2258: -27,6
+            2259: -27,5
+            2288: -55,5
+            2289: -55,3
+            2290: -55,2
+            2291: -55,1
+            2292: -55,0
+            2293: -55,-1
+            2294: -55,-3
+            2295: -55,-6
+            2296: -55,-6
+            2297: -55,-7
+            2298: -55,-7
+            2299: -55,-8
+            2300: -55,-9
+            2301: -55,-9
+            2302: -55,-11
+            2311: -55,-10
+            2312: -55,-11
+            2313: -55,-12
+            2314: -55,-13
+            2315: -55,-13
+            2316: -55,-15
+            2317: -55,-15
+            2323: -55,-14
+            2328: -55,-16
+            2329: -55,-17
+            2330: -55,-18
+            2331: -55,-20
+            2332: -55,-21
+            2345: -52,-28
+            2346: -52,-29
+            2347: -52,-30
+            2348: -52,-30
+            2349: -52,-31
+            2350: -52,-32
+            2364: -49,-35
+            2365: -49,-36
+            2372: -49,-38
+            2373: -49,-38
+            2374: -49,-39
+            2375: -49,-40
+            2376: -49,-40
+            2377: -49,-41
+            2378: -49,-42
+            2379: -49,-43
+            2380: -49,-43
+            2381: -49,-44
+            2430: -42,-50
+            2431: -42,-50
+            2432: -42,-51
+            2433: -42,-51
+            2434: -42,-52
+            2435: -42,-52
+            2436: -42,-53
+            2437: -42,-54
+            2457: -56,-54
+            2458: -56,-53
+            2459: -56,-52
+            2460: -56,-52
+            2461: -56,-51
+            2462: -56,-51
+            2463: -56,-48
+            2464: -56,-48
+            2465: -56,-47
+            2466: -56,-50
+            2469: -41,-29
+            2470: -41,-28
+            2504: 7,-33
+            2522: 27,-23
+            2523: 27,-23
+            2524: 27,-23
+            2525: 27,-22
+            2526: 27,-24
+            2527: 27,-21
+            2528: 27,-20
+            2574: 57,-18
+            2575: 57,-17
+            2579: 52,-24
+            2580: 52,-23
+            2581: 52,-22
+            2587: 41,-17
+            2588: 41,-16
+            2589: 41,-15
+            2590: 41,-12
+            2591: 41,-11
+            2594: 41,-9
+            2595: 41,-8
+            2596: 41,-7
+            2597: 41,-7
+            2598: 41,-6
+            2599: 41,-5
+            2600: 41,-5
+            2601: 41,-4
+            2602: 41,-3
+            2603: 41,-3
+            2604: 41,-1
+            2605: 41,-1
+            2606: 41,-1
+            2607: 41,-2
+            2639: 19,3
+            2640: 19,4
+            2641: 19,4
+            2642: 19,4
+            2643: 19,5
+            2644: 19,5
+            2645: 19,7
+            2646: 19,8
+            2647: 19,8
+            2648: 19,8
+            2649: 19,10
+            2650: 19,10
+            2651: 19,11
+            2652: 19,10
+            2653: 19,10
+            2654: 19,12
+            2655: 19,10
+            2656: 19,9
+            2657: 19,9
+            2667: 19,13
+            2668: 19,14
+            2669: 19,14
+            2670: 19,14
+            2671: 19,15
+            2672: 19,15
+            2673: 19,15
+            2674: 19,16
+            2675: 19,16
+            2676: 19,18
+            2677: 19,18
+            2737: -27,20
+            2738: -27,18
         - node:
             color: '#52B4E996'
             id: MonoOverlay
           decals:
-            6228: 44,8
+            6072: 44,8
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
           decals:
-            1035: 36,-36
+            1010: 36,-36
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
-            6230: 43,9
+            6074: 43,9
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
           decals:
-            1523: -27,11
-            1524: -27,15
-            1525: -27,16
-            1526: -27,12
-            1527: -27,13
-            1528: -27,14
-            1634: -52,-26
-            1635: -52,-27
-            1636: -52,-25
-            1637: -52,-24
+            1473: -27,11
+            1474: -27,15
+            1475: -27,16
+            1476: -27,12
+            1477: -27,13
+            1478: -27,14
+            1584: -52,-26
+            1585: -52,-27
+            1586: -52,-25
+            1587: -52,-24
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale
           decals:
-            1548: -17,-30
-            1549: -16,-30
-            1550: -15,-30
-            1551: -14,-30
-            1552: -13,-30
-            1614: 5,-27
-            1615: 5,-28
-            1616: 5,-29
-            1617: 5,-30
-            1618: 3,-30
-            1619: 2,-30
-            1620: 1,-30
-            1621: 0,-30
-            1622: -1,-30
-            1623: -3,-30
-            1624: -2,-30
-            1625: -4,-30
-            1626: -5,-30
-            1627: -6,-30
-            1628: -7,-30
-            1629: -8,-30
-            1666: 6,21
-            1667: 5,21
-            1668: 2,21
-            1669: 1,21
-            1670: 0,21
-            1671: -1,21
-            1672: -4,21
-            1673: -5,21
-            1674: -6,21
-            1675: -7,21
-            1676: -8,21
-            1677: -11,21
-            1678: -12,21
-            1679: -13,21
-            1680: -14,21
-            1681: -15,21
-            1682: -16,21
-            1696: 28,4
-            1697: 27,4
-            1698: 23,4
-            1699: 22,4
-            1915: 57,-17
-            1916: 58,-17
-            1917: 59,-17
-            1918: 60,-17
-            1919: 61,-17
-            2148: -1,-33
-            6209: 38,4
-            6210: 40,4
-            6211: 41,4
-            6212: 42,4
-            6213: 43,4
+            1498: -17,-30
+            1499: -16,-30
+            1500: -15,-30
+            1501: -14,-30
+            1502: -13,-30
+            1564: 5,-27
+            1565: 5,-28
+            1566: 5,-29
+            1567: 5,-30
+            1568: 3,-30
+            1569: 2,-30
+            1570: 1,-30
+            1571: 0,-30
+            1572: -1,-30
+            1573: -3,-30
+            1574: -2,-30
+            1575: -4,-30
+            1576: -5,-30
+            1577: -6,-30
+            1578: -7,-30
+            1579: -8,-30
+            1616: 6,21
+            1617: 5,21
+            1618: 2,21
+            1619: 1,21
+            1620: 0,21
+            1621: -1,21
+            1622: -4,21
+            1623: -5,21
+            1624: -6,21
+            1625: -7,21
+            1626: -8,21
+            1627: -11,21
+            1628: -12,21
+            1629: -13,21
+            1630: -14,21
+            1631: -15,21
+            1632: -16,21
+            1646: 28,4
+            1647: 27,4
+            1648: 23,4
+            1649: 22,4
+            1855: 57,-17
+            1856: 58,-17
+            1857: 59,-17
+            1858: 60,-17
+            1859: 61,-17
+            2088: -1,-33
+            6053: 38,4
+            6054: 40,4
+            6055: 41,4
+            6056: 42,4
+            6057: 43,4
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            1193: 6,30
-            1630: -51,-20
-            1631: -50,-20
-            1632: -49,-20
-            1633: -48,-20
+            1168: 6,30
+            1580: -51,-20
+            1581: -50,-20
+            1582: -49,-20
+            1583: -48,-20
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale
           decals:
-            1572: 12,-32
-            1573: 11,-32
-            1574: 13,-32
-            1575: 14,-32
-            1576: 15,-32
-            1577: 16,-32
-            1578: 17,-32
-            1579: 19,-32
-            1580: 19,-30
-            1581: 19,-29
-            1582: 19,-27
-            1583: 19,-26
-            1584: 19,-25
-            1585: 20,-25
-            1586: 21,-25
-            1587: 22,-25
-            1588: 23,-25
-            1589: 24,-25
-            1601: 19,-31
+            1522: 12,-32
+            1523: 11,-32
+            1524: 13,-32
+            1525: 14,-32
+            1526: 15,-32
+            1527: 16,-32
+            1528: 17,-32
+            1529: 19,-32
+            1530: 19,-30
+            1531: 19,-29
+            1532: 19,-27
+            1533: 19,-26
+            1534: 19,-25
+            1535: 20,-25
+            1536: 21,-25
+            1537: 22,-25
+            1538: 23,-25
+            1539: 24,-25
+            1551: 19,-31
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1708: 37,-21
-            1709: 50,-21
-            1710: 34,-21
-            1711: 36,-21
-            1712: 35,-21
-            1925: 51,-21
-            2021: 29,-21
-            2022: 29,-22
-            2023: 29,-23
-            2024: 29,-24
-            2025: 29,-25
-            2026: 29,-26
-            2027: 29,-27
-            2028: 28,-27
-            2029: 27,-27
-            2030: 26,-27
-            2031: 25,-27
-            2032: 24,-27
-            2033: 23,-27
-            2034: 21,-27
-            2035: 21,-29
-            2036: 21,-30
-            2037: 21,-31
-            2038: 21,-32
-            2039: 21,-33
-            2040: 21,-34
-            2041: 20,-34
-            2042: 19,-34
+            1658: 37,-21
+            1659: 50,-21
+            1660: 34,-21
+            1661: 36,-21
+            1662: 35,-21
+            1865: 51,-21
+            1961: 29,-21
+            1962: 29,-22
+            1963: 29,-23
+            1964: 29,-24
+            1965: 29,-25
+            1966: 29,-26
+            1967: 29,-27
+            1968: 28,-27
+            1969: 27,-27
+            1970: 26,-27
+            1971: 25,-27
+            1972: 24,-27
+            1973: 23,-27
+            1974: 21,-27
+            1975: 21,-29
+            1976: 21,-30
+            1977: 21,-31
+            1978: 21,-32
+            1979: 21,-33
+            1980: 21,-34
+            1981: 20,-34
+            1982: 19,-34
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            6231: 45,7
+            6075: 45,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1536: -25,11
-            1537: -25,12
-            1538: -25,13
-            1539: -25,14
-            1540: -25,15
-            1541: -25,16
-            1542: -25,17
-            1700: 21,5
-            1701: 21,7
-            1702: 21,8
-            1703: 21,9
-            1704: 21,16
-            1705: 21,18
-            1706: 21,19
-            1707: 21,20
-            1920: 61,-17
-            1921: 61,-18
-            1922: 61,-19
-            1923: 61,-20
-            2144: -1,-33
-            2145: 0,-33
-            2146: 1,-33
-            2147: 2,-33
-            6214: 43,4
-            6215: 43,3
-            6216: 43,2
-            6217: 43,1
-            6218: 43,-1
-            6219: 43,-2
-            6220: 43,-3
-            6221: 43,-4
-            6222: 43,-5
-            6223: 43,-6
-            6224: 43,-7
-            6225: 43,-8
-            6226: 43,-9
-            6227: 43,-10
+            1486: -25,11
+            1487: -25,12
+            1488: -25,13
+            1489: -25,14
+            1490: -25,15
+            1491: -25,16
+            1492: -25,17
+            1650: 21,5
+            1651: 21,7
+            1652: 21,8
+            1653: 21,9
+            1654: 21,16
+            1655: 21,18
+            1656: 21,19
+            1657: 21,20
+            1860: 61,-17
+            1861: 61,-18
+            1862: 61,-19
+            1863: 61,-20
+            2084: -1,-33
+            2085: 0,-33
+            2086: 1,-33
+            2087: 2,-33
+            6058: 43,4
+            6059: 43,3
+            6060: 43,2
+            6061: 43,1
+            6062: 43,-1
+            6063: 43,-2
+            6064: 43,-3
+            6065: 43,-4
+            6066: 43,-5
+            6067: 43,-6
+            6068: 43,-7
+            6069: 43,-8
+            6070: 43,-9
+            6071: 43,-10
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1194: 3,32
+            1169: 3,32
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale180
           decals:
-            1568: 9,-27
-            1569: 9,-29
-            1570: 9,-30
-            1571: 9,-31
+            1518: 9,-27
+            1519: 9,-29
+            1520: 9,-30
+            1521: 9,-31
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1595: 19,-25
-            1596: 19,-26
-            1597: 19,-27
-            1598: 19,-29
-            1599: 19,-30
-            6232: 43,7
+            1545: 19,-25
+            1546: 19,-26
+            1547: 19,-27
+            1548: 19,-29
+            1549: 19,-30
+            6076: 43,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1529: -27,11
-            1530: -27,12
-            1531: -27,13
-            1532: -27,14
-            1533: -27,15
-            1534: -27,16
-            1535: -27,17
-            1600: 19,-31
-            1638: -52,-27
-            1639: -52,-26
-            1640: -52,-25
-            1641: -52,-24
-            1642: -52,-23
-            1713: 34,-21
-            1714: 35,-21
-            1715: 36,-21
-            1716: 37,-21
-            1717: 50,-21
-            1926: 51,-21
-            2043: 19,-34
-            2044: 20,-34
-            2045: 21,-34
-            2052: 23,-27
-            2053: 24,-27
-            2054: 25,-27
-            2055: 26,-27
-            2056: 27,-27
-            2057: 28,-27
-            2058: 29,-27
+            1479: -27,11
+            1480: -27,12
+            1481: -27,13
+            1482: -27,14
+            1483: -27,15
+            1484: -27,16
+            1485: -27,17
+            1550: 19,-31
+            1588: -52,-27
+            1589: -52,-26
+            1590: -52,-25
+            1591: -52,-24
+            1592: -52,-23
+            1663: 34,-21
+            1664: 35,-21
+            1665: 36,-21
+            1666: 37,-21
+            1667: 50,-21
+            1866: 51,-21
+            1983: 19,-34
+            1984: 20,-34
+            1985: 21,-34
+            1992: 23,-27
+            1993: 24,-27
+            1994: 25,-27
+            1995: 26,-27
+            1996: 27,-27
+            1997: 28,-27
+            1998: 29,-27
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1191: 6,32
+            1166: 6,32
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale270
           decals:
-            1565: 5,-29
-            1566: 5,-28
-            1567: 5,-27
-            2139: -1,-33
-            2140: 1,-33
-            2141: 0,-33
-            2142: 2,-33
+            1515: 5,-29
+            1516: 5,-28
+            1517: 5,-27
+            2079: -1,-33
+            2080: 1,-33
+            2081: 0,-33
+            2082: 2,-33
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1036: 44,-36
+            1011: 44,-36
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1590: 19,-25
-            1591: 20,-25
-            1592: 21,-25
-            1593: 22,-25
-            1594: 23,-25
-            6191: 40,4
-            6192: 38,4
-            6193: 41,4
-            6194: 42,4
-            6195: 43,4
-            6196: 43,3
-            6197: 43,2
-            6198: 43,1
-            6199: 43,-1
-            6200: 43,-2
-            6201: 43,-3
-            6202: 43,-4
-            6203: 43,-5
-            6204: 43,-6
-            6205: 43,-7
-            6206: 43,-10
-            6207: 43,-9
-            6208: 43,-8
-            6229: 45,9
+            1540: 19,-25
+            1541: 20,-25
+            1542: 21,-25
+            1543: 22,-25
+            1544: 23,-25
+            6035: 40,4
+            6036: 38,4
+            6037: 41,4
+            6038: 42,4
+            6039: 43,4
+            6040: 43,3
+            6041: 43,2
+            6042: 43,1
+            6043: 43,-1
+            6044: 43,-2
+            6045: 43,-3
+            6046: 43,-4
+            6047: 43,-5
+            6048: 43,-6
+            6049: 43,-7
+            6050: 43,-10
+            6051: 43,-9
+            6052: 43,-8
+            6073: 45,9
         - node:
             color: '#79150096'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1517: -25,11
-            1518: -25,12
-            1519: -25,13
-            1520: -25,15
-            1521: -25,14
-            1522: -25,16
+            1467: -25,11
+            1468: -25,12
+            1469: -25,13
+            1470: -25,15
+            1471: -25,14
+            1472: -25,16
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1543: -16,-30
-            1544: -15,-30
-            1545: -14,-30
-            1546: -13,-30
-            1547: -17,-30
+            1493: -16,-30
+            1494: -15,-30
+            1495: -14,-30
+            1496: -13,-30
+            1497: -17,-30
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1683: 21,20
-            1684: 21,19
-            1685: 21,18
-            1686: 21,16
-            1687: 21,9
-            1688: 21,8
-            1689: 21,7
-            1690: 21,5
-            1691: 21,4
-            1692: 22,4
-            1693: 23,4
-            1694: 27,4
-            1695: 28,4
+            1633: 21,20
+            1634: 21,19
+            1635: 21,18
+            1636: 21,16
+            1637: 21,9
+            1638: 21,8
+            1639: 21,7
+            1640: 21,5
+            1641: 21,4
+            1642: 22,4
+            1643: 23,4
+            1644: 27,4
+            1645: 28,4
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1908: 61,-17
-            1909: 60,-17
-            1910: 59,-17
-            1911: 58,-17
-            1912: 61,-18
-            1913: 61,-19
-            1914: 61,-20
-            1924: 57,-17
+            1848: 61,-17
+            1849: 60,-17
+            1850: 59,-17
+            1851: 58,-17
+            1852: 61,-18
+            1853: 61,-19
+            1854: 61,-20
+            1864: 57,-17
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1602: 17,-32
-            1603: 16,-32
-            1604: 15,-32
-            1605: 14,-32
-            1606: 13,-32
-            1607: 12,-32
-            1608: 11,-32
-            1609: 9,-32
-            1610: 9,-31
-            1611: 9,-30
-            1612: 9,-29
-            1613: 9,-27
-            1643: -51,-20
-            1644: -50,-20
-            1645: -49,-20
-            1646: -48,-20
-            1647: -52,-20
-            1648: -62,-22
-            2046: 21,-34
-            2047: 21,-33
-            2048: 21,-32
-            2049: 21,-31
-            2050: 21,-30
-            2051: 21,-29
-            2059: 29,-27
-            2060: 29,-26
-            2061: 29,-25
-            2062: 29,-24
-            2063: 29,-23
-            2064: 29,-22
+            1552: 17,-32
+            1553: 16,-32
+            1554: 15,-32
+            1555: 14,-32
+            1556: 13,-32
+            1557: 12,-32
+            1558: 11,-32
+            1559: 9,-32
+            1560: 9,-31
+            1561: 9,-30
+            1562: 9,-29
+            1563: 9,-27
+            1593: -51,-20
+            1594: -50,-20
+            1595: -49,-20
+            1596: -48,-20
+            1597: -52,-20
+            1598: -62,-22
+            1986: 21,-34
+            1987: 21,-33
+            1988: 21,-32
+            1989: 21,-31
+            1990: 21,-30
+            1991: 21,-29
+            1999: 29,-27
+            2000: 29,-26
+            2001: 29,-25
+            2002: 29,-24
+            2003: 29,-23
+            2004: 29,-22
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1192: 3,30
-            1649: -16,21
-            1650: -15,21
-            1651: -14,21
-            1652: -13,21
-            1653: -12,21
-            1654: -11,21
-            1655: -8,21
-            1656: -7,21
-            1657: -6,21
-            1658: -5,21
-            1659: -4,21
-            1660: -1,21
-            1661: 0,21
-            1662: 1,21
-            1663: 2,21
-            1664: 5,21
-            1665: 6,21
+            1167: 3,30
+            1599: -16,21
+            1600: -15,21
+            1601: -14,21
+            1602: -13,21
+            1603: -12,21
+            1604: -11,21
+            1605: -8,21
+            1606: -7,21
+            1607: -6,21
+            1608: -5,21
+            1609: -4,21
+            1610: -1,21
+            1611: 0,21
+            1612: 1,21
+            1613: 2,21
+            1614: 5,21
+            1615: 6,21
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1553: -8,-30
-            1554: -7,-30
-            1555: -6,-30
-            1556: -5,-30
-            1557: -4,-30
-            1558: -3,-30
-            1559: -2,-30
-            1560: 0,-30
-            1561: -1,-30
-            1562: 1,-30
-            1563: 2,-30
-            1564: 3,-30
-            2143: 2,-33
+            1503: -8,-30
+            1504: -7,-30
+            1505: -6,-30
+            1506: -5,-30
+            1507: -4,-30
+            1508: -3,-30
+            1509: -2,-30
+            1510: 0,-30
+            1511: -1,-30
+            1512: 1,-30
+            1513: 2,-30
+            1514: 3,-30
+            2083: 2,-33
         - node:
             color: '#FFFFFFFF'
             id: Rock01
           decals:
-            1494: -52,-49
+            1444: -52,-49
         - node:
             color: '#FFFFFFFF'
             id: Rock03
           decals:
-            904: -49,-9
-            1495: -47,-49
+            879: -49,-9
+            1445: -47,-49
         - node:
             color: '#FFFFFFFF'
             id: Rock04
           decals:
-            882: -47,4
+            857: -47,4
         - node:
             color: '#FFFFFFFF'
             id: Rock05
           decals:
-            881: -49,-2
+            856: -49,-2
         - node:
             color: '#FFFFFFFF'
             id: Rock06
           decals:
-            884: -51,4
-            906: -46,-7
-            1497: -46,-49
-            1730: 58,19
+            859: -51,4
+            881: -46,-7
+            1447: -46,-49
+            1680: 58,19
         - node:
             color: '#FFFFFFFF'
             id: Rock07
           decals:
-            883: -46,-2
-            905: -50,-8
-            1496: -51,-49
-            1731: 61,19
+            858: -46,-2
+            880: -50,-8
+            1446: -51,-49
+            1681: 61,19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Rust
           decals:
-            2931: -5,-39
-            2932: -7,-40
-            2933: -6,-41
-            2934: -7,-41
-            2935: -8,-39
-            2936: -8,-42
+            2871: -5,-39
+            2872: -7,-40
+            2873: -6,-41
+            2874: -7,-41
+            2875: -8,-39
+            2876: -8,-42
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
@@ -8202,11 +8218,17 @@ entities:
             id: SpaceStationSign7
           decals:
             487: -31,0
+        - node:
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            6973: 57.998478,-4.7559896
+            6974: 60.004295,-4.7682204
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            1141: -3,24
+            1116: -3,24
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale
@@ -8216,7 +8238,7 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            1140: -2,23
+            1115: -2,23
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -8226,7 +8248,7 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            1139: -3,23
+            1114: -3,23
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -8236,7 +8258,7 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            1138: -2,24
+            1113: -2,24
         - node:
             color: '#EFB34196'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -8246,19 +8268,19 @@ entities:
             color: '#FFFFFFB1'
             id: VentSmall
           decals:
-            2865: -36,22
+            2805: -36,22
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            1182: 6,32
-            6543: 91,-13
+            1157: 6,32
+            6387: 91,-13
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
-            1181: 3,32
-            6544: 88,-13
+            1156: 3,32
+            6388: 88,-13
         - node:
             color: '#EFB34196'
             id: WarnCornerSE
@@ -8268,7 +8290,7 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            6542: 91,-16
+            6386: 91,-16
         - node:
             color: '#EFB34196'
             id: WarnCornerSW
@@ -8278,48 +8300,49 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            6541: 88,-16
+            6385: 88,-16
+            6897: 46,15
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            7089: -35,12
+            6810: -35,12
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            6699: 49,-11
-            6700: 52,-11
+            6543: 49,-11
+            6544: 52,-11
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            7088: -35,16
+            6809: -35,16
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            6697: 49,-11
-            6698: 52,-11
+            6541: 49,-11
+            6542: 52,-11
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNE
           decals:
-            6621: 12,-30
-            6622: 12,-30
+            6465: 12,-30
+            6466: 12,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNE
           decals:
-            6768: 14,39
-            6769: 14,39
-            6770: 14,39
-            6771: 14,39
+            6610: 14,39
+            6611: 14,39
+            6612: 14,39
+            6613: 14,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNE
           decals:
-            6620: 12,-30
+            6464: 12,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNE
@@ -8329,30 +8352,32 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
           decals:
-            1315: 25,23
-            1316: 29,23
-            2073: 11,-47
-            6278: 51,13
-            6366: 51,-11
+            1290: 25,23
+            1291: 29,23
+            2013: 11,-47
+            6122: 51,13
+            6210: 51,-11
+            6900: 46,15
+            6998: 57,-5
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNW
           decals:
-            6623: 16,-30
-            6624: 16,-30
+            6467: 16,-30
+            6468: 16,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNW
           decals:
-            6764: 16,39
-            6765: 16,39
-            6766: 16,39
-            6767: 16,39
+            6606: 16,39
+            6607: 16,39
+            6608: 16,39
+            6609: 16,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNW
           decals:
-            6619: 16,-30
+            6463: 16,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNW
@@ -8363,18 +8388,19 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
           decals:
-            1080: 39,-1
-            1317: 25,23
-            1318: 29,23
-            2074: 14,-47
+            1055: 39,-1
+            1292: 25,23
+            1293: 29,23
+            2014: 14,-47
+            6977: 61,-5
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSE
           decals:
-            6760: 14,42
-            6761: 14,42
-            6762: 14,42
-            6763: 14,42
+            6602: 14,42
+            6603: 14,42
+            6604: 14,42
+            6605: 14,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSE
@@ -8387,16 +8413,16 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
-            1437: 55,-33
-            6277: 51,15
+            1412: 55,-33
+            6121: 51,15
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSW
           decals:
-            6756: 16,42
-            6757: 16,42
-            6758: 16,42
-            6759: 16,42
+            6598: 16,42
+            6599: 16,42
+            6600: 16,42
+            6601: 16,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSW
@@ -8407,14 +8433,14 @@ entities:
             color: '#EFB34131'
             id: WarnLineE
           decals:
-            6732: 14,40
-            6733: 14,40
-            6734: 14,41
-            6735: 14,41
-            6744: 14,40
-            6745: 14,40
-            6746: 14,41
-            6747: 14,41
+            6574: 14,40
+            6575: 14,40
+            6576: 14,41
+            6577: 14,41
+            6586: 14,40
+            6587: 14,40
+            6588: 14,41
+            6589: 14,41
         - node:
             color: '#EFB34196'
             id: WarnLineE
@@ -8442,78 +8468,93 @@ entities:
             279: 29,-13
             280: 29,-12
             281: 29,-11
-            6175: 47,14
-            6176: 47,14
-            6177: 47,15
-            6178: 47,15
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            1183: 6,31
-            1184: 6,30
-            1432: 55,-36
-            1433: 55,-34
-            1434: 55,-35
-            1850: 73,-14
-            1851: 73,-15
-            1852: 73,-17
-            1853: 73,-16
-            1854: 73,-18
-            1855: 73,-19
-            6141: -45,23
-            6275: 51,14
-            6365: 51,-10
-            6539: 91,-15
-            6540: 91,-14
-            6667: -33,-11
-            6668: -33,-10
+            1158: 6,31
+            1159: 6,30
+            1407: 55,-36
+            1408: 55,-34
+            1409: 55,-35
+            1790: 73,-14
+            1791: 73,-15
+            1792: 73,-17
+            1793: 73,-16
+            1794: 73,-18
+            1795: 73,-19
+            6013: -45,23
+            6119: 51,14
+            6209: 51,-10
+            6383: 91,-15
+            6384: 91,-14
+            6511: -33,-11
+            6512: -33,-10
+            6898: 46,16
+            6997: 57,-4
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleE
           decals:
-            6367: 52,-12
-            6368: 52,-13
-            6369: 52,-14
-            6370: 52,-15
-            6371: 49,-12
-            6372: 49,-13
-            6373: 49,-14
-            6374: 49,-15
+            6211: 52,-12
+            6212: 52,-13
+            6213: 52,-14
+            6214: 52,-15
+            6215: 49,-12
+            6216: 49,-13
+            6217: 49,-14
+            6218: 49,-15
+        - node:
+            color: '#EFB34196'
+            id: WarnLineGreyscaleN
+          decals:
+            6910: 42,13
+            6911: 46,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
           decals:
-            7082: -34,12
-            7083: -33,12
-            7084: -31,12
-            7085: -30,12
+            6803: -34,12
+            6804: -33,12
+            6805: -31,12
+            6806: -30,12
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleS
+          decals:
+            6993: 59,-8
+        - node:
+            color: '#EFB34196'
+            id: WarnLineGreyscaleS
+          decals:
+            6908: 42,13
+            6909: 46,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
           decals:
-            7086: -34,16
-            7087: -33,16
+            6807: -34,16
+            6808: -33,16
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleW
           decals:
-            6375: 49,-15
-            6376: 49,-14
-            6377: 49,-13
-            6378: 49,-12
-            6379: 52,-12
-            6380: 52,-13
-            6381: 52,-14
-            6382: 52,-15
+            6219: 49,-15
+            6220: 49,-14
+            6221: 49,-13
+            6222: 49,-12
+            6223: 52,-12
+            6224: 52,-13
+            6225: 52,-14
+            6226: 52,-15
         - node:
             color: '#EFB34131'
             id: WarnLineN
           decals:
-            6752: 15,42
-            6753: 15,42
-            6754: 15,42
-            6755: 15,42
+            6594: 15,42
+            6595: 15,42
+            6596: 15,42
+            6597: 15,42
         - node:
             color: '#EFB34196'
             id: WarnLineN
@@ -8531,52 +8572,50 @@ entities:
             271: 26,-14
             272: 27,-14
             273: 28,-14
-            1472: 46,14
-            6165: 46,14
-            6166: 46,14
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            1435: 56,-33
-            1436: 57,-33
-            1895: 69,-30
-            1896: 68,-30
-            1897: 70,-30
-            1898: 71,-30
-            1968: 23,-38
-            1969: 24,-38
-            1970: 25,-38
-            2065: 11,-48
-            2066: 12,-48
-            2067: 14,-48
-            2068: 13,-48
-            2069: 15,-48
-            2070: 16,-48
-            2122: 0,-38
-            2123: 1,-38
-            2124: 2,-38
-            6138: -44,24
-            6533: 89,-16
-            6534: 90,-16
-            6797: 33,-14
-            6798: 34,-14
-            6799: 35,-14
-            6841: 7,-47
-            6842: 8,-47
-            6843: 9,-47
+            1410: 56,-33
+            1411: 57,-33
+            1835: 69,-30
+            1836: 68,-30
+            1837: 70,-30
+            1838: 71,-30
+            1908: 23,-38
+            1909: 24,-38
+            1910: 25,-38
+            2005: 11,-48
+            2006: 12,-48
+            2007: 14,-48
+            2008: 13,-48
+            2009: 15,-48
+            2010: 16,-48
+            2062: 0,-38
+            2063: 1,-38
+            2064: 2,-38
+            6010: -44,24
+            6377: 89,-16
+            6378: 90,-16
+            6639: 33,-14
+            6640: 34,-14
+            6641: 35,-14
+            6683: 7,-47
+            6684: 8,-47
+            6685: 9,-47
+            6896: 47,15
         - node:
             color: '#EFB34131'
             id: WarnLineS
           decals:
-            6736: 16,40
-            6737: 16,40
-            6738: 16,41
-            6739: 16,41
-            6740: 16,41
-            6741: 16,40
-            6742: 16,41
-            6743: 16,40
+            6578: 16,40
+            6579: 16,40
+            6580: 16,41
+            6581: 16,41
+            6582: 16,41
+            6583: 16,40
+            6584: 16,41
+            6585: 16,40
         - node:
             color: '#EFB34196'
             id: WarnLineS
@@ -8604,51 +8643,47 @@ entities:
             275: 16,-11
             276: 16,-10
             277: 16,-9
-            6169: 45,16
-            6170: 45,15
-            6171: 45,14
-            6172: 45,14
-            6173: 45,15
-            6174: 45,16
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            1769: 61,-24
-            1782: 61,-23
-            1996: 26,-43
-            1997: 26,-46
-            6139: -43,23
-            6276: 57,14
-            6537: 88,-15
-            6538: 88,-14
-            6665: -33,-10
-            6666: -33,-11
+            1709: 61,-24
+            1722: 61,-23
+            1936: 26,-43
+            1937: 26,-46
+            6011: -43,23
+            6120: 57,14
+            6381: 88,-15
+            6382: 88,-14
+            6509: -33,-10
+            6510: -33,-11
+            6895: 46,16
+            6976: 61,-4
         - node:
             color: '#EFB34118'
             id: WarnLineW
           decals:
-            6625: 13,-30
-            6626: 13,-30
-            6627: 14,-30
-            6628: 14,-30
-            6629: 15,-30
-            6630: 15,-30
+            6469: 13,-30
+            6470: 13,-30
+            6471: 14,-30
+            6472: 14,-30
+            6473: 15,-30
+            6474: 15,-30
         - node:
             color: '#EFB34131'
             id: WarnLineW
           decals:
-            6748: 15,39
-            6749: 15,39
-            6750: 15,39
-            6751: 15,39
+            6590: 15,39
+            6591: 15,39
+            6592: 15,39
+            6593: 15,39
         - node:
             color: '#EFB3416C'
             id: WarnLineW
           decals:
-            6616: 13,-30
-            6617: 14,-30
-            6618: 15,-30
+            6460: 13,-30
+            6461: 14,-30
+            6462: 15,-30
         - node:
             color: '#EFB34196'
             id: WarnLineW
@@ -8665,64 +8700,66 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            1069: 36,-1
-            1070: 37,-1
-            1079: 38,-1
-            1179: 4,32
-            1180: 5,32
-            1309: 30,23
-            1310: 31,23
-            1311: 23,23
-            1312: 24,23
-            1313: 26,23
-            1314: 28,23
-            1800: 68,-11
-            1801: 69,-11
-            1802: 70,-11
-            1891: 68,-29
-            1892: 70,-29
-            1893: 69,-29
-            1894: 71,-29
-            1965: 23,-37
-            1966: 25,-37
-            1967: 24,-37
-            2016: 28,-38
-            2017: 29,-38
-            2071: 12,-47
-            2072: 13,-47
-            2132: 9,-39
-            2133: 10,-39
-            2134: 8,-39
-            2135: 11,-39
-            2149: -5,-35
-            2163: -6,-35
-            2164: -4,-35
-            6140: -44,22
-            6363: 52,-11
-            6364: 53,-11
-            6535: 89,-13
-            6536: 90,-13
-            6800: 33,-11
-            6801: 34,-11
-            6802: 35,-11
+            1044: 36,-1
+            1045: 37,-1
+            1054: 38,-1
+            1154: 4,32
+            1155: 5,32
+            1284: 30,23
+            1285: 31,23
+            1286: 23,23
+            1287: 24,23
+            1288: 26,23
+            1289: 28,23
+            1740: 68,-11
+            1741: 69,-11
+            1742: 70,-11
+            1831: 68,-29
+            1832: 70,-29
+            1833: 69,-29
+            1834: 71,-29
+            1905: 23,-37
+            1906: 25,-37
+            1907: 24,-37
+            1956: 28,-38
+            1957: 29,-38
+            2011: 12,-47
+            2012: 13,-47
+            2072: 9,-39
+            2073: 10,-39
+            2074: 8,-39
+            2075: 11,-39
+            2089: -5,-35
+            2103: -6,-35
+            2104: -4,-35
+            6012: -44,22
+            6207: 52,-11
+            6208: 53,-11
+            6379: 89,-13
+            6380: 90,-13
+            6642: 33,-11
+            6643: 34,-11
+            6644: 35,-11
+            6899: 47,15
+            6975: 59,-5
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinBox
           decals:
-            6137: -44,23
+            6009: -44,23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
           decals:
             402: -18,-13
-            996: 44,-29
+            971: 44,-29
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
             379: -22,7
-            995: 40,-29
-            6810: -19,-13
+            970: 40,-29
+            6652: -19,-13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
@@ -8746,11 +8783,11 @@ entities:
             462: -30,-5
             463: -40,-5
             521: -38,3
-            655: -39,-16
-            858: -52,5
-            1178: -15,31
-            1733: 60,18
-            6863: 76,-25
+            630: -39,-16
+            833: -52,5
+            1153: -15,31
+            1683: 60,18
+            6705: 76,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNw
@@ -8760,10 +8797,10 @@ entities:
             460: -30,-5
             520: -30,3
             522: -25,-5
-            856: -43,-1
-            857: -43,5
-            1097: -59,-29
-            6862: 80,-25
+            831: -43,-1
+            832: -43,5
+            1072: -59,-29
+            6704: 80,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSe
@@ -8771,25 +8808,25 @@ entities:
             344: 43,-25
             363: -24,8
             384: -22,-1
-            654: -39,-13
-            855: -52,-3
-            6820: -22,-20
-            6821: -20,-20
+            629: -39,-13
+            830: -52,-3
+            6662: -22,-20
+            6663: -20,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
           decals:
-            577: -28,14
-            597: -37,-18
-            853: -43,3
-            854: -43,-3
-            963: -50.00212,-30.877844
-            964: -45.158802,-30.877844
-            965: -45.158802,-25.282345
-            966: -50.020466,-25.282345
-            1096: -59,-25
-            6818: -20,-20
-            6819: -18,-20
+            564: -28,14
+            572: -37,-18
+            828: -43,3
+            829: -43,-3
+            938: -50.00212,-30.877844
+            939: -45.158802,-30.877844
+            940: -45.158802,-25.282345
+            941: -50.020466,-25.282345
+            1071: -59,-25
+            6660: -20,-20
+            6661: -18,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
@@ -8821,35 +8858,35 @@ entities:
             513: -38,4
             544: -19,17
             545: -19,21
-            641: -39,-15
-            642: -39,-14
-            953: -46,-26
-            954: -46,-27
-            955: -46,-28
-            956: -46,-29
-            957: -46,-30
-            958: -46,-31
-            978: 36,-31
-            979: 36,-30
-            980: 36,-29
-            1002: 44,-31
-            1003: 44,-30
-            1172: -15,32
-            1173: -15,33
-            1174: -15,34
-            1328: 33,15
-            1376: 33,12
-            1377: 33,13
-            1378: 33,14
-            1732: 60,19
-            1870: 69,-24
-            1871: 69,-23
-            1872: 69,-22
-            1873: 69,-21
-            6812: -20,-21
-            6814: -22,-21
-            6858: 76,-24
-            6859: 76,-23
+            616: -39,-15
+            617: -39,-14
+            928: -46,-26
+            929: -46,-27
+            930: -46,-28
+            931: -46,-29
+            932: -46,-30
+            933: -46,-31
+            953: 36,-31
+            954: 36,-30
+            955: 36,-29
+            977: 44,-31
+            978: 44,-30
+            1147: -15,32
+            1148: -15,33
+            1149: -15,34
+            1303: 33,15
+            1351: 33,12
+            1352: 33,13
+            1353: 33,14
+            1682: 60,19
+            1810: 69,-24
+            1811: 69,-23
+            1812: 69,-22
+            1813: 69,-21
+            6654: -20,-21
+            6656: -22,-21
+            6700: 76,-24
+            6701: 76,-23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -8887,68 +8924,68 @@ entities:
             517: -34,3
             518: -32,3
             519: -31,3
-            630: -38,-16
-            631: -37,-16
-            632: -36,-16
-            633: -35,-16
-            634: -34,-16
-            635: -33,-16
-            636: -32,-16
-            637: -31,-16
-            638: -29,-16
-            639: -30,-16
-            640: -28,-16
-            749: -40,-33
-            750: -39,-33
-            751: -30,-33
-            752: -29,-33
-            757: -26,-40
-            758: -25,-40
-            759: -24,-40
-            760: -23,-40
-            761: -21,-40
-            762: -22,-40
-            763: -20,-40
-            764: -20,-40
-            773: -19,-40
-            774: -26,-36
-            775: -23,-36
-            776: -20,-36
-            777: -19,-36
-            784: -27,-40
-            785: -28,-40
-            786: -29,-40
-            814: -51,-1
-            815: -50,-1
-            816: -49,-1
-            817: -48,-1
-            818: -47,-1
-            819: -45,-1
-            820: -45,-1
-            821: -46,-1
-            822: -44,-1
-            823: -44,5
-            824: -46,5
-            825: -46,5
-            826: -45,5
-            827: -45,5
-            828: -47,5
-            829: -48,5
-            830: -48,5
-            831: -49,5
-            832: -50,5
-            833: -50,5
-            834: -51,5
-            997: 41,-29
-            998: 42,-29
-            999: 43,-29
-            1091: -61,-29
-            1092: -60,-29
-            1175: -14,31
-            1176: -13,31
-            1177: -12,31
-            6076: -35,3
-            6135: 36,-24
+            605: -38,-16
+            606: -37,-16
+            607: -36,-16
+            608: -35,-16
+            609: -34,-16
+            610: -33,-16
+            611: -32,-16
+            612: -31,-16
+            613: -29,-16
+            614: -30,-16
+            615: -28,-16
+            724: -40,-33
+            725: -39,-33
+            726: -30,-33
+            727: -29,-33
+            732: -26,-40
+            733: -25,-40
+            734: -24,-40
+            735: -23,-40
+            736: -21,-40
+            737: -22,-40
+            738: -20,-40
+            739: -20,-40
+            748: -19,-40
+            749: -26,-36
+            750: -23,-36
+            751: -20,-36
+            752: -19,-36
+            759: -27,-40
+            760: -28,-40
+            761: -29,-40
+            789: -51,-1
+            790: -50,-1
+            791: -49,-1
+            792: -48,-1
+            793: -47,-1
+            794: -45,-1
+            795: -45,-1
+            796: -46,-1
+            797: -44,-1
+            798: -44,5
+            799: -46,5
+            800: -46,5
+            801: -45,5
+            802: -45,5
+            803: -47,5
+            804: -48,5
+            805: -48,5
+            806: -49,5
+            807: -50,5
+            808: -50,5
+            809: -51,5
+            972: 41,-29
+            973: 42,-29
+            974: 43,-29
+            1066: -61,-29
+            1067: -60,-29
+            1150: -14,31
+            1151: -13,31
+            1152: -12,31
+            5948: -35,3
+            6007: 36,-24
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
@@ -8966,78 +9003,78 @@ entities:
             503: -35,5
             504: -34,5
             505: -33,5
-            594: -40,-18
-            595: -39,-18
-            596: -38,-18
-            643: -38,-13
-            644: -37,-13
-            645: -36,-13
-            646: -35,-13
-            647: -34,-13
-            648: -33,-13
-            649: -32,-13
-            650: -31,-13
-            651: -29,-13
-            652: -28,-13
-            653: -30,-13
-            656: -38,-10
-            657: -37,-10
-            658: -36,-10
-            659: -30,-10
-            660: -29,-10
-            661: -28,-10
-            745: -40,-26
-            746: -39,-26
-            747: -30,-26
-            748: -29,-26
-            765: -26,-34
-            766: -25,-34
-            767: -24,-34
-            768: -22,-34
-            769: -21,-34
-            770: -20,-34
-            771: -19,-34
-            772: -23,-34
-            778: -26,-38
-            779: -23,-38
-            780: -20,-38
-            781: -19,-38
-            835: -51,3
-            836: -50,3
-            837: -50,3
-            838: -49,3
-            839: -48,3
-            840: -47,3
-            841: -46,3
-            842: -45,3
-            843: -44,3
-            844: -44,-3
-            845: -45,-3
-            846: -46,-3
-            847: -46,-3
-            848: -47,-3
-            849: -49,-3
-            850: -49,-3
-            851: -51,-3
-            852: -51,-3
-            859: -50,-3
-            860: -48,-3
-            1093: -62,-25
-            1094: -61,-25
-            1095: -60,-25
-            1722: 58,19
-            1723: 59,19
-            1724: 60,19
-            3038: 65,-52
-            3039: 66,-52
-            3040: 67,-52
-            6134: 36,-24
-            6154: -38,-17
-            6816: -21,-20
-            6817: -19,-20
-            7101: -37,13
-            7102: -38,13
-            7103: -39,13
+            569: -40,-18
+            570: -39,-18
+            571: -38,-18
+            618: -38,-13
+            619: -37,-13
+            620: -36,-13
+            621: -35,-13
+            622: -34,-13
+            623: -33,-13
+            624: -32,-13
+            625: -31,-13
+            626: -29,-13
+            627: -28,-13
+            628: -30,-13
+            631: -38,-10
+            632: -37,-10
+            633: -36,-10
+            634: -30,-10
+            635: -29,-10
+            636: -28,-10
+            720: -40,-26
+            721: -39,-26
+            722: -30,-26
+            723: -29,-26
+            740: -26,-34
+            741: -25,-34
+            742: -24,-34
+            743: -22,-34
+            744: -21,-34
+            745: -20,-34
+            746: -19,-34
+            747: -23,-34
+            753: -26,-38
+            754: -23,-38
+            755: -20,-38
+            756: -19,-38
+            810: -51,3
+            811: -50,3
+            812: -50,3
+            813: -49,3
+            814: -48,3
+            815: -47,3
+            816: -46,3
+            817: -45,3
+            818: -44,3
+            819: -44,-3
+            820: -45,-3
+            821: -46,-3
+            822: -46,-3
+            823: -47,-3
+            824: -49,-3
+            825: -49,-3
+            826: -51,-3
+            827: -51,-3
+            834: -50,-3
+            835: -48,-3
+            1068: -62,-25
+            1069: -61,-25
+            1070: -60,-25
+            1672: 58,19
+            1673: 59,19
+            1674: 60,19
+            2973: 65,-52
+            2974: 66,-52
+            2975: 67,-52
+            6006: 36,-24
+            6026: -38,-17
+            6658: -21,-20
+            6659: -19,-20
+            6822: -37,13
+            6823: -38,13
+            6824: -39,13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
@@ -9071,1966 +9108,2060 @@ entities:
             511: -30,4
             543: -24,17
             546: -24,21
-            576: -28,13
-            591: -37,-21
-            592: -37,-20
-            593: -37,-19
-            947: -50,-27
-            948: -50,-28
-            949: -50,-29
-            950: -50,-30
-            951: -50,-31
-            952: -50,-26
-            1000: 40,-31
-            1001: 40,-30
-            1088: -59,-28
-            1089: -59,-27
-            1090: -59,-26
-            1742: 58,19
-            2238: -27,-16
-            2239: -27,-15
-            2240: -27,-14
-            2241: -27,-13
-            6813: -20,-21
-            6815: -18,-21
-            6860: 80,-24
-            6861: 80,-23
+            563: -28,13
+            566: -37,-21
+            567: -37,-20
+            568: -37,-19
+            922: -50,-27
+            923: -50,-28
+            924: -50,-29
+            925: -50,-30
+            926: -50,-31
+            927: -50,-26
+            975: 40,-31
+            976: 40,-30
+            1063: -59,-28
+            1064: -59,-27
+            1065: -59,-26
+            1692: 58,19
+            2178: -27,-16
+            2179: -27,-15
+            2180: -27,-14
+            2181: -27,-13
+            6655: -20,-21
+            6657: -18,-21
+            6702: 80,-24
+            6703: 80,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa1
           decals:
-            6092: 80.134224,-34.739353
+            5964: 80.134224,-34.739353
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa2
           decals:
-            6093: 81.98104,-35.791183
+            5965: 81.98104,-35.791183
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa3
           decals:
-            6094: 80.43999,-36.158104
+            5966: 80.43999,-36.158104
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb1
           decals:
-            6095: 83.2041,-35.583263
+            5967: 83.2041,-35.583263
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb3
           decals:
-            6096: 83.020645,-36.060257
+            5968: 83.020645,-36.060257
         - node:
             color: '#FFFFFFFF'
             id: e
           decals:
-            923: -40.4296,-9.97279
+            898: -40.4296,-9.97279
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow01
           decals:
-            6109: 83.460945,-36.10918
-            6110: 80.01192,-34.201206
+            5981: 83.460945,-36.10918
+            5982: 80.01192,-34.201206
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow03
           decals:
-            6106: 81.7242,-35.840107
+            5978: 81.7242,-35.840107
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow05
           decals:
-            6111: 81.07172,-34.84943
+            5983: 81.07172,-34.84943
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow06
           decals:
-            6115: 80.39903,-34.335743
+            5987: 80.39903,-34.335743
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow07
           decals:
-            6104: 80.04861,-36.219257
+            5976: 80.04861,-36.219257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow08
           decals:
-            6105: 80.8436,-35.974644
+            5977: 80.8436,-35.974644
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow09
           decals:
-            6107: 82.201195,-35.974644
-            6114: 81.98901,-35.155193
+            5979: 82.201195,-35.974644
+            5986: 81.98901,-35.155193
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow10
           decals:
-            6102: 80.02415,-34.922813
+            5974: 80.02415,-34.922813
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow11
           decals:
-            6103: 80.42776,-35.546574
-            6108: 83.24079,-35.7178
+            5975: 80.42776,-35.546574
+            5980: 83.24079,-35.7178
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow12
           decals:
-            6112: 82.99192,-34.910583
+            5984: 82.99192,-34.910583
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow13
           decals:
-            6113: 82.56385,-34.88612
+            5985: 82.56385,-34.88612
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa1
           decals:
-            6099: 82.82495,-35.571033
+            5971: 82.82495,-35.571033
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa2
           decals:
-            6118: 83.059845,-34.91084
+            5990: 83.059845,-34.91084
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa3
           decals:
-            6097: 79.9263,-35.46096
+            5969: 79.9263,-35.46096
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb2
           decals:
-            6098: 81.369514,-35.70557
-            6116: 80.8828,-34.87415
+            5970: 81.369514,-35.70557
+            5988: 80.8828,-34.87415
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb3
           decals:
-            6117: 79.87989,-33.993546
+            5989: 79.87989,-33.993546
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc2
           decals:
-            6101: 79.79176,-36.060257
+            5973: 79.79176,-36.060257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc3
           decals:
-            6100: 81.10044,-36.13364
+            5972: 81.10044,-36.13364
         - node:
             color: '#FFFFFFFF'
             id: h
           decals:
-            924: -40.486675,-10.812624
+            899: -40.486675,-10.812624
         - node:
             color: '#FFFF0066'
             id: shop
           decals:
-            3027: 50.31763,23.128677
-            3028: 51.239506,23.738052
-            3029: 52.00513,23.034927
+            2967: 50.31763,23.128677
+            2968: 51.239506,23.738052
+            2969: 52.00513,23.034927
         - node:
             color: '#FFFFFFFF'
             id: w
           decals:
-            922: -40.502983,-9.132956
+            897: -40.502983,-9.132956
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
           0,0:
             0: 4383
-          -1,0:
-            0: 4383
           0,-1:
-            0: 4383
+            0: 4371
+            1: 12
+          -1,0:
+            0: 31
+            1: 4352
           0,1:
-            0: 63903
+            0: 2451
+            1: 61452
+          -1,1:
+            0: 552
+            1: 61447
           0,2:
-            0: 65343
+            0: 3903
+          -1,2:
+            0: 3983
+          0,3:
+            1: 3855
+          -1,3:
+            1: 32527
+          0,4:
+            1: 61695
           1,0:
-            0: 39327
+            0: 23
+            1: 39304
           1,1:
-            0: 63625
+            1: 63625
           1,2:
-            0: 65419
+            0: 907
+            1: 3072
+          1,3:
+            1: 7951
+          1,-1:
+            0: 4192
+            1: 35225
+          1,4:
+            1: 61695
           2,0:
-            0: 56831
+            0: 21879
           2,1:
-            0: 64733
+            0: 12309
+            1: 17472
           2,2:
-            0: 65484
-          -3,0:
-            0: 30719
-          -3,1:
-            0: 63351
-          -3,2:
-            0: 65399
-          -2,0:
-            0: 62271
-          -2,1:
-            0: 62003
-          -2,2:
-            0: 65322
-          -1,1:
-            0: 61999
-          -1,2:
-            0: 65423
-          0,-3:
-            0: 16383
-          0,-2:
-            0: 39423
-          1,-3:
-            0: 36863
-          1,-2:
-            0: 35067
-          1,-1:
-            0: 39417
-          2,-3:
-            0: 53247
-          2,-2:
-            0: 56572
-          2,-1:
-            0: 64989
-          -3,-3:
-            0: 32767
-          -3,-2:
-            0: 30711
-          -3,-1:
-            0: 63351
-          -2,-3:
-            0: 12287
-          -2,-2:
-            0: 13050
-          -2,-1:
-            0: 13299
-          -1,-3:
-            0: 36863
-          -1,-2:
-            0: 8959
-          -1,-1:
-            0: 4383
-          0,3:
-            0: 65535
-          1,3:
-            0: 65535
+            1: 1860
           2,3:
-            0: 65535
+            1: 3855
+          2,-1:
+            0: 30037
+          2,4:
+            1: 61695
           3,0:
-            0: 65535
+            1: 56789
           3,1:
-            0: 65535
+            1: 56797
           3,2:
-            0: 65535
+            1: 56797
           3,3:
-            0: 65535
+            1: 3909
+          3,-1:
+            1: 21845
+          3,4:
+            1: 63679
+          4,0:
+            1: 43936
+          4,3:
+            1: 48058
           -4,0:
-            0: 65535
+            1: 30583
+          -4,-1:
+            1: 29303
+          -5,0:
+            1: 65535
           -4,1:
-            0: 65535
+            1: 30578
+          -5,1:
+            1: 56785
           -4,2:
-            0: 65535
+            1: 29810
+          -5,2:
+            1: 61937
           -4,3:
-            0: 65535
+            1: 3413
+          -5,3:
+            1: 15291
+          -4,4:
+            1: 62127
+          -3,0:
+            1: 273
+            0: 17612
+          -3,1:
+            1: 21841
+            0: 32772
+          -3,2:
+            1: 7509
           -3,3:
-            0: 65535
+            1: 20239
+          -3,4:
+            1: 61695
+          -3,-1:
+            0: 50244
+            1: 273
+          -2,0:
+            0: 53533
+            1: 8738
+          -2,1:
+            0: 4113
+            1: 57890
+          -2,2:
+            1: 1792
+            0: 2090
           -2,3:
-            0: 65535
-          -1,3:
-            0: 65535
+            1: 3855
+          -2,-1:
+            0: 4561
+            1: 8738
+          -2,4:
+            1: 61687
+          -1,-1:
+            0: 4104
+            1: 279
           0,-4:
-            0: 65535
+            1: 30583
+          0,-5:
+            1: 30471
+          -1,-4:
+            1: 57341
+          0,-3:
+            1: 7
+            0: 16128
+          -1,-3:
+            1: 13
+            0: 36608
+          0,-2:
+            0: 39183
+            1: 240
+          -1,-2:
+            0: 8719
+            1: 240
           1,-4:
-            0: 65535
+            1: 30583
+          1,-3:
+            1: 3079
+            0: 33536
+          1,-2:
+            0: 11
+            1: 35056
           2,-4:
-            0: 65535
+            1: 3869
+          2,-3:
+            1: 18191
+          2,-2:
+            0: 4144
+            1: 17476
+          2,-5:
+            1: 56785
           3,-4:
-            0: 65535
+            1: 18191
           3,-3:
-            0: 65535
+            1: 21853
           3,-2:
-            0: 65535
-          3,-1:
-            0: 65535
+            1: 21845
+          3,-5:
+            1: 65522
+          4,-4:
+            1: 65519
+          4,-3:
+            1: 65535
+          4,-2:
+            0: 240
+            2: 4096
+            3: 16384
+          4,-1:
+            2: 17
+            1: 61440
+            3: 68
           -4,-4:
-            0: 65535
+            1: 7645
+          -4,-5:
+            1: 56793
+          -5,-4:
+            1: 30711
           -4,-3:
-            0: 65535
+            1: 26215
+          -5,-3:
+            1: 65394
           -4,-2:
-            0: 65535
-          -4,-1:
-            0: 65535
+            1: 29302
+          -5,-2:
+            1: 61680
+          -5,-1:
+            1: 63487
           -3,-4:
-            0: 65535
+            1: 3551
+          -3,-3:
+            1: 23839
+          -3,-2:
+            1: 21845
+            0: 128
+          -3,-5:
+            1: 64988
           -2,-4:
-            0: 65535
-          -1,-4:
-            0: 65535
-          -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
+            1: 45055
+          -2,-3:
+            1: 1834
+            0: 10240
+          -2,-2:
+            0: 4122
+            1: 8928
+          -2,-5:
+            1: 65535
+          -1,-5:
+            1: 56605
           -4,-8:
-            0: 65535
+            1: 24575
+          -5,-8:
+            1: 36863
           -4,-7:
-            0: 65535
+            1: 30583
+          -5,-7:
+            1: 4095
+          -4,-6:
+            1: 62071
           -3,-8:
-            0: 65535
+            1: 24575
           -3,-7:
-            0: 65535
+            1: 5589
           -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
+            1: 7645
           -2,-8:
-            0: 65535
+            1: 28671
           -2,-7:
-            0: 65535
+            1: 12287
           -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
+            1: 12287
+          -2,-9:
+            1: 7647
           -1,-8:
-            0: 65535
-          -1,-7:
-            0: 65535
+            1: 4095
           -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
+            1: 53247
+          -1,-7:
+            1: 20206
+          -1,-9:
+            1: 33247
           0,-8:
-            0: 65535
+            1: 4095
           0,-7:
-            0: 65535
+            1: 3581
           0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
+            1: 32631
+          0,-9:
+            1: 29695
           1,-8:
-            0: 65535
-          1,-7:
-            0: 65535
+            1: 61439
           1,-6:
-            0: 65535
+            1: 65535
           1,-5:
-            0: 65535
+            1: 4095
+          1,-7:
+            1: 59630
+          1,-9:
+            1: 43566
+          2,-8:
+            1: 47935
           2,-7:
-            0: 65535
+            1: 47291
           2,-6:
-            0: 65535
-          2,-5:
-            0: 65535
-          2,-8:
-            0: 65535
+            1: 32755
+          2,-9:
+            1: 65295
           3,-8:
-            0: 65535
+            1: 65295
           3,-7:
-            0: 65535
+            1: 65535
           3,-6:
-            0: 65535
-          3,-5:
-            0: 65535
+            1: 65524
+          3,-9:
+            1: 65295
           4,-8:
-            0: 65535
+            1: 48015
           4,-7:
-            0: 65535
-          4,-6:
-            0: 65535
+            1: 48059
           4,-5:
-            0: 65535
-          5,-5:
-            0: 65535
-          6,-5:
-            0: 65535
-          4,-4:
-            0: 65535
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 45055
-            1: 4096
-            2: 16384
-          5,-4:
-            0: 65535
-          5,-3:
-            0: 65535
-          5,-2:
-            0: 45055
-            3: 20480
-          6,-4:
-            0: 65535
-          6,-3:
-            0: 65535
-          6,-2:
-            0: 45055
-            4: 4096
-            3: 16384
-          -5,-6:
-            0: 65535
-          -5,-5:
-            0: 65535
-          -5,-4:
-            0: 65535
-          -5,-3:
-            0: 65535
+            1: 65520
+          4,-9:
+            1: 65322
+          4,-6:
+            1: 61152
           5,-8:
-            0: 65535
+            1: 48059
           5,-7:
-            0: 65535
+            1: 65523
           5,-6:
-            0: 65535
+            1: 49083
+          5,-5:
+            1: 65521
+          5,-9:
+            1: 47903
+          5,-4:
+            1: 65535
+          6,-8:
+            1: 65535
           6,-7:
-            0: 65535
+            1: 65520
+          6,-5:
+            1: 46008
+          6,-9:
+            1: 65287
           6,-6:
-            0: 65535
+            1: 61166
+          6,-4:
+            1: 65343
+          7,-8:
+            1: 49083
           7,-7:
-            0: 65535
+            1: 47928
           7,-6:
-            0: 65535
+            1: 64315
           7,-5:
-            0: 65535
-          7,-8:
-            0: 65535
-          4,-1:
-            1: 17
-            0: 65450
-            2: 68
+            1: 12543
+            0: 32768
+          7,-9:
+            1: 48011
+          7,-4:
+            1: 13063
+            0: 34952
+          8,-8:
+            1: 49075
+          8,-7:
+            1: 64435
+          8,-6:
+            1: 62387
+          8,-5:
+            1: 255
+            0: 61440
+          5,-3:
+            1: 65535
+          5,-2:
+            0: 240
+            4: 20480
           5,-1:
-            3: 85
-            0: 65450
+            4: 85
+            1: 61440
+          6,-3:
+            1: 65535
+          6,-2:
+            0: 240
+            5: 4096
+            4: 16384
           6,-1:
-            4: 17
-            0: 65450
-            3: 68
-          7,-4:
-            0: 65535
+            5: 17
+            1: 28672
+            4: 68
           7,-3:
-            0: 65535
+            1: 51
+            0: 59528
           7,-2:
-            0: 65535
-          -5,-2:
-            0: 65535
-          -5,-1:
-            0: 65535
-          4,0:
-            0: 65535
+            0: 254
+            1: 28672
+          7,-1:
+            1: 56785
+          7,0:
+            1: 65309
+          8,-4:
+            0: 31
+            1: 60928
+          8,-3:
+            0: 4352
+            1: 49390
+          8,-2:
+            0: 17
+            1: 29900
+          8,-1:
+            1: 30576
+          -8,-8:
+            1: 65535
+          -8,-9:
+            1: 65291
+          -9,-8:
+            1: 65535
+          -8,-7:
+            1: 65535
+          -9,-7:
+            1: 65535
+          -8,-6:
+            1: 55792
+          -9,-6:
+            1: 57584
+          -8,-5:
+            1: 36317
+          -9,-5:
+            1: 52974
+          -8,-4:
+            1: 65535
+          -7,-8:
+            1: 64989
+          -7,-7:
+            1: 56799
+          -7,-6:
+            1: 56572
+          -7,-5:
+            1: 52701
+          -7,-9:
+            1: 40397
+          -7,-4:
+            1: 65535
+          -6,-8:
+            1: 16383
+          -6,-7:
+            1: 7099
+          -6,-6:
+            1: 53725
+          -6,-5:
+            1: 8189
+          -6,-9:
+            1: 8191
+          -6,-4:
+            1: 56797
+          -5,-6:
+            1: 28774
+          -5,-5:
+            1: 10103
+          -5,-9:
+            1: 35771
+          -9,-4:
+            1: 65535
+          -8,-3:
+            1: 56793
+          -9,-3:
+            1: 56796
+          -8,-2:
+            1: 61680
+          -9,-2:
+            1: 61680
+          -8,-1:
+            1: 65535
+          -9,-1:
+            1: 65535
+          -8,0:
+            1: 65535
+          -7,-3:
+            1: 56796
+          -7,-2:
+            1: 63736
+          -7,-1:
+            1: 65535
+          -7,0:
+            1: 65535
+          -6,-3:
+            1: 48049
+          -6,-2:
+            1: 62451
+          -6,-1:
+            1: 65535
+          -6,0:
+            1: 65535
           4,1:
-            0: 65535
+            1: 43690
           4,2:
-            0: 65535
-          4,3:
-            0: 65535
+            1: 43690
+          4,4:
+            1: 63659
           5,0:
-            0: 65535
+            1: 65520
+          5,1:
+            1: 47935
+          5,2:
+            1: 65339
+          5,3:
+            1: 65535
+          5,4:
+            1: 48051
           6,0:
-            0: 65535
-          8,-8:
-            0: 65535
-          8,-7:
-            0: 65535
-          8,-6:
-            0: 65535
-          8,-5:
-            0: 65535
+            1: 65392
+          6,1:
+            1: 65295
+          6,2:
+            1: 61263
+          6,3:
+            1: 61438
+          6,4:
+            1: 65524
+          7,1:
+            1: 64783
+          7,2:
+            1: 24013
+          7,3:
+            1: 56797
+          7,4:
+            1: 65532
+          8,0:
+            1: 65303
+          8,1:
+            1: 30479
+          8,2:
+            1: 2039
+          8,3:
+            1: 61182
+          8,-9:
+            1: 49151
           9,-8:
-            0: 65535
+            1: 49072
           9,-7:
-            0: 65535
+            1: 64312
           9,-6:
-            0: 65535
+            1: 63544
           9,-5:
-            0: 65535
+            1: 57599
+          9,-9:
+            1: 65535
+          9,-4:
+            1: 57582
           10,-8:
-            0: 65535
+            1: 65520
           10,-7:
-            0: 65535
+            1: 65295
           10,-6:
-            0: 65535
+            1: 65423
           10,-5:
-            0: 65535
+            1: 61183
+          10,-9:
+            1: 65535
+          10,-4:
+            1: 65263
           11,-8:
-            0: 65535
+            1: 48056
           11,-7:
-            0: 65535
+            1: 48011
           11,-6:
-            0: 65535
+            1: 64395
           11,-5:
-            0: 65535
-          8,-4:
-            0: 65535
-          8,-3:
-            0: 65535
-          8,-2:
-            0: 65535
-          9,-4:
-            0: 65535
-          9,-3:
-            0: 65535
-          -6,2:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,0:
-            0: 65535
-          -5,1:
-            0: 65535
-          -5,3:
-            0: 65535
-          4,-9:
-            0: 65535
-          5,-9:
-            0: 65535
-          7,-9:
-            0: 65535
-          0,-9:
-            0: 65535
-          1,-9:
-            0: 65535
-          2,-9:
-            0: 65535
-          3,-9:
-            0: 65535
-          4,4:
-            0: 65535
-          0,4:
-            0: 65535
-          1,4:
-            0: 65535
-          2,4:
-            0: 65535
-          3,4:
-            0: 65535
-          -4,4:
-            0: 65535
-          -3,4:
-            0: 65535
-          -2,4:
-            0: 65535
-          -1,4:
-            0: 65535
-          -5,4:
-            0: 65535
-          -4,-9:
-            0: 65535
-          -3,-9:
-            0: 65535
-          -2,-9:
-            0: 65535
-          -1,-9:
-            0: 65535
-          8,-9:
-            0: 65535
-          9,-9:
-            0: 65535
-          10,-9:
-            0: 65535
+            1: 57599
           11,-9:
-            0: 65535
+            1: 49151
+          11,-4:
+            1: 29798
           12,-8:
-            0: 65535
+            1: 48059
           12,-7:
-            0: 65535
+            1: 15251
           12,-6:
-            0: 65535
+            1: 62227
           12,-5:
-            0: 65535
-          12,-9:
-            0: 65535
-          -6,-2:
-            0: 65535
-          -6,-1:
-            0: 65535
-          -7,0:
-            0: 65535
+            1: 61695
+          9,-3:
+            1: 65254
+          9,-2:
+            1: 61695
+          9,-1:
+            1: 65535
+          9,0:
+            1: 65287
+          10,-1:
+            1: 61167
+          10,-3:
+            1: 61166
+          10,-2:
+            1: 61166
+          10,0:
+            1: 65534
+          11,-3:
+            1: 1764
+          11,-2:
+            1: 24806
+          11,-1:
+            1: 58894
+          12,-4:
+            1: 65520
+          12,-3:
+            1: 45055
+          12,-2:
+            1: 65535
+          12,-1:
+            1: 65535
+          -9,0:
+            1: 65535
+          -8,1:
+            1: 65535
+          -9,1:
+            1: 65535
+          -8,2:
+            1: 61680
+          -9,2:
+            1: 57584
+          -8,3:
+            1: 65535
+          -9,3:
+            1: 61422
+          -8,4:
+            1: 61695
           -7,1:
-            0: 65535
+            1: 65535
           -7,2:
-            0: 65535
-          -6,0:
-            0: 65535
+            1: 65278
+          -7,3:
+            1: 61438
+          -7,4:
+            1: 65262
           -6,1:
-            0: 65535
+            1: 65535
+          -6,2:
+            1: 64767
           -6,3:
-            0: 65535
-          -6,4:
-            0: 65535
-          10,-4:
-            0: 65535
-          10,-3:
-            0: 65535
-          11,-4:
-            0: 65535
-          11,-3:
-            0: 65535
-          -7,3:
-            0: 65535
+            1: 61438
+          -5,4:
+            1: 62392
+          4,-12:
+            1: 64765
+          4,-13:
+            1: 56588
+          3,-12:
+            1: 29695
+          4,-11:
+            1: 64735
+          3,-11:
+            1: 54384
+          4,-10:
+            1: 47778
+          3,-10:
+            1: 51665
+          5,-12:
+            1: 12288
+            0: 34
+          5,-11:
+            1: 12323
+          5,-10:
+            1: 65520
+          5,-13:
+            0: 8704
+          6,-12:
+            1: 65520
+          6,-11:
+            1: 4095
+          6,-10:
+            1: 63344
+          6,-13:
+            0: 57344
+            4: 200
+          7,-12:
+            1: 13104
+          7,-11:
+            1: 13107
+          7,-10:
+            1: 64307
+          7,-13:
+            0: 4096
+            4: 16
+            1: 8
+          8,-11:
+            0: 48896
+          8,-10:
+            1: 65520
+          0,-12:
+            0: 32627
+          0,-13:
+            0: 65523
+          -1,-12:
+            0: 65520
+          0,-11:
+            0: 35059
+            1: 13056
+          -1,-11:
+            0: 17600
+            1: 4352
+          0,-10:
+            1: 65331
+            0: 8
+          -1,-10:
+            1: 56337
+            0: 4
+          1,-12:
+            0: 4369
+            1: 32904
+          1,-13:
+            0: 4369
+            1: 32768
+          1,-11:
+            1: 26336
+          1,-10:
+            1: 26214
+          2,-12:
+            1: 45243
+          2,-11:
+            1: 61872
+          2,-10:
+            1: 4095
+          2,-13:
+            1: 47104
+          3,-13:
+            1: 65280
+            0: 1
           4,5:
-            0: 65535
+            1: 12543
+            0: 32768
+          3,5:
+            1: 62719
+          4,6:
+            1: 48
+            0: 8200
+          3,6:
+            1: 3823
+          4,7:
+            0: 8738
+          3,7:
+            1: 61422
+          4,8:
+            0: 2
+            1: 4352
+          5,5:
+            1: 35003
+            0: 12288
+          5,6:
+            0: 34947
+          6,5:
+            1: 65535
+          6,6:
+            1: 18020
+          7,5:
+            1: 65535
+          7,6:
+            1: 4913
+            0: 34944
+          8,4:
+            1: 61408
+          8,5:
+            1: 3839
+          -1,4:
+            1: 61680
           0,5:
-            0: 65535
+            1: 61695
+          -1,5:
+            1: 63231
+          0,6:
+            1: 60655
+          -1,6:
+            1: 63231
+          0,7:
+            1: 56591
+          -1,7:
+            1: 61183
+          0,8:
+            1: 49356
           1,5:
-            0: 65535
+            1: 47359
+          1,6:
+            1: 15291
+          1,7:
+            1: 65307
+          1,8:
+            1: 61695
           2,5:
-            0: 65535
-          3,5:
-            0: 65535
+            1: 57599
+          2,6:
+            1: 36622
+          2,7:
+            1: 43691
+          2,8:
+            1: 47786
+          3,8:
+            1: 65038
           -4,5:
-            0: 65535
+            1: 28927
+          -5,5:
+            1: 28927
+          -4,6:
+            1: 65351
+          -4,7:
+            1: 59647
+          -5,7:
+            1: 53375
+          -4,8:
+            1: 3823
           -3,5:
-            0: 65535
+            1: 28927
+          -3,6:
+            1: 65351
+          -3,7:
+            1: 53503
+          -3,8:
+            1: 3549
           -2,5:
-            0: 65535
-          -1,5:
-            0: 65535
-          -7,4:
-            0: 65535
+            1: 28927
+          -2,6:
+            1: 63303
+          -2,7:
+            1: 62463
+          -2,8:
+            1: 4095
+          -1,8:
+            1: 20206
+          -9,4:
+            1: 61678
+          -8,5:
+            1: 65522
+          -8,6:
+            1: 56785
+          -9,6:
+            1: 30711
+          -8,7:
+            1: 35057
+            0: 12288
+          -8,8:
+            0: 3
+            1: 56584
+          -9,7:
+            0: 61440
+            1: 119
           -7,5:
-            0: 65535
+            1: 61678
+          -7,6:
+            1: 61152
+          -7,7:
+            1: 3822
+          -7,8:
+            1: 65359
+          -6,4:
+            1: 65520
           -6,5:
-            0: 65535
-          -5,5:
-            0: 65535
-          -7,-8:
-            0: 65535
-          -7,-7:
-            0: 65535
-          -7,-6:
-            0: 65535
-          -7,-5:
-            0: 65535
-          -6,-8:
-            0: 65535
-          -6,-7:
-            0: 65535
-          -6,-6:
-            0: 65535
-          -6,-5:
-            0: 65535
-          -5,-8:
-            0: 65535
-          -5,-7:
-            0: 65535
-          -8,-2:
-            0: 65535
-          -8,-1:
-            0: 65535
-          -7,-2:
-            0: 65535
-          -7,-1:
-            0: 65535
-          -7,-4:
-            0: 65535
-          -7,-3:
-            0: 65535
-          -6,-4:
-            0: 65535
-          -6,-3:
-            0: 65535
-          -8,0:
-            0: 65535
-          -8,1:
-            0: 65535
-          -8,2:
-            0: 65535
-          -8,3:
-            0: 65535
-          -8,4:
-            0: 65535
-          -8,5:
-            0: 65535
-          -7,-9:
-            0: 65535
-          -6,-9:
-            0: 65535
-          -5,-9:
-            0: 65535
+            1: 61695
+          -6,6:
+            1: 43938
+          -6,7:
+            1: 58026
+          -6,8:
+            1: 26191
+          -5,6:
+            1: 30578
+          -5,8:
+            1: 61661
+          -4,-11:
+            0: 199
+            1: 40992
+          -5,-11:
+            0: 8
+            1: 36659
+          -5,-10:
+            1: 48059
+          -4,-10:
+            1: 61160
+          -4,-9:
+            1: 3808
+          -3,-11:
+            0: 120
+            1: 28672
+          -3,-10:
+            1: 48951
+          -3,-9:
+            1: 2040
+          -3,-12:
+            0: 34952
+          -3,-13:
+            0: 34952
+          -2,-12:
+            0: 61155
+          -2,-11:
+            1: 65280
+          -2,-10:
+            1: 53759
+          -2,-13:
+            0: 61155
+          9,-11:
+            0: 3840
+          9,-10:
+            1: 65520
+          10,-11:
+            0: 3840
+          10,-10:
+            1: 65520
+          11,-11:
+            0: 44800
+          11,-10:
+            1: 65520
+          12,-11:
+            0: 4352
+            1: 34816
+          12,-10:
+            1: 45976
+          12,-9:
+            1: 48063
+          13,-8:
+            1: 39169
+          13,-7:
+            1: 2456
+          13,-6:
+            1: 65535
+          13,-5:
+            1: 61695
+          13,-9:
+            1: 56797
+          14,-8:
+            1: 65280
+          14,-7:
+            1: 10103
+          14,-6:
+            1: 65535
+          14,-5:
+            1: 61183
+          13,-4:
+            1: 48056
+          14,-9:
+            1: 30583
+          14,-4:
+            1: 61164
+          15,-8:
+            1: 62702
+          15,-7:
+            1: 61428
+          15,-6:
+            1: 47342
+          15,-5:
+            1: 49087
+          15,-4:
+            1: 64441
+          15,-9:
+            1: 57344
+            4: 4
+          16,-8:
+            1: 12834
+          16,-7:
+            1: 30576
+          16,-6:
+            1: 62071
+          16,-5:
+            1: 65523
+          12,-12:
+            0: 19968
+          13,-12:
+            0: 36736
+            1: 11
+          13,-11:
+            1: 30464
+          13,-10:
+            1: 4215
+          14,-12:
+            1: 1
+            0: 256
+          14,-11:
+            1: 33312
+          15,-10:
+            1: 142
+          16,-10:
+            0: 273
+            1: 4096
+          -8,-12:
+            1: 65280
+          -9,-12:
+            1: 47872
+            0: 4
+          -8,-11:
+            1: 3887
+          -9,-11:
+            1: 7947
+          -8,-10:
+            1: 48063
+          -9,-10:
+            1: 35293
+          -9,-9:
+            1: 65323
+          -7,-11:
+            1: 39726
+          -7,-10:
+            1: 65535
+          -7,-12:
+            0: 3809
+          -7,-13:
+            0: 12288
+          -6,-11:
+            1: 1295
+          -6,-10:
+            1: 65535
+          -6,-12:
+            1: 57890
+            0: 136
+          -6,-13:
+            1: 8192
+            0: 32768
+          -5,-12:
+            1: 12834
+            0: 34952
+          -5,-13:
+            1: 8192
+            0: 32768
+          -12,-4:
+            1: 7677
+          -12,-5:
+            1: 56591
+          -13,-4:
+            1: 61166
+          -12,-3:
+            1: 61692
+          -13,-3:
+            1: 57584
           -12,-2:
-            0: 65535
+            1: 61695
+          -13,-2:
+            1: 57582
           -12,-1:
-            0: 65535
-          -11,-2:
-            0: 65535
+            1: 65535
+          -13,-1:
+            1: 65535
+          -12,0:
+            1: 65535
+          -11,-4:
+            1: 60637
+          -11,-3:
+            1: 43699
           -11,-1:
-            0: 65535
+            1: 14199
+          -11,-5:
+            1: 21829
+          -11,-2:
+            1: 25826
+          -11,0:
+            1: 16383
+          -10,-4:
+            1: 61167
+          -10,-3:
+            1: 56792
           -10,-2:
-            0: 65535
+            1: 61680
           -10,-1:
-            0: 65535
-          -9,-2:
-            0: 65535
-          -9,-1:
-            0: 65535
-          -12,0:
-            0: 65535
+            1: 65535
+          -10,0:
+            1: 65535
+          -10,-5:
+            1: 20479
+          -13,0:
+            1: 65535
           -12,1:
-            0: 65535
-          -11,0:
-            0: 65535
+            1: 65535
+          -13,1:
+            1: 61439
+          -12,2:
+            1: 65521
+          -13,2:
+            1: 61152
+          -12,3:
+            1: 255
+            0: 28672
+          -13,3:
+            1: 238
+            0: 61440
           -11,1:
-            0: 65535
+            1: 26487
           -11,2:
-            0: 65535
+            1: 63956
           -11,3:
-            0: 65535
-          -10,0:
-            0: 65535
+            1: 47291
+          -11,4:
+            1: 187
+            0: 61440
           -10,1:
-            0: 65535
+            1: 65535
           -10,2:
-            0: 65535
+            1: 58608
           -10,3:
-            0: 65535
-          -9,0:
-            0: 65535
-          -9,1:
-            0: 65535
-          -9,2:
-            0: 65535
-          -9,3:
-            0: 65535
-          -11,4:
-            0: 65535
+            1: 3822
           -10,4:
-            0: 65535
+            1: 35071
+            0: 12288
+          -12,5:
+            4: 32768
+            0: 8
+          -12,4:
+            0: 32768
+          -11,5:
+            0: 35019
+            4: 12544
+          -11,6:
+            4: 1
+            0: 136
+            1: 2048
           -10,5:
-            0: 65518
-          -9,4:
-            0: 65535
+            0: 4352
+            1: 52416
+          -10,6:
+            0: 257
+            1: 51884
+          -10,7:
+            1: 255
+            0: 61440
+          -11,7:
+            0: 32768
+          -11,8:
+            0: 8
+          -10,8:
+            0: 34959
           -9,5:
-            0: 65535
-          -8,-6:
-            0: 65535
-          -8,-5:
-            0: 65535
-          -8,-4:
-            0: 65535
-          -8,-3:
-            0: 65535
-          -11,-4:
-            0: 65535
-          -11,-3:
-            0: 65535
-          -10,-4:
-            0: 65535
-          -10,-3:
-            0: 65535
-          -9,-4:
-            0: 65535
-          -9,-3:
-            0: 65535
-          -11,-6:
-            0: 65535
-          -11,-5:
-            0: 65535
-          -10,-6:
-            0: 65535
-          -10,-5:
-            0: 65535
-          -9,-6:
-            0: 65535
-          -9,-5:
-            0: 65535
-          -8,-8:
-            0: 65535
-          -8,-7:
-            0: 65535
-          -8,-11:
-            0: 65535
-          -8,-10:
-            0: 65535
-          -8,-9:
-            0: 65535
-          -7,-11:
-            0: 65535
-          -7,-10:
-            0: 65535
-          -6,-11:
-            0: 65535
-          -6,-10:
-            0: 65535
-          -5,-11:
-            0: 65535
-          -5,-10:
-            0: 65535
+            1: 30576
+          -9,8:
+            0: 15
+            1: 52224
+          -12,-8:
+            1: 65487
+          -12,-9:
+            1: 29619
+          -13,-8:
+            1: 65407
+          -12,-7:
+            1: 64767
+          -13,-7:
+            1: 63487
+          -12,-6:
+            1: 65535
+          -13,-6:
+            1: 65535
+          -13,-5:
+            1: 61135
           -11,-8:
-            0: 65535
+            1: 64443
           -11,-7:
-            0: 65535
+            1: 48063
+          -11,-6:
+            1: 21969
+          -11,-9:
+            1: 35647
           -10,-8:
-            0: 65535
+            1: 65535
           -10,-7:
-            0: 65535
-          -9,-8:
-            0: 65535
-          -9,-7:
-            0: 65535
-          -11,-9:
-            0: 65535
+            1: 65535
+          -10,-6:
+            1: 62192
           -10,-9:
-            0: 65535
-          -10,-11:
-            0: 65535
+            1: 65295
+          -12,-12:
+            1: 16383
+          -12,-13:
+            1: 61440
+          -13,-12:
+            1: 36863
+          -12,-11:
+            1: 13107
+            0: 8
+            4: 32768
+          -13,-11:
+            1: 34952
+            0: 13059
+          -12,-10:
+            1: 62259
+            4: 8
+          -13,-10:
+            1: 63624
+            0: 51
+          -13,-9:
+            1: 51641
+          -11,-12:
+            1: 4095
+          -11,-11:
+            0: 15
+            4: 36864
+          -11,-10:
+            1: 61440
+          -11,-13:
+            1: 56524
+          -10,-12:
+            1: 52497
+          -10,-13:
+            1: 39249
           -10,-10:
-            0: 65535
-          -9,-11:
-            0: 65535
-          -9,-10:
-            0: 65535
-          -9,-9:
-            0: 65535
-          -15,0:
-            0: 51336
+            1: 9736
+          -10,-11:
+            1: 34828
+          -9,-13:
+            0: 57354
           -15,1:
-            0: 52428
-          -14,0:
-            0: 65535
+            1: 3084
+          -15,2:
+            0: 12
+          -15,0:
+            0: 2184
           -14,1:
-            0: 65535
-          -13,0:
-            0: 65535
-          -13,1:
-            0: 65535
+            1: 61423
+          -15,3:
+            0: 128
+          -14,3:
+            0: 241
+          -14,0:
+            1: 61166
+          -14,2:
+            1: 3812
+          -14,-1:
+            1: 61423
           -15,-2:
-            0: 52224
+            0: 3072
           -15,-1:
-            0: 52428
-          -14,-2:
-            0: 65535
-          -14,-1:
-            0: 65535
-          -13,-2:
-            0: 65535
-          -13,-1:
-            0: 65535
-          -12,-4:
-            0: 65535
-          -12,-3:
-            0: 65535
-          -12,2:
-            0: 65535
-          -12,3:
-            0: 65535
-          -12,-8:
-            0: 65535
-          -12,-7:
-            0: 65535
-          -12,-6:
-            0: 65535
-          -12,-5:
-            0: 65535
-          -12,-9:
-            0: 65535
-          -14,2:
-            0: 65535
-          -13,2:
-            0: 65535
-          -13,3:
-            0: 65535
+            1: 3084
           -14,-4:
-            0: 65535
+            1: 61166
           -14,-3:
-            0: 65535
-          -13,-4:
-            0: 65535
-          -13,-3:
-            0: 65535
-          -14,-6:
-            0: 65535
+            1: 61166
+          -14,-2:
+            1: 61166
           -14,-5:
-            0: 65535
-          -14,-8:
-            0: 65535
-          -14,-7:
-            0: 65535
-          -13,-8:
-            0: 65535
-          -13,-7:
-            0: 65535
-          -13,-6:
-            0: 65535
-          -13,-5:
-            0: 65535
-          -14,-9:
-            0: 65535
-          -13,-9:
-            0: 65535
-          6,-8:
-            0: 65535
-          6,-9:
-            0: 65535
-          7,-10:
-            0: 65535
-          8,-10:
-            0: 65535
-          9,-10:
-            0: 65535
-          10,-10:
-            0: 65535
-          11,-10:
-            0: 65535
-          12,-10:
-            0: 65535
-          7,-1:
-            0: 65535
-          5,1:
-            0: 65535
-          5,2:
-            0: 65535
-          5,3:
-            0: 65535
-          6,1:
-            0: 65535
-          7,0:
-            0: 65535
-          7,1:
-            0: 65535
-          8,-1:
-            0: 65535
-          9,-2:
-            0: 65535
-          9,-1:
-            0: 65535
-          10,-2:
-            0: 65535
-          10,-1:
-            0: 65535
-          11,-2:
-            0: 65535
-          11,-1:
-            0: 65535
-          5,4:
-            0: 65535
-          5,5:
-            0: 65535
+            1: 61166
           -16,-8:
-            0: 65535
+            1: 53759
           -16,-7:
-            0: 65535
+            1: 56797
+          -17,-7:
+            1: 65392
           -16,-6:
-            0: 65535
+            1: 51697
+          -16,-5:
+            0: 3585
+            1: 12
+          -17,-5:
+            0: 12
           -15,-8:
-            0: 65535
+            1: 47167
           -15,-7:
-            0: 65535
+            1: 48063
           -15,-6:
-            0: 65535
+            1: 11832
+          -15,-5:
+            0: 3976
+            1: 34
           -15,-9:
-            0: 65535
-          8,0:
-            0: 65535
-          8,1:
-            0: 65535
-          9,0:
-            0: 65535
+            1: 20479
+          -14,-8:
+            1: 30471
+          -14,-7:
+            1: 65399
+          -14,-6:
+            1: 61191
+          -14,-9:
+            1: 19867
+          -16,-9:
+            0: 1860
+          -17,-9:
+            0: 2048
+          -16,-10:
+            0: 17486
+          -15,-10:
+            0: 15
+            1: 61440
+          -15,-12:
+            0: 17476
+          -15,-13:
+            0: 17476
+          -14,-12:
+            1: 4095
+          -14,-10:
+            0: 143
+            1: 45056
+          -14,-13:
+            1: 30583
+          -14,-11:
+            0: 34830
+          -13,-13:
+            1: 61440
           9,1:
-            0: 65535
-          10,0:
-            0: 65535
+            1: 21791
+          9,2:
+            1: 36725
+          9,3:
+            1: 48059
           10,1:
-            0: 65535
+            1: 64767
+          10,2:
+            1: 58607
+          10,3:
+            1: 63726
+          10,4:
+            1: 3626
           11,0:
-            0: 65535
+            1: 30576
           11,1:
-            0: 65535
+            1: 61815
+          11,2:
+            1: 62975
+          11,3:
+            1: 65535
+          11,4:
+            1: 3855
+          12,0:
+            1: 65534
+          12,1:
+            1: 65279
+          12,2:
+            1: 61183
+          12,3:
+            1: 61182
+          -18,-8:
+            0: 35840
+          -18,-6:
+            0: 51200
           -17,-8:
-            0: 36744
-          -17,-7:
-            0: 65535
+            0: 1792
           -17,-6:
-            0: 63743
-          0,6:
-            0: 65535
-          0,7:
-            0: 65535
-          1,6:
-            0: 65535
-          1,7:
-            0: 65535
-          2,6:
-            0: 65535
-          2,7:
-            0: 65535
-          3,6:
-            0: 65535
-          3,7:
-            0: 65535
-          -4,6:
-            0: 65535
-          -4,7:
-            0: 65535
-          -3,6:
-            0: 65535
-          -3,7:
-            0: 65535
-          -2,6:
-            0: 65535
-          -2,7:
-            0: 65535
-          -1,6:
-            0: 65535
-          -1,7:
-            0: 65535
-          -8,6:
-            0: 65535
-          -7,6:
-            0: 65535
-          -6,6:
-            0: 65535
-          -6,7:
-            0: 65535
-          -5,6:
-            0: 65535
-          -5,7:
-            0: 65535
-          0,8:
-            0: 65535
+            1: 7
+            0: 28672
           0,9:
-            0: 65535
+            1: 3824
+          -1,9:
+            1: 20222
           0,10:
-            0: 65535
-          1,8:
-            0: 65535
+            1: 61006
+          -1,10:
+            1: 61166
+          0,11:
+            1: 65524
+          -1,11:
+            1: 65530
+          0,12:
+            1: 65295
           1,9:
-            0: 65535
-          2,8:
-            0: 65535
+            1: 57568
+          1,10:
+            1: 3822
+          1,11:
+            0: 17478
+          1,12:
+            0: 17476
           2,9:
-            0: 65535
-          3,8:
-            0: 65535
+            1: 12792
+            0: 32768
+          2,10:
+            1: 819
+            0: 34952
           3,9:
-            0: 65535
-          -4,8:
-            0: 65535
+            1: 57582
+          3,10:
+            1: 3822
+          4,9:
+            1: 4113
+          4,10:
+            1: 273
           -4,9:
-            0: 65535
-          -3,8:
-            0: 65535
+            1: 65455
+          -5,9:
+            1: 34831
+            0: 13056
+          -4,10:
+            1: 255
+            0: 61440
+          -5,10:
+            1: 136
+            0: 62243
           -3,9:
-            0: 65535
-          -2,8:
-            0: 65535
+            1: 64783
+          -3,10:
+            1: 157
+            0: 64512
+          -3,11:
+            0: 17476
+          -3,12:
+            0: 76
           -2,9:
-            0: 65535
-          -1,8:
-            0: 65535
-          -1,9:
-            0: 65535
-          -1,10:
-            0: 65535
-          -6,8:
-            0: 65535
-          -6,9:
-            0: 65535
-          -5,8:
-            0: 65535
-          -5,9:
-            0: 65535
-          6,2:
-            0: 65535
-          6,3:
-            0: 65535
-          7,2:
-            0: 65535
-          7,3:
-            0: 65535
-          5,6:
-            0: 34959
-          6,4:
-            0: 65535
-          6,5:
-            0: 65535
-          6,6:
-            0: 65535
-          7,4:
-            0: 65535
-          7,5:
-            0: 65535
-          7,6:
-            0: 65535
-          8,2:
-            0: 65535
-          8,3:
-            0: 65535
-          0,11:
-            0: 65535
-          1,10:
-            0: 65535
-          1,11:
-            0: 21847
+            1: 3823
           -2,10:
-            0: 65535
+            1: 61006
           -2,11:
-            0: 65535
-          -1,11:
-            0: 65535
+            1: 61156
           -2,12:
-            0: 47871
-          -2,13:
-            0: 25322
+            1: 14
+            0: 512
           -1,12:
-            0: 65535
+            1: 65391
+          -8,9:
+            1: 3583
+          -9,9:
+            1: 3276
+          -8,10:
+            0: 43567
+          -9,10:
+            0: 15
+          -8,11:
+            0: 43754
+          -8,12:
+            0: 43754
+          -7,9:
+            1: 4087
+          -7,10:
+            0: 65295
+          -7,11:
+            0: 65295
+          -7,12:
+            0: 65295
+          -6,9:
+            1: 18032
+          -6,10:
+            0: 65391
+          -6,11:
+            0: 65519
+          -6,12:
+            0: 65519
+          -5,11:
+            0: 13091
+          -5,12:
+            0: 13091
+          -2,13:
+            0: 610
+          -2,14:
+            0: 8
           -1,13:
-            0: 8191
-          0,12:
-            0: 65535
+            1: 239
+            0: 4096
+          -1,14:
+            0: 15
           0,13:
-            0: 36863
-          1,12:
-            0: 21845
+            1: 127
+            0: 32768
+          0,14:
+            0: 15
+          1,14:
+            0: 1
           1,13:
-            0: 25717
-          8,4:
-            0: 65535
-          8,5:
-            0: 65535
+            0: 1124
           8,6:
-            0: 15
+            0: 14
           9,4:
-            0: 65535
+            1: 40912
           9,5:
-            0: 13311
-          4,6:
-            0: 14207
-          -4,-11:
-            0: 65527
-          -4,-10:
-            0: 65535
-          13,-8:
-            0: 65535
-          13,-7:
-            0: 65535
-          14,-8:
-            0: 65535
-          14,-7:
-            0: 65535
-          15,-8:
-            0: 65535
-          15,-7:
-            0: 65535
-          13,-10:
-            0: 65535
-          13,-9:
-            0: 65535
-          14,-10:
-            0: 65535
-          14,-9:
-            0: 65535
-          15,-10:
-            0: 65535
-          15,-9:
-            0: 65531
-            3: 4
-          -12,-12:
-            0: 65535
-          -12,-11:
-            0: 32767
-            3: 32768
-          -12,-10:
-            0: 65527
-            3: 8
-          -11,-12:
-            0: 65535
-          -11,-11:
-            0: 28671
-            3: 36864
-          -11,-10:
-            0: 65535
-          -10,-12:
-            0: 65535
-          -15,-12:
-            0: 52428
-          -14,-12:
-            0: 65535
-          -14,-11:
-            0: 35071
-          -14,-10:
-            0: 65423
-          -13,-12:
-            0: 65535
-          -13,-11:
-            0: 65535
-          -13,-10:
-            0: 65535
-          9,2:
-            0: 65535
-          9,3:
-            0: 65535
-          10,2:
-            0: 65535
-          10,3:
-            0: 65535
-          11,2:
-            0: 65535
-          11,3:
-            0: 65535
-          10,4:
-            0: 65535
+            1: 273
+            0: 204
+          9,6:
+            0: 3
           10,5:
             0: 255
-          11,4:
-            0: 65535
-          12,1:
-            0: 65535
-          12,2:
-            0: 65535
-          12,3:
-            0: 65535
+          11,5:
+            0: 4369
+            1: 204
+          11,6:
+            0: 15
+          12,4:
+            1: 4064
+          12,5:
+            1: 52445
+            0: 4096
+          12,6:
+            0: 3857
+            1: 12
+          13,0:
+            1: 65504
           13,1:
-            0: 65535
+            1: 65038
           13,2:
-            0: 65535
+            1: 65038
           13,3:
-            0: 65535
-          12,4:
-            0: 65535
-          13,4:
-            0: 65535
-          -15,-13:
-            0: 52428
-          -14,-13:
-            0: 65535
-          -13,-13:
-            0: 65280
-          -12,-13:
-            0: 65280
-          -11,-13:
-            0: 65518
-          -10,-13:
-            0: 65407
-          13,-5:
-            0: 65535
-          12,0:
-            0: 65535
-          13,0:
-            0: 65535
+            1: 61198
+          13,-1:
+            1: 64799
           14,0:
-            0: 65535
+            1: 49080
           14,1:
-            0: 65535
+            1: 56587
           14,2:
-            0: 65535
+            1: 57101
           14,3:
-            0: 65535
+            1: 61197
+          14,-1:
+            1: 9743
+          14,4:
+            1: 61166
+          15,0:
+            1: 61949
+          15,1:
+            1: 3853
           15,2:
-            0: 65535
+            1: 10987
           15,3:
-            0: 65535
-          14,4:
-            0: 65535
-          14,5:
-            0: 65535
+            1: 48014
+          15,-1:
+            1: 8075
           15,4:
-            0: 65535
+            1: 48059
+          16,1:
+            1: 3050
+          16,2:
+            1: 819
+            0: 8
+          13,4:
+            1: 40944
+          13,5:
+            1: 62395
+          13,6:
+            1: 7
+            0: 1792
+          13,7:
+            0: 3200
+          14,5:
+            1: 61712
+            0: 192
+          14,6:
+            1: 30578
+          14,7:
+            0: 3840
           15,5:
-            0: 65535
+            0: 16
+            1: 29896
+          15,6:
+            1: 30578
+          15,7:
+            0: 3968
+          16,5:
+            1: 254
+            0: 61440
+          16,6:
+            0: 4369
+          16,7:
+            0: 257
           -16,-16:
-            0: 43690
+            0: 8738
+          -16,-17:
+            0: 9770
           -16,-15:
-            0: 43690
+            0: 8738
           -16,-14:
-            0: 58030
+            0: 57894
+          -16,-13:
+            0: 2
           -15,-16:
-            0: 65535
+            1: 65535
           -15,-15:
-            0: 65535
+            1: 65535
           -15,-14:
-            0: 64767
+            1: 7
+            0: 29696
+          -15,-17:
+            1: 65280
           -14,-16:
-            0: 65535
+            1: 30583
           -14,-15:
-            0: 65535
+            1: 29169
           -14,-14:
-            0: 65535
+            1: 30583
+          -14,-17:
+            1: 7936
+            0: 4
           -11,-16:
-            0: 61166
+            1: 52428
           -11,-15:
-            0: 61166
+            1: 49376
           -11,-14:
-            0: 61166
+            1: 52428
           -10,-16:
-            0: 65535
+            1: 65535
           -10,-15:
-            0: 65535
+            1: 65535
           -10,-14:
-            0: 65535
+            1: 64797
+          -10,-17:
+            1: 65280
           -9,-16:
-            0: 48059
+            1: 4369
+            0: 34952
           -9,-15:
-            0: 48059
+            1: 4369
+            0: 34952
           -9,-14:
-            0: 64447
-          -16,-17:
-            0: 44714
-          -15,-17:
-            0: 65520
-          -14,-17:
-            0: 65532
-          -11,-17:
-            0: 61158
-          -10,-17:
-            0: 65520
+            1: 1
+            0: 60044
           -9,-17:
-            0: 49082
-          12,-4:
-            0: 65535
-          12,-3:
-            0: 65535
-          12,-2:
-            0: 65535
-          12,-1:
-            0: 65535
-          13,-4:
-            0: 65535
+            1: 4352
+            0: 35978
+          -8,-13:
+            0: 61440
+          -16,-18:
+            0: 57344
+          -15,-18:
+            0: 61440
+          -14,-18:
+            0: 29760
+          -13,-18:
+            1: 240
+          -12,-18:
+            1: 240
+          -11,-18:
+            1: 16
+            0: 50240
+          -11,-17:
+            0: 4
+            1: 3584
+          -10,-18:
+            0: 61440
+          -9,-18:
+            0: 61440
           13,-3:
-            0: 65535
+            1: 3003
           13,-2:
-            0: 65535
-          13,-1:
-            0: 65535
+            1: 61949
           14,-3:
-            0: 65535
+            1: 36622
           14,-2:
-            0: 65535
-          14,-1:
-            0: 57343
-            5: 8192
-          15,0:
-            0: 65535
-          15,1:
-            0: 65535
-          15,-1:
-            0: 65535
-          16,0:
-            0: 65535
-          16,1:
-            0: 65535
-          16,-1:
-            0: 65535
-          13,-6:
-            0: 65535
-          14,-6:
-            0: 65535
-          14,-5:
-            0: 65535
-          15,-6:
-            0: 65535
-          15,-5:
-            0: 65535
-          13,5:
-            0: 65535
-          13,6:
-            0: 36863
-          14,6:
-            0: 65535
-          15,6:
-            0: 65535
-          14,-4:
-            0: 65535
-          15,-4:
-            0: 65535
+            1: 65262
           15,-3:
-            0: 65535
+            1: 36619
           15,-2:
-            0: 65535
-          16,2:
-            0: 30591
-          16,3:
-            0: 21845
+            1: 47931
           16,-4:
-            0: 65535
+            1: 64435
           16,-3:
-            0: 65535
+            1: 56715
           16,-2:
-            0: 65535
+            1: 16157
+          16,-1:
+            1: 11259
+          16,0:
+            1: 10986
+          16,3:
+            0: 17476
+          16,4:
+            0: 1092
+          17,0:
+            1: 2039
+          17,1:
+            1: 2039
+          17,2:
+            0: 15
+          18,0:
+            1: 12336
+          18,1:
+            1: 12336
+          18,2:
+            0: 3
+          18,-1:
+            1: 12336
           17,-4:
-            0: 65535
+            1: 65520
           17,-3:
-            0: 65535
+            1: 65535
           17,-2:
-            0: 65535
-          18,-4:
-            0: 65535
+            1: 3871
+          17,-1:
+            1: 2039
+          17,-5:
+            1: 65520
           18,-3:
-            0: 65535
+            1: 30478
           18,-2:
-            0: 65535
+            1: 7943
+          18,-5:
+            1: 65524
+          18,-4:
+            1: 61166
           19,-4:
-            0: 65535
+            1: 49075
           19,-3:
-            0: 65535
+            1: 8067
           19,-2:
-            0: 65535
-          16,4:
-            0: 62805
-          16,5:
-            0: 65535
-          16,-8:
-            0: 65535
-          16,-7:
-            0: 65535
-          16,-6:
-            0: 65535
-          16,-5:
-            0: 65535
+            1: 3581
+          19,-5:
+            1: 49072
+          20,-4:
+            1: 13104
+            0: 34944
+          20,-3:
+            1: 4080
+          20,-2:
+            1: 1911
+          17,5:
+            1: 16
+            0: 4096
+          16,-9:
+            1: 57344
+            0: 142
           17,-8:
-            0: 65535
+            1: 65280
           17,-7:
-            0: 65535
+            1: 12287
           17,-6:
-            0: 65535
-          17,-5:
-            0: 65535
+            1: 65535
+          17,-9:
+            1: 61440
+            0: 7
+          18,-9:
+            1: 28945
+          18,-6:
+            1: 58980
           18,-8:
-            0: 65535
+            1: 17484
           18,-7:
-            0: 65535
-          18,-6:
-            0: 65535
-          18,-5:
-            0: 65535
+            1: 17476
+          19,-8:
+            1: 65295
+          19,-7:
+            1: 65535
           19,-6:
-            0: 65535
-          19,-5:
-            0: 65535
-          20,-4:
-            0: 65535
-          20,-3:
-            0: 65535
-          21,-4:
-            0: 65535
-          21,-3:
-            0: 65535
+            1: 61695
+          20,-8:
+            1: 56783
+          20,-7:
+            1: 40413
           20,-6:
-            0: 65535
+            1: 63675
           20,-5:
-            0: 65535
-          21,-6:
-            0: 65535
+            1: 13104
+            0: 34944
+          21,-3:
+            1: 826
+            0: 34816
+          21,-2:
+            0: 4383
+          21,-4:
+            1: 43690
           21,-5:
-            0: 65535
-          16,-9:
-            0: 65471
-          17,-9:
-            0: 65423
-          18,-9:
-            0: 65331
-          4,-12:
-            0: 65535
-          4,-11:
-            0: 65535
-          4,-10:
-            0: 65535
-          5,-12:
-            0: 65535
-          5,-11:
-            0: 65535
-          5,-10:
-            0: 65535
-          6,-12:
-            0: 65535
-          6,-11:
-            0: 65535
-          6,-10:
-            0: 65535
-          7,-12:
-            0: 65535
-          7,-11:
-            0: 65535
-          0,-11:
-            0: 65523
-          0,-10:
-            0: 65535
-          1,-10:
-            0: 65535
-          1,-11:
-            0: 65535
-          2,-11:
-            0: 65535
-          2,-10:
-            0: 65535
-          2,-12:
-            0: 65535
-          3,-12:
-            0: 65535
-          3,-11:
-            0: 65535
-          3,-10:
-            0: 65535
-          -3,-11:
-            0: 65528
-          -3,-10:
-            0: 65535
-          -2,-10:
-            0: 65535
-          -1,-10:
-            0: 65535
-          -1,-11:
-            0: 65520
+            1: 43690
+          22,-4:
+            1: 65535
+          22,-3:
+            1: 15
+          22,-5:
+            1: 65535
+          23,-4:
+            1: 4369
+            0: 34952
+          23,-3:
+            1: 1
+            0: 2188
+          23,-5:
+            1: 4369
+            0: 51328
+          20,-9:
+            1: 20479
+          21,-6:
+            1: 61600
+          21,-8:
+            0: 17508
+          21,-7:
+            0: 25668
+          22,-6:
+            1: 62000
+            0: 128
+          23,-6:
+            0: 48
+            1: 4096
+          16,-12:
+            1: 33
+            0: 4368
+          16,-11:
+            0: 4369
+          18,-10:
+            1: 4096
+          19,-9:
+            0: 1792
           4,-16:
-            0: 65295
+            0: 15
+            1: 49152
+          3,-16:
+            0: 4431
           4,-15:
-            0: 65535
+            1: 16349
+          3,-15:
+            1: 34952
+            0: 4369
           4,-14:
-            0: 65535
-          4,-13:
-            0: 65535
+            1: 65534
+          3,-14:
+            1: 34944
+            0: 4369
           5,-16:
-            0: 65423
+            0: 143
           5,-15:
-            0: 65535
+            1: 30566
           5,-14:
-            0: 65535
-          5,-13:
-            0: 65535
+            1: 30577
           6,-16:
-            0: 28931
+            0: 3
+            1: 24576
           6,-15:
-            0: 65527
+            1: 132
           6,-14:
-            0: 65471
-            3: 64
-          6,-13:
-            0: 65335
-            3: 200
-          7,-13:
-            0: 65519
-            3: 16
-          2,-13:
-            0: 64752
-          3,-13:
-            0: 65535
-          3,-16:
-            0: 65359
-          3,-15:
-            0: 65535
-          3,-14:
-            0: 65535
-          1,-12:
-            0: 65535
-          -8,7:
-            0: 65535
-          -7,7:
-            0: 65535
-          -2,-11:
-            0: 65520
-          -9,6:
-            0: 65535
-          -9,7:
-            0: 65535
-          -16,-5:
-            0: 3823
-          -15,-5:
-            0: 4095
-          -8,8:
-            0: 65535
-          -7,8:
-            0: 65535
-          -9,-13:
-            0: 57355
-          1,-13:
-            0: 61937
-          -11,6:
-            0: 35070
-            3: 1
-          -11,7:
-            0: 34952
-          -10,6:
-            0: 65519
-          -10,7:
-            0: 65535
-          -16,-9:
-            0: 65484
-          -8,9:
-            0: 65535
-          -7,9:
-            0: 65535
-          -17,-9:
-            0: 34816
-          -9,8:
-            0: 61167
-          -9,9:
-            0: 61166
-          0,-12:
-            0: 32627
-          -2,-12:
-            0: 61155
-          -1,-12:
-            0: 65520
-          -7,-12:
-            0: 65521
-          -6,-12:
-            0: 65535
-          -5,-12:
-            0: 65535
-          -12,4:
-            0: 34952
-          -11,5:
-            0: 52987
-            3: 12544
-          -4,10:
-            0: 65535
-          -3,10:
-            0: 65535
-          -8,10:
-            0: 43567
-          -8,11:
-            0: 43754
-          -7,10:
-            0: 65295
-          -7,11:
-            0: 65295
-          -6,10:
-            0: 65391
-          -6,11:
-            0: 65519
-          -5,10:
-            0: 65519
-          -5,11:
-            0: 13091
-          12,5:
-            0: 65535
-          12,6:
-            0: 4095
-          13,7:
-            0: 3208
-          14,7:
-            0: 3855
-          15,7:
-            0: 3983
-          -14,-18:
-            0: 64704
-          -13,-18:
-            0: 240
-          -12,-18:
-            0: 240
-          -11,-18:
-            0: 58992
-          17,0:
-            0: 65535
-          17,1:
-            0: 65535
-          18,0:
-            0: 13107
-          18,1:
-            0: 13107
-          17,-1:
-            0: 65535
-          18,-1:
-            0: 13107
-          17,4:
-            0: 4096
-          17,5:
-            0: 4369
-          19,-8:
-            0: 65535
-          19,-7:
-            0: 65535
-          20,-2:
-            0: 65535
-          20,-8:
-            0: 65535
-          20,-7:
-            0: 65535
-          21,-8:
-            0: 21877
-          21,-7:
-            0: 30037
-          19,-9:
-            0: 65416
+            4: 64
+          7,-15:
+            1: 12816
+            0: 3072
+          7,-14:
+            1: 33842
+          8,-15:
+            0: 3840
+          8,-14:
+            0: 61440
           0,-15:
             0: 48930
+          -1,-15:
+            0: 3840
           0,-14:
             0: 65523
-          0,-13:
-            0: 65523
-          -9,10:
-            0: 15
-          -2,-14:
-            0: 61152
-          -2,-13:
-            0: 61155
           -1,-14:
             0: 65520
           -1,-13:
             0: 65520
-          -8,12:
-            0: 43754
+          1,-15:
+            0: 4096
+          1,-14:
+            0: 4369
+          -10,9:
+            0: 34952
+          -10,10:
+            0: 136
+          -3,-15:
+            0: 32768
+          -3,-14:
+            0: 34952
+          -2,-15:
+            0: 7936
+          -2,-14:
+            0: 61152
           -8,13:
             0: 50730
-          -7,12:
-            0: 65295
           -7,13:
             0: 61455
-          -6,12:
-            0: 65519
           -6,13:
             0: 63087
-          -5,12:
-            0: 13091
           -5,13:
             0: 4899
-          20,-9:
-            0: 65535
-          21,-9:
-            0: 4369
-          4,7:
-            0: 13107
-          8,-11:
-            0: 48896
-          9,-11:
-            0: 3840
-          10,-11:
-            0: 3840
-          11,-11:
-            0: 44800
-          12,-11:
-            0: 65518
-          13,-11:
-            0: 65535
-          14,-11:
-            0: 62257
-          -8,-12:
-            0: 65520
-          -9,-12:
-            0: 65525
-          -16,-10:
-            0: 52302
-          -15,-10:
-            0: 65295
-          -18,-7:
-            0: 34952
-          -18,-6:
-            0: 51336
-          2,10:
-            0: 65535
-          11,5:
-            0: 8191
-          16,-10:
-            0: 4369
-          17,-10:
-            0: 32768
-          18,-10:
-            0: 12288
-          7,-15:
-            0: 16144
-          7,-14:
-            0: 63283
-          4,8:
-            0: 13107
-          4,9:
-            0: 13107
-          13,-12:
-            0: 36751
-          14,-12:
-            0: 257
-          -15,2:
-            0: 12
-          -15,3:
-            0: 128
-          -14,3:
-            0: 241
-          -18,-8:
-            0: 35840
-          -17,-5:
-            0: 12
-          -3,11:
-            0: 17476
-          -3,12:
-            0: 50252
-          -2,14:
-            0: 12
-          -1,14:
-            0: 15
-          0,14:
-            0: 15
-          1,14:
-            0: 3
-          9,6:
-            0: 3
-          11,6:
-            0: 15
-          -16,-18:
-            0: 57344
-          -15,-18:
-            0: 61440
-          -10,-18:
-            0: 61440
-          -9,-18:
-            0: 61440
-          17,2:
-            0: 15
-          18,2:
-            0: 3
-          16,6:
-            0: 4369
-          16,7:
-            0: 257
-          21,-2:
-            0: 4383
-          16,-12:
-            0: 7679
-          16,-11:
-            0: 4369
-          17,-12:
-            0: 1
-          -11,8:
-            0: 8
-          -10,8:
-            0: 34959
-          -10,9:
-            0: 34952
-          -10,10:
-            0: 136
-          -8,-13:
-            0: 61440
-          -7,-13:
-            0: 12288
-          8,-15:
-            0: 3840
-          8,-14:
-            0: 61440
           9,-15:
             0: 3840
           9,-14:
-            0: 64640
+            0: 12288
+            1: 17536
           9,-13:
-            0: 12
+            1: 4
           10,-15:
-            0: 61312
+            0: 768
+            1: 9344
           10,-14:
-            0: 65535
+            1: 1
           10,-13:
-            0: 3
-          11,-15:
-            0: 65520
+            1: 2
           11,-14:
-            0: 65471
-            3: 64
+            4: 64
           11,-13:
-            0: 142
+            1: 134
           12,-15:
-            0: 63280
-          12,-14:
-            0: 65535
+            1: 50224
           12,-13:
-            0: 36863
+            1: 33040
           13,-15:
             0: 61440
           13,-14:
-            0: 13107
+            1: 3
           13,-13:
-            0: 65527
+            1: 132
           14,-15:
-            0: 63692
+            0: 61440
+            1: 2116
           14,-13:
-            0: 61696
-          14,-16:
-            0: 32768
-          15,-16:
-            0: 12288
+            0: 57344
           15,-15:
-            0: 65535
+            1: 4096
           15,-13:
-            0: 63624
+            0: 28672
+            1: 32768
+          15,-16:
+            1: 8192
           15,-14:
-            0: 35022
-          16,-15:
-            0: 63248
+            1: 35010
           16,-14:
-            0: 65535
+            1: 61408
           16,-13:
-            0: 65535
-          17,-14:
-            0: 13073
-          17,-13:
-            0: 4403
-          -16,-13:
-            0: 2
-          3,10:
-            0: 65535
-          19,-10:
-            0: 32768
-          20,-10:
-            0: 61440
-          21,-10:
-            0: 4096
-          4,10:
-            0: 13107
-          -12,5:
-            0: 19656
-            3: 32768
-          -12,6:
-            0: 140
-          -3,-12:
-            0: 34952
-          1,-15:
-            0: 4096
-          1,-14:
-            0: 4369
-          -3,-15:
-            0: 32768
-          -3,-14:
-            0: 34952
-          -3,-13:
-            0: 34952
-          -2,-15:
-            0: 7936
-          -1,-15:
-            0: 3840
-          22,-4:
-            0: 65535
-          22,-3:
-            0: 255
-          23,-4:
-            0: 48059
-          23,-3:
-            0: 2239
-          22,-6:
-            0: 65527
-          22,-5:
-            0: 65535
-          23,-6:
-            0: 13104
-          23,-5:
-            0: 64435
-          12,-12:
-            0: 19968
-          -6,-13:
-            0: 61440
-          -5,-13:
-            0: 61440
+            1: 1646
+          16,-15:
+            1: 1024
         uniqueMixes:
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
-          - 21.824879
-          - 82.10312
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -11044,8 +11175,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
-          - 0
+          - 21.824879
+          - 82.10312
           - 0
           - 0
           - 0
@@ -11059,7 +11190,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
           - 6666.982
           - 0
           - 0
@@ -11071,11 +11201,12 @@ entities:
           - 0
           - 0
           - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
           - 0
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -11092,7 +11223,7 @@ entities:
           - 0
           - 0
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -11102,13 +11233,13 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14975
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
           - 0
           - 0
           - 0
+          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -11147,11 +11278,11 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: fgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADJAAAAAACHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAgQAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAfQAAAAAAggAAAAABYQAAAAAEfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAgQAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAACJAAAAAAAJAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAJAAAAAACJAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADfgAAAAAAgQAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAACfQAAAAAAggAAAAACYQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAgQAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAADJAAAAAACJAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAABJAAAAAACJAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -11246,43 +11377,47 @@ entities:
       version: 2
       data:
         tiles:
-          0,0:
-            0: 15
+          -1,0:
+            0: 8
           0,-1:
-            0: 65535
-          -1,-1:
-            0: 34952
+            1: 61439
+          0,0:
+            0: 4
           1,0:
-            0: 52428
+            1: 2184
           1,1:
-            0: 12
+            0: 4
           2,0:
-            0: 30583
+            1: 5943
           2,1:
-            0: 7
-          0,-3:
-            0: 65280
-          0,-2:
-            0: 65535
-          1,-3:
-            0: 4096
-          1,-2:
-            0: 65497
-          1,-1:
-            0: 57343
-          2,-2:
-            0: 30579
+            1: 3
+            0: 4
           2,-1:
-            0: 30583
+            1: 14195
+            0: 16384
           -1,-3:
-            0: 34816
+            0: 2048
+          0,-2:
+            1: 65023
+            0: 512
+          0,-3:
+            1: 24576
           -1,-2:
-            0: 34952
-          -1,0:
-            0: 8
+            1: 32768
+          -1,-1:
+            1: 136
+          1,-1:
+            1: 2447
+            0: 512
+          1,-2:
+            0: 520
+            1: 36032
+          2,-2:
+            0: 3
+            1: 29440
         uniqueMixes:
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -11296,6 +11431,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -11313,6 +11463,20 @@ entities:
       parent: 2
 - proto: AirAlarm
   entities:
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 44.5,17.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18416
+      - 18417
+      - 18418
+      - 877
+      - 8751
+      - 8750
+      - 8749
   - uid: 894
     components:
     - type: Transform
@@ -11327,6 +11491,20 @@ entities:
       - 493
       - 492
       - 491
+  - uid: 4744
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-5.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8736
+      - 8737
+      - 8738
+      - 12369
+      - 4957
+      - 7019
   - uid: 8353
     components:
     - type: Transform
@@ -11346,10 +11524,6 @@ entities:
       - 6363
       - 19304
       - 19305
-      - 19301
-      - 19300
-      - 19302
-      - 19303
   - uid: 8367
     components:
     - type: Transform
@@ -11385,20 +11559,6 @@ entities:
       - 8756
       - 18389
       - 18375
-  - uid: 8369
-    components:
-    - type: Transform
-      pos: 44.5,14.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 18417
-      - 18416
-      - 18418
-      - 8753
-      - 8749
-      - 8750
-      - 8751
   - uid: 8370
     components:
     - type: Transform
@@ -11437,19 +11597,6 @@ entities:
       - 18514
       - 18512
       - 18513
-  - uid: 8373
-    components:
-    - type: Transform
-      pos: 58.5,-2.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8736
-      - 8737
-      - 8738
-      - 18475
-      - 18474
-      - 18472
   - uid: 8374
     components:
     - type: Transform
@@ -12227,10 +12374,6 @@ entities:
       - 6363
       - 19304
       - 19305
-      - 19301
-      - 19300
-      - 19302
-      - 19303
   - uid: 8421
     components:
     - type: Transform
@@ -12243,8 +12386,6 @@ entities:
       - 6357
       - 6356
       - 20177
-      - 20169
-      - 20167
   - uid: 8422
     components:
     - type: Transform
@@ -12257,8 +12398,6 @@ entities:
       - 6353
       - 6354
       - 20178
-      - 20164
-      - 20168
   - uid: 8423
     components:
     - type: Transform
@@ -14601,7 +14740,7 @@ entities:
       pos: -16.5,19.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -44094.324
+      secondsUntilStateChange: -50157.324
       state: Opening
   - uid: 4196
     components:
@@ -15315,10 +15454,10 @@ entities:
       parent: 2
 - proto: AirlockMaintChemLocked
   entities:
-  - uid: 6025
+  - uid: 21373
     components:
     - type: Transform
-      pos: 42.5,14.5
+      pos: 42.5,15.5
       parent: 2
 - proto: AirlockMaintEngiLocked
   entities:
@@ -16112,6 +16251,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,-9.5
       parent: 2
+  - uid: 12369
+    components:
+    - type: Transform
+      pos: 59.5,-4.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 17875
     components:
     - type: Transform
@@ -16282,8 +16430,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 18428
     components:
     - type: Transform
@@ -16296,11 +16444,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 50.5,-1.5
       parent: 2
-  - uid: 18475
-    components:
-    - type: Transform
-      pos: 61.5,-5.5
-      parent: 2
   - uid: 18496
     components:
     - type: Transform
@@ -17173,13 +17316,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,6.5
       parent: 2
-  - uid: 9978
-    components:
-    - type: MetaData
-      name: Chemistry APC
-    - type: Transform
-      pos: 43.5,14.5
-      parent: 2
   - uid: 9979
     components:
     - type: MetaData
@@ -17386,6 +17522,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,33.5
       parent: 2
+  - uid: 20615
+    components:
+    - type: Transform
+      pos: 43.5,17.5
+      parent: 2
   - uid: 20945
     components:
     - type: MetaData
@@ -19230,16 +19371,16 @@ entities:
       parent: 2
 - proto: BaseGasCondenser
   entities:
-  - uid: 17295
+  - uid: 1440
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-12.5
+      pos: 45.5,16.5
       parent: 2
-  - uid: 20610
+  - uid: 17295
     components:
     - type: Transform
-      pos: 47.5,16.5
+      rot: 3.141592653589793 rad
+      pos: 16.5,-12.5
       parent: 2
 - proto: Bed
   entities:
@@ -19348,10 +19489,10 @@ entities:
     - type: Transform
       pos: 37.5,12.5
       parent: 2
-  - uid: 7056
+  - uid: 7036
     components:
     - type: Transform
-      pos: 57.5,-6.5
+      pos: 61.5,-5.5
       parent: 2
   - uid: 7126
     components:
@@ -19388,6 +19529,11 @@ entities:
     - type: Transform
       pos: 67.5,-54.5
       parent: 2
+  - uid: 17413
+    components:
+    - type: Transform
+      pos: 61.5,-4.5
+      parent: 2
 - proto: BedsheetBlack
   entities:
   - uid: 144
@@ -19407,10 +19553,15 @@ entities:
       parent: 2
 - proto: BedsheetBlue
   entities:
-  - uid: 15610
+  - uid: 18466
     components:
     - type: Transform
-      pos: 57.5,-6.5
+      pos: 61.5,-4.5
+      parent: 2
+  - uid: 18474
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
       parent: 2
 - proto: BedsheetBrown
   entities:
@@ -20315,6 +20466,11 @@ entities:
     - type: Transform
       pos: 71.50742,-20.366497
       parent: 2
+  - uid: 12367
+    components:
+    - type: Transform
+      pos: 57.528355,-7.3207555
+      parent: 2
   - uid: 21556
     components:
     - type: Transform
@@ -20648,6 +20804,11 @@ entities:
       parent: 2
 - proto: ButtonFrameGrey
   entities:
+  - uid: 4982
+    components:
+    - type: Transform
+      pos: 35.5,16.5
+      parent: 2
   - uid: 16238
     components:
     - type: Transform
@@ -20660,6 +20821,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -23.5,15.5
       parent: 2
+  - uid: 20514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-16.5
+      parent: 2
   - uid: 21600
     components:
     - type: Transform
@@ -20740,12 +20907,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-11.5
       parent: 2
-  - uid: 21621
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,10.5
-      parent: 2
   - uid: 21622
     components:
     - type: Transform
@@ -20784,6 +20945,12 @@ entities:
     - type: Transform
       pos: 61.5,28.5
       parent: 2
+  - uid: 21845
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,10.5
+      parent: 2
 - proto: ButtonFrameJanitor
   entities:
   - uid: 16220
@@ -21302,6 +21469,16 @@ entities:
     - type: Transform
       pos: -26.5,-41.5
       parent: 2
+  - uid: 2352
+    components:
+    - type: Transform
+      pos: 41.5,16.5
+      parent: 2
+  - uid: 2357
+    components:
+    - type: Transform
+      pos: 41.5,17.5
+      parent: 2
   - uid: 2737
     components:
     - type: Transform
@@ -21452,6 +21629,11 @@ entities:
     - type: Transform
       pos: 57.5,-26.5
       parent: 2
+  - uid: 6020
+    components:
+    - type: Transform
+      pos: 41.5,18.5
+      parent: 2
   - uid: 6136
     components:
     - type: Transform
@@ -29657,26 +29839,6 @@ entities:
     - type: Transform
       pos: 61.5,-4.5
       parent: 2
-  - uid: 12367
-    components:
-    - type: Transform
-      pos: 62.5,-4.5
-      parent: 2
-  - uid: 12368
-    components:
-    - type: Transform
-      pos: 62.5,-5.5
-      parent: 2
-  - uid: 12369
-    components:
-    - type: Transform
-      pos: 62.5,-6.5
-      parent: 2
-  - uid: 12370
-    components:
-    - type: Transform
-      pos: 62.5,-7.5
-      parent: 2
   - uid: 12371
     components:
     - type: Transform
@@ -36592,6 +36754,16 @@ entities:
     - type: Transform
       pos: 63.5,-52.5
       parent: 2
+  - uid: 18454
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
+      parent: 2
+  - uid: 18458
+    components:
+    - type: Transform
+      pos: 61.5,-6.5
+      parent: 2
   - uid: 19035
     components:
     - type: Transform
@@ -36687,6 +36859,16 @@ entities:
     - type: Transform
       pos: -23.5,32.5
       parent: 2
+  - uid: 20614
+    components:
+    - type: Transform
+      pos: 42.5,18.5
+      parent: 2
+  - uid: 20617
+    components:
+    - type: Transform
+      pos: 44.5,15.5
+      parent: 2
   - uid: 20790
     components:
     - type: Transform
@@ -37192,6 +37374,11 @@ entities:
     - type: Transform
       pos: -21.5,-41.5
       parent: 2
+  - uid: 21749
+    components:
+    - type: Transform
+      pos: 45.5,15.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 264
@@ -47160,6 +47347,11 @@ entities:
     - type: Transform
       pos: -5.5,-15.5
       parent: 2
+  - uid: 20616
+    components:
+    - type: Transform
+      pos: 43.5,16.5
+      parent: 2
   - uid: 20948
     components:
     - type: Transform
@@ -47175,6 +47367,16 @@ entities:
     - type: Transform
       pos: 90.5,-21.5
       parent: 2
+  - uid: 21043
+    components:
+    - type: Transform
+      pos: 43.5,15.5
+      parent: 2
+  - uid: 21044
+    components:
+    - type: Transform
+      pos: 43.5,17.5
+      parent: 2
   - uid: 21079
     components:
     - type: Transform
@@ -50343,6 +50545,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,37.5
       parent: 2
+  - uid: 5998
+    components:
+    - type: Transform
+      pos: 42.5,18.5
+      parent: 2
   - uid: 6054
     components:
     - type: Transform
@@ -51050,6 +51257,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,16.5
       parent: 2
+  - uid: 12460
+    components:
+    - type: Transform
+      pos: 41.5,18.5
+      parent: 2
   - uid: 12461
     components:
     - type: Transform
@@ -53148,6 +53360,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 80.5,-9.5
       parent: 2
+  - uid: 14228
+    components:
+    - type: Transform
+      pos: 41.5,16.5
+      parent: 2
+  - uid: 14248
+    components:
+    - type: Transform
+      pos: 41.5,17.5
+      parent: 2
   - uid: 15054
     components:
     - type: Transform
@@ -54119,11 +54341,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 87.5,-16.5
       parent: 2
-  - uid: 21044
-    components:
-    - type: Transform
-      pos: -35.5,-42.5
-      parent: 2
   - uid: 21129
     components:
     - type: Transform
@@ -54308,18 +54525,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 53.5,18.5
       parent: 2
-  - uid: 21646
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,16.5
-      parent: 2
-  - uid: 21647
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,17.5
-      parent: 2
   - uid: 21648
     components:
     - type: Transform
@@ -55094,12 +55299,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,-33.5
       parent: 2
-  - uid: 711
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,13.5
-      parent: 2
   - uid: 712
     components:
     - type: Transform
@@ -55577,6 +55776,12 @@ entities:
     - type: Transform
       pos: -53.5,-45.5
       parent: 2
+  - uid: 2119
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,14.5
+      parent: 2
   - uid: 2555
     components:
     - type: Transform
@@ -55592,6 +55797,12 @@ entities:
     - type: Transform
       pos: -42.5,-45.5
       parent: 2
+  - uid: 3480
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,13.5
+      parent: 2
   - uid: 3627
     components:
     - type: Transform
@@ -56219,11 +56430,6 @@ entities:
     - type: Transform
       pos: 54.5,2.5
       parent: 2
-  - uid: 6763
-    components:
-    - type: Transform
-      pos: 55.5,2.5
-      parent: 2
   - uid: 6764
     components:
     - type: Transform
@@ -56283,11 +56489,11 @@ entities:
     - type: Transform
       pos: -35.5,-12.5
       parent: 2
-  - uid: 7055
+  - uid: 7037
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-5.5
       parent: 2
   - uid: 7148
     components:
@@ -56844,18 +57050,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 76.5,-16.5
       parent: 2
-  - uid: 20607
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,15.5
-      parent: 2
-  - uid: 20608
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 46.5,15.5
-      parent: 2
   - uid: 20788
     components:
     - type: Transform
@@ -57167,12 +57361,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 55.5,10.5
       parent: 2
-  - uid: 7058
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-7.5
-      parent: 2
   - uid: 7149
     components:
     - type: Transform
@@ -57502,18 +57690,6 @@ entities:
     - type: Transform
       pos: 31.515789,-24.396605
       parent: 2
-- proto: chem_master
-  entities:
-  - uid: 6017
-    components:
-    - type: Transform
-      pos: 47.5,11.5
-      parent: 2
-  - uid: 6019
-    components:
-    - type: Transform
-      pos: 41.5,11.5
-      parent: 2
 - proto: ChemDispenser
   entities:
   - uid: 6021
@@ -57528,10 +57704,22 @@ entities:
       parent: 2
 - proto: ChemistryHotplate
   entities:
-  - uid: 12256
+  - uid: 14261
     components:
     - type: Transform
-      pos: 45.5,13.5
+      pos: 43.5,12.5
+      parent: 2
+- proto: ChemMaster
+  entities:
+  - uid: 6017
+    components:
+    - type: Transform
+      pos: 47.5,11.5
+      parent: 2
+  - uid: 6019
+    components:
+    - type: Transform
+      pos: 41.5,11.5
       parent: 2
 - proto: ChessBoard
   entities:
@@ -57863,6 +58051,11 @@ entities:
       parent: 2
 - proto: ClosetMaintenanceFilledRandom
   entities:
+  - uid: 5965
+    components:
+    - type: Transform
+      pos: 83.5,-10.5
+      parent: 2
   - uid: 14740
     components:
     - type: Transform
@@ -57928,11 +58121,6 @@ entities:
     - type: Transform
       pos: 73.5,-22.5
       parent: 2
-  - uid: 14753
-    components:
-    - type: Transform
-      pos: 82.5,-10.5
-      parent: 2
   - uid: 14754
     components:
     - type: Transform
@@ -58125,15 +58313,15 @@ entities:
     - type: Transform
       pos: -17.5,23.5
       parent: 2
-  - uid: 14879
+  - uid: 14880
     components:
     - type: Transform
-      pos: 83.5,-10.5
+      pos: -13.5,-7.5
       parent: 2
-  - uid: 14880
+  - uid: 15294
     components:
     - type: Transform
-      pos: -13.5,-7.5
+      pos: 84.5,-10.5
       parent: 2
   - uid: 15614
     components:
@@ -58349,11 +58537,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-40.5
       parent: 2
-  - uid: 20284
+  - uid: 21646
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,12.5
+      pos: 42.5,14.5
       parent: 2
 - proto: ClosetWallFire
   entities:
@@ -58529,6 +58716,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-40.5
       parent: 2
+  - uid: 15600
+    components:
+    - type: Transform
+      pos: 41.5,14.5
+      parent: 2
   - uid: 16213
     components:
     - type: Transform
@@ -58541,12 +58733,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -54.5,-57.5
       parent: 2
-  - uid: 20285
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,13.5
-      parent: 2
 - proto: ClothingBackpackClown
   entities:
   - uid: 8189
@@ -58924,13 +59110,6 @@ entities:
     - type: Transform
       pos: 21.504559,-47.81257
       parent: 2
-- proto: ClothingHeadsetMining
-  entities:
-  - uid: 20877
-    components:
-    - type: Transform
-      pos: 41.574528,17.44522
-      parent: 2
 - proto: ClothingMaskBee
   entities:
   - uid: 16410
@@ -59051,13 +59230,6 @@ entities:
     - type: Transform
       pos: -53.317593,-60.37925
       parent: 2
-- proto: ClothingNeckScarfStripedBlue
-  entities:
-  - uid: 7065
-    components:
-    - type: Transform
-      pos: 57.492764,-7.502381
-      parent: 2
 - proto: ClothingNeckScarfStripedSyndieRed
   entities:
   - uid: 21052
@@ -59167,10 +59339,10 @@ entities:
     - type: InsideEntityStorage
 - proto: ClothingOuterWinterCoat
   entities:
-  - uid: 8193
+  - uid: 7050
     components:
     - type: Transform
-      pos: 62.677505,-4.2970705
+      pos: 57.579605,-6.501329
       parent: 2
 - proto: ClothingOuterWinterMime
   entities:
@@ -59371,11 +59543,6 @@ entities:
     - type: Transform
       pos: 55.5,-9.5
       parent: 2
-  - uid: 14883
-    components:
-    - type: Transform
-      pos: 43.5,18.5
-      parent: 2
   - uid: 14885
     components:
     - type: Transform
@@ -59422,6 +59589,11 @@ entities:
     - type: Transform
       pos: 58.5,8.5
       parent: 2
+  - uid: 20877
+    components:
+    - type: Transform
+      pos: 41.5,18.5
+      parent: 2
   - uid: 21395
     components:
     - type: Transform
@@ -59950,12 +60122,6 @@ entities:
       parent: 2
 - proto: ComputerFrame
   entities:
-  - uid: 7061
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-5.5
-      parent: 2
   - uid: 8066
     components:
     - type: Transform
@@ -60041,23 +60207,23 @@ entities:
     - type: Transform
       pos: 42.5,-32.5
       parent: 2
-  - uid: 7142
+  - uid: 6024
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-12.5
+      pos: 64.5,-22.5
       parent: 2
-  - uid: 7427
+  - uid: 7142
     components:
     - type: Transform
-      pos: 68.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-12.5
       parent: 2
 - proto: ComputerRoboticsControl
   entities:
-  - uid: 14228
+  - uid: 6023
     components:
     - type: Transform
-      pos: 64.5,-22.5
+      pos: 68.5,-25.5
       parent: 2
 - proto: ComputerSalvageExpedition
   entities:
@@ -60390,13 +60556,19 @@ entities:
   - uid: 7388
     components:
     - type: Transform
+      anchored: True
       pos: 77.5,-15.5
       parent: 2
+    - type: Physics
+      bodyType: Static
   - uid: 7389
     components:
     - type: Transform
+      anchored: True
       pos: 77.5,-11.5
       parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: CrateEmptySpawner
   entities:
   - uid: 4613
@@ -60720,20 +60892,20 @@ entities:
       parent: 2
 - proto: CryogenicSleepUnit
   entities:
-  - uid: 4957
+  - uid: 6029
     components:
     - type: Transform
-      pos: 62.5,-7.5
+      pos: 3.5,48.5
       parent: 2
-  - uid: 4982
+  - uid: 12368
     components:
     - type: Transform
-      pos: 62.5,-6.5
+      pos: 61.5,-7.5
       parent: 2
-  - uid: 6029
+  - uid: 16908
     components:
     - type: Transform
-      pos: 3.5,48.5
+      pos: 60.5,-7.5
       parent: 2
 - proto: CryogenicSleepUnitSpawner
   entities:
@@ -60766,24 +60938,19 @@ entities:
   - uid: 6617
     components:
     - type: Transform
-      pos: 61.5,-3.5
+      pos: 58.5,-3.5
       parent: 2
-  - uid: 7039
+  - uid: 6749
     components:
     - type: Transform
-      pos: 59.5,-3.5
+      pos: 60.5,-3.5
       parent: 2
 - proto: CryoxadoneBeakerSmall
   entities:
-  - uid: 7062
-    components:
-    - type: Transform
-      pos: 62.372772,-3.182847
-      parent: 2
-  - uid: 7063
+  - uid: 7045
     components:
     - type: Transform
-      pos: 62.55623,-3.3418446
+      pos: 61.698986,-3.4069648
       parent: 2
 - proto: CurtainsBlackOpen
   entities:
@@ -61558,10 +61725,11 @@ entities:
       parent: 2
 - proto: DisposalBend
   entities:
-  - uid: 755
+  - uid: 6025
     components:
     - type: Transform
-      pos: -20.5,14.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,19.5
       parent: 2
   - uid: 12923
     components:
@@ -62024,15 +62192,10 @@ entities:
     - type: Transform
       pos: 68.5,-20.5
       parent: 2
-  - uid: 15406
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,14.5
-      parent: 2
-  - uid: 16121
+  - uid: 16258
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -24.5,16.5
       parent: 2
   - uid: 20691
@@ -62105,6 +62268,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,25.5
       parent: 2
+  - uid: 21787
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 2
+  - uid: 21804
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,2.5
+      parent: 2
+  - uid: 21829
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,2.5
+      parent: 2
+  - uid: 21842
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,15.5
+      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 12957
@@ -62343,6 +62529,54 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-42.5
       parent: 2
+  - uid: 6038
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,19.5
+      parent: 2
+  - uid: 6201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,19.5
+      parent: 2
+  - uid: 6591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,19.5
+      parent: 2
+  - uid: 6747
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,19.5
+      parent: 2
+  - uid: 6751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,19.5
+      parent: 2
+  - uid: 6753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,19.5
+      parent: 2
+  - uid: 6938
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,18.5
+      parent: 2
+  - uid: 7380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,17.5
+      parent: 2
   - uid: 9042
     components:
     - type: Transform
@@ -65245,39 +65479,11 @@ entities:
     - type: Transform
       pos: -28.5,12.5
       parent: 2
-  - uid: 14248
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,14.5
-      parent: 2
-  - uid: 14256
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,14.5
-      parent: 2
   - uid: 14257
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -23.5,14.5
-      parent: 2
-  - uid: 14259
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -24.5,15.5
-      parent: 2
-  - uid: 14260
-    components:
-    - type: Transform
-      pos: -20.5,12.5
-      parent: 2
-  - uid: 14261
-    components:
-    - type: Transform
-      pos: -20.5,11.5
+      pos: -14.5,19.5
       parent: 2
   - uid: 15396
     components:
@@ -65307,10 +65513,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,16.5
       parent: 2
-  - uid: 16258
+  - uid: 16103
     components:
     - type: Transform
-      pos: -20.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: -17.5,19.5
+      parent: 2
+  - uid: 17489
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,19.5
       parent: 2
   - uid: 20227
     components:
@@ -65324,6 +65537,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-39.5
       parent: 2
+  - uid: 20284
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,19.5
+      parent: 2
   - uid: 20697
     components:
     - type: Transform
@@ -65795,6 +66014,500 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,23.5
       parent: 2
+  - uid: 21754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,19.5
+      parent: 2
+  - uid: 21755
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,19.5
+      parent: 2
+  - uid: 21756
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,19.5
+      parent: 2
+  - uid: 21757
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,19.5
+      parent: 2
+  - uid: 21758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,19.5
+      parent: 2
+  - uid: 21759
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,19.5
+      parent: 2
+  - uid: 21760
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,19.5
+      parent: 2
+  - uid: 21761
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,19.5
+      parent: 2
+  - uid: 21762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,19.5
+      parent: 2
+  - uid: 21763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,19.5
+      parent: 2
+  - uid: 21764
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,19.5
+      parent: 2
+  - uid: 21765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,19.5
+      parent: 2
+  - uid: 21766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,19.5
+      parent: 2
+  - uid: 21767
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,19.5
+      parent: 2
+  - uid: 21768
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,19.5
+      parent: 2
+  - uid: 21769
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,19.5
+      parent: 2
+  - uid: 21770
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,19.5
+      parent: 2
+  - uid: 21771
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,19.5
+      parent: 2
+  - uid: 21772
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,19.5
+      parent: 2
+  - uid: 21773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,19.5
+      parent: 2
+  - uid: 21774
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,19.5
+      parent: 2
+  - uid: 21775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,19.5
+      parent: 2
+  - uid: 21776
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,19.5
+      parent: 2
+  - uid: 21777
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,19.5
+      parent: 2
+  - uid: 21778
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,19.5
+      parent: 2
+  - uid: 21779
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,19.5
+      parent: 2
+  - uid: 21780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,19.5
+      parent: 2
+  - uid: 21781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,19.5
+      parent: 2
+  - uid: 21782
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,19.5
+      parent: 2
+  - uid: 21783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,19.5
+      parent: 2
+  - uid: 21784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,19.5
+      parent: 2
+  - uid: 21785
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,19.5
+      parent: 2
+  - uid: 21786
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,19.5
+      parent: 2
+  - uid: 21788
+    components:
+    - type: Transform
+      pos: 19.5,18.5
+      parent: 2
+  - uid: 21789
+    components:
+    - type: Transform
+      pos: 19.5,17.5
+      parent: 2
+  - uid: 21790
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 2
+  - uid: 21791
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 2
+  - uid: 21792
+    components:
+    - type: Transform
+      pos: 19.5,14.5
+      parent: 2
+  - uid: 21793
+    components:
+    - type: Transform
+      pos: 19.5,13.5
+      parent: 2
+  - uid: 21794
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 2
+  - uid: 21795
+    components:
+    - type: Transform
+      pos: 19.5,11.5
+      parent: 2
+  - uid: 21796
+    components:
+    - type: Transform
+      pos: 19.5,10.5
+      parent: 2
+  - uid: 21797
+    components:
+    - type: Transform
+      pos: 19.5,9.5
+      parent: 2
+  - uid: 21798
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 2
+  - uid: 21799
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 2
+  - uid: 21800
+    components:
+    - type: Transform
+      pos: 19.5,6.5
+      parent: 2
+  - uid: 21801
+    components:
+    - type: Transform
+      pos: 19.5,5.5
+      parent: 2
+  - uid: 21802
+    components:
+    - type: Transform
+      pos: 19.5,4.5
+      parent: 2
+  - uid: 21803
+    components:
+    - type: Transform
+      pos: 19.5,3.5
+      parent: 2
+  - uid: 21805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,2.5
+      parent: 2
+  - uid: 21806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,2.5
+      parent: 2
+  - uid: 21807
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,2.5
+      parent: 2
+  - uid: 21808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,2.5
+      parent: 2
+  - uid: 21809
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,2.5
+      parent: 2
+  - uid: 21810
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,2.5
+      parent: 2
+  - uid: 21811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,2.5
+      parent: 2
+  - uid: 21812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,2.5
+      parent: 2
+  - uid: 21813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,2.5
+      parent: 2
+  - uid: 21814
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,2.5
+      parent: 2
+  - uid: 21815
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,2.5
+      parent: 2
+  - uid: 21816
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,2.5
+      parent: 2
+  - uid: 21817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,2.5
+      parent: 2
+  - uid: 21818
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,2.5
+      parent: 2
+  - uid: 21819
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,2.5
+      parent: 2
+  - uid: 21820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,2.5
+      parent: 2
+  - uid: 21821
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,2.5
+      parent: 2
+  - uid: 21822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,2.5
+      parent: 2
+  - uid: 21823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,2.5
+      parent: 2
+  - uid: 21824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,2.5
+      parent: 2
+  - uid: 21825
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,2.5
+      parent: 2
+  - uid: 21826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,2.5
+      parent: 2
+  - uid: 21827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,2.5
+      parent: 2
+  - uid: 21828
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,2.5
+      parent: 2
+  - uid: 21830
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,3.5
+      parent: 2
+  - uid: 21831
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,4.5
+      parent: 2
+  - uid: 21832
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,5.5
+      parent: 2
+  - uid: 21833
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,6.5
+      parent: 2
+  - uid: 21834
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,7.5
+      parent: 2
+  - uid: 21835
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,8.5
+      parent: 2
+  - uid: 21836
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,9.5
+      parent: 2
+  - uid: 21837
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,10.5
+      parent: 2
+  - uid: 21838
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,11.5
+      parent: 2
+  - uid: 21839
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,12.5
+      parent: 2
+  - uid: 21840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,13.5
+      parent: 2
+  - uid: 21841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,14.5
+      parent: 2
 - proto: DisposalTrunk
   entities:
   - uid: 2313
@@ -66025,12 +66738,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,16.5
       parent: 2
-  - uid: 16118
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,10.5
-      parent: 2
   - uid: 20722
     components:
     - type: Transform
@@ -66055,6 +66762,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,25.5
       parent: 2
+  - uid: 21843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,15.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 950
@@ -66546,10 +67259,10 @@ entities:
       parent: 2
 - proto: DrinkHotCoco
   entities:
-  - uid: 8168
+  - uid: 8858
     components:
     - type: Transform
-      pos: 62.326893,-4.4846063
+      pos: 57.7852,-6.7703786
       parent: 2
 - proto: DrinkHotCoffee
   entities:
@@ -66718,6 +67431,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,29.5
       parent: 2
+  - uid: 5411
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-6.5
+      parent: 2
   - uid: 5991
     components:
     - type: Transform
@@ -67042,12 +67761,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 52.5,-7.5
       parent: 2
-  - uid: 17413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-5.5
-      parent: 2
   - uid: 17414
     components:
     - type: Transform
@@ -67838,6 +68551,18 @@ entities:
       parent: 2
 - proto: FireAlarm
   entities:
+  - uid: 7048
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-6.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8736
+      - 8737
+      - 8738
+      - 12369
   - uid: 9102
     components:
     - type: Transform
@@ -67933,10 +68658,10 @@ entities:
     - type: DeviceList
       devices:
       - 18418
-      - 8753
-      - 8749
-      - 8750
+      - 877
       - 8751
+      - 8750
+      - 8749
   - uid: 17551
     components:
     - type: Transform
@@ -68029,18 +68754,6 @@ entities:
       - 8734
       - 8735
       - 18496
-  - uid: 17558
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-5.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8736
-      - 8737
-      - 8738
-      - 18475
   - uid: 17559
     components:
     - type: Transform
@@ -69598,6 +70311,15 @@ entities:
       parent: 2
 - proto: Firelock
   entities:
+  - uid: 877
+    components:
+    - type: Transform
+      pos: 42.5,15.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17550
+      - 755
   - uid: 2691
     components:
     - type: Transform
@@ -70105,16 +70827,28 @@ entities:
     - type: Transform
       pos: 54.5,-4.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 8737
     components:
     - type: Transform
       pos: 54.5,-3.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 8738
     components:
     - type: Transform
       pos: 59.5,-8.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7048
+      - 4744
   - uid: 8739
     components:
     - type: Transform
@@ -70132,18 +70866,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
-      - 17550
-  - uid: 8753
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 42.5,14.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 8754
     components:
     - type: Transform
@@ -70587,6 +71311,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,23.5
       parent: 2
+  - uid: 7379
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,14.5
+      parent: 2
   - uid: 8555
     components:
     - type: Transform
@@ -72086,8 +72816,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 8750
     components:
     - type: Transform
@@ -72095,8 +72825,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
       - 17550
+      - 755
   - uid: 8755
     components:
     - type: Transform
@@ -72621,10 +73351,11 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 20605
+  - uid: 17482
     components:
     - type: Transform
-      pos: 43.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,14.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -72886,10 +73617,10 @@ entities:
       parent: 2
 - proto: FoodBurgerCheese
   entities:
-  - uid: 16103
+  - uid: 6763
     components:
     - type: Transform
-      pos: -21.500511,10.626959
+      pos: -21.23491,10.5502615
       parent: 2
 - proto: FoodBurgerMime
   entities:
@@ -73075,6 +73806,13 @@ entities:
     - type: Transform
       pos: 65.5,-2.5
       parent: 2
+- proto: GasFilter
+  entities:
+  - uid: 7035
+    components:
+    - type: Transform
+      pos: 60.5,-5.5
+      parent: 2
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 1093
@@ -73107,21 +73845,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-3.5
       parent: 2
-- proto: GasMixer
-  entities:
-  - uid: 7049
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-6.5
-      parent: 2
 - proto: GasMixerFlipped
   entities:
-  - uid: 877
-    components:
-    - type: Transform
-      pos: 47.5,15.5
-      parent: 2
   - uid: 1098
     components:
     - type: Transform
@@ -73302,16 +74027,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,-10.5
       parent: 2
-  - uid: 6749
+  - uid: 7017
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 61.5,-4.5
+      pos: 61.5,-6.5
       parent: 2
-  - uid: 7050
+  - uid: 7064
     components:
     - type: Transform
-      pos: 61.5,-6.5
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-5.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7065
+    components:
+    - type: Transform
+      pos: 61.5,-4.5
       parent: 2
   - uid: 8957
     components:
@@ -73329,6 +74062,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 12370
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-6.5
+      parent: 2
   - uid: 16392
     components:
     - type: Transform
@@ -73704,14 +74443,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18473
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-6.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18484
     components:
     - type: Transform
@@ -74917,17 +75648,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20516
-    components:
-    - type: Transform
-      pos: 61.5,-3.5
-      parent: 2
-  - uid: 20614
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,15.5
-      parent: 2
   - uid: 21106
     components:
     - type: Transform
@@ -74938,7 +75658,7 @@ entities:
       color: '#FF1212FF'
 - proto: GasPipeFourway
   entities:
-  - uid: 7044
+  - uid: 7063
     components:
     - type: Transform
       pos: 60.5,-4.5
@@ -75539,6 +76259,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 76.5,-12.5
       parent: 2
+  - uid: 7051
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-8.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7052
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-11.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7055
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-9.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7367
     components:
     - type: Transform
@@ -75587,6 +76331,26 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 79.5,-12.5
       parent: 2
+  - uid: 8373
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-10.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8500
+    components:
+    - type: Transform
+      pos: 48.5,-3.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 8857
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
+      parent: 2
   - uid: 9252
     components:
     - type: Transform
@@ -79647,46 +80411,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18458
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 50.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18461
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18462
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18463
     components:
     - type: Transform
@@ -79703,22 +80427,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18465
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18466
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 55.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18467
     components:
     - type: Transform
@@ -79735,14 +80443,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18470
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18476
     components:
     - type: Transform
@@ -86893,14 +87593,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 19928
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 19929
     components:
     - type: Transform
@@ -88410,19 +89102,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20515
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 20615
+  - uid: 20285
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,15.5
+      pos: 45.5,15.5
       parent: 2
   - uid: 20618
     components:
@@ -88526,20 +89209,42 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4744
+  - uid: 5982
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-4.5
+      parent: 2
+  - uid: 7061
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 59.5,-4.5
       parent: 2
-  - uid: 5982
+  - uid: 7062
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -50.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 58.5,-6.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 8168
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8844
     components:
     - type: Transform
@@ -89371,21 +90076,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18454
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-3.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 18469
-    components:
-    - type: Transform
-      pos: 57.5,-4.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18485
     components:
     - type: Transform
@@ -90357,19 +91047,18 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20514
-    components:
-    - type: Transform
-      pos: 59.5,-3.5
-      parent: 2
   - uid: 21105
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 54.5,-34.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
 - proto: GasPort
   entities:
   - uid: 1198
@@ -90432,18 +91121,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 75.5,-16.5
       parent: 2
-  - uid: 7051
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-7.5
-      parent: 2
-  - uid: 7052
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-7.5
-      parent: 2
   - uid: 9103
     components:
     - type: Transform
@@ -90452,18 +91129,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9276
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,14.5
-      parent: 2
-  - uid: 9277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 47.5,14.5
-      parent: 2
   - uid: 20213
     components:
     - type: Transform
@@ -90483,6 +91148,12 @@ entities:
     - type: Transform
       pos: 16.5,-10.5
       parent: 2
+  - uid: 21753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,14.5
+      parent: 2
 - proto: GasPressurePump
   entities:
   - uid: 1204
@@ -90578,49 +91249,19 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7045
+  - uid: 7056
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 58.5,-4.5
+      pos: 57.5,-4.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7048
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-5.5
-      parent: 2
-  - uid: 7377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-12.5
-      parent: 2
-  - uid: 7378
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-16.5
-      parent: 2
-  - uid: 7379
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-18.5
-      parent: 2
-  - uid: 7380
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-14.5
-      parent: 2
-  - uid: 16908
+  - uid: 7057
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 58.5,-3.5
+      pos: 59.5,-5.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -90638,10 +91279,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.5,-13.5
       parent: 2
-  - uid: 7040
+  - uid: 18459
     components:
     - type: Transform
-      pos: 60.5,-3.5
+      pos: 59.5,-3.5
       parent: 2
 - proto: GasThermoMachineFreezerEnabled
   entities:
@@ -90676,6 +91317,16 @@ entities:
       parent: 2
 - proto: GasVentPump
   entities:
+  - uid: 7019
+    components:
+    - type: Transform
+      pos: 59.5,-7.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 4744
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9034
     components:
     - type: Transform
@@ -90955,7 +91606,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
+      - 755
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18426
@@ -90973,14 +91624,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18472
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-5.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18498
     components:
     - type: Transform
@@ -91363,22 +92006,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 19301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -55.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 19302
+  - uid: 19303
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: -57.5,-57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 19314
     components:
     - type: Transform
@@ -91713,19 +92348,27 @@ entities:
   - uid: 20164
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -56.5,-57.5
+      rot: 1.5707963267948966 rad
+      pos: -55.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 20167
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20169
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -38.5,-57.5
+      pos: -37.5,-57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 20195
     components:
     - type: Transform
@@ -91759,12 +92402,25 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,12.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 3102
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 34.5,-12.5
       parent: 2
+  - uid: 4957
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-6.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 4744
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9078
     components:
     - type: Transform
@@ -92055,7 +92711,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 8369
+      - 755
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18427
@@ -92074,13 +92730,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18474
-    components:
-    - type: Transform
-      pos: 58.5,-5.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18497
     components:
     - type: Transform
@@ -92431,18 +93080,26 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -55.5,-47.5
+      pos: -55.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 19303
+      color: '#FF1212FF'
+  - uid: 19301
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -39.5,-47.5
+      pos: -39.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
+  - uid: 19302
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -38.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 19307
     components:
     - type: Transform
@@ -92794,18 +93451,10 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -57.5,-57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 20169
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -37.5,-57.5
+      pos: -56.5,-57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 21102
     components:
     - type: Transform
@@ -92817,6 +93466,32 @@ entities:
       - 21113
     - type: AtmosPipeColor
       color: '#FF1212FF'
+- proto: GasVolumePump
+  entities:
+  - uid: 9163
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-18.5
+      parent: 2
+  - uid: 9276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-12.5
+      parent: 2
+  - uid: 9277
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-16.5
+      parent: 2
+  - uid: 9978
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-14.5
+      parent: 2
 - proto: GeneratorBasic
   entities:
   - uid: 5917
@@ -92829,6 +93504,18 @@ entities:
     - type: Transform
       pos: 65.5,-49.5
       parent: 2
+- proto: GenericTank
+  entities:
+  - uid: 5960
+    components:
+    - type: Transform
+      pos: 82.5,-10.5
+      parent: 2
+  - uid: 21621
+    components:
+    - type: Transform
+      pos: -13.5,-13.5
+      parent: 2
 - proto: Girder
   entities:
   - uid: 21208
@@ -95070,12 +95757,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 61.5,4.5
       parent: 2
-  - uid: 6938
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 43.5,19.5
-      parent: 2
   - uid: 6944
     components:
     - type: Transform
@@ -95628,10 +96309,9 @@ entities:
     - type: Transform
       pos: -13.5,-42.5
       parent: 2
-  - uid: 15599
+  - uid: 15601
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 41.5,19.5
       parent: 2
   - uid: 15860
@@ -97357,16 +98037,6 @@ entities:
     - type: Transform
       pos: -0.5,-42.5
       parent: 2
-  - uid: 15600
-    components:
-    - type: Transform
-      pos: 41.5,17.5
-      parent: 2
-  - uid: 15602
-    components:
-    - type: Transform
-      pos: 41.5,20.5
-      parent: 2
   - uid: 15960
     components:
     - type: Transform
@@ -97688,11 +98358,6 @@ entities:
     - type: Transform
       pos: -9.5,-42.5
       parent: 2
-  - uid: 15601
-    components:
-    - type: Transform
-      pos: 41.5,18.5
-      parent: 2
   - uid: 15608
     components:
     - type: Transform
@@ -98285,11 +98950,6 @@ entities:
       parent: 2
 - proto: HandLabeler
   entities:
-  - uid: 1440
-    components:
-    - type: Transform
-      pos: 46.023155,16.415075
-      parent: 2
   - uid: 5754
     components:
     - type: Transform
@@ -98300,6 +98960,11 @@ entities:
     - type: Transform
       pos: 71.5145,-14.448126
       parent: 2
+  - uid: 15406
+    components:
+    - type: Transform
+      pos: -50.496944,-12.854496
+      parent: 2
   - uid: 16923
     components:
     - type: Transform
@@ -99134,11 +99799,6 @@ entities:
     - type: Transform
       pos: -20.5,15.5
       parent: 2
-  - uid: 4676
-    components:
-    - type: Transform
-      pos: 44.5,13.5
-      parent: 2
   - uid: 5251
     components:
     - type: Transform
@@ -99164,6 +99824,11 @@ entities:
     - type: Transform
       pos: -54.5,-36.5
       parent: 2
+  - uid: 21751
+    components:
+    - type: Transform
+      pos: 45.5,12.5
+      parent: 2
 - proto: KitchenSpike
   entities:
   - uid: 1472
@@ -99448,10 +100113,10 @@ entities:
           ent: null
 - proto: LockerChemistryFilled
   entities:
-  - uid: 6020
+  - uid: 21750
     components:
     - type: Transform
-      pos: 44.5,11.5
+      pos: 47.5,14.5
       parent: 2
 - proto: LockerChiefEngineerFilled
   entities:
@@ -100267,17 +100932,17 @@ entities:
       - 5555
 - proto: MachineCentrifuge
   entities:
-  - uid: 20617
+  - uid: 14259
     components:
     - type: Transform
-      pos: 46.5,16.5
+      pos: 44.5,16.5
       parent: 2
 - proto: MachineElectrolysisUnit
   entities:
-  - uid: 20616
+  - uid: 20605
     components:
     - type: Transform
-      pos: 45.5,16.5
+      pos: 43.5,16.5
       parent: 2
 - proto: MachineFrame
   entities:
@@ -100401,11 +101066,21 @@ entities:
     - type: Transform
       pos: -28.5,16.5
       parent: 2
-  - uid: 17482
+    - type: MailingUnit
+      tag: Botany
+    - type: Configuration
+      config:
+        tag: Botany
+  - uid: 5744
     components:
     - type: Transform
-      pos: -20.5,10.5
+      pos: 45.5,15.5
       parent: 2
+    - type: MailingUnit
+      tag: Chemistry
+    - type: Configuration
+      config:
+        tag: Chemistry
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 1494
@@ -100655,15 +101330,15 @@ entities:
     - type: Transform
       pos: 54.47062,1.5245901
       parent: 2
-  - uid: 6751
+  - uid: 16507
     components:
     - type: Transform
-      pos: 54.45839,1.6958185
+      pos: -66.463234,-26.53495
       parent: 2
-  - uid: 16507
+  - uid: 21850
     components:
     - type: Transform
-      pos: -66.463234,-26.53495
+      pos: 54.53653,1.3832933
       parent: 2
 - proto: MedkitBurnFilled
   entities:
@@ -100672,10 +101347,10 @@ entities:
     - type: Transform
       pos: 54.984303,1.5490514
       parent: 2
-  - uid: 6753
+  - uid: 21851
     components:
     - type: Transform
-      pos: 54.984303,1.7569715
+      pos: 55.020905,1.3676683
       parent: 2
 - proto: MedkitCombatFilled
   entities:
@@ -100701,15 +101376,15 @@ entities:
     - type: Transform
       pos: 53.479942,1.5368208
       parent: 2
-  - uid: 6747
+  - uid: 16524
     components:
     - type: Transform
-      pos: 53.492172,1.7202798
+      pos: 13.522673,32.605183
       parent: 2
-  - uid: 16524
+  - uid: 21848
     components:
     - type: Transform
-      pos: 13.522673,32.605183
+      pos: 53.47403,1.3676683
       parent: 2
 - proto: MedkitRadiationFilled
   entities:
@@ -100811,15 +101486,15 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 6591
+  - uid: 6592
     components:
     - type: Transform
-      pos: 53.990242,1.7065567
+      pos: 54.002472,1.5230979
       parent: 2
-  - uid: 6592
+  - uid: 21849
     components:
     - type: Transform
-      pos: 54.002472,1.5230979
+      pos: 54.00528,1.3520433
       parent: 2
 - proto: MedkitToxinFilled
   entities:
@@ -100828,10 +101503,10 @@ entities:
     - type: Transform
       pos: 55.49799,1.5245901
       parent: 2
-  - uid: 6755
+  - uid: 21852
     components:
     - type: Transform
-      pos: 55.51022,1.6958185
+      pos: 55.50528,1.3676683
       parent: 2
 - proto: Memorial
   entities:
@@ -103631,6 +104306,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 15610
   - uid: 1666
     components:
     - type: Transform
@@ -103834,6 +104512,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 14879
   - uid: 1688
     components:
     - type: Transform
@@ -103843,6 +104524,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 16121
   - uid: 1689
     components:
     - type: Transform
@@ -104015,6 +104699,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7054
   - uid: 2907
     components:
     - type: Transform
@@ -104222,6 +104909,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7032
   - uid: 4276
     components:
     - type: Transform
@@ -105025,16 +105715,11 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7037
+  - uid: 7049
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-4.5
+      pos: 59.5,-3.5
       parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 7067
     components:
     - type: Transform
@@ -105122,6 +105807,9 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7039
   - uid: 7421
     components:
     - type: Transform
@@ -106390,6 +107078,11 @@ entities:
     - type: Transform
       pos: 65.5,-54.5
       parent: 2
+  - uid: 18462
+    components:
+    - type: Transform
+      pos: 58.5,-7.5
+      parent: 2
   - uid: 19814
     components:
     - type: Transform
@@ -108212,11 +108905,6 @@ entities:
     - type: Transform
       pos: 46.5,19.5
       parent: 2
-  - uid: 15294
-    components:
-    - type: Transform
-      pos: 41.5,16.5
-      parent: 2
   - uid: 15295
     components:
     - type: Transform
@@ -108774,6 +109462,16 @@ entities:
     - type: Transform
       pos: 1.5,-28.5
       parent: 2
+  - uid: 5997
+    components:
+    - type: Transform
+      pos: 40.5,13.5
+      parent: 2
+  - uid: 7040
+    components:
+    - type: Transform
+      pos: 57.5,-8.5
+      parent: 2
   - uid: 8794
     components:
     - type: Transform
@@ -109134,18 +109832,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,2.5
       parent: 2
-  - uid: 8857
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-8.5
-      parent: 2
-  - uid: 8858
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-8.5
-      parent: 2
   - uid: 8859
     components:
     - type: Transform
@@ -109164,12 +109850,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 56.5,13.5
       parent: 2
-  - uid: 8862
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 41.5,14.5
-      parent: 2
   - uid: 8863
     components:
     - type: Transform
@@ -109535,6 +110215,11 @@ entities:
     - type: Transform
       pos: 41.5,-31.5
       parent: 2
+  - uid: 18461
+    components:
+    - type: Transform
+      pos: 58.5,-8.5
+      parent: 2
 - proto: RandomProduce
   entities:
   - uid: 21375
@@ -109845,11 +110530,6 @@ entities:
     - type: Transform
       pos: 32.5,-28.5
       parent: 2
-  - uid: 8500
-    components:
-    - type: Transform
-      pos: 59.5,-5.5
-      parent: 2
   - uid: 16478
     components:
     - type: Transform
@@ -111968,6 +112648,11 @@ entities:
     - type: Transform
       pos: 77.5,-5.5
       parent: 2
+  - uid: 12256
+    components:
+    - type: Transform
+      pos: 41.5,19.5
+      parent: 2
   - uid: 13965
     components:
     - type: Transform
@@ -112298,12 +112983,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,40.5
       parent: 2
-  - uid: 16576
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 43.5,19.5
-      parent: 2
   - uid: 16683
     components:
     - type: Transform
@@ -112545,6 +113224,11 @@ entities:
     - type: Transform
       pos: 71.5,-19.5
       parent: 2
+  - uid: 14883
+    components:
+    - type: Transform
+      pos: -45.5,-5.5
+      parent: 2
   - uid: 16012
     components:
     - type: Transform
@@ -113210,6 +113894,23 @@ entities:
     - type: DeviceLinkSink
       links:
       - 5653
+  - uid: 7033
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,14.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 18465
+  - uid: 7377
+    components:
+    - type: Transform
+      pos: -20.5,10.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 15913
   - uid: 8280
     components:
     - type: Transform
@@ -113432,7 +114133,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 17489
+      - 21844
   - uid: 17479
     components:
     - type: Transform
@@ -113441,7 +114142,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 17489
+      - 21844
   - uid: 17480
     components:
     - type: Transform
@@ -113450,7 +114151,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 17489
+      - 21844
   - uid: 17492
     components:
     - type: Transform
@@ -113606,6 +114307,15 @@ entities:
     - type: DeviceLinkSink
       links:
       - 17520
+  - uid: 19928
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,15.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 18465
   - uid: 20807
     components:
     - type: Transform
@@ -113918,6 +114628,18 @@ entities:
       linkedPorts:
         7:
         - Pressed: DoorBolt
+  - uid: 15610
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-25.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1665:
+        - Pressed: Toggle
   - uid: 20353
     components:
     - type: Transform
@@ -114030,6 +114752,42 @@ entities:
         - Pressed: Toggle
         6905:
         - Pressed: DoorBolt
+  - uid: 7032
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        4257:
+        - Pressed: Toggle
+  - uid: 7039
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-22.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7289:
+        - Pressed: Toggle
+  - uid: 7054
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-31.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        2871:
+        - Pressed: Toggle
   - uid: 7937
     components:
     - type: MetaData
@@ -114144,6 +114902,18 @@ entities:
       linkedPorts:
         20777:
         - Pressed: Toggle
+  - uid: 14879
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1686:
+        - Pressed: Toggle
   - uid: 15913
     components:
     - type: Transform
@@ -114162,6 +114932,20 @@ entities:
         - Pressed: Toggle
         21746:
         - Pressed: Toggle
+        7377:
+        - Pressed: Toggle
+  - uid: 16121
+    components:
+    - type: MetaData
+      name: lights off button
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1688:
+        - Pressed: Toggle
   - uid: 16148
     components:
     - type: Transform
@@ -114246,20 +115030,6 @@ entities:
         - Pressed: Toggle
         20827:
         - Pressed: Toggle
-  - uid: 17489
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,10.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        17479:
-        - Pressed: Toggle
-        17478:
-        - Pressed: Toggle
-        17480:
-        - Pressed: Toggle
   - uid: 17491
     components:
     - type: Transform
@@ -114406,6 +115176,17 @@ entities:
         - Pressed: DoorBolt
         2908:
         - Pressed: Toggle
+  - uid: 18465
+    components:
+    - type: Transform
+      pos: 35.5,16.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7033:
+        - Pressed: Toggle
+        19928:
+        - Pressed: Toggle
   - uid: 20319
     components:
     - type: Transform
@@ -114490,6 +115271,20 @@ entities:
         - Pressed: DoorBolt
         - Pressed: Close
         - Pressed: AutoClose
+  - uid: 21844
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,10.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        17478:
+        - Pressed: Toggle
+        17480:
+        - Pressed: Toggle
+        17479:
+        - Pressed: Toggle
 - proto: SignAnomaly
   entities:
   - uid: 8366
@@ -114592,6 +115387,13 @@ entities:
     - type: Transform
       pos: 41.5,10.5
       parent: 2
+- proto: SignChemistry2
+  entities:
+  - uid: 8369
+    components:
+    - type: Transform
+      pos: 42.5,16.5
+      parent: 2
 - proto: SignConference
   entities:
   - uid: 2699
@@ -115612,6 +116414,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,45.5
       parent: 2
+  - uid: 6755
+    components:
+    - type: Transform
+      pos: -20.5,12.5
+      parent: 2
   - uid: 8239
     components:
     - type: Transform
@@ -115622,15 +116429,11 @@ entities:
     - type: Transform
       pos: 15.5,26.5
       parent: 2
-  - uid: 9163
-    components:
-    - type: Transform
-      pos: 43.5,13.5
-      parent: 2
-  - uid: 12460
+  - uid: 9024
     components:
     - type: Transform
-      pos: -20.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,14.5
       parent: 2
   - uid: 14218
     components:
@@ -115749,7 +116552,7 @@ entities:
     - type: Transform
       pos: 88.5,-22.5
       parent: 2
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 2102
     components:
@@ -116285,7 +117088,7 @@ entities:
       parent: 2
 - proto: SolidSecretDoor
   entities:
-  - uid: 21043
+  - uid: 2339
     components:
     - type: Transform
       pos: -35.5,-42.5
@@ -116589,7 +117392,7 @@ entities:
       parent: 2
 - proto: SpawnPointChef
   entities:
-  - uid: 2119
+  - uid: 16118
     components:
     - type: Transform
       pos: -20.5,12.5
@@ -118973,17 +119776,6 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Lobby
-  - uid: 9024
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 44.5,13.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
-      nameSet: True
-      id: Chemistry
   - uid: 9025
     components:
     - type: Transform
@@ -119091,6 +119883,17 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Virology
+  - uid: 14256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,16.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Chemistry
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 7976
@@ -119841,10 +120644,10 @@ entities:
       parent: 2
 - proto: Syringe
   entities:
-  - uid: 7064
+  - uid: 8193
     components:
     - type: Transform
-      pos: 62.629612,-3.733224
+      pos: 61.51553,-3.394734
       parent: 2
   - uid: 16540
     components:
@@ -120469,6 +121272,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,35.5
       parent: 2
+  - uid: 14753
+    components:
+    - type: Transform
+      pos: -20.5,10.5
+      parent: 2
   - uid: 15092
     components:
     - type: Transform
@@ -121306,11 +122114,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,26.5
       parent: 2
-  - uid: 5118
-    components:
-    - type: Transform
-      pos: 45.5,16.5
-      parent: 2
   - uid: 5428
     components:
     - type: Transform
@@ -121395,11 +122198,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,10.5
       parent: 2
-  - uid: 6038
-    components:
-    - type: Transform
-      pos: 44.5,13.5
-      parent: 2
   - uid: 6582
     components:
     - type: Transform
@@ -121478,21 +122276,15 @@ entities:
     - type: Transform
       pos: 61.5,15.5
       parent: 2
-  - uid: 7053
-    components:
-    - type: Transform
-      pos: 62.5,-3.5
-      parent: 2
-  - uid: 7054
+  - uid: 7044
     components:
     - type: Transform
-      pos: 62.5,-4.5
+      pos: 57.5,-6.5
       parent: 2
-  - uid: 7057
+  - uid: 7053
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-7.5
+      pos: 61.5,-3.5
       parent: 2
   - uid: 7097
     components:
@@ -121567,6 +122359,11 @@ entities:
     - type: Transform
       pos: 71.5,-7.5
       parent: 2
+  - uid: 7427
+    components:
+    - type: Transform
+      pos: 44.5,16.5
+      parent: 2
   - uid: 7616
     components:
     - type: Transform
@@ -121646,11 +122443,11 @@ entities:
     - type: Transform
       pos: 75.5,-11.5
       parent: 2
-  - uid: 12255
+  - uid: 8753
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,13.5
+      rot: 3.141592653589793 rad
+      pos: 45.5,12.5
       parent: 2
   - uid: 15813
     components:
@@ -121672,6 +122469,12 @@ entities:
     - type: Transform
       pos: -31.5,14.5
       parent: 2
+  - uid: 16576
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,12.5
+      parent: 2
   - uid: 17537
     components:
     - type: Transform
@@ -121684,6 +122487,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,13.5
       parent: 2
+  - uid: 18460
+    components:
+    - type: Transform
+      pos: 57.5,-7.5
+      parent: 2
   - uid: 20250
     components:
     - type: Transform
@@ -121693,7 +122501,7 @@ entities:
   - uid: 20606
     components:
     - type: Transform
-      pos: 46.5,16.5
+      pos: 43.5,16.5
       parent: 2
   - uid: 20995
     components:
@@ -122913,17 +123721,17 @@ entities:
       parent: 2
 - proto: VendingMachineChemDrobe
   entities:
-  - uid: 6024
+  - uid: 5996
     components:
     - type: Transform
-      pos: 41.5,13.5
+      pos: 41.5,12.5
       parent: 2
 - proto: VendingMachineChemicals
   entities:
-  - uid: 6023
+  - uid: 711
     components:
     - type: Transform
-      pos: 41.5,12.5
+      pos: 41.5,13.5
       parent: 2
 - proto: VendingMachineCigs
   entities:
@@ -122952,6 +123760,11 @@ entities:
     - type: Transform
       pos: 13.5,-33.5
       parent: 2
+  - uid: 20607
+    components:
+    - type: Transform
+      pos: -21.5,-4.5
+      parent: 2
 - proto: VendingMachineClothing
   entities:
   - uid: 1593
@@ -122959,11 +123772,6 @@ entities:
     - type: Transform
       pos: 38.5,0.5
       parent: 2
-  - uid: 2339
-    components:
-    - type: Transform
-      pos: -21.5,-4.5
-      parent: 2
   - uid: 2340
     components:
     - type: Transform
@@ -122974,6 +123782,11 @@ entities:
     - type: Transform
       pos: 52.5,-21.5
       parent: 2
+  - uid: 20610
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 2
 - proto: VendingMachineCoffee
   entities:
   - uid: 2341
@@ -123162,11 +123975,6 @@ entities:
       parent: 2
 - proto: VendingMachineTankDispenserEngineering
   entities:
-  - uid: 2352
-    components:
-    - type: Transform
-      pos: -9.5,-25.5
-      parent: 2
   - uid: 2353
     components:
     - type: Transform
@@ -123189,6 +123997,11 @@ entities:
     - type: Transform
       pos: -31.5,35.5
       parent: 2
+  - uid: 20608
+    components:
+    - type: Transform
+      pos: -9.5,-25.5
+      parent: 2
 - proto: VendingMachineTheater
   entities:
   - uid: 2354
@@ -123227,11 +124040,6 @@ entities:
     - type: Transform
       pos: 29.5,-26.5
       parent: 2
-  - uid: 2357
-    components:
-    - type: Transform
-      pos: -21.5,-3.5
-      parent: 2
   - uid: 2358
     components:
     - type: Transform
@@ -125990,11 +126798,6 @@ entities:
     - type: Transform
       pos: 44.5,19.5
       parent: 2
-  - uid: 5744
-    components:
-    - type: Transform
-      pos: 42.5,17.5
-      parent: 2
   - uid: 5762
     components:
     - type: Transform
@@ -126283,27 +127086,11 @@ entities:
     - type: Transform
       pos: 40.5,13.5
       parent: 2
-  - uid: 5960
-    components:
-    - type: Transform
-      pos: 41.5,16.5
-      parent: 2
   - uid: 5963
     components:
     - type: Transform
       pos: 41.5,14.5
       parent: 2
-  - uid: 5965
-    components:
-    - type: Transform
-      pos: 43.5,14.5
-      parent: 2
-  - uid: 5998
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,15.5
-      parent: 2
   - uid: 6000
     components:
     - type: Transform
@@ -127165,30 +127952,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 61.5,-8.5
       parent: 2
-  - uid: 7032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-7.5
-      parent: 2
-  - uid: 7033
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-6.5
-      parent: 2
-  - uid: 7035
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-4.5
-      parent: 2
-  - uid: 7036
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-3.5
-      parent: 2
   - uid: 7066
     components:
     - type: Transform
@@ -128435,6 +129198,11 @@ entities:
     - type: Transform
       pos: 76.5,-32.5
       parent: 2
+  - uid: 12255
+    components:
+    - type: Transform
+      pos: 43.5,19.5
+      parent: 2
   - uid: 12462
     components:
     - type: Transform
@@ -128608,6 +129376,11 @@ entities:
     - type: Transform
       pos: 7.5,-45.5
       parent: 2
+  - uid: 15599
+    components:
+    - type: Transform
+      pos: 43.5,17.5
+      parent: 2
   - uid: 15847
     components:
     - type: Transform
@@ -129031,6 +129804,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,-29.5
       parent: 2
+  - uid: 18469
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-6.5
+      parent: 2
+  - uid: 18470
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-7.5
+      parent: 2
+  - uid: 18475
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-4.5
+      parent: 2
   - uid: 20303
     components:
     - type: Transform
@@ -129190,6 +129981,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-49.5
       parent: 2
+  - uid: 21748
+    components:
+    - type: Transform
+      pos: 42.5,16.5
+      parent: 2
 - proto: WallReinforcedRust
   entities:
   - uid: 2330
@@ -131838,12 +132634,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 10.5,33.5
       parent: 2
-  - uid: 5411
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-2.5
-      parent: 2
   - uid: 5423
     components:
     - type: Transform
@@ -132000,12 +132790,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,19.5
       parent: 2
-  - uid: 5745
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,18.5
-      parent: 2
   - uid: 5789
     components:
     - type: Transform
@@ -132306,18 +133090,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,10.5
       parent: 2
-  - uid: 5996
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,14.5
-      parent: 2
-  - uid: 5997
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,16.5
-      parent: 2
   - uid: 5999
     components:
     - type: Transform
@@ -132552,12 +133324,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -42.5,-50.5
       parent: 2
-  - uid: 6201
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,16.5
-      parent: 2
   - uid: 6202
     components:
     - type: Transform
@@ -133289,18 +134055,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.5,-8.5
       parent: 2
-  - uid: 7017
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-8.5
-      parent: 2
-  - uid: 7019
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-5.5
-      parent: 2
   - uid: 7030
     components:
     - type: Transform
@@ -133690,6 +134444,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 74.5,-4.5
       parent: 2
+  - uid: 7378
+    components:
+    - type: Transform
+      pos: 42.5,14.5
+      parent: 2
   - uid: 7390
     components:
     - type: Transform
@@ -135652,6 +136411,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-48.5
       parent: 2
+  - uid: 17558
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-3.5
+      parent: 2
+  - uid: 18472
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-5.5
+      parent: 2
+  - uid: 18473
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-6.5
+      parent: 2
   - uid: 19807
     components:
     - type: Transform
@@ -135826,6 +136603,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 60.5,7.5
       parent: 2
+  - uid: 21647
+    components:
+    - type: Transform
+      pos: 42.5,17.5
+      parent: 2
 - proto: WallShuttle
   entities:
   - uid: 21142
@@ -141507,11 +142289,6 @@ entities:
       parent: 2
 - proto: WeldingFuelTankFull
   entities:
-  - uid: 3480
-    components:
-    - type: Transform
-      pos: -13.5,-13.5
-      parent: 2
   - uid: 3481
     components:
     - type: Transform
@@ -141967,6 +142744,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,10.5
       parent: 2
+  - uid: 8862
+    components:
+    - type: Transform
+      pos: 46.5,15.5
+      parent: 2
   - uid: 18993
     components:
     - type: Transform
@@ -142109,6 +142891,12 @@ entities:
       parent: 2
 - proto: WindoorSecureMedicalLocked
   entities:
+  - uid: 4676
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,1.5
+      parent: 2
   - uid: 5773
     components:
     - type: Transform
@@ -142620,6 +143408,12 @@ entities:
     - type: Transform
       pos: 2.5,32.5
       parent: 2
+  - uid: 5118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,15.5
+      parent: 2
   - uid: 5453
     components:
     - type: Transform
@@ -142830,11 +143624,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-17.5
       parent: 2
+  - uid: 14260
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,16.5
+      parent: 2
   - uid: 15404
     components:
     - type: Transform
       pos: -20.5,10.5
       parent: 2
+  - uid: 15602
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,1.5
+      parent: 2
   - uid: 15843
     components:
     - type: Transform
@@ -142915,6 +143721,23 @@ entities:
     - type: Transform
       pos: 2.5,-9.5
       parent: 2
+  - uid: 21752
+    components:
+    - type: Transform
+      pos: 47.5,15.5
+      parent: 2
+  - uid: 21846
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,1.5
+      parent: 2
+  - uid: 21847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,1.5
+      parent: 2
 - proto: WoodDoor
   entities:
   - uid: 3557
@@ -143057,6 +143880,11 @@ entities:
     - type: Transform
       pos: -3.4365067,-12.554331
       parent: 2
+  - uid: 5745
+    components:
+    - type: Transform
+      pos: 45.357437,14.368599
+      parent: 2
   - uid: 5753
     components:
     - type: Transform
@@ -143077,9 +143905,4 @@ entities:
     - type: Transform
       pos: 1.7595062,-8.203196
       parent: 21128
-  - uid: 21373
-    components:
-    - type: Transform
-      pos: 46.224125,16.563536
-      parent: 2
 ...

From 7b25f841194cd426dc1b906fc93446f928545c23 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 1 Jun 2024 05:25:03 +1200
Subject: [PATCH 176/568] Fix hugging mispredict (#28432)

* git mv

* Move namespaces

* Fix hugging mispredict
---
 .../EntitySystems/AnimalHusbandrySystem.cs    |  2 +-
 .../Components/InteractionPopupComponent.cs   |  2 +-
 .../Interaction/InteractionPopupSystem.cs     | 67 ++++++++++++++-----
 3 files changed, 51 insertions(+), 20 deletions(-)
 rename {Content.Server => Content.Shared}/Interaction/Components/InteractionPopupComponent.cs (98%)
 rename {Content.Server => Content.Shared}/Interaction/InteractionPopupSystem.cs (75%)

diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index d0fcd113595d..cd0541340564 100644
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Interaction.Components;
 using Content.Server.Popups;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.AnimalHusbandry;
diff --git a/Content.Server/Interaction/Components/InteractionPopupComponent.cs b/Content.Shared/Interaction/Components/InteractionPopupComponent.cs
similarity index 98%
rename from Content.Server/Interaction/Components/InteractionPopupComponent.cs
rename to Content.Shared/Interaction/Components/InteractionPopupComponent.cs
index 000344e61c61..4ef5a1d18083 100644
--- a/Content.Server/Interaction/Components/InteractionPopupComponent.cs
+++ b/Content.Shared/Interaction/Components/InteractionPopupComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Interaction.Components;
+namespace Content.Shared.Interaction.Components;
 
 [RegisterComponent, Access(typeof(InteractionPopupSystem))]
 public sealed partial class InteractionPopupComponent : Component
diff --git a/Content.Server/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
similarity index 75%
rename from Content.Server/Interaction/InteractionPopupSystem.cs
rename to Content.Shared/Interaction/InteractionPopupSystem.cs
index 77b76f898a7a..030bc0ae6b87 100644
--- a/Content.Server/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -1,26 +1,27 @@
-using Content.Server.Interaction.Components;
-using Content.Server.Popups;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Interaction;
+namespace Content.Shared.Interaction;
 
 public sealed class InteractionPopupSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly INetManager _netMan = default!;
 
     public override void Initialize()
     {
@@ -53,9 +54,17 @@ private void SharedInteract(
             return;
 
         //Handling does nothing and this thing annoyingly plays way too often.
+        // HUH? What does this comment even mean?
+
         if (HasComp<SleepingComponent>(uid))
             return;
 
+        if (TryComp<MobStateComponent>(uid, out var state)
+            && !_mobStateSystem.IsAlive(uid, state))
+        {
+            return;
+        }
+
         args.Handled = true;
 
         var curTime = _gameTiming.CurTime;
@@ -63,18 +72,21 @@ private void SharedInteract(
         if (curTime < component.LastInteractTime + component.InteractDelay)
             return;
 
-        if (TryComp<MobStateComponent>(uid, out var state)
-            && !_mobStateSystem.IsAlive(uid, state))
-        {
-            return;
-        }
+        component.LastInteractTime = curTime;
 
         // TODO: Should be an attempt event
         // TODO: Need to handle pausing with an accumulator.
 
-        string msg = ""; // Stores the text to be shown in the popup message
+        var msg = ""; // Stores the text to be shown in the popup message
         SoundSpecifier? sfx = null; // Stores the filepath of the sound to be played
 
+        var predict = component.SuccessChance is 0 or 1
+                      && component.InteractSuccessSpawn == null
+                      && component.InteractFailureSpawn == null;
+
+        if (_netMan.IsClient && !predict)
+            return;
+
         if (_random.Prob(component.SuccessChance))
         {
             if (component.InteractSuccessString != null)
@@ -102,20 +114,39 @@ private void SharedInteract(
         {
             var msgOthers = Loc.GetString(component.MessagePerceivedByOthers,
                 ("user", Identity.Entity(user, EntityManager)), ("target", Identity.Entity(uid, EntityManager)));
-            _popupSystem.PopupEntity(msg, uid, user);
             _popupSystem.PopupEntity(msgOthers, uid, Filter.PvsExcept(user, entityManager: EntityManager), true);
         }
-        else
-            _popupSystem.PopupEntity(msg, uid, user); //play only for the initiating entity.
 
-        if (sfx is not null) //not all cases will have sound.
+        if (!predict)
         {
+            _popupSystem.PopupEntity(msg, uid, user);
+
             if (component.SoundPerceivedByOthers)
-                _audio.PlayPvs(sfx, target); //play for everyone in range
+                _audio.PlayPvs(sfx, target);
             else
-                _audio.PlayEntity(sfx, Filter.Entities(user, target), target, true); //play only for the initiating entity and its target.
+                _audio.PlayEntity(sfx, Filter.Entities(user, target), target, false);
+            return;
         }
 
-        component.LastInteractTime = curTime;
+        _popupSystem.PopupPredicted(msg, uid, user);
+
+        if (sfx == null)
+            return;
+
+        if (component.SoundPerceivedByOthers)
+        {
+            _audio.PlayPredicted(sfx, target, user);
+            return;
+        }
+
+        if (_netMan.IsClient)
+        {
+            if (_gameTiming.IsFirstTimePredicted)
+                _audio.PlayEntity(sfx, Filter.Local(), target, true);
+        }
+        else
+        {
+            _audio.PlayEntity(sfx, Filter.Empty().FromEntities(target), target, false);
+        }
     }
 }

From faa3554d14fd778ec1b11028ad643f9f5af6f79b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 17:26:09 +0000
Subject: [PATCH 177/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 527df3dd39f2..b7291d72b0c5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Crotalus
-  changes:
-  - message: Sort agents by success rate in end game summary
-    type: Tweak
-  id: 6154
-  time: '2024-03-14T15:52:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26058
 - author: nikthechampiongr
   changes:
   - message: The radio jammer is now able to jam the signal of suit sensors.
@@ -3854,3 +3847,10 @@
   id: 6653
   time: '2024-05-31T14:56:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28420
+- author: ElectroJr
+  changes:
+  - message: Hugging a player no longer briefly opens the mugging UI
+    type: Fix
+  id: 6654
+  time: '2024-05-31T17:25:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28432

From e145a666c9b05278dab848ef49e3cbebd06a5ca2 Mon Sep 17 00:00:00 2001
From: Flesh <62557990+PolterTzi@users.noreply.github.com>
Date: Fri, 31 May 2024 19:56:41 +0200
Subject: [PATCH 178/568] Use existing probability field (#28422)

Remove the PlantAdjustAttribute "Prob" field and use the existing probability field from ReagentEffects instead.
---
 .../PlantMetabolism/PlantAdjustAttribute.cs            |  9 +--------
 Resources/Prototypes/Reagents/botany.yml               | 10 +++++-----
 Resources/Prototypes/Reagents/elements.yml             |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
index 80c5ca5cf2b9..9bd8fdaa6847 100644
--- a/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
+++ b/Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantAdjustAttribute.cs
@@ -12,9 +12,6 @@ public abstract partial class PlantAdjustAttribute : ReagentEffect
         [DataField]
         public float Amount { get; protected set; } = 1;
 
-        [DataField]
-        public float Prob { get; protected set; } = 1; // = (80);
-
         /// <summary>
         /// Localisation key for the name of the adjusted attribute. Used for guidebook descriptions.
         /// </summary>
@@ -45,11 +42,7 @@ public bool CanMetabolize(EntityUid plantHolder, [NotNullWhen(true)] out PlantHo
                                     || 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);
+            return true;
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index cdd19dc308d4..99e9182103dc 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 e47335b1b4a1..4f05568ad2b0 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 114a99eb8d1b43ae0b3cb4fc3b15ac043bc68f53 Mon Sep 17 00:00:00 2001
From: Brandon Li <48413902+aspiringLich@users.noreply.github.com>
Date: Fri, 31 May 2024 15:44:22 -0400
Subject: [PATCH 179/568] Chem colors (#28367)

* chem colors

* lithium & sodium colors

* update oxygen color

* update fluorine color
---
 Resources/Prototypes/Reagents/elements.yml | 10 +++++-----
 Resources/Prototypes/Reagents/gases.yml    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 4f05568ad2b0..8d317102c1bc 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -85,7 +85,7 @@
   desc: reagent-desc-fluorine
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#ba85cc"
   boilingPoint: -188.11
   meltingPoint: -219.67
   plantMetabolism:
@@ -123,7 +123,7 @@
   desc: reagent-desc-hydrogen
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#cccccc"
   boilingPoint: -253.0
   meltingPoint: -259.2
 
@@ -176,7 +176,7 @@
   desc: reagent-desc-lithium
   physicalDesc: reagent-physical-desc-shiny
   flavor: metallic
-  color: "#c6c8cc"
+  color: "#d6c0a7"
   meltingPoint: 180.5
   boilingPoint: 1330.0
   metabolisms:
@@ -235,7 +235,7 @@
   desc: reagent-desc-phosphorus
   physicalDesc: reagent-physical-desc-powdery
   flavor: metallic
-  color: "#ede4e4"
+  color: "#f5da9a"
   meltingPoint: 44.2
   boilingPoint: 280.5
   plantMetabolism:
@@ -312,7 +312,7 @@
   desc: reagent-desc-sodium
   physicalDesc: reagent-physical-desc-metallic
   flavor: bitter
-  color: "#c6c8cc"
+  color: "#a7b3d6"
   meltingPoint: 97.8
   boilingPoint: 883.0
 
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 06fb2b269b6e..9ef508feead5 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -4,7 +4,7 @@
   desc: reagent-desc-oxygen
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#c4f5ff"
   boilingPoint: -183.0
   meltingPoint: -218.4
   metabolisms:
@@ -190,7 +190,7 @@
   desc: reagent-desc-nitrogen
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#a1e1ff"
   boilingPoint: -195.8
   meltingPoint: -210.0
   metabolisms:
@@ -232,7 +232,7 @@
   desc: reagent-desc-nitrous-oxide
   physicalDesc: reagent-physical-desc-gaseous
   flavor: bitter
-  color: "#808080"
+  color: "#5d88c9"
   boilingPoint: -88
   meltingPoint: -90
   metabolisms:

From 311d684b6185bea514a382b700fe2bbfa4d64fa6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 31 May 2024 19:45:29 +0000
Subject: [PATCH 180/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b7291d72b0c5..19441ce065fb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: The radio jammer is now able to jam the signal of suit sensors.
-    type: Tweak
-  id: 6155
-  time: '2024-03-14T15:55:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26046
 - author: deltanedas
   changes:
   - message: Holocarp and Magicarp plushies can now be found in maintenance.
@@ -3854,3 +3847,10 @@
   id: 6654
   time: '2024-05-31T17:25:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28432
+- author: aspiringLich
+  changes:
+  - message: Some chemicals have been made more colorful and child-friendly.
+    type: Tweak
+  id: 6655
+  time: '2024-05-31T19:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28367

From 2ddca94375e6142784b5ef650d6e2f8a09266ec0 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Fri, 31 May 2024 14:52:04 -0500
Subject: [PATCH 181/568] Adds more spawners (#28280)

* adds more spawners

* make it WORK. ooo.. a. e

* fix

* outerclothing capitalization

* prototype fix

* flashbang fix
---
 .../Markers/Spawners/Random/crates.yml        |  77 +++++++++
 .../Spawners/Random/encryption_key.yml        |  27 ++++
 .../Markers/Spawners/Random/industrial.yml    |  87 ++++++++++
 .../Markers/Spawners/Random/materials.yml     | 147 +++++++++++++++++
 .../Markers/Spawners/Random/medical.yml       |  65 ++++++++
 .../Markers/Spawners/Random/security.yml      | 148 ++++++++++++++++++
 6 files changed, 551 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml
 create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index ae7e5bcf7620..1986dfc29c52 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -22,6 +22,7 @@
         - CrateScience
         - CrateSurgery
       chance: 0.7
+      offset: 0.0
 
 - type: entity
   name: Filled Crate Spawner
@@ -59,3 +60,79 @@
         - CrateMaterialPlasma
         - CrateHydroponicsSeedsExotic
       rareChance: 0.1
+      offset: 0.0
+
+- type: entity
+  name: random engineering crate spawner
+  id: LootSpawnerRandomCrateEngineering
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/Crates/engineering.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - CrateEngineeringSingularityGenerator
+        - CrateEngineeringTeslaGenerator
+        - CrateEngineeringTeslaGroundingRod
+        - CrateEngineeringParticleAccelerator
+        - CrateRCD
+        - CrateEngineeringGear
+      rareChance: 0.2
+      prototypes:
+        - CrateEngineering
+        - CrateElectrical
+        - CrateEngineeringElectricalSupplies
+        - CrateRCDAmmo
+        - CrateEngineeringCableLV
+        - CrateEngineeringCableMV
+        - CrateEngineeringCableHV
+        - CrateEngineeringCableBulk
+        - CrateEngineeringSingularityContainment
+        - CrateEngineeringSingularityCollector
+        - CrateEngineeringTeslaCoil
+        - CrateEngineeringSingularityEmitter
+        - CrateEngineeringGyroscope
+        - CrateEngineeringThruster
+        - CrateEngineeringToolbox
+        - CrateEngineeringShuttle
+        - CrateEngineeringSolar
+        - CrateEngineeringJetpack
+        - CrateEmergencyRadiation
+        - CrateRadiation
+      chance: 0.9
+      offset: 0.0
+
+- type: entity
+  name: random security crate spawner
+  id: LootSpawnerRandomCrateSecurity
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Storage/Crates/sec_gear.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
+        - CrateArmoryShotgun
+        - CrateArmorySMG
+        - CrateSecurityRiot
+        - CrateSecurityNonlethal
+      rareChance: 0.1
+      prototypes:
+        - CrateWeaponSecure
+        - CrateArmoryLaser
+        - CrateArmoryPistols
+        - CrateTrainingBombs
+        - CrateTrackingImplants
+        - CrateSecurityTrackingMindshieldImplants
+        - CrateSecurityHelmet
+        - CrateSecurityArmor
+        - CrateRestraints
+        - CrateEmergencyExplosive
+        - CrateSecurityBiosuit
+      chance: 0.9
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml
new file mode 100644
index 000000000000..7c29de7f7c7b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/encryption_key.yml
@@ -0,0 +1,27 @@
+# Intentionally does not include channels like syndicate comms or binary, since these getting in to the hands of random people can cause a round to derail.
+- type: entity
+  name: random encryption key spawner
+  id: LootSpawnerEncryptionKey
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Devices/encryption_keys.rsi
+          state: crypt_rusted
+        - sprite: Objects/Devices/encryption_keys.rsi
+          state: nano_label
+    - type: RandomSpawner
+      rarePrototypes:
+        - EncryptionKeyCommand
+        - EncryptionKeySecurity
+      rareChance: 0.1
+      prototypes:
+        - EncryptionKeyCommon
+        - EncryptionKeyEngineering
+        - EncryptionKeyScience
+        - EncryptionKeyService
+        - EncryptionKeyMedical
+        - EncryptionKeyCargo
+      chance: 0.9
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
new file mode 100644
index 000000000000..e2ce2c8aff2f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
@@ -0,0 +1,87 @@
+#Industrial spawners
+- type: entity
+  name: industrial fluff spawner
+  id: LootSpawnerIndustrialFluff
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/flashlight.rsi
+          state: flashlight
+    - type: RandomSpawner
+      rarePrototypes:
+        - CheapLighter
+        - Pen
+        - Cigar
+        - CigarSpent
+        - Cigarette
+        - CigaretteSpent
+        - Paper
+        - FolderSpawner
+      rareChance: 0.1
+      prototypes:
+        - RemoteSignaller
+        - GeigerCounter
+        - trayScanner
+        - FlashlightLantern
+        - ClothingHandsGlovesColorBlack
+        - Lighter
+        - ClothingMaskGas
+        - HandheldGPSBasic
+      chance: 0.85
+      offset: 0.0
+
+- type: entity
+  name: industrial loot spawner
+  suffix: Tools + Materials
+  id: LootSpawnerIndustrial
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/welder.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - CapacitorStockPart
+        - MicroManipulatorStockPart
+        - MatterBinStockPart
+        - CableHVStack10
+        - WelderIndustrial
+        - PowerCellHigh
+        - PowerCellSmall
+        - ClothingHandsGlovesColorYellowBudget
+      rareChance: 0.2
+      prototypes:
+        - ClothingHeadHatWelding
+        - WelderMini
+        - Crowbar
+        - CrowbarRed
+        - Screwdriver
+        - Wrench
+        - Wirecutter
+        - Welder
+        - RemoteSignaller
+        - GeigerCounter
+        - GasAnalyzer
+        - Multitool
+        - trayScanner
+        - FlashlightLantern
+        - ClothingHandsGlovesColorBlack
+        - ClothingMaskGas
+        - HandheldGPSBasic
+        - FireExtinguisher
+        - PowerCellMedium
+        - SheetSteel10
+        - SheetGlass10
+        - SheetPlastic10
+        - SheetPlasteel10
+        - PartRodMetal10
+        - CableApcStack10
+        - CableMVStack10
+        - ToolboxElectricalFilled
+        - ToolboxMechanicalFilled
+      chance: 0.8
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
new file mode 100644
index 000000000000..fbbda73ac0d6
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/materials.yml
@@ -0,0 +1,147 @@
+# Normal materials spawners
+- type: entity
+  name: materials spawner
+  id: LootSpawnerMaterials
+  suffix: Construction Materials
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/metal.rsi
+          state: steel_3
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetPlasteel10
+      rareChance: 0.2
+      prototypes:
+        - SheetSteel
+        - SheetGlass
+        - SheetPlastic
+        - CableApcStack
+        - CableMVStack
+        - CableHVStack
+      chance: 0.8
+      offset: 0.0
+
+- type: entity
+  name: materials spawner
+  suffix: Supplementary Materials
+  id: LootSpawnerMaterialsSupplementary
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/materials.rsi
+          state: wood_2
+    - type: RandomSpawner
+      prototypes:
+        - MaterialWoodPlank10
+        - MaterialCardboard10
+        - PartRodMetal10
+      chance: 0.8
+      offset: 0.0
+
+# High-value materials spawners
+# Maybe these should use the 10-in-stack variants?
+- type: entity
+  name: high-value materials spawner
+  suffix: Construction Materials
+  id: LootSpawnerMaterialsHighValueConstruction
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/metal.rsi
+          state: plasteel_2
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetRPGlass
+      rareChance: 0.2
+      prototypes:
+        - SheetPlasteel
+        - SheetRGlass
+      chance: 0.8
+      offset: 0.0
+
+- type: entity
+  name: high-value materials spawner
+  id: LootSpawnerMaterialsHighValue
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/other.rsi
+          state: plasma_2
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetUranium
+      rareChance: 0.2
+      prototypes:
+        - SheetPlasma
+        - IngotGold
+        - IngotSilver
+      chance: 0.8
+      offset: 0.0
+
+# Surplus materials spawner.
+# Intended use case: randomly place in maintenance or in storage areas.
+# Does not include weirdo stuff like Bronze or Paper since those are intended to be gimmicks.
+- type: entity
+  name: surplus materials spawner
+  id: LootSpawnerMaterialsSurplus
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Materials/Sheets/metal.rsi
+          state: steel_3
+    - type: RandomSpawner
+      rarePrototypes:
+        - SheetUranium1
+        - IngotGold1
+        - IngotSilver1
+      rareChance: 0.1
+      prototypes:
+        - SheetPlasteel10
+        - SheetPlasma1
+        - MaterialWoodPlank10
+        - PartRodMetal10
+        - SheetSteel10
+        - SheetGlass10
+        - MaterialCloth10
+        - MaterialCardboard10
+        - SheetPlastic10
+        - CableApcStack10
+        - CableMVStack10
+        - CableHVStack10
+      chance: 0.9
+      offset: 0.0
+
+# Cable coil spawner
+- type: entity
+  name: cable coil spawner
+  id: LootSpawnerCableCoil
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Tools/cable-coils.rsi
+          state: coilall-30
+    - type: RandomSpawner
+      rarePrototypes:
+        - CableApcStack10
+        - CableMVStack10
+        - CableHVStack10
+      rareChance: 0.1
+      prototypes:
+        - CableApcStack
+        - CableMVStack
+        - CableHVStack
+      chance: 0.9
+      offset: 0.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml
new file mode 100644
index 000000000000..ca6618dd122d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/medical.yml
@@ -0,0 +1,65 @@
+# Minor medical loot spawner
+# Use case: Common areas that aren't medical
+- type: entity
+  name: healing supplies spawner
+  id: LootSpawnerMedicalMinor
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Specific/Medical/medical.rsi
+          state: brutepack
+    - type: RandomSpawner
+      rarePrototypes:
+        - MedkitFilled
+      rareChance: 0.1
+      prototypes:
+        - Syringe #you win some you lose some
+        - Brutepack
+        - Ointment
+        - Gauze
+        - EmergencyMedipen
+        - PillCanisterIron
+      chance: 0.9
+      offset: 0.0
+
+# Proper medical loot spawner, contains things like beakers and better meds.
+- type: entity
+  name: medical loot spawner
+  id: LootSpawnerMedicalClassy
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Specific/Medical/firstaidkits.rsi
+          state: firstaid
+    - type: RandomSpawner
+      rarePrototypes:
+        - PillCanisterDermaline
+        - PillCanisterDylovene
+        - PillCanisterBicaridine
+        - PillCanisterKelotane
+        - PillCanisterDexalin
+        - HandheldHealthAnalyzer
+        - ClothingHandsGlovesLatex
+      rareChance: 0.1
+      prototypes:
+        - Syringe
+        - Dropper
+        - Beaker
+        - LargeBeaker
+        - Brutepack
+        - Ointment
+        - Gauze
+        - EmergencyMedipen
+        - EpinephrineChemistryBottle
+        - PillCanisterTricordrazine
+        - PillCanisterCharcoal
+        - PillCanisterHyronalin
+        - PillCanisterIron
+        - Bloodpack
+        - MedkitFilled
+      chance: 0.9
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml
new file mode 100644
index 000000000000..f5585a5e32f8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml
@@ -0,0 +1,148 @@
+# Security 
+- type: entity
+  name: security loot spawner
+  suffix: Gear, Simple
+  id: LootSpawnerSecurityBasic
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Melee/flash.rsi
+          state: flash
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingEyesGlassesSunglasses
+        - BoxHandcuff
+      rareChance: 0.05
+      prototypes:
+        - Flash
+        - Handcuffs
+        - Zipties
+        - FlashlightSeclite
+        - Tourniquet
+      chance: 0.85
+
+- type: entity
+  name: security loot spawner
+  suffix: Gear, Better
+  id: LootSpawnerSecurity
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Melee/flash.rsi
+          state: flash
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingEyesGlassesSunglasses
+        - BoxHandcuff
+        - BoxFlashbang
+        - TearGasGrenade
+        - WeaponDisabler
+        - Stunbaton
+      rareChance: 0.05
+      prototypes:
+        - Flash
+        - Handcuffs
+        - Zipties
+        - FlashlightSeclite
+        - GrenadeFlashBang
+        - SecurityWhistle
+        - Tourniquet
+      chance: 0.85
+ 
+# Armory loot spawner
+# Automatics are a complete mess right now, so the AK-MS And WT-550 have been commented out for consistency's sake. I have no idea what role these guns are supposed to fufill.
+- type: entity
+  name: armory loot spawner
+  suffix: Guns, Armor
+  id: LootSpawnerArmory
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Clothing/OuterClothing/Armor/security.rsi
+          state: icon
+        - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingHeadHelmetSwat
+        - WeaponShotgunEnforcer
+#        - WeaponRifleAk
+      rareChance: 0.05
+      prototypes:
+        - RiotShield
+        - RiotBulletShield
+        - RiotLaserShield
+        - ClothingHeadHelmetBasic
+        - ClothingHeadHelmetRiot
+        - ClothingOuterArmorBasic
+        - ClothingOuterArmorRiot
+        - ClothingOuterArmorBulletproof
+#        - WeaponSubMachineGunWt550
+        - WeaponDisabler
+        - WeaponPistolMk58
+        - WeaponRifleLecter
+        - WeaponSubMachineGunDrozd
+        - WeaponLaserCarbine
+        - WeaponShotgunKammerer
+      chance: 0.95
+      offset: 0.0
+
+- type: entity
+  name: armory loot spawner
+  suffix: Guns
+  id: LootSpawnerArmoryGunsOnly
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - WeaponShotgunEnforcer
+#        - WeaponRifleAk
+      rareChance: 0.05
+      prototypes:
+#        - WeaponSubMachineGunWt550
+        - WeaponDisabler
+        - WeaponPistolMk58
+        - WeaponRifleLecter
+        - WeaponSubMachineGunDrozd
+        - WeaponLaserCarbine
+        - WeaponShotgunKammerer
+      chance: 0.95
+      offset: 0.0
+
+- type: entity
+  name: armory loot spawner
+  suffix: Armor
+  id: LootSpawnerArmoryArmorOnly
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Clothing/OuterClothing/Armor/security.rsi
+          state: icon
+    - type: RandomSpawner
+      rarePrototypes:
+        - ClothingHeadHelmetSwat
+      rareChance: 0.05
+      prototypes:
+        - RiotShield
+        - RiotBulletShield
+        - RiotLaserShield
+        - ClothingHeadHelmetBasic
+        - ClothingHeadHelmetRiot
+        - ClothingOuterArmorBasic
+        - ClothingOuterArmorRiot
+        - ClothingOuterArmorBulletproof
+      chance: 0.95
+      offset: 0.0
\ No newline at end of file

From c4291920a628a13684769f54adc4b0df7b7b09ad Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 1 Jun 2024 08:05:34 +1200
Subject: [PATCH 182/568] Make chat & examine systems use
 FormattedMessage.EscapeText() (#28431)

---
 Content.Client/Examine/ExamineSystem.cs   |  6 ++----
 Content.Server/Chat/Systems/ChatSystem.cs |  4 ++--
 Content.Shared/Chat/MsgChatMessage.cs     | 11 +++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 125ec62e4920..b476971a13ac 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -239,9 +239,7 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
 
             if (knowTarget)
             {
-                // TODO: FormattedMessage.RemoveMarkupPermissive
-                // var itemName = FormattedMessage.RemoveMarkupPermissive(Identity.Name(target, EntityManager, player));
-                var itemName = FormattedMessage.FromMarkupPermissive(Identity.Name(target, EntityManager, player)).ToString();
+                var itemName = FormattedMessage.EscapeText(Identity.Name(target, EntityManager, player));
                 var labelMessage = FormattedMessage.FromMarkupPermissive($"[bold]{itemName}[/bold]");
                 var label = new RichTextLabel();
                 label.SetMessage(labelMessage);
@@ -250,7 +248,7 @@ public void OpenTooltip(EntityUid player, EntityUid target, bool centeredOnCurso
             else
             {
                 var label = new RichTextLabel();
-                label.SetMessage(FormattedMessage.FromMarkup("[bold]???[/bold]"));
+                label.SetMessage(FormattedMessage.FromMarkupOrThrow("[bold]???[/bold]"));
                 hBox.AddChild(label);
             }
 
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 111e56a2a35a..8e6c2ba4b37c 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -378,7 +378,7 @@ private void SendEntitySpeak(
         if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
             return;
 
-        var message = TransformSpeech(source, FormattedMessage.RemoveMarkup(originalMessage));
+        var message = TransformSpeech(source, originalMessage);
 
         if (message.Length == 0)
             return;
@@ -417,7 +417,7 @@ private void SendEntitySpeak(
 
         // To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc.
         // Also doesn't log if hideLog is true.
-        if (!HasComp<ActorComponent>(source) || hideLog == true)
+        if (!HasComp<ActorComponent>(source) || hideLog)
             return;
 
         if (originalMessage == message)
diff --git a/Content.Shared/Chat/MsgChatMessage.cs b/Content.Shared/Chat/MsgChatMessage.cs
index f7311d2dc8ce..85367ffb739a 100644
--- a/Content.Shared/Chat/MsgChatMessage.cs
+++ b/Content.Shared/Chat/MsgChatMessage.cs
@@ -11,8 +11,19 @@ namespace Content.Shared.Chat
     public sealed class ChatMessage
     {
         public ChatChannel Channel;
+
+        /// <summary>
+        /// This is the text spoken by the entity, after accents and such were applied.
+        /// This should have <see cref="FormattedMessage.EscapeText"/> applied before using it in any rich text box.
+        /// </summary>
         public string Message;
+
+        /// <summary>
+        /// This is the <see cref="Message"/> but with special characters escaped and wrapped in some rich text
+        /// formatting tags.
+        /// </summary>
         public string WrappedMessage;
+
         public NetEntity SenderEntity;
 
         /// <summary>

From a1a8f04036a6f7aa623028ccb77d6ec119267dd8 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Fri, 31 May 2024 16:26:19 -0400
Subject: [PATCH 183/568] Decouple interactions from hands, cleanup old events,
 add new fears (#28393)

* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* :eye: :eye:

* shadowcommander review
---
 Content.Client/Guidebook/GuidebookSystem.cs   |   2 +-
 .../Tests/Buckle/BuckleTest.cs                |   1 +
 .../Components/ActionBlocking/HandCuffTest.cs |   1 +
 .../Click/InteractionSystemTests.cs           |   4 +
 .../Tests/Interaction/InteractionTest.cs      |   1 +
 .../Tests/VendingMachineRestockTest.cs        |   1 +
 .../Actions/ActionOnInteractSystem.cs         |   2 +-
 .../Atmos/EntitySystems/FlammableSystem.cs    |   2 +-
 .../Atmos/Monitor/Systems/AirAlarmSystem.cs   |   3 +
 .../EntitySystems/GasPressurePumpSystem.cs    |   3 +
 .../Binary/EntitySystems/GasValveSystem.cs    |   4 +
 .../EntitySystems/GasVolumePumpSystem.cs      |   3 +
 .../Trinary/EntitySystems/GasFilterSystem.cs  |   3 +
 .../Trinary/EntitySystems/GasMixerSystem.cs   |   3 +
 .../Unary/EntitySystems/GasCanisterSystem.cs  |   3 +
 .../EntitySystems/GasOutletInjectorSystem.cs  |   4 +
 .../CardboardBox/CardboardBoxSystem.cs        |  19 ++-
 .../Systems/SignalSwitchSystem.cs             |   2 +-
 .../Disposal/Mailing/MailingUnitSystem.cs     |   3 +
 .../Unit/EntitySystems/DisposalUnitSystem.cs  |   3 +
 Content.Server/Doors/Systems/AirlockSystem.cs |   3 +
 .../Explosion/EntitySystems/TriggerSystem.cs  |   3 +
 .../Fluids/EntitySystems/AbsorbentSystem.cs   |   8 +-
 Content.Server/Gatherable/GatherableSystem.cs |   4 +
 .../EntitySystems/HandheldLightSystem.cs      |   2 +-
 .../EntitySystems/MechGrabberSystem.cs        |   7 +-
 .../EntitySystems/SmokingSystem.Cigar.cs      |   2 +-
 Content.Server/Pinpointer/PinpointerSystem.cs |   5 +
 .../Radiation/Systems/GeigerSystem.cs         |   2 +-
 .../Radio/EntitySystems/JammerSystem.cs       |   3 +
 .../Radio/EntitySystems/RadioDeviceSystem.cs  |   6 +
 .../EntitySystems/RevenantSystem.Abilities.cs |  13 +-
 .../Shuttles/Systems/ThrusterSystem.cs        |   5 +
 Content.Server/Tabletop/TabletopSystem.cs     |   3 +
 .../Zombies/ZombieSystem.Transform.cs         |   2 +
 .../ActionBlocker/ActionBlockerSystem.cs      |   4 +-
 Content.Shared/Burial/BurialSystem.cs         |   3 +-
 .../SharedSolutionContainerMixerSystem.cs     |   4 +
 .../Systems/TwoWayLeverSystem.cs              |   2 +-
 .../Doors/Systems/SharedDoorSystem.cs         |   2 +-
 .../SharedHandsSystem.Interactions.cs         |  14 ++
 .../Interaction/ActivateInWorldEvent.cs       |  37 +++++-
 .../Components/ComplexInteractionComponent.cs |   9 ++
 .../Interaction/Events/UseAttemptEvent.cs     |   9 +-
 Content.Shared/Interaction/InteractHand.cs    |  54 --------
 .../Interaction/InteractionPopupSystem.cs     |   3 +
 .../Interaction/SharedInteractionSystem.cs    | 125 +++++++++++++-----
 Content.Shared/Lock/LockSystem.cs             |   2 +-
 .../Mech/EntitySystems/SharedMechSystem.cs    |   4 +-
 .../Projectiles/SharedProjectileSystem.cs     |   2 +-
 .../SharedEntityStorageSystem.cs              |   2 +-
 .../EntitySystems/SharedStorageSystem.cs      |   2 +-
 .../Strip/SharedStrippableSystem.cs           |   2 +-
 .../SubFloor/SharedTrayScannerSystem.cs       |   4 +
 .../Systems/SwapTeleporterSystem.cs           |   4 +
 .../Toilet/Systems/SharedToiletSystem.cs      |   2 +-
 .../Systems/SharedToolSystem.MultipleTool.cs  |   2 +-
 .../UserInterface/ActivatableUISystem.cs      |   2 +-
 Content.Shared/Verbs/SharedVerbSystem.cs      |  24 +---
 .../Weapons/Misc/SharedGrapplingGunSystem.cs  |   2 +-
 .../Misc/SharedTetherGunSystem.Force.cs       |   3 +
 .../Weapons/Misc/SharedTetherGunSystem.cs     |   3 +
 .../Systems/BatteryWeaponFireModesSystem.cs   |   3 +
 .../Ranged/Systems/RechargeCycleAmmoSystem.cs |   3 +
 .../SharedGunSystem.ChamberMagazine.cs        |   2 +-
 .../Mobs/Cyborgs/base_borg_chassis.yml        |   1 +
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |   1 +
 .../Prototypes/Entities/Mobs/NPCs/mimic.yml   |   1 -
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |   1 +
 .../Entities/Mobs/Player/admin_ghost.yml      |   1 +
 .../Entities/Mobs/Player/guardian.yml         |   1 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   2 +
 72 files changed, 312 insertions(+), 165 deletions(-)
 create mode 100644 Content.Shared/Interaction/Components/ComplexInteractionComponent.cs

diff --git a/Content.Client/Guidebook/GuidebookSystem.cs b/Content.Client/Guidebook/GuidebookSystem.cs
index 0aa2c85142e0..86dcf7694248 100644
--- a/Content.Client/Guidebook/GuidebookSystem.cs
+++ b/Content.Client/Guidebook/GuidebookSystem.cs
@@ -148,7 +148,7 @@ private void OnGuidebookControlsTestInteractHand(EntityUid uid, GuidebookControl
 
     public void FakeClientActivateInWorld(EntityUid activated)
     {
-        var activateMsg = new ActivateInWorldEvent(GetGuidebookUser(), activated);
+        var activateMsg = new ActivateInWorldEvent(GetGuidebookUser(), activated, true);
         RaiseLocalEvent(activated, activateMsg);
     }
 
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 7c700d9fb8a8..57ac63b12476 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -29,6 +29,7 @@ public sealed class BuckleTest
   components:
   - type: Buckle
   - type: Hands
+  - type: ComplexInteraction
   - type: InputMover
   - type: Body
     prototype: Human
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index c6a8e618cc1a..0ac6b68a3ec2 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -24,6 +24,7 @@ public sealed class HandCuffTest
   components:
   - type: Cuffable
   - type: Hands
+  - type: ComplexInteraction
   - type: Body
     prototype: Human
 
diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
index 4415eddf376d..2b844d34f0ca 100644
--- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -64,6 +65,7 @@ await server.WaitAssertion(() =>
             {
                 user = sEntities.SpawnEntity(null, coords);
                 sEntities.EnsureComponent<HandsComponent>(user);
+                sEntities.EnsureComponent<ComplexInteractionComponent>(user);
                 handSys.AddHand(user, "hand", HandLocation.Left);
                 target = sEntities.SpawnEntity(null, coords);
                 item = sEntities.SpawnEntity(null, coords);
@@ -205,6 +207,7 @@ await server.WaitAssertion(() =>
             {
                 user = sEntities.SpawnEntity(null, coords);
                 sEntities.EnsureComponent<HandsComponent>(user);
+                sEntities.EnsureComponent<ComplexInteractionComponent>(user);
                 handSys.AddHand(user, "hand", HandLocation.Left);
                 target = sEntities.SpawnEntity(null, new MapCoordinates(new Vector2(SharedInteractionSystem.InteractionRange - 0.1f, 0), mapId));
                 item = sEntities.SpawnEntity(null, coords);
@@ -347,6 +350,7 @@ await server.WaitAssertion(() =>
             {
                 user = sEntities.SpawnEntity(null, coords);
                 sEntities.EnsureComponent<HandsComponent>(user);
+                sEntities.EnsureComponent<ComplexInteractionComponent>(user);
                 handSys.AddHand(user, "hand", HandLocation.Left);
                 target = sEntities.SpawnEntity(null, coords);
                 item = sEntities.SpawnEntity(null, coords);
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 42f64b344cdb..e5f794feaa04 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -137,6 +137,7 @@ public abstract partial class InteractionTest
     prototype: Aghost
   - type: DoAfter
   - type: Hands
+  - type: ComplexInteraction
   - type: MindContainer
   - type: Stripping
   - type: Tag
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 99481db70e71..3cceaefbdc9e 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -27,6 +27,7 @@ public sealed class VendingMachineRestockTest : EntitySystem
   id: HumanVendingDummy
   components:
   - type: Hands
+  - type: ComplexInteraction
   - type: Body
     prototype: Human
 
diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs
index b6eec0ce0f69..286858585929 100644
--- a/Content.Server/Actions/ActionOnInteractSystem.cs
+++ b/Content.Server/Actions/ActionOnInteractSystem.cs
@@ -39,7 +39,7 @@ private void OnMapInit(EntityUid uid, ActionOnInteractComponent component, MapIn
 
     private void OnActivate(EntityUid uid, ActionOnInteractComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         if (component.ActionEntities is not {} actionEnts)
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index b6e26435a759..dd0ac25d703b 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -155,7 +155,7 @@ private void OnInteractUsing(EntityUid uid, FlammableComponent flammable, Intera
 
         private void OnExtinguishActivateInWorld(EntityUid uid, ExtinguishOnInteractComponent component, ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             if (!TryComp(uid, out FlammableComponent? flammable))
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index 881f54512a16..f4650861dbca 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -246,6 +246,9 @@ private void OnShutdown(EntityUid uid, AirAlarmComponent component, ComponentShu
 
     private void OnActivate(EntityUid uid, AirAlarmComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (TryComp<WiresPanelComponent>(uid, out var panel) && panel.Open)
         {
             args.Handled = false;
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index 83b7b67ba46a..871c84e05886 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -103,6 +103,9 @@ private void OnPumpLeaveAtmosphere(EntityUid uid, GasPressurePumpComponent pump,
 
         private void OnPumpActivate(EntityUid uid, GasPressurePumpComponent pump, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
index ed7567428e14..4aeba2f8fe2f 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
@@ -52,8 +52,12 @@ private void OnStartup(EntityUid uid, GasValveComponent component, ComponentStar
 
         private void OnActivate(EntityUid uid, GasValveComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             Toggle(uid, component);
             _audio.PlayPvs(component.ValveSound, uid, AudioParams.Default.WithVariation(0.25f));
+            args.Handled = true;
         }
 
         public void Set(EntityUid uid, GasValveComponent component, bool value)
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index cbcd1f4fa3bd..d9fbeb474e2f 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -133,6 +133,9 @@ private void OnVolumePumpLeaveAtmosphere(EntityUid uid, GasVolumePumpComponent p
 
         private void OnPumpActivate(EntityUid uid, GasVolumePumpComponent pump, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index 007d304e98e7..752d1e9eb835 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -99,6 +99,9 @@ private void OnFilterLeaveAtmosphere(EntityUid uid, GasFilterComponent filter, r
 
         private void OnFilterActivate(EntityUid uid, GasFilterComponent filter, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index 4ab8572843b3..178caeaa4a92 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -139,6 +139,9 @@ private void OnMixerLeaveAtmosphere(EntityUid uid, GasMixerComponent mixer, ref
 
         private void OnMixerActivate(EntityUid uid, GasMixerComponent mixer, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index e279db09aaf8..584928def72a 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -201,6 +201,9 @@ private void OnCanisterUpdated(EntityUid uid, GasCanisterComponent canister, ref
 
     private void OnCanisterActivate(EntityUid uid, GasCanisterComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!TryComp<ActorComponent>(args.User, out var actor))
             return;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
index 834a1dfb0b75..620391851708 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs
@@ -33,8 +33,12 @@ private void OnMapInit(EntityUid uid, GasOutletInjectorComponent component, MapI
 
         private void OnActivate(EntityUid uid, GasOutletInjectorComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             component.Enabled = !component.Enabled;
             UpdateAppearance(uid, component);
+            args.Handled = true;
         }
 
         public void UpdateAppearance(EntityUid uid, GasOutletInjectorComponent component, AppearanceComponent? appearance = null)
diff --git a/Content.Server/CardboardBox/CardboardBoxSystem.cs b/Content.Server/CardboardBox/CardboardBoxSystem.cs
index b9c9427d5c8c..836dc485d922 100644
--- a/Content.Server/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Server/CardboardBox/CardboardBoxSystem.cs
@@ -36,7 +36,6 @@ public override void Initialize()
         SubscribeLocalEvent<CardboardBoxComponent, StorageAfterCloseEvent>(AfterStorageClosed);
         SubscribeLocalEvent<CardboardBoxComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);
         SubscribeLocalEvent<CardboardBoxComponent, ActivateInWorldEvent>(OnInteracted);
-        SubscribeLocalEvent<CardboardBoxComponent, InteractedNoHandEvent>(OnNoHandInteracted);
         SubscribeLocalEvent<CardboardBoxComponent, EntInsertedIntoContainerMessage>(OnEntInserted);
         SubscribeLocalEvent<CardboardBoxComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
 
@@ -45,9 +44,18 @@ public override void Initialize()
 
     private void OnInteracted(EntityUid uid, CardboardBoxComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled)
+            return;
+
         if (!TryComp<EntityStorageComponent>(uid, out var box))
             return;
 
+        if (!args.Complex)
+        {
+            if (box.Open || !box.Contents.Contains(args.User))
+                return;
+        }
+
         args.Handled = true;
         _storage.ToggleOpen(args.User, uid, box);
 
@@ -58,15 +66,6 @@ private void OnInteracted(EntityUid uid, CardboardBoxComponent component, Activa
         }
     }
 
-    private void OnNoHandInteracted(EntityUid uid, CardboardBoxComponent component, InteractedNoHandEvent args)
-    {
-        //Free the mice please
-        if (!TryComp<EntityStorageComponent>(uid, out var box) || box.Open || !box.Contents.Contains(args.User))
-            return;
-
-        _storage.OpenStorage(uid);
-    }
-
     private void OnGetAdditionalAccess(EntityUid uid, CardboardBoxComponent component, ref GetAdditionalAccessEvent args)
     {
         if (component.Mover == null)
diff --git a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
index f6469d68b932..67fad29d934e 100644
--- a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
@@ -26,7 +26,7 @@ private void OnInit(EntityUid uid, SignalSwitchComponent comp, ComponentInit arg
 
     private void OnActivated(EntityUid uid, SignalSwitchComponent comp, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         comp.State = !comp.State;
diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index 8e9c9e4ba73a..e1fbdbf0894d 100644
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -152,6 +152,9 @@ private void OnConfigurationUpdated(EntityUid uid, MailingUnitComponent componen
 
     private void HandleActivate(EntityUid uid, MailingUnitComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
         {
             return;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 1f3b9703d4cc..e63c03bd5e7a 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -263,6 +263,9 @@ public void ToggleEngage(EntityUid uid, SharedDisposalUnitComponent component)
 
     private void OnActivate(EntityUid uid, SharedDisposalUnitComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (!TryComp(args.User, out ActorComponent? actor))
         {
             return;
diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
index 71f9347e9ed3..fd5d3a9ceba3 100644
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -67,6 +67,9 @@ private void OnPowerChanged(EntityUid uid, AirlockComponent component, ref Power
 
     private void OnActivate(EntityUid uid, AirlockComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (TryComp<WiresPanelComponent>(uid, out var panel) &&
             panel.Open &&
             TryComp<ActorComponent>(args.User, out var actor))
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 7c6b5df7f143..e03b8aff5446 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -218,6 +218,9 @@ private void OnSpawnTriggered(EntityUid uid, TriggerOnSpawnComponent component,
 
         private void OnActivate(EntityUid uid, TriggerOnActivateComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             Trigger(uid, args.User);
             args.Handled = true;
         }
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index d88f46968abb..a3717fd94ce8 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -34,7 +34,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<AbsorbentComponent, ComponentInit>(OnAbsorbentInit);
         SubscribeLocalEvent<AbsorbentComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<AbsorbentComponent, InteractNoHandEvent>(OnInteractNoHand);
+        SubscribeLocalEvent<AbsorbentComponent, UserActivateInWorldEvent>(OnActivateInWorld);
         SubscribeLocalEvent<AbsorbentComponent, SolutionContainerChangedEvent>(OnAbsorbentSolutionChange);
     }
 
@@ -84,12 +84,12 @@ private void UpdateAbsorbent(EntityUid uid, AbsorbentComponent component)
         Dirty(uid, component);
     }
 
-    private void OnInteractNoHand(EntityUid uid, AbsorbentComponent component, InteractNoHandEvent args)
+    private void OnActivateInWorld(EntityUid uid, AbsorbentComponent component, UserActivateInWorldEvent args)
     {
-        if (args.Handled || args.Target == null)
+        if (args.Handled)
             return;
 
-        Mop(uid, args.Target.Value, uid, component);
+        Mop(uid, args.Target, uid, component);
         args.Handled = true;
     }
 
diff --git a/Content.Server/Gatherable/GatherableSystem.cs b/Content.Server/Gatherable/GatherableSystem.cs
index 44e60cb102a1..e24b0da59394 100644
--- a/Content.Server/Gatherable/GatherableSystem.cs
+++ b/Content.Server/Gatherable/GatherableSystem.cs
@@ -38,10 +38,14 @@ private void OnAttacked(Entity<GatherableComponent> gatherable, ref AttackedEven
 
     private void OnActivate(Entity<GatherableComponent> gatherable, ref ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         if (gatherable.Comp.ToolWhitelist?.IsValid(args.User, EntityManager) != true)
             return;
 
         Gather(gatherable, args.User);
+        args.Handled = true;
     }
 
     public void Gather(EntityUid gatheredUid, EntityUid? gatherer = null, GatherableComponent? component = null)
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index 813f8c407b71..a5a41bcc1052 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -126,7 +126,7 @@ private void OnRemove(Entity<HandheldLightComponent> ent, ref ComponentRemove ar
 
         private void OnActivate(Entity<HandheldLightComponent> ent, ref ActivateInWorldEvent args)
         {
-            if (args.Handled || !ent.Comp.ToggleOnInteract)
+            if (args.Handled || !args.Complex || !ent.Comp.ToggleOnInteract)
                 return;
 
             if (ToggleStatus(args.User, ent))
diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
index 4b2ba8ffbdcc..c5c44056b96c 100644
--- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
+++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
@@ -40,7 +40,7 @@ public override void Initialize()
         SubscribeLocalEvent<MechGrabberComponent, MechEquipmentRemovedEvent>(OnEquipmentRemoved);
         SubscribeLocalEvent<MechGrabberComponent, AttemptRemoveMechEquipmentEvent>(OnAttemptRemove);
 
-        SubscribeLocalEvent<MechGrabberComponent, InteractNoHandEvent>(OnInteract);
+        SubscribeLocalEvent<MechGrabberComponent, UserActivateInWorldEvent>(OnInteract);
         SubscribeLocalEvent<MechGrabberComponent, GrabberDoAfterEvent>(OnMechGrab);
     }
 
@@ -123,10 +123,11 @@ private void OnUiStateReady(EntityUid uid, MechGrabberComponent component, MechE
         args.States.Add(GetNetEntity(uid), state);
     }
 
-    private void OnInteract(EntityUid uid, MechGrabberComponent component, InteractNoHandEvent args)
+    private void OnInteract(EntityUid uid, MechGrabberComponent component, UserActivateInWorldEvent args)
     {
-        if (args.Handled || args.Target is not {} target)
+        if (args.Handled)
             return;
+        var target = args.Target;
 
         if (args.Target == args.User || component.DoAfter != null)
             return;
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
index 4e672444d181..510b9552a3df 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Cigar.cs
@@ -18,7 +18,7 @@ private void InitializeCigars()
 
         private void OnCigarActivatedEvent(Entity<CigarComponent> entity, ref ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             if (!EntityManager.TryGetComponent(entity, out SmokableComponent? smokable))
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
index be9a715d5d57..eebf9cbbfde8 100644
--- a/Content.Server/Pinpointer/PinpointerSystem.cs
+++ b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -45,10 +45,15 @@ private void UpdateAppearance(EntityUid uid, PinpointerComponent pinpointer, App
 
     private void OnActivate(EntityUid uid, PinpointerComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         TogglePinpointer(uid, component);
 
         if (!component.CanRetarget)
             LocateTarget(uid, component);
+
+        args.Handled = true;
     }
 
     private void OnLocateTarget(ref FTLCompletedEvent ev)
diff --git a/Content.Server/Radiation/Systems/GeigerSystem.cs b/Content.Server/Radiation/Systems/GeigerSystem.cs
index f889336a0681..a0bc5dd7394c 100644
--- a/Content.Server/Radiation/Systems/GeigerSystem.cs
+++ b/Content.Server/Radiation/Systems/GeigerSystem.cs
@@ -35,7 +35,7 @@ public override void Initialize()
 
     private void OnActivate(Entity<GeigerComponent> geiger, ref ActivateInWorldEvent args)
     {
-        if (args.Handled || geiger.Comp.AttachedToSuit)
+        if (args.Handled || !args.Complex || geiger.Comp.AttachedToSuit)
             return;
         args.Handled = true;
 
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index 4f58cb21e1d7..223d0e47c021 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -67,6 +67,9 @@ public override void Update(float frameTime)
 
     private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         var activated = !HasComp<ActiveRadioJammerComponent>(uid) &&
             _powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
             battery.CurrentCharge > GetCurrentWattage(comp);
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 56c5d8e548ce..8484fb233638 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -81,6 +81,9 @@ private void OnSpeakerInit(EntityUid uid, RadioSpeakerComponent component, Compo
     #region Toggling
     private void OnActivateMicrophone(EntityUid uid, RadioMicrophoneComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!component.ToggleOnInteract)
             return;
 
@@ -90,6 +93,9 @@ private void OnActivateMicrophone(EntityUid uid, RadioMicrophoneComponent compon
 
     private void OnActivateSpeaker(EntityUid uid, RadioSpeakerComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!component.ToggleOnInteract)
             return;
 
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 4106630d526a..fd7d15ea5dce 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -43,7 +43,7 @@ public sealed partial class RevenantSystem
 
     private void InitializeAbilities()
     {
-        SubscribeLocalEvent<RevenantComponent, InteractNoHandEvent>(OnInteract);
+        SubscribeLocalEvent<RevenantComponent, UserActivateInWorldEvent>(OnInteract);
         SubscribeLocalEvent<RevenantComponent, SoulEvent>(OnSoulSearch);
         SubscribeLocalEvent<RevenantComponent, HarvestEvent>(OnHarvest);
 
@@ -53,11 +53,14 @@ private void InitializeAbilities()
         SubscribeLocalEvent<RevenantComponent, RevenantMalfunctionActionEvent>(OnMalfunctionAction);
     }
 
-    private void OnInteract(EntityUid uid, RevenantComponent component, InteractNoHandEvent args)
+    private void OnInteract(EntityUid uid, RevenantComponent component, UserActivateInWorldEvent args)
     {
-        if (args.Target == args.User || args.Target == null)
+        if (args.Handled)
+            return;
+
+        if (args.Target == args.User)
             return;
-        var target = args.Target.Value;
+        var target = args.Target;
 
         if (HasComp<PoweredLightComponent>(target))
         {
@@ -78,6 +81,8 @@ private void OnInteract(EntityUid uid, RevenantComponent component, InteractNoHa
         {
             BeginHarvestDoAfter(uid, target, component, essence);
         }
+
+        args.Handled = true;
     }
 
     private void BeginSoulSearchDoAfter(EntityUid uid, EntityUid target, RevenantComponent revenant)
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index 74c42ccbc535..e82235e44f5b 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -128,15 +128,20 @@ private void OnShuttleTileChange(EntityUid uid, ShuttleComponent component, ref
 
     private void OnActivateThruster(EntityUid uid, ThrusterComponent component, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         component.Enabled ^= true;
 
         if (!component.Enabled)
         {
             DisableThruster(uid, component);
+            args.Handled = true;
         }
         else if (CanEnable(uid, component))
         {
             EnableThruster(uid, component);
+            args.Handled = true;
         }
     }
 
diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index 4376ec4bc61d..caa319a0b718 100644
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -141,6 +141,9 @@ private void AddPlayGameVerb(EntityUid uid, TabletopGameComponent component, Get
 
         private void OnTabletopActivate(EntityUid uid, TabletopGameComponent component, ActivateInWorldEvent args)
         {
+            if (args.Handled || !args.Complex)
+                return;
+
             // Check that a player is attached to the entity.
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index a2c13ed71c1f..0a745d5fc7da 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -21,6 +21,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Humanoid;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
@@ -106,6 +107,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
             RemComp<ReproductiveComponent>(target);
             RemComp<ReproductivePartnerComponent>(target);
             RemComp<LegsParalyzedComponent>(target);
+            RemComp<ComplexInteractionComponent>(target);
 
             //funny voice
             var accentType = "zombie";
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index 47b3997806d3..d2883b5ef5be 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -96,9 +96,9 @@ public bool CanInteract(EntityUid user, EntityUid? target)
         ///     involve using a held entity. In the majority of cases, systems that provide interactions will not need
         ///     to check this themselves.
         /// </remarks>
-        public bool CanUseHeldEntity(EntityUid user)
+        public bool CanUseHeldEntity(EntityUid user, EntityUid used)
         {
-            var ev = new UseAttemptEvent(user);
+            var ev = new UseAttemptEvent(user, used);
             RaiseLocalEvent(user, ev);
 
             return !ev.Cancelled;
diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 326272cc7dec..45a89f3be970 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -83,10 +83,11 @@ private void OnAfterInteractUsing(EntityUid uid, GraveComponent component, After
 
     private void OnActivate(EntityUid uid, GraveComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         _popupSystem.PopupClient(Loc.GetString("grave-digging-requires-tool", ("grave", args.Target)), uid, args.User);
+        args.Handled = true;
     }
 
     private void OnGraveDigging(EntityUid uid, GraveComponent component, GraveDiggingDoAfterEvent args)
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
index 87957066125e..c8e8e89ce53b 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
@@ -31,7 +31,11 @@ public override void Initialize()
 
     private void OnActivateInWorld(Entity<SolutionContainerMixerComponent> entity, ref ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         TryStartMix(entity, args.User);
+        args.Handled = true;
     }
 
     private void OnRemoveAttempt(Entity<SolutionContainerMixerComponent> ent, ref ContainerIsRemovingAttemptEvent args)
diff --git a/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
index c8783b05fc70..7e665dc19065 100644
--- a/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
+++ b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
@@ -28,7 +28,7 @@ private void OnInit(EntityUid uid, TwoWayLeverComponent component, ComponentInit
 
         private void OnActivated(EntityUid uid, TwoWayLeverComponent component, ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             component.State = component.State switch
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 20456c14777b..ab2df72568e5 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -215,7 +215,7 @@ protected bool SetState(EntityUid uid, DoorState state, DoorComponent? door = nu
     #region Interactions
     protected void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
     {
-        if (args.Handled || !door.ClickOpen)
+        if (args.Handled || !args.Complex || !door.ClickOpen)
             return;
 
         if (!TryToggleDoor(uid, door, args.User, predicted: true))
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
index 6d4d332479fd..ae22efcd6a53 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
+using Content.Shared.Interaction;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Localizations;
 using Robust.Shared.Input.Binding;
@@ -23,6 +24,7 @@ private void InitializeInteractions()
         SubscribeAllEvent<RequestMoveHandItemEvent>(HandleMoveItemFromHand);
         SubscribeAllEvent<RequestHandAltInteractEvent>(HandleHandAltInteract);
 
+        SubscribeLocalEvent<HandsComponent, GetUsedEntityEvent>(OnGetUsedEntity);
         SubscribeLocalEvent<HandsComponent, ExaminedEvent>(HandleExamined);
 
         CommandBinds.Builder
@@ -181,6 +183,18 @@ public bool TryMoveHeldEntityToActiveHand(EntityUid uid, string handName, bool c
         return true;
     }
 
+    private void OnGetUsedEntity(EntityUid uid, HandsComponent component, ref GetUsedEntityEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // TODO: this pattern is super uncommon, but it might be worth changing GetUsedEntityEvent to be recursive.
+        if (TryComp<VirtualItemComponent>(component.ActiveHandEntity, out var virtualItem))
+            args.Used = virtualItem.BlockingEntity;
+        else
+            args.Used = component.ActiveHandEntity;
+    }
+
     //TODO: Actually shows all items/clothing/etc.
     private void HandleExamined(EntityUid examinedUid, HandsComponent handsComp, ExaminedEvent args)
     {
diff --git a/Content.Shared/Interaction/ActivateInWorldEvent.cs b/Content.Shared/Interaction/ActivateInWorldEvent.cs
index 9dbd636c48fd..f7a1b7a799d5 100644
--- a/Content.Shared/Interaction/ActivateInWorldEvent.cs
+++ b/Content.Shared/Interaction/ActivateInWorldEvent.cs
@@ -18,14 +18,49 @@ public sealed class ActivateInWorldEvent : HandledEntityEventArgs, ITargetedInte
     /// </summary>
     public EntityUid Target { get; }
 
+    /// <summary>
+    ///     Whether or not <see cref="User"/> can perform complex interactions or only basic ones.
+    /// </summary>
+    public bool Complex;
+
     /// <summary>
     ///     Set to true when the activation is logged by a specific logger.
     /// </summary>
     public bool WasLogged { get; set; }
 
-    public ActivateInWorldEvent(EntityUid user, EntityUid target)
+    public ActivateInWorldEvent(EntityUid user, EntityUid target, bool complex)
+    {
+        User = user;
+        Target = target;
+        Complex = complex;
+    }
+}
+
+/// <summary>
+/// Event raised on the user when it activates something in the world
+/// </summary>
+[PublicAPI]
+public sealed class UserActivateInWorldEvent : HandledEntityEventArgs, ITargetedInteractEventArgs
+{
+    /// <summary>
+    ///     Entity that activated the target world entity.
+    /// </summary>
+    public EntityUid User { get; }
+
+    /// <summary>
+    ///     Entity that was activated in the world.
+    /// </summary>
+    public EntityUid Target { get; }
+
+    /// <summary>
+    ///     Whether or not <see cref="User"/> can perform complex interactions or only basic ones.
+    /// </summary>
+    public bool Complex;
+
+    public UserActivateInWorldEvent(EntityUid user, EntityUid target, bool complex)
     {
         User = user;
         Target = target;
+        Complex = complex;
     }
 }
diff --git a/Content.Shared/Interaction/Components/ComplexInteractionComponent.cs b/Content.Shared/Interaction/Components/ComplexInteractionComponent.cs
new file mode 100644
index 000000000000..ae7d65de366b
--- /dev/null
+++ b/Content.Shared/Interaction/Components/ComplexInteractionComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Interaction.Components;
+
+/// <summary>
+/// This is used for identifying entities as being able to use complex interactions with the environment.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedInteractionSystem))]
+public sealed partial class ComplexInteractionComponent : Component;
diff --git a/Content.Shared/Interaction/Events/UseAttemptEvent.cs b/Content.Shared/Interaction/Events/UseAttemptEvent.cs
index 3db185ed1729..c28f2b651774 100644
--- a/Content.Shared/Interaction/Events/UseAttemptEvent.cs
+++ b/Content.Shared/Interaction/Events/UseAttemptEvent.cs
@@ -1,12 +1,9 @@
 namespace Content.Shared.Interaction.Events
 {
-    public sealed class UseAttemptEvent : CancellableEntityEventArgs
+    public sealed class UseAttemptEvent(EntityUid uid, EntityUid used) : CancellableEntityEventArgs
     {
-        public UseAttemptEvent(EntityUid uid)
-        {
-            Uid = uid;
-        }
+        public EntityUid Uid { get; } = uid;
 
-        public EntityUid Uid { get; }
+        public EntityUid Used = used;
     }
 }
diff --git a/Content.Shared/Interaction/InteractHand.cs b/Content.Shared/Interaction/InteractHand.cs
index 63ea3b6f30db..1d2df4c28b29 100644
--- a/Content.Shared/Interaction/InteractHand.cs
+++ b/Content.Shared/Interaction/InteractHand.cs
@@ -51,58 +51,4 @@ public BeforeInteractHandEvent(EntityUid target)
             Target = target;
         }
     }
-
-    /// <summary>
-    /// Low-level interaction event used for entities without hands.
-    /// </summary>
-    /// <remarks>
-    /// SHIT IS CURSED.
-    /// </remarks>
-    //TODO: KILLLLLLL
-    public sealed class InteractNoHandEvent : HandledEntityEventArgs
-    {
-        /// <summary>
-        ///     Entity that triggered the interaction.
-        /// </summary>
-        public EntityUid User;
-
-        /// <summary>
-        ///     Entity that was interacted on.
-        /// </summary>
-        public EntityUid? Target;
-
-        public EntityCoordinates ClickLocation;
-
-        public InteractNoHandEvent(EntityUid user, EntityUid? target, EntityCoordinates clickLocation)
-        {
-            User = user;
-            Target = target;
-            ClickLocation = clickLocation;
-        }
-    }
-
-    /// <summary>
-    /// Reverse of the InteractNoHandEvent - raised on what was interacted on, rather than the other way around.
-    /// </summary>
-    public sealed class InteractedNoHandEvent : HandledEntityEventArgs
-    {
-        /// <summary>
-        /// Entity that was interacted on
-        /// </summary>
-        public EntityUid Target;
-
-        /// <summary>
-        /// Entity that triggered this interaction
-        /// </summary>
-        public EntityUid User;
-
-        public EntityCoordinates ClickLocation;
-
-        public InteractedNoHandEvent(EntityUid target, EntityUid user, EntityCoordinates clickLocation)
-        {
-            Target = target;
-            User = user;
-            ClickLocation = clickLocation;
-        }
-    }
 }
diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs
index 030bc0ae6b87..d956ff3d9539 100644
--- a/Content.Shared/Interaction/InteractionPopupSystem.cs
+++ b/Content.Shared/Interaction/InteractionPopupSystem.cs
@@ -32,6 +32,9 @@ public override void Initialize()
 
     private void OnActivateInWorld(EntityUid uid, InteractionPopupComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!component.OnActivate)
             return;
 
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index bcde27ceba3f..1e4c49211f56 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -76,6 +76,7 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         private EntityQuery<WallMountComponent> _wallMountQuery;
         private EntityQuery<UseDelayComponent> _delayQuery;
         private EntityQuery<ActivatableUIComponent> _uiQuery;
+        private EntityQuery<ComplexInteractionComponent> _complexInteractionQuery;
 
         private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
 
@@ -98,6 +99,7 @@ public override void Initialize()
             _wallMountQuery = GetEntityQuery<WallMountComponent>();
             _delayQuery = GetEntityQuery<UseDelayComponent>();
             _uiQuery = GetEntityQuery<ActivatableUIComponent>();
+            _complexInteractionQuery = GetEntityQuery<ComplexInteractionComponent>();
 
             SubscribeLocalEvent<BoundUserInterfaceCheckRangeEvent>(HandleUserInterfaceRangeCheck);
             SubscribeLocalEvent<BoundUserInterfaceMessageAttempt>(OnBoundInterfaceInteractAttempt);
@@ -360,8 +362,13 @@ public void UserInteraction(
                 // TODO this needs to be handled better. This probably bypasses many complex can-interact checks in weird roundabout ways.
                 if (_actionBlockerSystem.CanInteract(user, target))
                 {
-                    UserInteraction(relay.RelayEntity.Value, coordinates, target, altInteract, checkCanInteract,
-                        checkAccess, checkCanUse);
+                    UserInteraction(relay.RelayEntity.Value,
+                        coordinates,
+                        target,
+                        altInteract,
+                        checkCanInteract,
+                        checkAccess,
+                        checkCanUse);
                     return;
                 }
             }
@@ -398,25 +405,10 @@ public void UserInteraction(
                 ? !checkAccess || InRangeUnobstructed(user, coordinates)
                 : !checkAccess || InRangeUnobstructed(user, target.Value); // permits interactions with wall mounted entities
 
-            // Does the user have hands?
-            if (!_handsQuery.TryComp(user, out var hands) || hands.ActiveHand == null)
-            {
-                var ev = new InteractNoHandEvent(user, target, coordinates);
-                RaiseLocalEvent(user, ev);
-
-                if (target != null)
-                {
-                    var interactedEv = new InteractedNoHandEvent(target.Value, user, coordinates);
-                    RaiseLocalEvent(target.Value, interactedEv);
-                    DoContactInteraction(user, target.Value, ev);
-                }
-                return;
-            }
-
             // empty-hand interactions
             // combat mode hand interactions will always be true here -- since
             // they check this earlier before returning in
-            if (hands.ActiveHandEntity is not { } held)
+            if (!TryGetUsedEntity(user, out var used, checkCanUse))
             {
                 if (inRangeUnobstructed && target != null)
                     InteractHand(user, target.Value);
@@ -424,11 +416,7 @@ public void UserInteraction(
                 return;
             }
 
-            // Can the user use the held entity?
-            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
-                return;
-
-            if (target == held)
+            if (target == used)
             {
                 UseInHandInteraction(user, target.Value, checkCanUse: false, checkCanInteract: false);
                 return;
@@ -438,7 +426,7 @@ public void UserInteraction(
             {
                 InteractUsing(
                     user,
-                    held,
+                    used.Value,
                     target.Value,
                     coordinates,
                     checkCanInteract: false,
@@ -449,7 +437,7 @@ public void UserInteraction(
 
             InteractUsingRanged(
                 user,
-                held,
+                used.Value,
                 target,
                 coordinates,
                 inRangeUnobstructed);
@@ -457,6 +445,18 @@ public void UserInteraction(
 
         public void InteractHand(EntityUid user, EntityUid target)
         {
+            var complexInteractions = SupportsComplexInteractions(user);
+            if (!complexInteractions)
+            {
+                InteractionActivate(user,
+                    target,
+                    checkCanInteract: false,
+                    checkUseDelay: true,
+                    checkAccess: false,
+                    complexInteractions: complexInteractions);
+                return;
+            }
+
             // allow for special logic before main interaction
             var ev = new BeforeInteractHandEvent(target);
             RaiseLocalEvent(user, ev);
@@ -475,10 +475,12 @@ public void InteractHand(EntityUid user, EntityUid target)
                 return;
 
             // Else we run Activate.
-            InteractionActivate(user, target,
+            InteractionActivate(user,
+                target,
                 checkCanInteract: false,
                 checkUseDelay: true,
-                checkAccess: false);
+                checkAccess: false,
+                complexInteractions: complexInteractions);
         }
 
         public void InteractUsingRanged(EntityUid user, EntityUid used, EntityUid? target,
@@ -921,7 +923,7 @@ public void InteractUsing(
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
                 return;
 
-            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
+            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used))
                 return;
 
             if (RangedInteractDoBefore(user, used, target, clickLocation, true))
@@ -1001,7 +1003,8 @@ public bool InteractionActivate(
             EntityUid used,
             bool checkCanInteract = true,
             bool checkUseDelay = true,
-            bool checkAccess = true)
+            bool checkAccess = true,
+            bool? complexInteractions = null)
         {
             _delayQuery.TryComp(used, out var delayComponent);
             if (checkUseDelay && delayComponent != null && _useDelay.IsDelayed((used, delayComponent)))
@@ -1018,13 +1021,12 @@ public bool InteractionActivate(
             if (checkAccess && !IsAccessible(user, used))
                 return false;
 
-            // Does the user have hands?
-            if (!_handsQuery.HasComp(user))
-                return false;
-
-            var activateMsg = new ActivateInWorldEvent(user, used);
+            complexInteractions ??= SupportsComplexInteractions(user);
+            var activateMsg = new ActivateInWorldEvent(user, used, complexInteractions.Value);
             RaiseLocalEvent(used, activateMsg, true);
-            if (!activateMsg.Handled)
+            var userEv = new UserActivateInWorldEvent(user, used, complexInteractions.Value);
+            RaiseLocalEvent(user, userEv, true);
+            if (!activateMsg.Handled && !userEv.Handled)
                 return false;
 
             DoContactInteraction(user, used, activateMsg);
@@ -1059,7 +1061,7 @@ public bool UseInHandInteraction(
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, used))
                 return false;
 
-            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
+            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used))
                 return false;
 
             var useMsg = new UseInHandEvent(user);
@@ -1259,6 +1261,39 @@ private void HandleUserInterfaceRangeCheck(ref BoundUserInterfaceCheckRangeEvent
                     ? BoundUserInterfaceRangeResult.Pass
                     : BoundUserInterfaceRangeResult.Fail;
         }
+
+        /// <summary>
+        /// Gets the entity that is currently being "used" for the interaction.
+        /// In most cases, this refers to the entity in the character's active hand.
+        /// </summary>
+        /// <returns>If there is an entity being used.</returns>
+        public bool TryGetUsedEntity(EntityUid user, [NotNullWhen(true)] out EntityUid? used, bool checkCanUse = true)
+        {
+            var ev = new GetUsedEntityEvent();
+            RaiseLocalEvent(user, ref ev);
+
+            used = ev.Used;
+            if (!ev.Handled)
+                return false;
+
+            // Can the user use the held entity?
+            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, ev.Used!.Value))
+            {
+                used = null;
+                return false;
+            }
+
+            return ev.Handled;
+        }
+
+        /// <summary>
+        /// Checks if a given entity is able to do specific complex interactions.
+        /// This is used to gate manipulation to general humanoids. If a mouse shouldn't be able to do something, then it's complex.
+        /// </summary>
+        public bool SupportsComplexInteractions(EntityUid user)
+        {
+            return _complexInteractionQuery.HasComp(user);
+        }
     }
 
     /// <summary>
@@ -1284,6 +1319,24 @@ public InteractInventorySlotEvent(NetEntity itemUid, bool altInteract = false)
         }
     }
 
+    /// <summary>
+    ///     Raised directed by-ref on an entity to determine what item will be used in interactions.
+    /// </summary>
+    [ByRefEvent]
+    public record struct GetUsedEntityEvent()
+    {
+        public EntityUid? Used = null;
+
+        public bool Handled => Used != null;
+    };
+
+    /// <summary>
+    ///     Raised directed by-ref on an item and a user to determine if interactions can occur.
+    /// </summary>
+    /// <param name="Cancelled">Whether the hand interaction should be cancelled.</param>
+    [ByRefEvent]
+    public record struct AttemptUseInteractEvent(EntityUid User, EntityUid Used, bool Cancelled = false);
+
     /// <summary>
     ///     Raised directed by-ref on an item to determine if hand interactions should go through.
     ///     Defaults to allowing hand interactions to go through. Cancel to force the item to be attacked instead.
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index a25dcea8a78e..bf4af1cb9a4e 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -62,7 +62,7 @@ private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup a
 
     private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         // Only attempt an unlock by default on Activate
diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index 97b5bfeba6f5..73b7c0847fc1 100644
--- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
+++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
@@ -43,7 +43,7 @@ public override void Initialize()
     {
         SubscribeLocalEvent<MechComponent, MechToggleEquipmentEvent>(OnToggleEquipmentAction);
         SubscribeLocalEvent<MechComponent, MechEjectPilotEvent>(OnEjectPilotEvent);
-        SubscribeLocalEvent<MechComponent, InteractNoHandEvent>(RelayInteractionEvent);
+        SubscribeLocalEvent<MechComponent, UserActivateInWorldEvent>(RelayInteractionEvent);
         SubscribeLocalEvent<MechComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<MechComponent, DestructionEventArgs>(OnDestruction);
         SubscribeLocalEvent<MechComponent, GetAdditionalAccessEvent>(OnGetAdditionalAccess);
@@ -71,7 +71,7 @@ private void OnEjectPilotEvent(EntityUid uid, MechComponent component, MechEject
         TryEject(uid, component);
     }
 
-    private void RelayInteractionEvent(EntityUid uid, MechComponent component, InteractNoHandEvent args)
+    private void RelayInteractionEvent(EntityUid uid, MechComponent component, UserActivateInWorldEvent args)
     {
         var pilot = component.PilotSlot.ContainedEntity;
         if (pilot == null)
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 372dc8a75d19..b718c3a69008 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -47,7 +47,7 @@ private void OnEmbedActivate(EntityUid uid, EmbeddableProjectileComponent compon
         if (component.RemovalTime == null)
             return;
 
-        if (args.Handled || !TryComp<PhysicsComponent>(uid, out var physics) || physics.BodyType != BodyType.Static)
+        if (args.Handled || !args.Complex || !TryComp<PhysicsComponent>(uid, out var physics) || physics.BodyType != BodyType.Static)
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 636c60383480..0576e46df4a2 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -89,7 +89,7 @@ protected virtual void OnComponentStartup(EntityUid uid, SharedEntityStorageComp
 
     protected void OnInteract(EntityUid uid, SharedEntityStorageComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 18a8f20afc7e..ee087901f3ba 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -364,7 +364,7 @@ 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
diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index 075cf81a4cb9..38e2f9fd7a52 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -21,7 +21,7 @@ public override void Initialize()
 
     private void OnActivateInWorld(EntityUid uid, StrippableComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled || args.Target == args.User)
+        if (args.Handled || !args.Complex || args.Target == args.User)
             return;
 
         if (TryOpenStrippingUi(args.User, (uid, component)))
diff --git a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
index 6e8393036d47..8903747e430f 100644
--- a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
+++ b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs
@@ -26,7 +26,11 @@ public override void Initialize()
 
     private void OnTrayScannerActivate(EntityUid uid, TrayScannerComponent scanner, ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         SetScannerEnabled(uid, !scanner.Enabled, scanner);
+        args.Handled = true;
     }
 
     private void SetScannerEnabled(EntityUid uid, bool enabled, TrayScannerComponent? scanner = null)
diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
index 62c0b0f44e41..bc73baa61adf 100644
--- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
@@ -101,6 +101,9 @@ private void OnGetAltVerb(Entity<SwapTeleporterComponent> ent, ref GetVerbsEvent
 
     private void OnActivateInWorld(Entity<SwapTeleporterComponent> ent, ref ActivateInWorldEvent args)
     {
+        if (args.Handled || !args.Complex)
+            return;
+
         var (uid, comp) = ent;
         var user = args.User;
         if (comp.TeleportTime != null)
@@ -130,6 +133,7 @@ private void OnActivateInWorld(Entity<SwapTeleporterComponent> ent, ref Activate
         comp.NextTeleportUse = _timing.CurTime + comp.Cooldown;
         comp.TeleportTime = _timing.CurTime + comp.TeleportDelay;
         Dirty(uid, comp);
+        args.Handled = true;
     }
 
     public void DoTeleport(Entity<SwapTeleporterComponent, TransformComponent> ent)
diff --git a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
index 87df69e88dab..f11af3355275 100644
--- a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
+++ b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
@@ -79,7 +79,7 @@ private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbs
 
         private void OnActivateInWorld(EntityUid uid, ToiletComponent comp, ActivateInWorldEvent args)
         {
-            if (args.Handled)
+            if (args.Handled || !args.Complex)
                 return;
 
             args.Handled = true;
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
index 9114c62adeed..d69f01d762f6 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
@@ -28,7 +28,7 @@ private void OnMultipleToolStartup(EntityUid uid, MultipleToolComponent multiple
 
     private void OnMultipleToolActivated(EntityUid uid, MultipleToolComponent multiple, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         args.Handled = CycleMultipleTool(uid, multiple, args.User);
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs
index c1822c4ee335..1bb11f337f65 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.cs
@@ -133,7 +133,7 @@ private void OnUseInHand(EntityUid uid, ActivatableUIComponent component, UseInH
 
     private void OnActivate(EntityUid uid, ActivatableUIComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         if (component.VerbOnly)
diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs
index e78fe98f4c3c..319f927c7b3d 100644
--- a/Content.Shared/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/Verbs/SharedVerbSystem.cs
@@ -78,28 +78,8 @@ public SortedSet<Verb> GetLocalVerbs(EntityUid target, EntityUid user, List<Type
             // call ActionBlocker checks, just cache it for the verb request.
             var canInteract = force || _actionBlockerSystem.CanInteract(user, target);
 
-            EntityUid? @using = null;
-            if (TryComp(user, out HandsComponent? hands) && (force || _actionBlockerSystem.CanUseHeldEntity(user)))
-            {
-                // if we don't actually have any hands, pass in a null value for the events.
-                if (hands.Count == 0)
-                {
-                    hands = null;
-                }
-                else
-                {
-                    @using = hands.ActiveHandEntity;
-
-                    // Check whether the "Held" entity is a virtual pull entity. If yes, set that as the entity being "Used".
-                    // This allows you to do things like buckle a dragged person onto a surgery table, without click-dragging
-                    // their sprite.
-
-                    if (TryComp(@using, out VirtualItemComponent? pull))
-                    {
-                        @using = pull.BlockingEntity;
-                    }
-                }
-            }
+            _interactionSystem.TryGetUsedEntity(user, out var @using);
+            TryComp<HandsComponent>(user, out var hands);
 
             // TODO: fix this garbage and use proper generics or reflection or something else, not this.
             if (types.Contains(typeof(InteractionVerb)))
diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
index 41e1895da2c9..6feffffbe318 100644
--- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
@@ -116,7 +116,7 @@ private void OnWeightlessMove(ref CanWeightlessMoveEvent ev)
 
     private void OnGunActivate(EntityUid uid, GrapplingGunComponent component, ActivateInWorldEvent args)
     {
-        if (!Timing.IsFirstTimePredicted || args.Handled)
+        if (!Timing.IsFirstTimePredicted || args.Handled || !args.Complex)
             return;
 
         if (Deleted(component.Projectile))
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs
index eec115b02dfb..932ef704607b 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.Force.cs
@@ -14,6 +14,9 @@ private void InitializeForce()
 
     private void OnForceActivate(EntityUid uid, ForceGunComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         StopTether(uid, component);
     }
 
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index ad2249bfddf6..3d7f9df458ef 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -152,6 +152,9 @@ protected bool TryGetTetherGun(EntityUid user, [NotNullWhen(true)] out EntityUid
 
     private void OnTetherActivate(EntityUid uid, TetherGunComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         StopTether(uid, component);
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 68fb2f27c98e..8e44576d2834 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -75,6 +75,9 @@ private void OnGetVerb(EntityUid uid, BatteryWeaponFireModesComponent component,
 
     private void OnInteractHandEvent(EntityUid uid, BatteryWeaponFireModesComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (component.FireModes.Count < 2)
             return;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
index a014f8e5c744..ee5ca2174f36 100644
--- a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs
@@ -18,6 +18,9 @@ public override void Initialize()
 
     private void OnRechargeCycled(EntityUid uid, RechargeCycleAmmoComponent component, ActivateInWorldEvent args)
     {
+        if (!args.Complex)
+            return;
+
         if (!TryComp<BasicEntityAmmoProviderComponent>(uid, out var basic) || args.Handled)
             return;
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index c421c92a9f75..adae26a223a1 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -51,7 +51,7 @@ private void OnChamberStartup(EntityUid uid, ChamberMagazineAmmoProviderComponen
     /// </summary>
     private void OnChamberActivate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ActivateInWorldEvent args)
     {
-        if (args.Handled)
+        if (args.Handled || !args.Complex)
             return;
 
         args.Handled = true;
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 71f5596ccfd0..8bf55e48bd3e 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -84,6 +84,7 @@
   - type: Hands
     showInHands: false
     disableExplosionRecursion: true
+  - type: ComplexInteraction
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
     channels:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index a79d96065a6d..b5f69e6f56b6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1200,6 +1200,7 @@
       state: "creampie_human"
       visible: false
   - type: Hands
+  - type: ComplexInteraction
   - type: GenericVisualizer
     visuals:
       enum.CreamPiedVisuals.Creamed:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 657ac466f846..285e75bca0a8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -12,7 +12,6 @@
   - type: NpcFactionMember
     factions:
     - SimpleHostile
-  - type: Hands
   - type: Sprite
     drawdepth: Mobs
     sprite: Structures/Machines/VendingMachines/cola.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index de3a282eeb6e..a3d4eafacbbc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -40,6 +40,7 @@
     factions:
     - Xeno
   - type: Hands
+  - type: ComplexInteraction
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Aliens/Xenos/burrower.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index b294729e07a4..0fa85fc84f21 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -18,6 +18,7 @@
     canInteract: true
   - type: GhostHearing
   - type: Hands
+  - type: ComplexInteraction
   - type: Puller
   - type: CombatMode
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index c7b4464350e8..80ee2c55b88a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -225,6 +225,7 @@
     - type: Inventory
       templateId: holoclown
     - type: Hands
+    - type: ComplexInteraction
     - type: Clumsy
       clumsyDamage:
         types:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 01b938ffa863..a49f8ff34c35 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -149,6 +149,7 @@
   - type: Identity
   - type: IdExaminable
   - type: Hands
+  - type: ComplexInteraction
   - type: Internals
   - type: Inventory
   - type: InventorySlots
@@ -309,6 +310,7 @@
   abstract: true
   components:
   - type: Hands
+  - type: ComplexInteraction
   - type: Inventory
   - type: InventorySlots
   - type: ContainerContainer

From a9a65b7e0d21b246498c32fd822ca36517e06355 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 31 May 2024 23:51:07 -0500
Subject: [PATCH 184/568] Randomizes more humanoid appearances (#27997)

---
 .../RandomHumanoidAppearanceComponent.cs      |   6 +-
 .../Systems/RandomHumanoidAppearanceSystem.cs |   3 +
 .../RandomHumanoidSettingsPrototype.cs        |   4 +-
 .../Prototypes/Entities/Mobs/Player/human.yml |   3 +
 .../Entities/Mobs/Player/humanoid.yml         | 156 +++++-------------
 5 files changed, 58 insertions(+), 114 deletions(-)

diff --git a/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs b/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs
index 5a0f6fcef110..5efea024f4e3 100644
--- a/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs
+++ b/Content.Server/Humanoid/Components/RandomHumanoidAppearanceComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 
 namespace Content.Server.CharacterAppearance.Components;
@@ -7,4 +7,8 @@ namespace Content.Server.CharacterAppearance.Components;
 public sealed partial class RandomHumanoidAppearanceComponent : Component
 {
     [DataField("randomizeName")] public bool RandomizeName = true;
+    /// <summary>
+    /// After randomizing, sets the hair style to this, if possible
+    /// </summary>
+    [DataField] public string? Hair = null;
 }
diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
index 9185fedc3899..2822fb69e144 100644
--- a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs
@@ -25,6 +25,9 @@ private void OnMapInit(EntityUid uid, RandomHumanoidAppearanceComponent componen
         }
 
         var profile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
+        //If we have a specified hair style, change it to this
+        if(component.Hair != null)
+            profile = profile.WithCharacterAppearance(profile.Appearance.WithHairStyleName(component.Hair));
 
         _humanoid.LoadProfile(uid, profile, humanoid);
 
diff --git a/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs b/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs
index ec6818221a9a..a97c3134bedc 100644
--- a/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/RandomHumanoidSettingsPrototype.cs
@@ -15,6 +15,7 @@ public sealed partial class RandomHumanoidSettingsPrototype : IPrototype, IInher
     public string[]? Parents { get; }
 
     [AbstractDataField]
+    [NeverPushInheritance]
     public bool Abstract { get; }
 
     /// <summary>
@@ -32,6 +33,7 @@ public sealed partial class RandomHumanoidSettingsPrototype : IPrototype, IInher
     /// <summary>
     ///     Extra components to add to this entity.
     /// </summary>
-    [DataField("components")]
+    [DataField]
+    [AlwaysPushInheritance]
     public ComponentRegistry? Components { get; private set; }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index 2c7ad4972c0c..629ba91518ae 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -11,6 +11,9 @@
   name: syndicate agent
   suffix: Human, Base
   components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
+      hair: HairBald
     - type: Loadout
       prototypes: [SyndicateOperativeGearExtremelyBasic]
     - type: RandomMetadata
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index c5805f0ed921..e365ee3a1cfa 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: InitialInfectedExempt
 
 ## Death Squad
 
@@ -20,22 +34,20 @@
 
 - type: randomHumanoidSettings
   id: DeathSquad
+  parent: EventHumanoidMindShielded
   randomizeName: false
-  components:
-    - type: MindShield
+  components:        
     - 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
@@ -58,22 +70,20 @@
 
 - type: randomHumanoidSettings
   id: ERTLeader
+  parent: EventHumanoidMindShielded
   randomizeName: false
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGear ]
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitaryLeader
       - NamesLastMilitary
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVA
@@ -92,16 +102,13 @@
   id: ERTLeaderEVA
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVALecter
@@ -116,16 +123,13 @@
   id: ERTLeaderEVALecter
   parent: ERTLeaderEVA
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVALecter ]
-    - type: InitialInfectedExempt
 
 ## ERT Chaplain
 
@@ -149,20 +153,17 @@
   id: ERTChaplain
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
@@ -180,16 +181,13 @@
   id: ERTChaplainEVA
   parent: ERTChaplain
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Janitor
 
@@ -213,20 +211,17 @@
   id: ERTJanitor
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTJanitorGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
@@ -244,16 +239,13 @@
   id: ERTJanitorEVA
   parent: ERTJanitor
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Engineer
 
@@ -277,20 +269,17 @@
   id: ERTEngineer
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTEngineerGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
@@ -308,16 +297,13 @@
   id: ERTEngineerEVA
   parent: ERTEngineer
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
-    - type: InitialInfectedExempt
 
 ## ERT Security
 
@@ -341,20 +327,17 @@
   id: ERTSecurity
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTSecurityGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
@@ -372,16 +355,13 @@
   id: ERTSecurityEVA
   parent: ERTSecurity
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVALecter
@@ -395,16 +375,13 @@
   id: ERTSecurityEVALecter
   parent: ERTSecurityEVA
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVALecter ]
-    - type: InitialInfectedExempt
 
 ## ERT Medic
 
@@ -428,20 +405,17 @@
   id: ERTMedical
   parent: ERTLeader
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
     - type: Loadout
       prototypes: [ ERTMedicalGear ]
-    - type: InitialInfectedExempt
 
 - type: entity
   id: RandomHumanoidSpawnerERTMedicalEVA
@@ -459,16 +433,13 @@
   id: ERTMedicalEVA
   parent: ERTMedical
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
-    - type: InitialInfectedExempt
 
 ## CBURN
 
@@ -486,8 +457,8 @@
 
 - type: randomHumanoidSettings
   id: CBURNAgent
+  parent: EventHumanoidMindShielded
   components:
-    - type: MindShield
     - type: Loadout
       prototypes: [CBURNGear]
     - type: GhostRole
@@ -495,12 +466,10 @@
       description: ghost-role-information-cburn-agent-description
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitary
       - NamesLastMilitary
-    - type: InitialInfectedExempt
 ## Central Command
 
 - type: entity
@@ -516,17 +485,15 @@
 
 - type: randomHumanoidSettings
   id: CentcomOfficial
+  parent: EventHumanoidMindShielded
   components:
-    - type: MindShield
     - type: GhostRole
       name: ghost-role-information-centcom-official-name
       description: ghost-role-information-centcom-official-description
       raffle:
         settings: default
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ CentcomGear ]
-    - type: InitialInfectedExempt
 
 ## Syndicate
 
@@ -545,6 +512,8 @@
 - type: randomHumanoidSettings
   id: SyndicateAgent
   components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
     - type: Loadout
       prototypes: [SyndicateOperativeGearExtremelyBasic]
 
@@ -561,6 +530,8 @@
 - type: randomHumanoidSettings
   id: NukeOp
   components:
+    - type: RandomHumanoidAppearance
+      randomizeName: false
     - type: NukeOperative
 
 - type: entity
@@ -580,6 +551,7 @@
 
 - type: randomHumanoidSettings
   id: Cluwne
+  parent: EventHumanoid
   randomizeName: false
   components:
     - type: GhostRole
@@ -587,9 +559,11 @@
       description: ghost-role-information-cluwne-description
       raffle:
         settings: default
-    - type: GhostTakeoverAvailable
     - type: Cluwne
 
+
+## Shuttle roles
+
 ## Lost Cargo technician
 
 - type: entity
@@ -619,7 +593,7 @@
 
 - type: randomHumanoidSettings
   id: LostCargoTechnician
-  randomizeName: false
+  parent: EventHumanoid
   components:
     - type: GhostRole
       name: ghost-role-information-lost-cargo-technical-name
@@ -627,13 +601,8 @@
       rules: ghost-role-information-lost-cargo-technical-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 # Clown troupe
 
@@ -674,6 +643,7 @@
 
 - type: randomHumanoidSettings
   id: ClownTroupe
+  parent: EventHumanoid
   randomizeName: false
   components:
     - type: GhostRole
@@ -682,7 +652,6 @@
       rules: ghost-role-information-clown-troupe-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ClownTroupe ]
     - type: RandomMetadata
@@ -691,18 +660,11 @@
 
 - type: randomHumanoidSettings
   id: ClownTroupeBanana
+  parent: ClownTroupe
   randomizeName: false
   components:
-    - type: GhostRole
-      name: ghost-role-information-clown-troupe-name
-      description: ghost-role-information-clown-troupe-description
-      rules: ghost-role-information-clown-troupe-rules
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ BananaClown ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_clown
 
 # Traveling exotic chef
 
@@ -732,7 +694,7 @@
 
 - type: randomHumanoidSettings
   id: TravelingChef
-  randomizeName: false
+  parent: EventHumanoid
   components:
     - type: GhostRole
       name: ghost-role-information-traveling-chef-name
@@ -740,13 +702,8 @@
       rules: ghost-role-information-traveling-chef-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ TravelingChef ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 # Disaster victim
 
@@ -793,9 +750,11 @@
     - type: RandomHumanoidSpawner
       settings: DisasterVictimCaptain
 
+## Following use EventHumanoidMindShielded since they are heads and probably should have mindshields
+
 - type: randomHumanoidSettings
-  id: DisasterVictimResearchDirector
-  randomizeName: false
+  id: DisasterVictimHead
+  parent: EventHumanoidMindShielded
   components:
     - type: GhostRole
       name: ghost-role-information-disaster-victim-name
@@ -803,49 +762,27 @@
       rules: ghost-role-information-disaster-victim-rules
       raffle:
         settings: default
-    - type: GhostTakeoverAvailable
+
+- type: randomHumanoidSettings
+  id: DisasterVictimResearchDirector
+  parent: DisasterVictimHead
+  components:
     - type: Loadout
       prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 - type: randomHumanoidSettings
   id: DisasterVictimCMO
-  randomizeName: false
+  parent: DisasterVictimHead
   components:
-    - type: GhostRole
-      name: ghost-role-information-disaster-victim-name
-      description: ghost-role-information-disaster-victim-description
-      rules: ghost-role-information-disaster-victim-rules
-      raffle:
-        settings: default
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 - type: randomHumanoidSettings
   id: DisasterVictimCaptain
-  randomizeName: false
+  parent: DisasterVictimHead
   components:
-    - type: GhostRole
-      name: ghost-role-information-disaster-victim-name
-      description: ghost-role-information-disaster-victim-description
-      rules: ghost-role-information-disaster-victim-rules
-      raffle:
-        settings: default
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last
 
 # Syndie Disaster Victim
 
@@ -875,7 +812,7 @@
 
 - type: randomHumanoidSettings
   id: SyndieDisasterVictim
-  randomizeName: false
+  parent: EventHumanoid
   components:
     - type: NpcFactionMember
       factions:
@@ -886,10 +823,5 @@
       rules: ghost-role-information-syndie-disaster-victim-rules
       raffle:
         settings: short
-    - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ SyndicateOperativeGearCivilian ]
-    - type: RandomMetadata
-      nameSegments:
-      - names_first
-      - names_last

From e39c6bcd9dfcc9c82935a53632349366bb460e7d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 04:52:14 +0000
Subject: [PATCH 185/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 19441ce065fb..57bc6fc62718 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Holocarp and Magicarp plushies can now be found in maintenance.
-    type: Add
-  id: 6156
-  time: '2024-03-15T02:58:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26081
 - author: TheShuEd
   changes:
   - message: Added random colored jumpsuits to the mixed wardrobes. Each costume is
@@ -3854,3 +3847,11 @@
   id: 6655
   time: '2024-05-31T19:44:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28367
+- author: Vermidia
+  changes:
+  - message: Many more ghost roles have a random appearance, including ERT and shuttle
+      roles.
+    type: Tweak
+  id: 6656
+  time: '2024-06-01T04:51:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27997

From cbba09ae256be2cfa60adcb7a12082c46ef9c571 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Fri, 31 May 2024 23:54:24 -0500
Subject: [PATCH 186/568] Gives Mediborg the Medical Hud (#28391)

---
 .../Prototypes/Entities/Clothing/Eyes/hud.yml | 53 ++++++-------------
 .../Entities/Mobs/Cyborgs/borg_chassis.yml    |  2 +-
 .../Prototypes/Entities/Mobs/NPCs/silicon.yml |  8 +--
 3 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 835c405e1926..c74a60e8fc45 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -7,6 +7,17 @@
   - type: ShowMindShieldIcons
   - type: ShowCriminalRecordIcons
 
+- type: entity
+  id: ShowMedicalIcons
+  abstract: true
+  noSpawn: true
+  components:
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers: 
+    - Biological
 
 - type: entity
   parent: ClothingEyesBase
@@ -24,7 +35,7 @@
     - Silicon
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
   id: ClothingEyesHudMedical
   name: medical hud
   description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
@@ -33,12 +44,6 @@
     sprite: Clothing/Eyes/Hud/med.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/med.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: Tag
     tags:
     - HudMedical
@@ -110,7 +115,7 @@
   - type: ShowThirstIcons
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
   id: ClothingEyesHudMedOnion
   name: medonion hud
   description: Filler
@@ -119,16 +124,10 @@
     sprite: Clothing/Eyes/Hud/medonion.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonion.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowHungerIcons
 
 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
   id: ClothingEyesHudMedOnionBeer
   name: medthungerst hud
   description: Filler
@@ -137,17 +136,11 @@
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
   id: ClothingEyesHudMedSec
   name: medsec hud
   description: An eye display that looks like a mixture of medical and security huds.
@@ -159,15 +152,9 @@
   - type: Construction
     graph: HudMedSec
     node: medsecHud
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers: 
-    - Biological
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
   id: ClothingEyesHudMultiversal
   name: multiversal hud
   description: Filler
@@ -180,13 +167,10 @@
     damageContainers:
     - Biological
     - Inorganic
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowSyndicateIcons
 
 - type: entity
-  parent: [ClothingEyesBase, ShowSecurityIcons]
+  parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons]
   id: ClothingEyesHudOmni
   name: omni hud
   description: Filler
@@ -199,9 +183,6 @@
     damageContainers:
     - Biological
     - Inorganic
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
   - type: ShowSyndicateIcons
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 81f889b438ad..075ac534c62a 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -192,7 +192,7 @@
 
 - type: entity
   id: BorgChassisMedical
-  parent: BaseBorgChassisNT
+  parent: [BaseBorgChassisNT, ShowMedicalIcons]
   name: medical cyborg
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 3c61306e0414..b2fefb67ae95 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -246,7 +246,7 @@
       path: /Audio/Ambience/Objects/periodic_beep.ogg
 
 - type: entity
-  parent: MobSiliconBase
+  parent: [MobSiliconBase, ShowMedicalIcons]
   id: MobMedibot
   name: medibot
   description: No substitute for a doctor, but better than nothing.
@@ -287,12 +287,6 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
 
 - type: entity
   parent: MobSiliconBase

From 480d5558d10b97bbb30056cb798c1c4b227ef015 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 04:55:29 +0000
Subject: [PATCH 187/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 57bc6fc62718..9b0149deb012 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: TheShuEd
-  changes:
-  - message: Added random colored jumpsuits to the mixed wardrobes. Each costume is
-      randomly generated from parts painted in random colors, which gives a huge number
-      of combinations of the appearance of such costumes.
-    type: Add
-  id: 6157
-  time: '2024-03-15T07:37:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25888
 - author: Nopey
   changes:
   - message: Dead players can no longer spin on a bar stool.
@@ -3855,3 +3846,10 @@
   id: 6656
   time: '2024-06-01T04:51:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27997
+- author: Cojoke-dot
+  changes:
+  - message: Medical Borgs now have medical huds
+    type: Add
+  id: 6657
+  time: '2024-06-01T04:54:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28391

From 54a38daee57f918939cbda5fdc25ec7e0ff04d24 Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Fri, 31 May 2024 21:58:07 -0700
Subject: [PATCH 188/568] Added verb for removing evidence! (#28101)

---
 .../Forensics/Systems/ForensicsSystem.cs      | 74 ++++++++++++++++---
 .../Locale/en-US/forensics/forensics.ftl      |  8 +-
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 1445e253f38d..3304330acabc 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics.Components;
 using Content.Server.Popups;
+using Content.Shared.Popups;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
@@ -11,6 +12,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Random;
+using Content.Shared.Verbs;
 
 namespace Content.Server.Forensics
 {
@@ -32,6 +34,8 @@ public override void Initialize()
             SubscribeLocalEvent<CleansForensicsComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(AbsorbentSystem) });
             SubscribeLocalEvent<ForensicsComponent, CleanForensicsDoAfterEvent>(OnCleanForensicsDoAfter);
             SubscribeLocalEvent<DnaComponent, TransferDnaEvent>(OnTransferDnaEvent);
+            SubscribeLocalEvent<CleansForensicsComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
+
         }
 
         private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args)
@@ -51,7 +55,7 @@ private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args)
 
         private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEvent args)
         {
-            foreach(EntityUid part in args.GibbedParts)
+            foreach (EntityUid part in args.GibbedParts)
             {
                 var partComp = EnsureComp<ForensicsComponent>(part);
                 partComp.DNAs.Add(component.DNA);
@@ -61,13 +65,13 @@ private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEve
 
         private void OnMeleeHit(EntityUid uid, ForensicsComponent component, MeleeHitEvent args)
         {
-            if((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
+            if ((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
                 (args.BaseDamage.DamageDict.TryGetValue("Slash", out var slashDamage) && slashDamage.Value > 0) ||
                 (args.BaseDamage.DamageDict.TryGetValue("Piercing", out var pierceDamage) && pierceDamage.Value > 0))
             {
-                foreach(EntityUid hitEntity in args.HitEntities)
+                foreach (EntityUid hitEntity in args.HitEntities)
                 {
-                    if(TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
+                    if (TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
                         component.DNAs.Add(hitEntityComp.DNA);
                 }
             }
@@ -101,17 +105,58 @@ public void CopyForensicsFrom(ForensicsComponent src, EntityUid target)
             }
         }
 
-        private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component, AfterInteractEvent args)
+        private void OnAfterInteract(Entity<CleansForensicsComponent> cleanForensicsEntity, ref AfterInteractEvent args)
         {
-            if (args.Handled || !args.CanReach)
+            if (args.Handled || !args.CanReach || args.Target == null)
                 return;
 
-            if (!TryComp<ForensicsComponent>(args.Target, out var forensicsComp))
+            args.Handled = TryStartCleaning(cleanForensicsEntity, args.User, args.Target.Value);
+        }
+
+        private void OnUtilityVerb(Entity<CleansForensicsComponent> entity, ref GetVerbsEvent<UtilityVerb> args)
+        {
+            if (!args.CanInteract || !args.CanAccess)
                 return;
 
-            if((forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned) || (forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0))
+            // These need to be set outside for the anonymous method!
+            var user = args.User;
+            var target = args.Target;
+
+            var verb = new UtilityVerb()
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
+                Act = () => TryStartCleaning(entity, user, target),
+                IconEntity = GetNetEntity(entity),
+                Text = Loc.GetString(Loc.GetString("forensics-verb-text")),
+                Message = Loc.GetString(Loc.GetString("forensics-verb-message")),
+                // This is important because if its true using the cleaning device will count as touching the object.
+                DoContactInteraction = false
+            };
+
+            args.Verbs.Add(verb);
+        }
+
+        /// <summary>
+        ///     Attempts to clean the given item with the given CleansForensics entity.
+        /// </summary>
+        /// <param name="cleanForensicsEntity">The entity that is being used to clean the target.</param>
+        /// <param name="user">The user that is using the cleanForensicsEntity.</param>
+        /// <param name="target">The target of the forensics clean.</param>
+        /// <returns>True if the target can be cleaned and has some sort of DNA or fingerprints / fibers and false otherwise.</returns>
+        public bool TryStartCleaning(Entity<CleansForensicsComponent> cleanForensicsEntity, EntityUid user, EntityUid target)
+        {
+            if (!TryComp<ForensicsComponent>(target, out var forensicsComp))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning-cannot-clean", ("target", target)), user, user, PopupType.MediumCaution);
+                return false;
+            }
+
+            var totalPrintsAndFibers = forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count;
+            var hasRemovableDNA = forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned;
+
+            if (hasRemovableDNA || totalPrintsAndFibers > 0)
+            {
+                var cleanDelay = cleanForensicsEntity.Comp.CleanDelay;
+                var doAfterArgs = new DoAfterArgs(EntityManager, user, cleanDelay, new CleanForensicsDoAfterEvent(), cleanForensicsEntity, target: target, used: cleanForensicsEntity)
                 {
                     BreakOnHandChange = true,
                     NeedHand = true,
@@ -122,10 +167,17 @@ private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component,
                 };
 
                 _doAfterSystem.TryStartDoAfter(doAfterArgs);
-                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
 
-                args.Handled = true;
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", target)), user, user);
+
+                return true;
+            }
+            else
+            {
+                _popupSystem.PopupEntity(Loc.GetString("forensics-cleaning-cannot-clean", ("target", target)), user, user, PopupType.MediumCaution);
+                return false;
             }
+
         }
 
         private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component, CleanForensicsDoAfterEvent args)
diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl
index 957cc444a8cd..29e2db8f7887 100644
--- a/Resources/Locale/en-US/forensics/forensics.ftl
+++ b/Resources/Locale/en-US/forensics/forensics.ftl
@@ -20,9 +20,11 @@ forensic-scanner-printer-not-ready = Printer is not ready yet.
 forensic-scanner-verb-text = Scan
 forensic-scanner-verb-message = Perform a forensic scan
 
-
-
 forensic-pad-fingerprint-name = {$entity}'s fingerprints
 forensic-pad-gloves-name = fibers from {$entity}
 
-forensics-cleaning = You begin cleaning the evidence off of {THE($target)}...
\ No newline at end of file
+forensics-verb-text = Remove evidence
+forensics-verb-message = Remove fingerprints and DNA residues from the object!
+forensics-cleaning = You begin cleaning the evidence off of {THE($target)}...
+
+forensics-cleaning-cannot-clean = There is nothing cleanable on {THE($target)}!
\ No newline at end of file

From 69b61fcb8eaaceb38b48afb6e5841cf573fe18e5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 04:59:13 +0000
Subject: [PATCH 189/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9b0149deb012..27a550f1d546 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Nopey
-  changes:
-  - message: Dead players can no longer spin on a bar stool.
-    type: Fix
-  id: 6158
-  time: '2024-03-15T10:03:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24308
 - author: Nairodian
   changes:
   - message: Added a new red neck gaiter to the AutoDrobe.
@@ -3853,3 +3846,10 @@
   id: 6657
   time: '2024-06-01T04:54:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28391
+- author: beck-thompson
+  changes:
+  - message: You can now remove evidence from containers using the verb menu.
+    type: Fix
+  id: 6658
+  time: '2024-06-01T04:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28101

From 355d0fee38343f587266f9db0be3f1070b418ec1 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Fri, 31 May 2024 21:51:16 -0800
Subject: [PATCH 190/568] Increase Tesla coil power output (#28424)

* Increase Tesla coil power output

* Make number bigger
---
 .../Entities/Structures/Power/Generation/Tesla/coil.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index 48994ac7d848..b63f131a7f4c 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -60,7 +60,7 @@
     startingCharge: 0
   - type: BatteryDischarger
   - type: TeslaCoil
-    chargeFromLightning: 500000
+    chargeFromLightning: 2000000
   - type: LightningTarget
     priority: 4
     hitProbability: 0.5

From 90f606f5e5382155487a19a8933e26fa793d404c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 05:52:22 +0000
Subject: [PATCH 191/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 27a550f1d546..2a808f32825b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Nairodian
-  changes:
-  - message: Added a new red neck gaiter to the AutoDrobe.
-    type: Add
-  id: 6159
-  time: '2024-03-15T10:11:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25891
 - author: Tayrtahn
   changes:
   - message: Reflected tranquilizer rounds no longer inject the character who reflected
@@ -3853,3 +3846,10 @@
   id: 6658
   time: '2024-06-01T04:58:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28101
+- author: notafet
+  changes:
+  - message: Increase power output from Tesla coils.
+    type: Tweak
+  id: 6659
+  time: '2024-06-01T05:51:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28424

From 94a113dbd6a076d199591eefb7875f91e9f7c463 Mon Sep 17 00:00:00 2001
From: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com>
Date: Sat, 1 Jun 2024 03:23:54 -0400
Subject: [PATCH 192/568] Adds a Pii Flag, Censors Hwid and Ip  (#27776)

* yes

* fixes
---
 .../Administration/BanList/BanListEui.cs      | 35 ++++++++++++++-----
 Content.Shared/Administration/AdminFlags.cs   |  5 +++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Administration/BanList/BanListEui.cs b/Content.Server/Administration/BanList/BanListEui.cs
index 3a86a42d531a..8ddc7459d7b9 100644
--- a/Content.Server/Administration/BanList/BanListEui.cs
+++ b/Content.Server/Administration/BanList/BanListEui.cs
@@ -65,13 +65,23 @@ private async Task LoadBans(NetUserId userId)
                 unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
             }
 
+            (string, int cidrMask)? ip = ("*Hidden*", 0);
+            var hwid = "*Hidden*";
+
+            if (_admins.HasAdminFlag(Player, AdminFlags.Pii))
+            {
+                ip = ban.Address is { } address
+                    ? (address.address.ToString(), address.cidrMask)
+                    : null;
+
+                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+            }
+
             Bans.Add(new SharedServerBan(
                 ban.Id,
                 ban.UserId,
-                ban.Address is { } address
-                    ? (address.address.ToString(), address.cidrMask)
-                    : null,
-                ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
+                ip,
+                hwid,
                 ban.BanTime.UtcDateTime,
                 ban.ExpirationTime?.UtcDateTime,
                 ban.Reason,
@@ -96,13 +106,22 @@ private async Task LoadRoleBans(NetUserId userId)
                 unban = new SharedServerUnban(unbanningAdmin, ban.Unban.UnbanTime.UtcDateTime);
             }
 
+            (string, int cidrMask)? ip = ("*Hidden*", 0);
+            var hwid = "*Hidden*";
+
+            if (_admins.HasAdminFlag(Player, AdminFlags.Pii))
+            {
+                ip = ban.Address is { } address
+                    ? (address.address.ToString(), address.cidrMask)
+                    : null;
+
+                hwid = ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan());
+            }
             RoleBans.Add(new SharedServerRoleBan(
                 ban.Id,
                 ban.UserId,
-                ban.Address is { } address
-                    ? (address.address.ToString(), address.cidrMask)
-                    : null,
-                ban.HWId == null ? null : Convert.ToBase64String(ban.HWId.Value.AsSpan()),
+                ip,
+                hwid,
                 ban.BanTime.UtcDateTime,
                 ban.ExpirationTime?.UtcDateTime,
                 ban.Reason,
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 571982b548da..280745af5815 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -104,6 +104,11 @@ public enum AdminFlags : uint
 		///</summary>
 		Adminchat = 1 << 17,
 
+        ///<summary>
+        /// Permits the visibility of Pii in game and on SS14 Admin
+        ///</summary>
+        Pii = 1 << 18,
+
         /// <summary>
         ///     Dangerous host permissions like scsi.
         /// </summary>

From 81387fa220d76d13ae93f89ea350d3c2aec58074 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 07:25:01 +0000
Subject: [PATCH 193/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index cd6a9a51c365..24fc59b3eb0b 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -265,5 +265,12 @@ Entries:
   id: 32
   time: '2024-05-31T06:28:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28030
+- author: Geekyhobo
+  changes:
+  - message: Added a PII admin flag to hide personal identification information.
+    type: Add
+  id: 33
+  time: '2024-06-01T07:23:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27776
 Name: Admin
 Order: 1

From 68992735d81a7709543ab7c6056385b9d3946d75 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 1 Jun 2024 04:14:43 -0400
Subject: [PATCH 194/568] Clean up command perms (#28451)

* Change BanExemption command to AdminFlags.Ban permissions

* Change LOOC to check for Moderator permission

* Change ListVerbs from Admin to Debug AdminFlags

* Change RunVerbAs from Admin to Fun AdminFlags

* More permission changes

* Change GhostKick to Moderator perm

* Clean up command perms

* fuck

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 .../Administration/Commands/AdminWhoCommand.cs    |  2 +-
 .../Administration/Commands/AnnounceUiCommand.cs  |  2 +-
 .../Commands/BanExemptionCommands.cs              |  4 ++--
 Content.Server/Administration/Commands/DSay.cs    |  2 +-
 .../Administration/Commands/FaxUiCommand.cs       |  3 +--
 .../Commands/LinkBluespaceLocker.cs               |  2 +-
 .../Administration/Commands/PlayTimeCommands.cs   | 10 +++++-----
 .../Administration/Commands/SetAdminOOC.cs        |  2 +-
 .../AlertLevel/Commands/SetAlertLevelCommand.cs   |  2 +-
 Content.Server/Announcements/AnnounceCommand.cs   |  2 +-
 Content.Server/Chat/Commands/SetOOCCommand.cs     |  2 +-
 Content.Server/Chat/Systems/ChatSystem.cs         | 11 ++++++++---
 Content.Server/Damage/Commands/GodModeCommand.cs  |  2 +-
 Content.Server/GhostKick/GhostKickManager.cs      |  2 +-
 Content.Server/Motd/SetMOTDCommand.cs             |  2 +-
 .../Toolshed/Commands/Verbs/RunVerbAsCommand.cs   |  2 +-
 Content.Server/Verbs/Commands/ListVerbsCommand.cs |  3 ++-
 Content.Server/Voting/Managers/VoteManager.cs     |  4 ++--
 Content.Server/Voting/VoteCommands.cs             |  4 ++--
 Content.Shared/Administration/AdminFlags.cs       | 15 +++++++++++++++
 Resources/engineCommandPerms.yml                  | 12 +++++++++---
 21 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs
index cf2f8c453c88..feeec90e483b 100644
--- a/Content.Server/Administration/Commands/AdminWhoCommand.cs
+++ b/Content.Server/Administration/Commands/AdminWhoCommand.cs
@@ -7,7 +7,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.AdminWho)]
 public sealed class AdminWhoCommand : IConsoleCommand
 {
     public string Command => "adminwho";
diff --git a/Content.Server/Administration/Commands/AnnounceUiCommand.cs b/Content.Server/Administration/Commands/AnnounceUiCommand.cs
index d80db9668635..abb9235a3af3 100644
--- a/Content.Server/Administration/Commands/AnnounceUiCommand.cs
+++ b/Content.Server/Administration/Commands/AnnounceUiCommand.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class AnnounceUiCommand : IConsoleCommand
     {
         public string Command => "announceui";
diff --git a/Content.Server/Administration/Commands/BanExemptionCommands.cs b/Content.Server/Administration/Commands/BanExemptionCommands.cs
index 6db00db90ce6..b6b5f705f971 100644
--- a/Content.Server/Administration/Commands/BanExemptionCommands.cs
+++ b/Content.Server/Administration/Commands/BanExemptionCommands.cs
@@ -6,7 +6,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Ban)]
 public sealed class BanExemptionUpdateCommand : LocalizedCommands
 {
     [Dependency] private readonly IServerDbManager _dbManager = default!;
@@ -61,7 +61,7 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Ban)]
 public sealed class BanExemptionGetCommand : LocalizedCommands
 {
     [Dependency] private readonly IServerDbManager _dbManager = default!;
diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs
index 8682614b5fcf..f29e105909f4 100644
--- a/Content.Server/Administration/Commands/DSay.cs
+++ b/Content.Server/Administration/Commands/DSay.cs
@@ -4,7 +4,7 @@
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     sealed class DSay : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _e = default!;
diff --git a/Content.Server/Administration/Commands/FaxUiCommand.cs b/Content.Server/Administration/Commands/FaxUiCommand.cs
index cf9e97e3997e..8323278c58bb 100644
--- a/Content.Server/Administration/Commands/FaxUiCommand.cs
+++ b/Content.Server/Administration/Commands/FaxUiCommand.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Fun)]
 public sealed class FaxUiCommand : IConsoleCommand
 {
     public string Command => "faxui";
@@ -27,4 +27,3 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         eui.OpenEui(ui, player);
     }
 }
-
diff --git a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
index d2f7e4de1591..9fac72664b63 100644
--- a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
+++ b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs
@@ -4,7 +4,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Fun)]
 public sealed class LinkBluespaceLocker : IConsoleCommand
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs
index 97d3f12e38d2..42bc8635c4d2 100644
--- a/Content.Server/Administration/Commands/PlayTimeCommands.cs
+++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs
@@ -6,7 +6,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeAddOverallCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -58,7 +58,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeAddRoleCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -123,7 +123,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeGetOverallCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -168,7 +168,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeGetRoleCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -247,7 +247,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
 /// <summary>
 /// Saves the timers for a particular player immediately
 /// </summary>
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class PlayTimeSaveCommand : IConsoleCommand
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;
diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs
index 27528e1940f9..c1f72f766606 100644
--- a/Content.Server/Administration/Commands/SetAdminOOC.cs
+++ b/Content.Server/Administration/Commands/SetAdminOOC.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.NameColor)]
     internal sealed class SetAdminOOC : IConsoleCommand
     {
         public string Command => "setadminooc";
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index f52fc2b7187a..405500442f71 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -8,7 +8,7 @@
 namespace Content.Server.AlertLevel.Commands
 {
     [UsedImplicitly]
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Fun)]
     public sealed class SetAlertLevelCommand : LocalizedCommands
     {
         [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs
index cedde3fc1406..2307f36a5d02 100644
--- a/Content.Server/Announcements/AnnounceCommand.cs
+++ b/Content.Server/Announcements/AnnounceCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Content.Server.Announcements
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class AnnounceCommand : IConsoleCommand
     {
         public string Command => "announce";
diff --git a/Content.Server/Chat/Commands/SetOOCCommand.cs b/Content.Server/Chat/Commands/SetOOCCommand.cs
index e6e688377e9d..d712a62401ad 100644
--- a/Content.Server/Chat/Commands/SetOOCCommand.cs
+++ b/Content.Server/Chat/Commands/SetOOCCommand.cs
@@ -6,7 +6,7 @@
 
 namespace Content.Server.Chat.Commands;
 
-[AdminCommand(AdminFlags.Server)]
+[AdminCommand(AdminFlags.Admin)]
 public sealed class SetOOCCommand : IConsoleCommand
 {
     public string Command => "setooc";
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 8e6c2ba4b37c..531c4259efea 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -10,6 +10,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -277,9 +278,13 @@ public void TrySendInGameOOCMessage(
         message = SanitizeInGameOOCMessage(message);
 
         var sendType = type;
-        // If dead player LOOC is disabled, unless you are an aghost, send dead messages to dead chat
-        if (!_adminManager.IsAdmin(player) && !_deadLoocEnabled &&
-            (HasComp<GhostComponent>(source) || _mobStateSystem.IsDead(source)))
+        // If dead player LOOC is disabled, unless you are an admin with Moderator perms, send dead messages to dead chat
+        if ((_adminManager.IsAdmin(player) && _adminManager.HasAdminFlag(player, AdminFlags.Moderator)) // Override if admin
+            || _deadLoocEnabled
+            || (!HasComp<GhostComponent>(source) && !_mobStateSystem.IsDead(source))) // Check that player is not dead
+        {
+        }
+        else
             sendType = InGameOOCChatType.Dead;
 
         // If crit player LOOC is disabled, don't send the message at all.
diff --git a/Content.Server/Damage/Commands/GodModeCommand.cs b/Content.Server/Damage/Commands/GodModeCommand.cs
index 866737f17a9e..06a968b47339 100644
--- a/Content.Server/Damage/Commands/GodModeCommand.cs
+++ b/Content.Server/Damage/Commands/GodModeCommand.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Server.Damage.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Fun)]
     public sealed class GodModeCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
diff --git a/Content.Server/GhostKick/GhostKickManager.cs b/Content.Server/GhostKick/GhostKickManager.cs
index 7dd82970acfa..40d21d79d2cc 100644
--- a/Content.Server/GhostKick/GhostKickManager.cs
+++ b/Content.Server/GhostKick/GhostKickManager.cs
@@ -44,7 +44,7 @@ public void DoDisconnect(INetChannel channel, string reason)
     }
 }
 
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class GhostKickCommand : IConsoleCommand
 {
     public string Command => "ghostkick";
diff --git a/Content.Server/Motd/SetMOTDCommand.cs b/Content.Server/Motd/SetMOTDCommand.cs
index c99f72843580..3a7a5e71c6a8 100644
--- a/Content.Server/Motd/SetMOTDCommand.cs
+++ b/Content.Server/Motd/SetMOTDCommand.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Motd;
 /// <summary>
 /// A console command usable by any user which prints or sets the Message of the Day.
 /// </summary>
-[AdminCommand(AdminFlags.Admin)]
+[AdminCommand(AdminFlags.Moderator)]
 public sealed class SetMotdCommand : LocalizedCommands
 {
     [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
diff --git a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
index 1b11dffeea7c..5c1bac6c93b4 100644
--- a/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
+++ b/Content.Server/Toolshed/Commands/Verbs/RunVerbAsCommand.cs
@@ -8,7 +8,7 @@
 
 namespace Content.Server.Toolshed.Commands.Verbs;
 
-[ToolshedCommand, AdminCommand(AdminFlags.Admin)]
+[ToolshedCommand, AdminCommand(AdminFlags.Moderator)]
 public sealed class RunVerbAsCommand : ToolshedCommand
 {
     private SharedVerbSystem? _verb;
diff --git a/Content.Server/Verbs/Commands/ListVerbsCommand.cs b/Content.Server/Verbs/Commands/ListVerbsCommand.cs
index 7b541afa666a..1c80edb82af3 100644
--- a/Content.Server/Verbs/Commands/ListVerbsCommand.cs
+++ b/Content.Server/Verbs/Commands/ListVerbsCommand.cs
@@ -1,11 +1,12 @@
 using Content.Server.Administration;
+using Content.Server.Database;
 using Content.Shared.Administration;
 using Content.Shared.Verbs;
 using Robust.Shared.Console;
 
 namespace Content.Server.Verbs.Commands
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class ListVerbsCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs
index 5bd18cd8c45c..edb11f0bdb53 100644
--- a/Content.Server/Voting/Managers/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -316,7 +316,7 @@ private bool CanCallVote(
             timeSpan = default;
 
             // Admins can always call votes.
-            if (_adminMgr.HasAdminFlag(initiator, AdminFlags.Admin))
+            if (_adminMgr.HasAdminFlag(initiator, AdminFlags.Moderator))
             {
                 isAdmin = true;
                 return true;
@@ -370,7 +370,7 @@ private void EndVote(VoteReg v)
                 .Select(e => e.Data)
                 .ToImmutableArray();
             // Store all votes in order for webhooks
-            var voteTally = new List<int>(); 
+            var voteTally = new List<int>();
             foreach(var entry in v.Entries)
             {
                 voteTally.Add(entry.Votes);
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index 3c792dc6252f..a6cfb3e0b902 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -66,7 +66,7 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         }
     }
 
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class CreateCustomCommand : IConsoleCommand
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -308,7 +308,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
     }
 
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Moderator)]
     public sealed class CancelVoteCommand : IConsoleCommand
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 280745af5815..02db1cf39485 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -109,6 +109,21 @@ public enum AdminFlags : uint
         ///</summary>
         Pii = 1 << 18,
 
+        /// <summary>
+        ///     Lets you take moderator actions on the game server.
+        /// </summary>
+        Moderator = 1 << 19,
+
+        /// <summary>
+        ///     Lets you check currently online admins.
+        /// </summary>
+        AdminWho = 1 << 20,
+
+        /// <summary>
+        ///     Lets you set the color of your OOC name.
+        /// </summary>
+        NameColor = 1 << 21,
+
         /// <summary>
         ///     Dangerous host permissions like scsi.
         /// </summary>
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 42cc4668a937..b68a2b22dfb0 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -90,12 +90,12 @@
 
 - Flags: ADMIN
   Commands:
-  - delete
-  - kick
   - listplayers
   - tp
   - tpto
-  - respawn
+
+- Flags: FUN
+  Commands:
   - tippy
   - tip
 
@@ -111,6 +111,12 @@
   Commands:
   - spawn
   - cspawn
+  - delete
+
+- Flags: MODERATOR
+  Commands:
+  - kick
+  - respawn
 
 - Flags: HOST
   Commands:

From 727a176ca80f65221d62dd0f4906120e24f9a4d6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 08:15:50 +0000
Subject: [PATCH 195/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 24fc59b3eb0b..2964e8c11b1e 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -272,5 +272,14 @@ Entries:
   id: 33
   time: '2024-06-01T07:23:54.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27776
+- author: ShadowCommander, EmoGarbage
+  changes:
+  - message: 'Added new permissions: moderator, adminwho, and namecolor'
+    type: Add
+  - message: Changed various command perms from admin to moderator & fun.
+    type: Tweak
+  id: 34
+  time: '2024-06-01T08:14:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28451
 Name: Admin
 Order: 1

From e3a66136bfad05d09028fe3196ce7221ba3fb2f1 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 1 Jun 2024 02:35:14 -0700
Subject: [PATCH 196/568] Fix the client thinking it cannot shoot after
 mispredicting when it actually can (#28464)

---
 .../Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 6242312b0709..784dd0793a89 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -186,6 +186,7 @@ private void ManualCycle(EntityUid uid, BallisticAmmoProviderComponent component
             !Paused(uid))
         {
             gunComp.NextFire = Timing.CurTime + TimeSpan.FromSeconds(1 / gunComp.FireRateModified);
+            Dirty(uid, gunComp);
         }
 
         Dirty(uid, component);

From 19be94c9ea184710218aaddff8c9b91237735042 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 1 Jun 2024 05:08:31 -0700
Subject: [PATCH 197/568] Add job whitelist system (#28085)

* Add job whitelist system

* Address reviews

* Fix name

* Apply suggestions from code review

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* cancinium

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
---
 Content.Client/Lobby/LobbyUIController.cs     |   17 +-
 .../JobRequirementsManager.cs                 |   28 +
 Content.IntegrationTests/PoolManager.Cvars.cs |    1 +
 .../20240531011555_RoleWhitelist.Designer.cs  | 1913 +++++++++++++++++
 .../Postgres/20240531011555_RoleWhitelist.cs  |   40 +
 .../PostgresServerDbContextModelSnapshot.cs   |   31 +
 .../20240531011549_RoleWhitelist.Designer.cs  | 1838 ++++++++++++++++
 .../Sqlite/20240531011549_RoleWhitelist.cs    |   40 +
 .../SqliteServerDbContextModelSnapshot.cs     |   31 +
 Content.Server.Database/Model.cs              |   20 +
 .../Commands/JobWhitelistCommands.cs          |  214 ++
 .../Administration/Managers/BanManager.cs     |    8 +-
 .../Administration/Managers/IBanManager.cs    |    4 +-
 Content.Server/Database/ServerDbBase.cs       |   61 +
 Content.Server/Database/ServerDbManager.cs    |   38 +
 Content.Server/Database/UserDbDataManager.cs  |   50 +-
 Content.Server/Entry/EntryPoint.cs            |    2 +
 .../Events/GetDisallowedJobsEvent.cs          |    8 +
 .../GameTicking/Events/IsJobAllowedEvent.cs   |   13 +
 .../GameTicking/GameTicker.Spawning.cs        |   19 +-
 Content.Server/GameTicking/GameTicker.cs      |    1 -
 Content.Server/IoC/ServerContentIoC.cs        |    2 +
 .../JobWhitelist/JobWhitelistManager.cs       |  114 +
 .../JobWhitelist/JobWhitelistSystem.cs        |   83 +
 .../PlayTimeTrackingManager.cs                |    9 +-
 .../PlayTimeTrackingSystem.cs                 |   30 +-
 .../Managers/ServerPreferencesManager.cs      |   15 +-
 .../Events/StationJobsGetCandidatesEvent.cs   |    8 +
 .../Systems/StationJobsSystem.Roundstart.cs   |    8 +-
 .../Station/Systems/StationJobsSystem.cs      |    2 +-
 Content.Shared/CCVar/CCVars.cs                |    6 +
 .../Players/JobWhitelist/MsgJobWhitelist.cs   |   33 +
 Content.Shared/Roles/JobPrototype.cs          |    5 +-
 .../en-US/commands/job-whitelist-command.ftl  |   20 +
 Resources/Locale/en-US/job/role-whitelist.ftl |    1 +
 35 files changed, 4666 insertions(+), 47 deletions(-)
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
 create mode 100644 Content.Server/Administration/Commands/JobWhitelistCommands.cs
 create mode 100644 Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
 create mode 100644 Content.Server/GameTicking/Events/IsJobAllowedEvent.cs
 create mode 100644 Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
 create mode 100644 Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
 create mode 100644 Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
 create mode 100644 Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
 create mode 100644 Resources/Locale/en-US/commands/job-whitelist-command.ftl
 create mode 100644 Resources/Locale/en-US/job/role-whitelist.ftl

diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index ae9196c1100b..f6a3eed962c1 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -22,7 +22,6 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Lobby;
@@ -70,12 +69,9 @@ public override void Initialize()
             _profileEditor?.RefreshFlavorText();
         });
 
-        _configurationManager.OnValueChanged(CCVars.GameRoleTimers, args =>
-        {
-            _profileEditor?.RefreshAntags();
-            _profileEditor?.RefreshJobs();
-            _profileEditor?.RefreshLoadouts();
-        });
+        _configurationManager.OnValueChanged(CCVars.GameRoleTimers, _ => RefreshProfileEditor());
+
+        _configurationManager.OnValueChanged(CCVars.GameRoleWhitelist, _ => RefreshProfileEditor());
     }
 
     private LobbyCharacterPreviewPanel? GetLobbyPreview()
@@ -193,6 +189,13 @@ private void RefreshLobbyPreview()
         PreviewPanel.SetSummaryText(humanoid.Summary);
     }
 
+    private void RefreshProfileEditor()
+    {
+        _profileEditor?.RefreshAntags();
+        _profileEditor?.RefreshJobs();
+        _profileEditor?.RefreshLoadouts();
+    }
+
     private void SaveProfile()
     {
         DebugTools.Assert(EditedProfile != null);
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 8193f795696b..cb155cadbf43 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.CCVar;
 using Content.Shared.Players;
+using Content.Shared.Players.JobWhitelist;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
 using Robust.Client;
@@ -24,6 +25,7 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager
 
     private readonly Dictionary<string, TimeSpan> _roles = new();
     private readonly List<string> _roleBans = new();
+    private readonly List<string> _jobWhitelists = new();
 
     private ISawmill _sawmill = default!;
 
@@ -36,6 +38,7 @@ public void Initialize()
         // Yeah the client manager handles role bans and playtime but the server ones are separate DEAL.
         _net.RegisterNetMessage<MsgRoleBans>(RxRoleBans);
         _net.RegisterNetMessage<MsgPlayTime>(RxPlayTime);
+        _net.RegisterNetMessage<MsgJobWhitelist>(RxJobWhitelist);
 
         _client.RunLevelChanged += ClientOnRunLevelChanged;
     }
@@ -79,6 +82,13 @@ private void RxPlayTime(MsgPlayTime message)
         Updated?.Invoke();
     }
 
+    private void RxJobWhitelist(MsgJobWhitelist message)
+    {
+        _jobWhitelists.Clear();
+        _jobWhitelists.AddRange(message.Whitelist);
+        Updated?.Invoke();
+    }
+
     public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
@@ -89,6 +99,9 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
             return false;
         }
 
+        if (!CheckWhitelist(job, out reason))
+            return false;
+
         var player = _playerManager.LocalSession;
         if (player == null)
             return true;
@@ -116,6 +129,21 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         return reason == null;
     }
 
+    public bool CheckWhitelist(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        reason = default;
+        if (!_cfg.GetCVar(CCVars.GameRoleWhitelist))
+            return true;
+
+        if (job.Whitelisted && !_jobWhitelists.Contains(job.ID))
+        {
+            reason = FormattedMessage.FromUnformatted(Loc.GetString("role-not-whitelisted"));
+            return false;
+        }
+
+        return true;
+    }
+
     public TimeSpan FetchOverallPlaytime()
     {
         return _roles.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
diff --git a/Content.IntegrationTests/PoolManager.Cvars.cs b/Content.IntegrationTests/PoolManager.Cvars.cs
index aa6b4dffdcce..5acd9d502c1b 100644
--- a/Content.IntegrationTests/PoolManager.Cvars.cs
+++ b/Content.IntegrationTests/PoolManager.Cvars.cs
@@ -21,6 +21,7 @@ private static readonly (string cvar, string value)[] TestCvars =
         (CCVars.NPCMaxUpdates.Name,           "999999"),
         (CVars.ThreadParallelCount.Name,      "1"),
         (CCVars.GameRoleTimers.Name,          "false"),
+        (CCVars.GameRoleWhitelist.Name,       "false"),
         (CCVars.GridFill.Name,                "false"),
         (CCVars.PreloadGrids.Name,            "false"),
         (CCVars.ArrivalsShuttles.Name,        "false"),
diff --git a/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.Designer.cs
new file mode 100644
index 000000000000..5032281dfece
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.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("20240531011555_RoleWhitelist")]
+    partial class RoleWhitelist
+    {
+        /// <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/20240531011555_RoleWhitelist.cs b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
new file mode 100644
index 000000000000..1cd0d8df17dc
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240531011555_RoleWhitelist.cs
@@ -0,0 +1,40 @@
+#nullable disable
+
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class RoleWhitelist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "role_whitelists",
+                columns: table => new
+                {
+                    player_user_id = table.Column<Guid>(type: "uuid", nullable: false),
+                    role_id = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_role_whitelists", x => new { x.player_user_id, x.role_id });
+                    table.ForeignKey(
+                        name: "FK_role_whitelists_player_player_user_id",
+                        column: x => x.player_user_id,
+                        principalTable: "player",
+                        principalColumn: "user_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "role_whitelists");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index bbbd64d874a1..32a655f7f65e 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -900,6 +900,22 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     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")
@@ -1623,6 +1639,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     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")
@@ -1822,6 +1851,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("AdminWatchlistsLastEdited");
 
                     b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Preference", b =>
diff --git a/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.Designer.cs
new file mode 100644
index 000000000000..531f013604f5
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.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("20240531011549_RoleWhitelist")]
+    partial class RoleWhitelist
+    {
+        /// <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/20240531011549_RoleWhitelist.cs b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
new file mode 100644
index 000000000000..9d192fc6853e
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240531011549_RoleWhitelist.cs
@@ -0,0 +1,40 @@
+#nullable disable
+
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class RoleWhitelist : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "role_whitelists",
+                columns: table => new
+                {
+                    player_user_id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    role_id = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_role_whitelists", x => new { x.player_user_id, x.role_id });
+                    table.ForeignKey(
+                        name: "FK_role_whitelists_player_player_user_id",
+                        column: x => x.player_user_id,
+                        principalTable: "player",
+                        principalColumn: "user_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "role_whitelists");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index d343f49f416d..2c444c83eb36 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -847,6 +847,22 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     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")
@@ -1548,6 +1564,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     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")
@@ -1747,6 +1776,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("AdminWatchlistsLastEdited");
 
                     b.Navigation("AdminWatchlistsReceived");
+
+                    b.Navigation("JobWhitelists");
                 });
 
             modelBuilder.Entity("Content.Server.Database.Preference", b =>
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index 57dcc3fc6dce..60935e8f06ad 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -40,6 +40,7 @@ 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<RoleWhitelist> RoleWhitelists { get; set; } = null!;
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -314,6 +315,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey(ban => ban.LastEditedById)
                 .HasPrincipalKey(author => author.UserId)
                 .OnDelete(DeleteBehavior.SetNull);
+
+            modelBuilder.Entity<RoleWhitelist>()
+                .HasOne(w => w.Player)
+                .WithMany(p => p.JobWhitelists)
+                .HasForeignKey(w => w.PlayerUserId)
+                .HasPrincipalKey(p => p.UserId)
+                .OnDelete(DeleteBehavior.Cascade);
         }
 
         public virtual IQueryable<AdminLog> SearchLogs(IQueryable<AdminLog> query, string searchText)
@@ -530,6 +538,7 @@ public class Player
         public List<ServerBan> AdminServerBansLastEdited { get; set; } = null!;
         public List<ServerRoleBan> AdminServerRoleBansCreated { get; set; } = null!;
         public List<ServerRoleBan> AdminServerRoleBansLastEdited { get; set; } = null!;
+        public List<RoleWhitelist> JobWhitelists { get; set; } = null!;
     }
 
     [Table("whitelist")]
@@ -1099,4 +1108,15 @@ public class AdminMessage : IAdminRemarksCommon
         /// </summary>
         public bool Dismissed { get; set; }
     }
+
+    [PrimaryKey(nameof(PlayerUserId), nameof(RoleId))]
+    public class RoleWhitelist
+    {
+        [Required, ForeignKey("Player")]
+        public Guid PlayerUserId { get; set; }
+        public Player Player { get; set; } = default!;
+
+        [Required]
+        public string RoleId { get; set; } = default!;
+    }
 }
diff --git a/Content.Server/Administration/Commands/JobWhitelistCommands.cs b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
new file mode 100644
index 000000000000..a84a11ef848e
--- /dev/null
+++ b/Content.Server/Administration/Commands/JobWhitelistCommands.cs
@@ -0,0 +1,214 @@
+using System.Linq;
+using Content.Server.Database;
+using Content.Server.Players.JobWhitelist;
+using Content.Shared.Administration;
+using Content.Shared.Roles;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class JobWhitelistAddCommand : LocalizedCommands
+{
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly JobWhitelistManager _jobWhitelist = default!;
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    public override string Command => "jobwhitelistadd";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var player = args[0].Trim();
+        var job = new ProtoId<JobPrototype>(args[1].Trim());
+        if (!_prototypes.TryIndex(job, out var jobPrototype))
+        {
+            shell.WriteError(Loc.GetString("cmd-jobwhitelist-job-does-not-exist", ("job", job.Id)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var data = await _playerLocator.LookupIdByNameAsync(player);
+        if (data != null)
+        {
+            var guid = data.UserId;
+            var isWhitelisted = await _db.IsJobWhitelisted(guid, job);
+            if (isWhitelisted)
+            {
+                shell.WriteLine(Loc.GetString("cmd-jobwhitelist-already-whitelisted",
+                    ("player", player),
+                    ("jobId", job.Id),
+                    ("jobName", jobPrototype.LocalizedName)));
+                return;
+            }
+
+            _jobWhitelist.AddWhitelist(guid, job);
+            shell.WriteLine(Loc.GetString("cmd-jobwhitelistadd-added",
+                ("player", player),
+                ("jobId", job.Id),
+                ("jobName", jobPrototype.LocalizedName)));
+            return;
+        }
+
+        shell.WriteError(Loc.GetString("cmd-jobwhitelist-player-not-found", ("player", player)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                _players.Sessions.Select(s => s.Name),
+                Loc.GetString("cmd-jobwhitelist-hint-player"));
+        }
+
+        if (args.Length == 2)
+        {
+            return CompletionResult.FromHintOptions(
+                _prototypes.EnumeratePrototypes<JobPrototype>().Select(p => p.ID),
+                Loc.GetString("cmd-jobwhitelist-hint-job"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class GetJobWhitelistCommand : LocalizedCommands
+{
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+
+    public override string Command => "jobwhitelistget";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length == 0)
+        {
+            shell.WriteError("This command needs at least one argument.");
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var player = string.Join(' ', args).Trim();
+        var data = await _playerLocator.LookupIdByNameAsync(player);
+        if (data != null)
+        {
+            var guid = data.UserId;
+            var whitelists = await _db.GetJobWhitelists(guid);
+            if (whitelists.Count == 0)
+            {
+                shell.WriteLine(Loc.GetString("cmd-jobwhitelistget-whitelisted-none", ("player", player)));
+                return;
+            }
+
+            shell.WriteLine(Loc.GetString("cmd-jobwhitelistget-whitelisted-for",
+                ("player", player),
+                ("jobs", string.Join(", ", whitelists))));
+            return;
+        }
+
+        shell.WriteError(Loc.GetString("cmd-jobwhitelist-player-not-found", ("player", player)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                _players.Sessions.Select(s => s.Name),
+                Loc.GetString("cmd-jobwhitelist-hint-player"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
+
+[AdminCommand(AdminFlags.Ban)]
+public sealed class RemoveJobWhitelistCommand : LocalizedCommands
+{
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly JobWhitelistManager _jobWhitelist = default!;
+    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    public override string Command => "jobwhitelistremove";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific",
+                ("properAmount", 2),
+                ("currentAmount", args.Length)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var player = args[0].Trim();
+        var job = new ProtoId<JobPrototype>(args[1].Trim());
+        if (!_prototypes.TryIndex(job, out var jobPrototype))
+        {
+            shell.WriteError(Loc.GetString("cmd-jobwhitelist-job-does-not-exist", ("job", job)));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        var data = await _playerLocator.LookupIdByNameAsync(player);
+        if (data != null)
+        {
+            var guid = data.UserId;
+            var isWhitelisted = await _db.IsJobWhitelisted(guid, job);
+            if (!isWhitelisted)
+            {
+                shell.WriteError(Loc.GetString("cmd-jobwhitelistremove-was-not-whitelisted",
+                    ("player", player),
+                    ("jobId", job.Id),
+                    ("jobName", jobPrototype.LocalizedName)));
+                return;
+            }
+
+            _jobWhitelist.RemoveWhitelist(guid, job);
+            shell.WriteLine(Loc.GetString("cmd-jobwhitelistremove-removed",
+                ("player", player),
+                ("jobId", job.Id),
+                ("jobName", jobPrototype.LocalizedName)));
+            return;
+        }
+
+        shell.WriteError(Loc.GetString("cmd-jobwhitelist-player-not-found", ("player", player)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                _players.Sessions.Select(s => s.Name),
+                Loc.GetString("cmd-jobwhitelist-hint-player"));
+        }
+
+        if (args.Length == 2)
+        {
+            return CompletionResult.FromHintOptions(
+                _prototypes.EnumeratePrototypes<JobPrototype>().Select(p => p.ID),
+                Loc.GetString("cmd-jobwhitelist-hint-job"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index 3a05b934b242..68bd81702653 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -73,7 +73,9 @@ private async Task<bool> AddRoleBan(ServerRoleBanDef banDef)
 
     public HashSet<string>? GetRoleBans(NetUserId playerUserId)
     {
-        return _cachedRoleBans.TryGetValue(playerUserId, out var roleBans) ? roleBans.Select(banDef => banDef.Role).ToHashSet() : null;
+        return _cachedRoleBans.TryGetValue(playerUserId, out var roleBans)
+            ? roleBans.Select(banDef => banDef.Role).ToHashSet()
+            : null;
     }
 
     private async Task CacheDbRoleBans(NetUserId userId, IPAddress? address = null, ImmutableArray<byte>? hwId = null)
@@ -263,13 +265,13 @@ public async Task<string> PardonRoleBan(int banId, NetUserId? unbanningAdmin, Da
         return $"Pardoned ban with id {banId}";
     }
 
-    public HashSet<string>? GetJobBans(NetUserId playerUserId)
+    public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId)
     {
         if (!_cachedRoleBans.TryGetValue(playerUserId, out var roleBans))
             return null;
         return roleBans
             .Where(ban => ban.Role.StartsWith(JobPrefix, StringComparison.Ordinal))
-            .Select(ban => ban.Role[JobPrefix.Length..])
+            .Select(ban => new ProtoId<JobPrototype>(ban.Role[JobPrefix.Length..]))
             .ToHashSet();
     }
     #endregion
diff --git a/Content.Server/Administration/Managers/IBanManager.cs b/Content.Server/Administration/Managers/IBanManager.cs
index dafe3d35bdd4..b60e0a25351d 100644
--- a/Content.Server/Administration/Managers/IBanManager.cs
+++ b/Content.Server/Administration/Managers/IBanManager.cs
@@ -2,8 +2,10 @@
 using System.Net;
 using System.Threading.Tasks;
 using Content.Shared.Database;
+using Content.Shared.Roles;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Managers;
 
@@ -24,7 +26,7 @@ public interface IBanManager
     /// <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 HashSet<string>? GetRoleBans(NetUserId playerUserId);
-    public HashSet<string>? GetJobBans(NetUserId playerUserId);
+    public HashSet<ProtoId<JobPrototype>>? GetJobBans(NetUserId playerUserId);
 
     /// <summary>
     /// Creates a job ban for the specified target, username or GUID
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 8743a4b5db1c..be6c7196d5f9 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -14,9 +14,11 @@
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
+using Content.Shared.Roles;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Database
@@ -1579,6 +1581,65 @@ protected async Task<List<ServerRoleBanNoteRecord>> GetGroupedServerRoleBansAsNo
 
         #endregion
 
+        #region Job Whitelists
+
+        public async Task<bool> AddJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            await using var db = await GetDb();
+            var exists = await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Where(w => w.RoleId == job.Id)
+                .AnyAsync();
+
+            if (exists)
+                return false;
+
+            var whitelist = new RoleWhitelist
+            {
+                PlayerUserId = player,
+                RoleId = job
+            };
+            db.DbContext.RoleWhitelists.Add(whitelist);
+            await db.DbContext.SaveChangesAsync();
+            return true;
+        }
+
+        public async Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel)
+        {
+            await using var db = await GetDb(cancel);
+            return await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Select(w => w.RoleId)
+                .ToListAsync(cancellationToken: cancel);
+        }
+
+        public async Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job)
+        {
+            await using var db = await GetDb();
+            return await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Where(w => w.RoleId == job.Id)
+                .AnyAsync();
+        }
+
+        public async Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            await using var db = await GetDb();
+            var entry = await db.DbContext.RoleWhitelists
+                .Where(w => w.PlayerUserId == player)
+                .Where(w => w.RoleId == job.Id)
+                .SingleOrDefaultAsync();
+
+            if (entry == null)
+                return false;
+
+            db.DbContext.RoleWhitelists.Remove(entry);
+            await db.DbContext.SaveChangesAsync();
+            return true;
+        }
+
+        #endregion
+
         // SQLite returns DateTime as Kind=Unspecified, Npgsql actually knows for sure it's Kind=Utc.
         // Normalize DateTimes here so they're always Utc. Thanks.
         protected abstract DateTime NormalizeDatabaseTime(DateTime time);
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 01d15267274e..1983fe43d20b 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -9,6 +9,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Preferences;
+using Content.Shared.Roles;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -17,6 +18,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using LogLevel = Robust.Shared.Log.LogLevel;
 using MSLogLevel = Microsoft.Extensions.Logging.LogLevel;
 
@@ -290,6 +292,18 @@ Task<int> AddConnectionLogAsync(
         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);
+
+        #endregion
     }
 
     public sealed class ServerDbManager : IServerDbManager
@@ -869,6 +883,30 @@ public Task MarkMessageAsSeen(int id, bool dismissedToo)
             return RunDbCommand(() => _db.MarkMessageAsSeen(id, dismissedToo));
         }
 
+        public Task AddJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.AddJobWhitelist(player, job));
+        }
+
+        public Task<List<string>> GetJobWhitelists(Guid player, CancellationToken cancel = default)
+        {
+            DbReadOpsMetric.Inc();
+            return RunDbCommand(() => _db.GetJobWhitelists(player, cancel));
+        }
+
+        public Task<bool> IsJobWhitelisted(Guid player, ProtoId<JobPrototype> job)
+        {
+            DbReadOpsMetric.Inc();
+            return RunDbCommand(() => _db.IsJobWhitelisted(player, job));
+        }
+
+        public Task<bool> RemoveJobWhitelist(Guid player, ProtoId<JobPrototype> job)
+        {
+            DbWriteOpsMetric.Inc();
+            return RunDbCommand(() => _db.RemoveJobWhitelist(player, job));
+        }
+
         // 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).
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index c58c594dbad0..1aac86c12916 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -1,8 +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;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
@@ -19,11 +17,12 @@ 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!;
 
@@ -51,8 +50,10 @@ public void ClientDisconnected(ICommonSession session)
         data.Cancel.Cancel();
         data.Cancel.Dispose();
 
-        _prefs.OnClientDisconnected(session);
-        _playTimeTracking.ClientDisconnected(session);
+        foreach (var onDisconnect in _onPlayerDisconnect)
+        {
+            onDisconnect(session);
+        }
     }
 
     private async Task Load(ICommonSession session, CancellationToken cancel)
@@ -62,12 +63,20 @@ 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.FinishLoad(session);
+
+            foreach (var action in _onFinishLoad)
+            {
+                action(session);
+            }
 
             _sawmill.Verbose($"Load complete for user {session}");
         }
@@ -118,10 +127,31 @@ public Task GetLoadTask(ICommonSession session)
         return _users[session.UserId].Task;
     }
 
+    public void AddOnLoadPlayer(OnLoadPlayer action)
+    {
+        _onLoadPlayer.Add(action);
+    }
+
+    public void AddOnFinishLoad(OnFinishLoad action)
+    {
+        _onFinishLoad.Add(action);
+    }
+
+    public void AddOnPlayerDisconnect(OnPlayerDisconnect action)
+    {
+        _onPlayerDisconnect.Add(action);
+    }
+
     void IPostInjectInit.PostInject()
     {
         _sawmill = _logManager.GetSawmill("userdb");
     }
 
     private sealed record UserData(CancellationTokenSource Cancel, Task Task);
+
+    public delegate Task OnLoadPlayer(ICommonSession player, CancellationToken cancel);
+
+    public delegate void OnFinishLoad(ICommonSession player);
+
+    public delegate void OnPlayerDisconnect(ICommonSession player);
 }
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 3cdf3bfe8e2e..234a2e465869 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -14,6 +14,7 @@
 using Content.Server.IoC;
 using Content.Server.Maps;
 using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Players.JobWhitelist;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Content.Server.ServerInfo;
@@ -107,6 +108,7 @@ public override void Init()
                 _voteManager.Initialize();
                 _updateManager.Initialize();
                 _playTimeTracking.Initialize();
+                IoCManager.Resolve<JobWhitelistManager>().Initialize();
             }
         }
 
diff --git a/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs b/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
new file mode 100644
index 000000000000..cd15cfb8f8d0
--- /dev/null
+++ b/Content.Server/GameTicking/Events/GetDisallowedJobsEvent.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Roles;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GameTicking.Events;
+
+[ByRefEvent]
+public readonly record struct GetDisallowedJobsEvent(ICommonSession Player, HashSet<ProtoId<JobPrototype>> Jobs);
diff --git a/Content.Server/GameTicking/Events/IsJobAllowedEvent.cs b/Content.Server/GameTicking/Events/IsJobAllowedEvent.cs
new file mode 100644
index 000000000000..51969d61ea0a
--- /dev/null
+++ b/Content.Server/GameTicking/Events/IsJobAllowedEvent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Roles;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.GameTicking.Events;
+
+[ByRefEvent]
+public struct IsJobAllowedEvent(ICommonSession player, ProtoId<JobPrototype> jobId, bool cancelled = false)
+{
+    public readonly ICommonSession Player = player;
+    public readonly ProtoId<JobPrototype> JobId = jobId;
+    public bool Cancelled = cancelled;
+}
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 843122e0feaa..22d368e57bde 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -2,11 +2,11 @@
 using System.Linq;
 using System.Numerics;
 using Content.Server.Administration.Managers;
+using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
 using Content.Server.Spawners.Components;
 using Content.Server.Speech.Components;
 using Content.Server.Station.Components;
-using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Mind;
 using Content.Shared.Players;
@@ -137,8 +137,14 @@ private void SpawnPlayer(ICommonSession player,
             if (jobBans == null || jobId != null && jobBans.Contains(jobId))
                 return;
 
-            if (jobId != null && !_playTimeTrackings.IsAllowed(player, jobId))
-                return;
+            if (jobId != null)
+            {
+                var ev = new IsJobAllowedEvent(player, new ProtoId<JobPrototype>(jobId));
+                RaiseLocalEvent(ref ev);
+                if (ev.Cancelled)
+                    return;
+            }
+
             SpawnPlayer(player, character, station, jobId, lateJoin, silent);
         }
 
@@ -181,10 +187,9 @@ private void SpawnPlayer(ICommonSession player,
             }
 
             // Figure out job restrictions
-            var restrictedRoles = new HashSet<string>();
-
-            var getDisallowed = _playTimeTrackings.GetDisallowedJobs(player);
-            restrictedRoles.UnionWith(getDisallowed);
+            var restrictedRoles = new HashSet<ProtoId<JobPrototype>>();
+            var ev = new GetDisallowedJobsEvent(player, restrictedRoles);
+            RaiseLocalEvent(ref ev);
 
             var jobBans = _banManager.GetJobBans(player.UserId);
             if (jobBans != null)
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index fa23312268f5..d9511309b9dc 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -19,7 +19,6 @@
 using Robust.Server;
 using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index f6800f72890d..c6dfcadd3826 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -13,6 +13,7 @@
 using Content.Server.Maps;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Players.JobWhitelist;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
 using Content.Server.ServerInfo;
@@ -61,6 +62,7 @@ public static void Register()
             IoCManager.Register<ServerDbEntryManager>();
             IoCManager.Register<ISharedPlaytimeManager, PlayTimeTrackingManager>();
             IoCManager.Register<ServerApi>();
+            IoCManager.Register<JobWhitelistManager>();
         }
     }
 }
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
new file mode 100644
index 000000000000..04289a40980d
--- /dev/null
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
@@ -0,0 +1,114 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Server.Database;
+using Content.Shared.CCVar;
+using Content.Shared.Players.JobWhitelist;
+using Content.Shared.Roles;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Serilog;
+
+namespace Content.Server.Players.JobWhitelist;
+
+public sealed class JobWhitelistManager : IPostInjectInit
+{
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    [Dependency] private readonly UserDbDataManager _userDb = default!;
+
+    private readonly Dictionary<NetUserId, HashSet<string>> _whitelists = new();
+
+    public void Initialize()
+    {
+        _net.RegisterNetMessage<MsgJobWhitelist>();
+    }
+
+    private async Task LoadData(ICommonSession session, CancellationToken cancel)
+    {
+        var whitelists = await _db.GetJobWhitelists(session.UserId, cancel);
+        cancel.ThrowIfCancellationRequested();
+        _whitelists[session.UserId] = whitelists.ToHashSet();
+    }
+
+    private void FinishLoad(ICommonSession session)
+    {
+        SendJobWhitelist(session);
+    }
+
+    private void ClientDisconnected(ICommonSession session)
+    {
+        _whitelists.Remove(session.UserId);
+    }
+
+    public async void AddWhitelist(NetUserId player, ProtoId<JobPrototype> job)
+    {
+        if (_whitelists.TryGetValue(player, out var whitelists))
+            whitelists.Add(job);
+
+        await _db.AddJobWhitelist(player, job);
+
+        if (_player.TryGetSessionById(player, out var session))
+            SendJobWhitelist(session);
+    }
+
+    public bool IsAllowed(ICommonSession session, ProtoId<JobPrototype> job)
+    {
+        if (!_config.GetCVar(CCVars.GameRoleWhitelist))
+            return true;
+
+        if (!_prototypes.TryIndex(job, out var jobPrototype) ||
+            !jobPrototype.Whitelisted)
+        {
+            return true;
+        }
+
+        return IsWhitelisted(session.UserId, job);
+    }
+
+    public bool IsWhitelisted(NetUserId player, ProtoId<JobPrototype> job)
+    {
+        if (!_whitelists.TryGetValue(player, out var whitelists))
+        {
+            Log.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
+                player,
+                job,
+                Environment.StackTrace);
+            return false;
+        }
+
+        return whitelists.Contains(job);
+    }
+
+    public async void RemoveWhitelist(NetUserId player, ProtoId<JobPrototype> job)
+    {
+        _whitelists.GetValueOrDefault(player)?.Remove(job);
+        await _db.RemoveJobWhitelist(player, job);
+
+        if (_player.TryGetSessionById(new NetUserId(player), out var session))
+            SendJobWhitelist(session);
+    }
+
+    public void SendJobWhitelist(ICommonSession player)
+    {
+        var msg = new MsgJobWhitelist
+        {
+            Whitelist = _whitelists.GetValueOrDefault(player.UserId) ?? new HashSet<string>()
+        };
+
+        _net.ServerSendMessage(msg, player.Channel);
+    }
+
+    void IPostInjectInit.PostInject()
+    {
+        _userDb.AddOnLoadPlayer(LoadData);
+        _userDb.AddOnFinishLoad(FinishLoad);
+        _userDb.AddOnPlayerDisconnect(ClientDisconnected);
+    }
+}
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
new file mode 100644
index 000000000000..aaada99dea94
--- /dev/null
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs
@@ -0,0 +1,83 @@
+using System.Collections.Immutable;
+using Content.Server.GameTicking.Events;
+using Content.Server.Station.Events;
+using Content.Shared.CCVar;
+using Content.Shared.Roles;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Players.JobWhitelist;
+
+public sealed class JobWhitelistSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly JobWhitelistManager _manager = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+
+    private ImmutableArray<ProtoId<JobPrototype>> _whitelistedJobs = [];
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+        SubscribeLocalEvent<StationJobsGetCandidatesEvent>(OnStationJobsGetCandidates);
+        SubscribeLocalEvent<IsJobAllowedEvent>(OnIsJobAllowed);
+        SubscribeLocalEvent<GetDisallowedJobsEvent>(OnGetDisallowedJobs);
+
+        CacheJobs();
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs ev)
+    {
+        if (ev.WasModified<JobPrototype>())
+            CacheJobs();
+    }
+
+    private void OnStationJobsGetCandidates(ref StationJobsGetCandidatesEvent ev)
+    {
+        if (!_config.GetCVar(CCVars.GameRoleWhitelist))
+            return;
+
+        for (var i = ev.Jobs.Count - 1; i >= 0; i--)
+        {
+            var jobId = ev.Jobs[i];
+            if (_player.TryGetSessionById(ev.Player, out var player) &&
+                !_manager.IsAllowed(player, jobId))
+            {
+                ev.Jobs.RemoveSwap(i);
+            }
+        }
+    }
+
+    private void OnIsJobAllowed(ref IsJobAllowedEvent ev)
+    {
+        if (!_manager.IsAllowed(ev.Player, ev.JobId))
+            ev.Cancelled = true;
+    }
+
+    private void OnGetDisallowedJobs(ref GetDisallowedJobsEvent ev)
+    {
+        if (!_config.GetCVar(CCVars.GameRoleWhitelist))
+            return;
+
+        foreach (var job in _whitelistedJobs)
+        {
+            if (!_manager.IsAllowed(ev.Player, job))
+                ev.Jobs.Add(job);
+        }
+    }
+
+    private void CacheJobs()
+    {
+        var builder = ImmutableArray.CreateBuilder<ProtoId<JobPrototype>>();
+        foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
+        {
+            if (job.Whitelisted)
+                builder.Add(job.ID);
+        }
+
+        _whitelistedJobs = builder.ToImmutable();
+    }
+}
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index c638c2f24094..bfd6172f4c0d 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -54,7 +54,7 @@ namespace Content.Server.Players.PlayTimeTracking;
 /// Operations like refreshing and sending play time info to clients are deferred until the next frame (note: not tick).
 /// </para>
 /// </remarks>
-public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
+public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjectInit
 {
     [Dependency] private readonly IServerDbManager _db = default!;
     [Dependency] private readonly IServerNetManager _net = default!;
@@ -62,6 +62,7 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ITaskManager _task = default!;
     [Dependency] private readonly IRuntimeLog _runtimeLog = default!;
+    [Dependency] private readonly UserDbDataManager _userDb = default!;
 
     private ISawmill _sawmill = default!;
 
@@ -445,4 +446,10 @@ private sealed class PlayTimeData
         /// </summary>
         public readonly HashSet<string> DbTrackersDirty = new();
     }
+
+    void IPostInjectInit.PostInject()
+    {
+        _userDb.AddOnLoadPlayer(LoadData);
+        _userDb.AddOnPlayerDisconnect(ClientDisconnected);
+    }
 }
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index e594e4de2696..c3142a709a76 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -4,7 +4,9 @@
 using Content.Server.Afk;
 using Content.Server.Afk.Events;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Events;
 using Content.Server.Mind;
+using Content.Server.Station.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Mobs;
@@ -12,7 +14,6 @@
 using Content.Shared.Players;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
@@ -50,6 +51,9 @@ public override void Initialize()
         SubscribeLocalEvent<UnAFKEvent>(OnUnAFK);
         SubscribeLocalEvent<MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
+        SubscribeLocalEvent<StationJobsGetCandidatesEvent>(OnStationJobsGetCandidates);
+        SubscribeLocalEvent<IsJobAllowedEvent>(OnIsJobAllowed);
+        SubscribeLocalEvent<GetDisallowedJobsEvent>(OnGetDisallowedJobs);
         _adminManager.OnPermsChanged += AdminPermsChanged;
     }
 
@@ -174,6 +178,22 @@ private void OnPlayerJoinedLobby(PlayerJoinedLobbyEvent ev)
         _tracking.QueueSendTimers(ev.PlayerSession);
     }
 
+    private void OnStationJobsGetCandidates(ref StationJobsGetCandidatesEvent ev)
+    {
+        RemoveDisallowedJobs(ev.Player, ev.Jobs);
+    }
+
+    private void OnIsJobAllowed(ref IsJobAllowedEvent ev)
+    {
+        if (!IsAllowed(ev.Player, ev.JobId))
+            ev.Cancelled = true;
+    }
+
+    private void OnGetDisallowedJobs(ref GetDisallowedJobsEvent ev)
+    {
+        ev.Jobs.UnionWith(GetDisallowedJobs(ev.Player));
+    }
+
     public bool IsAllowed(ICommonSession player, string role)
     {
         if (!_prototypes.TryIndex<JobPrototype>(role, out var job) ||
@@ -190,9 +210,9 @@ public bool IsAllowed(ICommonSession player, string role)
         return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes);
     }
 
-    public HashSet<string> GetDisallowedJobs(ICommonSession player)
+    public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
     {
-        var roles = new HashSet<string>();
+        var roles = new HashSet<ProtoId<JobPrototype>>();
         if (!_cfg.GetCVar(CCVars.GameRoleTimers))
             return roles;
 
@@ -222,7 +242,7 @@ public HashSet<string> GetDisallowedJobs(ICommonSession player)
         return roles;
     }
 
-    public void RemoveDisallowedJobs(NetUserId userId, ref List<string> jobs)
+    public void RemoveDisallowedJobs(NetUserId userId, List<ProtoId<JobPrototype>> jobs)
     {
         if (!_cfg.GetCVar(CCVars.GameRoleTimers))
             return;
@@ -239,7 +259,7 @@ public void RemoveDisallowedJobs(NetUserId userId, ref List<string> jobs)
         {
             var job = jobs[i];
 
-            if (!_prototypes.TryIndex<JobPrototype>(job, out var jobber) ||
+            if (!_prototypes.TryIndex(job, out var jobber) ||
                 jobber.Requirements == null ||
                 jobber.Requirements.Count == 0)
                 continue;
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index e32af589e958..f7c15a234058 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -3,26 +3,21 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.Database;
-using Content.Server.Humanoid;
 using Content.Shared.CCVar;
-using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
-using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-
 namespace Content.Server.Preferences.Managers
 {
     /// <summary>
     /// Sends <see cref="MsgPreferencesAndSettings"/> before the client joins the lobby.
     /// Receives <see cref="MsgSelectCharacter"/> and <see cref="MsgUpdateCharacter"/> at any time.
     /// </summary>
-    public sealed class ServerPreferencesManager : IServerPreferencesManager
+    public sealed class ServerPreferencesManager : IServerPreferencesManager, IPostInjectInit
     {
         [Dependency] private readonly IServerNetManager _netManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -30,6 +25,7 @@ public sealed class ServerPreferencesManager : IServerPreferencesManager
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IDependencyCollection _dependencies = default!;
         [Dependency] private readonly ILogManager _log = default!;
+        [Dependency] private readonly UserDbDataManager _userDb = 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 =
@@ -326,5 +322,12 @@ private sealed class PlayerPrefData
             public bool PrefsLoaded;
             public PlayerPreferences? Prefs;
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _userDb.AddOnLoadPlayer(LoadData);
+            _userDb.AddOnFinishLoad(FinishLoad);
+            _userDb.AddOnPlayerDisconnect(OnClientDisconnected);
+        }
     }
 }
diff --git a/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs b/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
new file mode 100644
index 000000000000..58d860b1e121
--- /dev/null
+++ b/Content.Server/Station/Events/StationJobsGetCandidatesEvent.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Roles;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Station.Events;
+
+[ByRefEvent]
+public readonly record struct StationJobsGetCandidatesEvent(NetUserId Player, List<ProtoId<JobPrototype>> Jobs);
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
index 4b7cd64961b1..c3c3865c7bfa 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
@@ -2,6 +2,7 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Station.Components;
+using Content.Server.Station.Events;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Shared.Network;
@@ -342,8 +343,9 @@ private Dictionary<NetUserId, List<string>> GetPlayersJobCandidates(int? weight,
         foreach (var (player, profile) in profiles)
         {
             var roleBans = _banManager.GetJobBans(player);
-            var profileJobs = profile.JobPriorities.Keys.ToList();
-            _playTime.RemoveDisallowedJobs(player, ref profileJobs);
+            var profileJobs = profile.JobPriorities.Keys.Select(k => new ProtoId<JobPrototype>(k)).ToList();
+            var ev = new StationJobsGetCandidatesEvent(player, profileJobs);
+            RaiseLocalEvent(ref ev);
 
             List<string>? availableJobs = null;
 
@@ -354,7 +356,7 @@ private Dictionary<NetUserId, List<string>> GetPlayersJobCandidates(int? weight,
                 if (!(priority == selectedPriority || selectedPriority is null))
                     continue;
 
-                if (!_prototypeManager.TryIndex(jobId, out JobPrototype? job))
+                if (!_prototypeManager.TryIndex(jobId, out var job))
                     continue;
 
                 if (weight is not null && job.Weight != weight.Value)
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index debac8902e2c..3bfa815af1ef 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -428,7 +428,7 @@ public IReadOnlySet<string> GetOverflowJobs(EntityUid station, StationJobsCompon
     /// <param name="pickOverflows">Whether or not to pick from the overflow list.</param>
     /// <param name="disallowedJobs">A set of disallowed jobs, if any.</param>
     /// <returns>The selected job, if any.</returns>
-    public string? PickBestAvailableJobWithPriority(EntityUid station, IReadOnlyDictionary<string, JobPriority> jobPriorities, bool pickOverflows, IReadOnlySet<string>? disallowedJobs = null)
+    public string? PickBestAvailableJobWithPriority(EntityUid station, IReadOnlyDictionary<string, JobPriority> jobPriorities, bool pickOverflows, IReadOnlySet<ProtoId<JobPrototype>>? disallowedJobs = null)
     {
         if (station == EntityUid.Invalid)
             return null;
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 5ca34945d88a..f41e0a1e6f10 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -225,6 +225,12 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool>
             GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        /// If roles should be restricted based on whether or not they are whitelisted.
+        /// </summary>
+        public static readonly CVarDef<bool>
+            GameRoleWhitelist = CVarDef.Create("game.role_whitelist", true, CVar.SERVER | CVar.REPLICATED);
+
         /// <summary>
         /// Whether or not disconnecting inside of a cryopod should remove the character or just store them until they reconnect.
         /// </summary>
diff --git a/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs b/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
new file mode 100644
index 000000000000..8347e2d706a2
--- /dev/null
+++ b/Content.Shared/Players/JobWhitelist/MsgJobWhitelist.cs
@@ -0,0 +1,33 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Players.JobWhitelist;
+
+public sealed class MsgJobWhitelist : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.EntityEvent;
+
+    public HashSet<string> Whitelist = new();
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+        var count = buffer.ReadVariableInt32();
+        Whitelist.EnsureCapacity(count);
+
+        for (var i = 0; i < count; i++)
+        {
+            Whitelist.Add(buffer.ReadString());
+        }
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+        buffer.WriteVariableInt32(Whitelist.Count);
+
+        foreach (var ban in Whitelist)
+        {
+            buffer.Write(ban);
+        }
+    }
+}
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 34a8ce64bffb..2959b564972a 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -1,10 +1,8 @@
 using Content.Shared.Access;
 using Content.Shared.Players.PlayTimeTracking;
-using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Roles
 {
@@ -116,6 +114,9 @@ public sealed partial class JobPrototype : IPrototype
 
         [DataField("extendedAccessGroups")]
         public IReadOnlyCollection<ProtoId<AccessGroupPrototype>> ExtendedAccessGroups { get; private set; } = Array.Empty<ProtoId<AccessGroupPrototype>>();
+
+        [DataField]
+        public bool Whitelisted;
     }
 
     /// <summary>
diff --git a/Resources/Locale/en-US/commands/job-whitelist-command.ftl b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
new file mode 100644
index 000000000000..7fa20f03dec5
--- /dev/null
+++ b/Resources/Locale/en-US/commands/job-whitelist-command.ftl
@@ -0,0 +1,20 @@
+cmd-jobwhitelist-job-does-not-exist = Job {$job} does not exist.
+cmd-jobwhitelist-player-not-found = Player {$player} not found.
+cmd-jobwhitelist-hint-player = [player]
+cmd-jobwhitelist-hint-job = [job]
+
+cmd-jobwhitelistadd-desc = Lets a player play a whitelisted job.
+cmd-jobwhitelistadd-help = Usage: jobwhitelistadd <username> <job>
+cmd-jobwhitelistadd-already-whitelisted = {$player} is already whitelisted to play as {$jobId} .({$jobName}).
+cmd-jobwhitelistadd-added = Added {$player} to the {$jobId} ({$jobName}) whitelist.
+
+cmd-jobwhitelistget-desc = Gets all the jobs that a player has been whitelisted for.
+cmd-jobwhitelistget-help = Usage: jobwhitelistadd <username>
+cmd-jobwhitelistget-whitelisted-none = Player {$player} is not whitelisted for any jobs.
+cmd-jobwhitelistget-whitelisted-for = "Player {$player} is whitelisted for:
+{$jobs}"
+
+cmd-jobwhitelistremove-desc = Removes a player's ability to play a whitelisted job.
+cmd-jobwhitelistremove-help = Usage: jobwhitelistadd <username> <job>
+cmd-jobwhitelistremove-was-not-whitelisted = {$player} was not whitelisted to play as {$jobId} ({$jobName}).
+cmd-jobwhitelistremove-removed = Removed {$player} from the whitelist for {$jobId} ({$jobName}).
diff --git a/Resources/Locale/en-US/job/role-whitelist.ftl b/Resources/Locale/en-US/job/role-whitelist.ftl
new file mode 100644
index 000000000000..3149f182b6a6
--- /dev/null
+++ b/Resources/Locale/en-US/job/role-whitelist.ftl
@@ -0,0 +1 @@
+role-not-whitelisted = You are not whitelisted to play this role.

From be6f55a09013ce88d7b57518ff283df0977aded9 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 198/568] Clean up store system (#28463)

---
 .../Store/Ui/StoreBoundUserInterface.cs       | 24 +++-----
 Content.Client/Store/Ui/StoreMenu.xaml.cs     |  5 +-
 .../GameTicking/Rules/NukeopsRuleSystem.cs    |  1 +
 .../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   | 42 +-------------
 .../SurplusBundle/SurplusBundleComponent.cs   | 13 +----
 .../SurplusBundle/SurplusBundleSystem.cs      | 57 ++++++++----------
 .../Traitor/Uplink/UplinkComponent.cs         |  7 +++
 Content.Server/Traitor/Uplink/UplinkSystem.cs | 18 +-----
 .../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   |  8 +--
 Resources/Prototypes/Store/presets.yml        | 58 +++++++++++--------
 26 files changed, 127 insertions(+), 209 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 88ad0e3de8b5..0010aedd9647 100644
--- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs
+++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Store;
 using JetBrains.Annotations;
 using System.Linq;
+using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Store.Ui;
@@ -13,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;
 
@@ -28,7 +26,9 @@ public StoreBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
 
     protected override void Open()
     {
-        _menu = new StoreMenu(_windowName);
+        _menu = new StoreMenu();
+        if (EntMan.TryGetComponent<StoreComponent>(Owner, out var store))
+            _menu.Title = Loc.GetString(store.Name);
 
         _menu.OpenCentered();
         _menu.OnClose += Close;
@@ -64,25 +64,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 b7a2c285fe5d..388b31291c19 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml.cs
+++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs
@@ -32,7 +32,7 @@ public sealed partial class StoreMenu : DefaultWindow
 
     private List<ListingData> _cachedListings = new();
 
-    public StoreMenu(string name)
+    public StoreMenu()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
@@ -40,9 +40,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 d6f1c3c619ab..1b62778d7585 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -25,6 +25,7 @@
 using Robust.Shared.Utility;
 using System.Linq;
 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 e8af08b2ebbb..88c5fb945925 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 d4934ee24e5f..43bf571eb456 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 47ae41896e22..e15dcfaa2bc7 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 c390432f3a1b..a05105662d4d 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 132f3534391f..3f0c2de2e18d 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 d259da2c95e8..5ad361eb4279 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 a56d9640d371..10b53a7c94b8 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 5a8be4be2bbd..4e823582e6e8 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 0a1a8d19f318..983d68d0af73 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 e310194778b0..0fd92cfb9651 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 Robust.Shared.Utility;
 
 namespace Content.Server.Store.Systems;
@@ -44,7 +43,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;
     }
 
@@ -54,7 +52,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();
@@ -167,43 +164,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);
-
-        if (_ui.HasUi(uid, StoreUiKey.Key))
-        {
-            _ui.SetUiState(uid, StoreUiKey.Key, new StoreInitializeState(preset.StoreName));
-        }
-    }
 }
 
 public sealed class CurrencyInsertAttemptEvent : CancellableEntityEventArgs
diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleComponent.cs
index 47ce68625a19..120581cf82d6 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 5c0a56d346c4..759cad5dedae 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 000000000000..35f11ce9ef76
--- /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/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 5670e28ec999..7c39f1ed666a 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.Store.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Store;
+using Content.Shared.Store.Components;
 
 namespace Content.Server.Traitor.Uplink
 {
@@ -17,18 +18,6 @@ public sealed class UplinkSystem : EntitySystem
         [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;
-        }
-
         /// <summary>
         /// Adds an uplink to the target
         /// </summary>
@@ -37,7 +26,7 @@ public int GetTCBalance(StoreComponent component)
         /// <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)
+        public bool AddUplink(EntityUid user, FixedPoint2? balance, EntityUid? uplinkEntity = null)
         {
             // Try to find target item
             if (uplinkEntity == null)
@@ -47,11 +36,10 @@ public bool AddUplink(EntityUid user, FixedPoint2? balance, string uplinkPresetI
                     return false;
             }
 
+            EnsureComp<UplinkComponent>(uplinkEntity.Value);
             var store = EnsureComp<StoreComponent>(uplinkEntity.Value);
-            _store.InitializeFromPreset(uplinkPresetId, uplinkEntity.Value, store);
             store.AccountOwner = user;
             store.Balance.Clear();
-
             if (balance != null)
             {
                 store.Balance.Clear();
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 0b7dbbea0942..223f50797171 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 ee4da6991f6c..59cf1bbbc818 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 997afedfc063..5c1a46339e72 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 3f9e909c809e..ba97af392507 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 b76ca6a14ad1..b1a6ab0b8fa6 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 554c5214c199..e47fa00c45bf 100644
--- a/Resources/Prototypes/Entities/Objects/Magic/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml
@@ -25,7 +25,7 @@
   id: WizardsGrimoire
   name: wizards grimoire
   suffix: Wizard
-  parent: BaseItem
+  parent: [ BaseItem, StorePresetSpellbook ]
   components:
     - type: Sprite
       sprite: Objects/Misc/books.rsi
@@ -46,7 +46,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
 
@@ -55,12 +54,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 c92985c2cbae..9690d0bdfe83 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 459beeef1880..53d4f7953b17 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,7 +96,6 @@
   suffix: 40 TC, NukeOps
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 40
   - type: Tag
@@ -112,7 +108,6 @@
   suffix: 60 TC, LoneOps
   components:
   - type: Store
-    preset: StorePresetUplink
     balance:
       Telecrystal: 60
   - type: Tag
@@ -125,6 +120,5 @@
   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 166c29fe4165..762ed68921aa 100644
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -1,29 +1,37 @@
-- type: storePreset
+- type: entity
   id: StorePresetUplink
-  storeName: Uplink
-  categories:
-  - UplinkWeaponry
-  - UplinkAmmo
-  - UplinkExplosives
-  - UplinkChemicals
-  - UplinkDeception
-  - UplinkDisruption
-  - UplinkImplants
-  - UplinkAllies
-  - UplinkWearables
-  - UplinkJob
-  - UplinkPointless
-  currencyWhitelist:
-  - Telecrystal
+  abstract: true
+  components:
+  - type: Store
+    name: store-preset-name-uplink
+    categories:
+    - UplinkWeaponry
+    - UplinkAmmo
+    - UplinkExplosives
+    - UplinkChemicals
+    - UplinkDeception
+    - UplinkDisruption
+    - UplinkImplants
+    - UplinkAllies
+    - UplinkWearables
+    - UplinkJob
+    - UplinkPointless
+    currencyWhitelist:
+    - Telecrystal
+    balance:
+      Telecrystal: 0
 
-- 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 5bb0c4d6a23232103d9da97e7df9c4bbfce467cc Mon Sep 17 00:00:00 2001
From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Sat, 1 Jun 2024 10:29:46 -0700
Subject: [PATCH 199/568] Fixed bug where ID card computer defaulted to the
 atmos as the job icon. (#28462)

Fixed ID atmos bug!
---
 Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
index 298912e7d536..82f6ebd8b59c 100644
--- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -27,6 +27,9 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
         private string? _lastJobTitle;
         private string? _lastJobProto;
 
+        // The job that will be picked if the ID doesn't have a job on the station.
+        private static ProtoId<JobPrototype> _defaultJob = "Passenger";
+
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
             List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
@@ -65,7 +68,6 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
             }
 
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
-
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
 
@@ -172,11 +174,15 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
                                        new List<ProtoId<AccessLevelPrototype>>());
 
             var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
-            if (jobIndex >= 0)
+            // If the job index is < 0 that means they don't have a job registered in the station records.
+            // For example, a new ID from a box would have no job index.
+            if (jobIndex < 0)
             {
-                JobPresetOptionButton.SelectId(jobIndex);
+                jobIndex = _jobPrototypeIds.IndexOf(_defaultJob);
             }
 
+            JobPresetOptionButton.SelectId(jobIndex);
+
             _lastFullName = state.TargetIdFullName;
             _lastJobTitle = state.TargetIdJobTitle;
             _lastJobProto = state.TargetIdJobPrototype;

From 81a328c543d9d7194570f2d176354aea9554e2a5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 17:30:52 +0000
Subject: [PATCH 200/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2a808f32825b..449f9bf43b5c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Reflected tranquilizer rounds no longer inject the character who reflected
-      them.
-    type: Fix
-  id: 6160
-  time: '2024-03-15T13:57:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26141
 - author: lzk228
   changes:
   - message: Refill light replacer from box popup now shows properly.
@@ -3853,3 +3845,11 @@
   id: 6659
   time: '2024-06-01T05:51:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28424
+- author: Beck Thompson
+  changes:
+  - message: ID computer will now select passenger as the default id icon instead
+      of atmospheric technician.
+    type: Fix
+  id: 6660
+  time: '2024-06-01T17:29:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28462

From a29b6a6894f8197be392bfd1c90085b8ea80f86c Mon Sep 17 00:00:00 2001
From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Date: Sun, 2 Jun 2024 03:46:35 +1000
Subject: [PATCH 201/568] Clean up new HTNs tasks (#28469)

* Clean up new HTNs tasks

* Added docs to math operations
---
 .../NPC/HTN/Preconditions/KeyExistsPrecondition.cs       | 7 ++++++-
 .../NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs    | 6 +++++-
 .../HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs  | 7 ++++---
 .../HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs | 8 ++++++--
 .../Preconditions/Math/KeyFloatGreaterPrecondition.cs    | 8 ++++++--
 .../HTN/Preconditions/Math/KeyFloatLessPrecondition.cs   | 8 ++++++--
 .../PrimitiveTasks/Operators/Math/AddFloatOperator.cs    | 5 +++--
 .../HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs | 5 +++--
 .../PrimitiveTasks/Operators/Math/SetFloatOperator.cs    | 5 +++--
 .../Operators/Math/SetRandomFloatOperator.cs             | 8 +++++---
 .../NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs   | 9 +++++++--
 .../NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs    | 7 ++++---
 12 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs
index 72c4e6367fef..69e265f2763d 100644
--- a/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/KeyExistsPrecondition.cs
@@ -1,8 +1,13 @@
 namespace Content.Server.NPC.HTN.Preconditions;
 
+/// <summary>
+/// Checks for the presence of the value by the specified <see cref="KeyExistsPrecondition.Key"/> in the <see cref="NPCBlackboard"/>.
+/// Returns true if there is a value.
+/// </summary>
 public sealed partial class KeyExistsPrecondition : HTNPrecondition
 {
-    [DataField("key", required: true)] public string Key = string.Empty;
+    [DataField(required: true), ViewVariables]
+    public string Key = string.Empty;
 
     public override bool IsMet(NPCBlackboard blackboard)
     {
diff --git a/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
index c12663901c74..8dc38e442ab3 100644
--- a/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
@@ -1,8 +1,12 @@
 namespace Content.Server.NPC.HTN.Preconditions;
 
+/// <summary>
+/// Checks if there is no value at the specified  <see cref="KeyNotExistsPrecondition.Key"/> in the <see cref="NPCBlackboard"/>.
+/// Returns true if there is no value.
+/// </summary>
 public sealed partial class KeyNotExistsPrecondition : HTNPrecondition
 {
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
index 8c7920e8be5c..2abb351272ff 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
@@ -1,16 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
 /// <summary>
-/// Checks for the presence of data in the blackboard and makes a comparison with the specified boolean
+/// Checks if there is a bool value for the specified <see cref="KeyBoolEqualsPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is equal to the <see cref="KeyBoolEqualsPrecondition.Value"/>.
 /// </summary>
 public sealed partial class KeyBoolEqualsPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public bool Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
index 802fdaf2b9c3..0f7e2cca2af0 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
@@ -1,13 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
+/// <summary>
+/// Checks if there is a float value for the specified <see cref="KeyFloatEqualsPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is equal to the <see cref="KeyFloatEqualsPrecondition.Value"/>.
+/// </summary>
 public sealed partial class KeyFloatEqualsPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public float Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
index 3a9ac366980a..b3a27a7d5deb 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
@@ -1,13 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
+/// <summary>
+/// Checks if there is a float value for the specified <see cref="KeyFloatGreaterPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is greater then <see cref="KeyFloatGreaterPrecondition.Value"/>.
+/// </summary>
 public sealed partial class KeyFloatGreaterPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public float Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
index 5cd51d7a7c57..c5eb35eebc43 100644
--- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
@@ -1,13 +1,17 @@
 namespace Content.Server.NPC.HTN.Preconditions.Math;
 
+/// <summary>
+/// Checks if there is a float value for the specified <see cref="KeyFloatGreaterPrecondition.Key"/>
+/// in the <see cref="NPCBlackboard"/> and the specified value is less then <see cref="KeyFloatGreaterPrecondition.Value"/>.
+/// </summary>
 public sealed partial class KeyFloatLessPrecondition : HTNPrecondition
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string Key = string.Empty;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
     public float Value;
 
     public override bool IsMet(NPCBlackboard blackboard)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
index 00404517c9e0..f8ed20544ecc 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
@@ -4,13 +4,14 @@
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Gets the key, and adds the value to that float
+/// Added <see cref="AddFloatOperator.Amount"/> to float value for the
+/// specified <see cref="AddFloatOperator.TargetKey"/> in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class AddFloatOperator : HTNOperator
 {
     [Dependency] private readonly IEntityManager _entManager = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
index a40b96798d4a..f168326af7b0 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
@@ -4,11 +4,12 @@
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Just sets a blackboard key to a bool
+/// Set <see cref="SetBoolOperator.Value"/> to bool value for the
+/// specified <see cref="SetFloatOperator.TargetKey"/> in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class SetBoolOperator : HTNOperator
 {
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
index 76842b431f70..f9b5e54fe3ee 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
@@ -4,11 +4,12 @@
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Just sets a blackboard key to a float
+/// Set <see cref="SetFloatOperator.Amount"/> to float value for the
+/// specified <see cref="SetFloatOperator.TargetKey"/> in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class SetFloatOperator : HTNOperator
 {
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
index 999756f1f74c..edcab6baff57 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
@@ -5,20 +5,22 @@
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
-/// Sets a random float from MinAmount to MaxAmount to blackboard
+/// Set random float value between <see cref="SetRandomFloatOperator.MinAmount"/> and
+/// <see cref="SetRandomFloatOperator.MaxAmount"/> specified <see cref="SetRandomFloatOperator.TargetKey"/>
+/// in the <see cref="NPCBlackboard"/>.
 /// </summary>
 public sealed partial class SetRandomFloatOperator : HTNOperator
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    [DataField(required: true)]
+    [DataField(required: true), ViewVariables]
     public string TargetKey = string.Empty;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float MaxAmount = 1f;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float MinAmount = 0f;
+    public float MinAmount;
 
     public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
         CancellationToken cancelToken)
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
index d1c7d6191502..558b1fc04dc6 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
@@ -20,7 +20,8 @@ public sealed partial class SayKeyOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-        _chat = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+
+        _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
@@ -28,8 +29,12 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
         if (!blackboard.TryGetValue<object>(Key, out var value, _entManager))
             return HTNOperatorStatus.Failed;
 
+        var @string = value.ToString();
+        if (@string is not { })
+            return HTNOperatorStatus.Failed;
+
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-        _chat.TrySendInGameICMessage(speaker, value.ToString() ?? "Oh no...", InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+        _chat.TrySendInGameICMessage(speaker, @string, InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
 
         return base.Update(blackboard, frameTime);
     }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
index cf07831959bd..8a4c655a39b5 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs
@@ -6,7 +6,7 @@ public sealed partial class SpeakOperator : HTNOperator
 {
     private ChatSystem _chat = default!;
 
-    [DataField("speech", required: true)]
+    [DataField(required: true)]
     public string Speech = string.Empty;
 
     /// <summary>
@@ -18,14 +18,15 @@ public sealed partial class SpeakOperator : HTNOperator
     public override void Initialize(IEntitySystemManager sysManager)
     {
         base.Initialize(sysManager);
-        _chat = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+
+        _chat = sysManager.GetEntitySystem<ChatSystem>();
     }
 
     public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
     {
         var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-
         _chat.TrySendInGameICMessage(speaker, Loc.GetString(Speech), InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+
         return base.Update(blackboard, frameTime);
     }
 }

From 09256cfaa572d326840edaea1dc0268cd9def5e3 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sat, 1 Jun 2024 13:49:28 -0400
Subject: [PATCH 202/568] Makes machine parts stackable, removes unused field
 in stack prototypes (#28434)

* Makes machine parts stacks, removes unused field in stack prototypes

* forgor

* Fix tests

* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely

* detail

* a
---
 .../Tests/MaterialArbitrageTest.cs            |  2 +-
 .../Construction/MachineFrameSystem.cs        | 59 +++++++++++---
 Content.Server/Stack/StackSystem.cs           |  2 +-
 .../Construction/MachinePartSystem.cs         |  4 +-
 Content.Shared/Materials/MaterialPrototype.cs |  2 +-
 Content.Shared/Stacks/StackPrototype.cs       | 19 ++---
 .../Entities/Objects/Misc/machine_parts.yml   |  8 ++
 .../Entities/Objects/Tools/fulton.yml         |  1 -
 .../Stacks/Materials/Sheets/glass.yml         |  7 --
 .../Stacks/Materials/Sheets/metal.yml         |  3 -
 .../Stacks/Materials/Sheets/other.yml         |  4 -
 .../Prototypes/Stacks/Materials/crystals.yml  |  1 -
 .../Prototypes/Stacks/Materials/ingots.yml    |  2 -
 .../Prototypes/Stacks/Materials/materials.yml | 13 ----
 Resources/Prototypes/Stacks/Materials/ore.yml |  9 ---
 .../Prototypes/Stacks/Materials/parts.yml     |  1 -
 .../Prototypes/Stacks/consumable_stacks.yml   | 11 ---
 .../Prototypes/Stacks/engineering_stacks.yml  |  2 -
 .../Prototypes/Stacks/floor_tile_stacks.yml   | 76 +------------------
 .../Prototypes/Stacks/medical_stacks.yml      |  8 --
 Resources/Prototypes/Stacks/power_stacks.yml  |  3 -
 .../Prototypes/Stacks/science_stacks.yml      | 19 ++++-
 22 files changed, 88 insertions(+), 168 deletions(-)

diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index 7f9c02fc13bc..ed1e5549438f 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -103,7 +103,7 @@ public async Task NoMaterialArbitrage()
                         continue;
 
                     var stackProto = protoManager.Index<StackPrototype>(materialStep.MaterialPrototypeId);
-                    var spawnProto = protoManager.Index<EntityPrototype>(stackProto.Spawn);
+                    var spawnProto = protoManager.Index(stackProto.Spawn);
 
                     if (!spawnProto.Components.ContainsKey(materialName) ||
                         !spawnProto.Components.TryGetValue(compositionName, out var compositionReg))
diff --git a/Content.Server/Construction/MachineFrameSystem.cs b/Content.Server/Construction/MachineFrameSystem.cs
index 09d8d413ecd7..e20c36d8498c 100644
--- a/Content.Server/Construction/MachineFrameSystem.cs
+++ b/Content.Server/Construction/MachineFrameSystem.cs
@@ -59,23 +59,27 @@ private void OnInteractUsing(EntityUid uid, MachineFrameComponent component, Int
             return;
         }
 
-        // Machine parts cannot currently satisfy stack/component/tag restrictions. Similarly stacks cannot satisfy
-        // component/tag restrictions. However, there is no reason this cannot be supported in the future. If this
-        // changes, then RegenerateProgress() also needs to be updated.
-        //
+        // If this changes in the future, then RegenerateProgress() also needs to be updated.
         // Note that one entity is ALLOWED to satisfy more than one kind of component or tag requirements. This is
         // necessary in order to avoid weird entity-ordering shenanigans in RegenerateProgress().
+        var stack = CompOrNull<StackComponent>(args.Used);
+        var machinePart = CompOrNull<MachinePartComponent>(args.Used);
+        if (stack != null && machinePart != null)
+        {
+            if (TryInsertPartStack(uid, args.Used, component, machinePart, stack))
+                args.Handled = true;
+            return;
+        }
 
         // Handle parts
-        if (TryComp<MachinePartComponent>(args.Used, out var machinePart))
+        if (machinePart != null)
         {
             if (TryInsertPart(uid, args.Used, component, machinePart))
                 args.Handled = true;
             return;
         }
 
-        // Handle stacks
-        if (TryComp<StackComponent>(args.Used, out var stack))
+        if (stack != null)
         {
             if (TryInsertStack(uid, args.Used, component, stack))
                 args.Handled = true;
@@ -191,6 +195,44 @@ private bool TryInsertPart(EntityUid uid, EntityUid used, MachineFrameComponent
         return true;
     }
 
+    /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
+    private bool TryInsertPartStack(EntityUid uid, EntityUid used, MachineFrameComponent component, MachinePartComponent machinePart, StackComponent stack)
+    {
+        if (!component.Requirements.ContainsKey(machinePart.PartType))
+            return false;
+
+        var progress = component.Progress[machinePart.PartType];
+        var requirement = component.Requirements[machinePart.PartType];
+
+        var needed = requirement - progress;
+        if (needed <= 0)
+            return false;
+
+        var count = stack.Count;
+        if (count < needed)
+        {
+            if (!_container.Insert(used, component.PartContainer))
+                return true;
+
+            component.Progress[machinePart.PartType] += count;
+            return true;
+        }
+
+        var splitStack = _stack.Split(used, needed, Transform(uid).Coordinates, stack);
+
+        if (splitStack == null)
+            return false;
+
+        if (!_container.Insert(splitStack.Value, component.PartContainer))
+            return true;
+
+        component.Progress[machinePart.PartType] += needed;
+        if (IsComplete(component))
+            _popupSystem.PopupEntity(Loc.GetString("machine-frame-component-on-complete"), uid);
+
+        return true;
+    }
+
     /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
     private bool TryInsertStack(EntityUid uid, EntityUid used, MachineFrameComponent component, StackComponent stack)
     {
@@ -328,8 +370,6 @@ public void RegenerateProgress(MachineFrameComponent component)
         {
             if (TryComp<MachinePartComponent>(part, out var machinePart))
             {
-                DebugTools.Assert(!HasComp<StackComponent>(part));
-
                 // Check this is part of the requirements...
                 if (!component.Requirements.ContainsKey(machinePart.PartType))
                     continue;
@@ -338,7 +378,6 @@ public void RegenerateProgress(MachineFrameComponent component)
                     component.Progress[machinePart.PartType] = 1;
                 else
                     component.Progress[machinePart.PartType]++;
-
                 continue;
             }
 
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index 001093a8dd4f..e34592b45f9c 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -51,7 +51,7 @@ public override void SetCount(EntityUid uid, int amount, StackComponent? compone
 
             // Get a prototype ID to spawn the new entity. Null is also valid, although it should rarely be picked...
             var prototype = _prototypeManager.TryIndex<StackPrototype>(stack.StackTypeId, out var stackType)
-                ? stackType.Spawn
+                ? stackType.Spawn.ToString()
                 : Prototype(uid)?.ID;
 
             // Set the output parameter in the event instance to the newly split stack.
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 1a19040b4106..359b58c8816f 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -87,9 +87,9 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
             foreach (var (stackId, amount) in comp.MaterialIdRequirements)
             {
                 var stackProto = _prototype.Index<StackPrototype>(stackId);
+                var defaultProto = _prototype.Index(stackProto.Spawn);
 
-                if (_prototype.TryIndex(stackProto.Spawn, out var defaultProto) &&
-                    defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
+                if (defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
                 {
                     foreach (var (mat, matAmount) in physComp.MaterialComposition)
                     {
diff --git a/Content.Shared/Materials/MaterialPrototype.cs b/Content.Shared/Materials/MaterialPrototype.cs
index 905a2359d38b..5adf13213ebe 100644
--- a/Content.Shared/Materials/MaterialPrototype.cs
+++ b/Content.Shared/Materials/MaterialPrototype.cs
@@ -29,7 +29,7 @@ public sealed partial class MaterialPrototype : IPrototype, IInheritingPrototype
         ///     include which stack we should spawn by default.
         /// </summary>
         [DataField]
-        public ProtoId<EntityPrototype>? StackEntity;
+        public EntProtoId? StackEntity;
 
         [DataField]
         public string Name = string.Empty;
diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs
index 28b7da8f2ae8..f108419a9efd 100644
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -4,7 +4,7 @@
 
 namespace Content.Shared.Stacks;
 
-[Prototype("stack")]
+[Prototype]
 public sealed partial class StackPrototype : IPrototype
 {
     [ViewVariables]
@@ -15,33 +15,26 @@ public sealed partial class StackPrototype : IPrototype
     ///     Human-readable name for this stack type e.g. "Steel"
     /// </summary>
     /// <remarks>This is a localization string ID.</remarks>
-    [DataField("name")]
+    [DataField]
     public string Name { get; private set; } = string.Empty;
 
     /// <summary>
     ///     An icon that will be used to represent this stack type.
     /// </summary>
-    [DataField("icon")]
+    [DataField]
     public SpriteSpecifier? Icon { get; private set; }
 
     /// <summary>
     ///     The entity id that will be spawned by default from this stack.
     /// </summary>
-    [DataField("spawn", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Spawn { get; private set; } = string.Empty;
+    [DataField(required: true)]
+    public EntProtoId Spawn { get; private set; } = string.Empty;
 
     /// <summary>
     ///     The maximum amount of things that can be in a stack.
     ///     Can be overriden on <see cref="StackComponent"/>
     ///     if null, simply has unlimited max count.
     /// </summary>
-    [DataField("maxCount")]
+    [DataField]
     public int? MaxCount { get; private set; }
-
-    /// <summary>
-    /// The size of an individual unit of this stack.
-    /// </summary>
-    [DataField("itemSize")]
-    public int? ItemSize;
 }
-
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 62a63c80c31a..37de294cce89 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -9,6 +9,8 @@
       sprite: Objects/Misc/stock_parts.rsi
     - type: Item
       size: Tiny
+    - type: Stack
+      count: 1
 
 - type: entity
   id: CapacitorStockPart
@@ -25,6 +27,8 @@
     - type: Tag
       tags:
         - CapacitorStockPart
+    - type: Stack
+      stackType: Capacitor
 
 - type: entity
   id: MicroManipulatorStockPart
@@ -38,6 +42,8 @@
     - type: MachinePart
       part: Manipulator
       rating: 1
+    - type: Stack
+      stackType: MicroManipulator
 
 - type: entity
   id: MatterBinStockPart
@@ -51,3 +57,5 @@
     - type: MachinePart
       part: MatterBin
       rating: 1
+    - type: Stack
+      stackType: MatterBin
diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
index 5255e5f303b8..cfd0b8f77009 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -7,7 +7,6 @@
     state: extraction_pack
   spawn: Fulton1
   maxCount: 10
-  itemSize: 2
 
 # Entities
 - type: entity
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
index 0caffb301f50..cd6aed7cdfcb 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: glass }
   spawn: SheetGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedGlass
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rglass }
   spawn: SheetRGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: PlasmaGlass
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: pglass }
   spawn: SheetPGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedPlasmaGlass
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: rpglass }
   spawn: SheetRPGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: UraniumGlass
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: uglass }
   spawn: SheetUGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ReinforcedUraniumGlass
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: ruglass }
   spawn: SheetRUGlass1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: ClockworkGlass
@@ -52,4 +46,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
   spawn: SheetClockworkGlass1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
index 77f750c205b9..7520130b9be1 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: steel }
   spawn: SheetSteel1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plasteel
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: plasteel }
   spawn: SheetPlasteel1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Brass
@@ -20,4 +18,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
   spawn: SheetBrass1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
index 96f22ae656c9..565b1fc1aeec 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/other.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: paper }
   spawn: SheetPaper1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plasma
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plasma }
   spawn: SheetPlasma1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Plastic
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: plastic }
   spawn: SheetPlastic1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Uranium
@@ -28,4 +25,3 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/other.rsi, state: uranium }
   spawn: SheetUranium1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/crystals.yml b/Resources/Prototypes/Stacks/Materials/crystals.yml
index 274f9c10eab1..28f4ed70ca02 100644
--- a/Resources/Prototypes/Stacks/Materials/crystals.yml
+++ b/Resources/Prototypes/Stacks/Materials/crystals.yml
@@ -3,4 +3,3 @@
   name: telecrystal
   icon: Objects/Specific/Syndicate/telecrystal.rsi
   spawn: Telecrystal1
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/ingots.yml b/Resources/Prototypes/Stacks/Materials/ingots.yml
index 956523c92ba0..1fd67a096dc7 100644
--- a/Resources/Prototypes/Stacks/Materials/ingots.yml
+++ b/Resources/Prototypes/Stacks/Materials/ingots.yml
@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
   spawn: IngotGold1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Silver
@@ -12,4 +11,3 @@
   icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
   spawn: IngotSilver1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
index cc963dde59a4..1157dc3f004c 100644
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Misc/monkeycube.rsi, state: cube }
   spawn: MaterialBiomass1
   maxCount: 100
-  itemSize: 1
 
 - type: stack
   id: WoodPlank
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: wood }
   spawn: MaterialWoodPlank1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Cardboard
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard }
   spawn: MaterialCardboard1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Cloth
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cloth }
   spawn: MaterialCloth1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Durathread
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: durathread }
   spawn: MaterialDurathread1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Diamond
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: diamond }
   spawn: MaterialDiamond1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: Cotton
@@ -52,7 +46,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
   spawn: MaterialCotton1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Pyrotton
@@ -60,7 +53,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: pyrotton }
   spawn: MaterialPyrotton1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Bananium
@@ -68,7 +60,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
   spawn: MaterialBananium1
   maxCount: 10
-  itemSize: 2
 
 - type: stack
   id: MeatSheets
@@ -76,7 +67,6 @@
   icon: { sprite: /Textures/Objects/Materials/Sheets/meaterial.rsi, state: meat }
   spawn: MaterialSheetMeat1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: WebSilk
@@ -84,7 +74,6 @@
   icon: { sprite: /Textures/Objects/Materials/silk.rsi, state: icon }
   spawn: MaterialWebSilk1
   maxCount: 50
-  itemSize: 1
 
 - type: stack
   id: Bones
@@ -92,7 +81,6 @@
   icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones}
   spawn: MaterialBones1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: Gunpowder
@@ -100,4 +88,3 @@
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: MaterialGunpowder
   maxCount: 60
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 2a95393c27bb..51254b5a7a68 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -4,7 +4,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: gold }
   spawn: GoldOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SteelOre
@@ -12,7 +11,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
   spawn: SteelOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: PlasmaOre
@@ -20,7 +18,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: plasma }
   spawn: PlasmaOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SilverOre
@@ -28,7 +25,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: silver }
   spawn: SilverOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SpaceQuartz
@@ -36,7 +32,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: spacequartz }
   spawn: SpaceQuartz1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: UraniumOre
@@ -44,7 +39,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
   spawn: UraniumOre1
   maxCount: 30
-  itemSize: 2
 
 
 - type: stack
@@ -53,7 +47,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
   spawn: BananiumOre1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: Coal
@@ -61,7 +54,6 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: coal }
   spawn: Coal1
   maxCount: 30
-  itemSize: 2
 
 - type: stack
   id: SaltOre
@@ -69,4 +61,3 @@
   icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
   spawn: Salt1
   maxCount: 30
-  itemSize: 2
diff --git a/Resources/Prototypes/Stacks/Materials/parts.yml b/Resources/Prototypes/Stacks/Materials/parts.yml
index 947bbb1bf25a..50ceb28757a7 100644
--- a/Resources/Prototypes/Stacks/Materials/parts.yml
+++ b/Resources/Prototypes/Stacks/Materials/parts.yml
@@ -4,4 +4,3 @@
   icon: { sprite: /Textures/Objects/Materials/parts.rsi, state: rods }
   spawn: PartRodMetal1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml
index 2936772f080c..e7feab7b5202 100644
--- a/Resources/Prototypes/Stacks/consumable_stacks.yml
+++ b/Resources/Prototypes/Stacks/consumable_stacks.yml
@@ -5,7 +5,6 @@
   name: pancake
   spawn: FoodBakedPancake
   maxCount: 3
-  itemSize: 1
 
 # Food Containers
 
@@ -15,7 +14,6 @@
   icon: { sprite: Objects/Consumable/Food/Baked/pizza.rsi, state: box }
   spawn: FoodBoxPizza
   maxCount: 30
-  itemSize: 10
 
 # Smokeables
 
@@ -25,7 +23,6 @@
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
   spawn: PaperRolling
   maxCount: 5
-  itemSize: 1
 
 - type: stack
   id: CigaretteFilter
@@ -33,7 +30,6 @@
   icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
   spawn: CigaretteFilter
   maxCount: 5
-  itemSize: 2
 
 - type: stack
   id: GroundTobacco
@@ -41,7 +37,6 @@
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundTobacco
   maxCount: 5
-  itemSize: 1
 
 - type: stack
   id: GroundCannabis
@@ -49,7 +44,6 @@
   icon: { sprite: /Textures/Objects/Misc/reagent_fillings.rsi, state: powderpile }
   spawn: GroundCannabis
   maxCount:
-  itemSize: 1
 
 - type: stack
   id: GroundCannabisRainbow
@@ -57,7 +51,6 @@
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: powderpile_rainbow }
   spawn: GroundCannabisRainbow
   maxCount:
-  itemSize: 1
 
 - type: stack
   id: LeavesTobaccoDried
@@ -65,7 +58,6 @@
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesTobaccoDried
   maxCount: 5
-  itemSize: 5
 
 - type: stack
   id: LeavesCannabisDried
@@ -73,12 +65,9 @@
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/tobacco.rsi, state: dried }
   spawn: LeavesCannabisDried
   maxCount: 5
-  itemSize: 5
 
 - type: stack
   id: LeavesCannabisRainbowDried
   name: dried rainbow cannabis leaves
   icon: { sprite: /Textures/Objects/Specific/Hydroponics/rainbow_cannabis.rsi, state: dried }
   spawn: LeavesCannabisRainbowDried
-  maxCount: 5
-  itemSize: 5
diff --git a/Resources/Prototypes/Stacks/engineering_stacks.yml b/Resources/Prototypes/Stacks/engineering_stacks.yml
index 77cc62040230..b4550015dc45 100644
--- a/Resources/Prototypes/Stacks/engineering_stacks.yml
+++ b/Resources/Prototypes/Stacks/engineering_stacks.yml
@@ -4,11 +4,9 @@
   name: inflatable wall
   spawn: InflatableWallStack1
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: InflatableDoor
   name: inflatable door
   spawn: InflatableDoorStack1
   maxCount: 4
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index c5e37013b870..c88786f0dc81 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -3,469 +3,402 @@
   name: steel tile
   spawn: FloorTileItemSteel
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMetalDiamond
   name: steel tile
   spawn: FloorTileItemMetalDiamond
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWood
   name: wood floor
   spawn: FloorTileItemWood
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWhite
   name: white tile
   spawn: FloorTileItemWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDark
   name: dark tile
   spawn: FloorTileItemDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileTechmaint
   name: techmaint floor
   spawn: FloorTileItemTechmaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileFreezer
   name: freezer tile
   spawn: FloorTileItemFreezer
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileShowroom
   name: showroom tile
   spawn: FloorTileItemShowroom
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGCircuit
   name: green-circuit floor
   spawn: FloorTileItemGCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGold
   name: gold floor
   spawn: FloorTileItemGold
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileReinforced
   name: reinforced tile
   spawn: FloorTileItemReinforced
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMono
   name: mono tile
   spawn: FloorTileItemMono
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBrassFilled
   name: filled brass plate
   spawn: FloorTileItemBrassFilled
   maxCount: 30
-  itemSize: 5
-  
+
 - type: stack
   id: FloorTileBrassReebe
   name: smooth brass plate
   spawn: FloorTileItemBrassReebe
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLino
   name: linoleum floor
   spawn: FloorTileItemLino
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileHydro
   name: hydro tile
   spawn: FloorTileItemHydro
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLime
   name: lime tile
   spawn: FloorTileItemLime
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDirty
   name: dirty tile
   spawn: FloorTileItemDirty
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleWhite
   name: white shuttle tile
   spawn: FloorTileItemShuttleWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleBlue
   name: blue shuttle tile
   spawn: FloorTileItemShuttleBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleOrange
   name: orange shuttle tile
   spawn: FloorTileItemShuttleOrange
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttlePurple
   name: purple shuttle tile
   spawn: FloorTileItemShuttlePurple
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleRed
   name: red shuttle tile
   spawn: FloorTileItemShuttleRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleGrey
   name: grey shuttle tile
   spawn: FloorTileItemShuttleGrey
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackShuttleBlack
   name: black shuttle tile
   spawn: FloorTileItemShuttleBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackEighties
   name: eighties floor tile
   spawn: FloorTileItemEighties
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeBlue
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeBlue2
   name: blue arcade tile
   spawn: FloorTileItemArcadeBlue2
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackArcadeRed
   name: red arcade tile
   spawn: FloorTileItemArcadeRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetRed
   name: red carpet tile
   spawn: FloorCarpetItemRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetBlack
   name: block carpet tile
   spawn: FloorCarpetItemBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetBlue
   name: blue carpet tile
   spawn: FloorCarpetItemBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetGreen
   name: green carpet tile
   spawn: FloorCarpetItemGreen
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetOrange
   name: orange carpet tile
   spawn: FloorCarpetItemOrange
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetSkyBlue
   name: skyblue carpet tile
   spawn: FloorCarpetItemSkyBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetPurple
   name: purple carpet tile
   spawn: FloorCarpetItemPurple
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetPink
   name: pink carpet tile
   spawn: FloorCarpetItemPink
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetCyan
   name: cyan carpet tile
   spawn: FloorCarpetItemCyan
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorCarpetWhite
   name: white carpet tile
   spawn: FloorCarpetItemWhite
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackCarpetClown
   name: clown carpet tile
   spawn: FloorTileItemCarpetClown
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackCarpetOffice
   name: office carpet tile
   spawn: FloorTileItemCarpetOffice
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackBoxing
   name: boxing ring tile
   spawn: FloorTileItemBoxing
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileStackGym
   name: gym floor tile
   spawn: FloorTileItemGym
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileElevatorShaft
   name: elevator shaft tile
   spawn: FloorTileItemElevatorShaft
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileRockVault
   name: rock vault tile
   spawn: FloorTileItemRockVault
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBlue
   name: blue floor tile
   spawn: FloorTileItemBlue
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMining
   name: mining floor tile
   spawn: FloorTileItemMining
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMiningDark
   name: dark mining floor tile
   spawn: FloorTileItemMiningDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMiningLight
   name: light mining floor tile
   spawn: FloorTileItemMiningLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBar
   name: item bar floor tile
   spawn: FloorTileItemBar
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileClown
   name: clown floor tile
   spawn: FloorTileItemClown
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMime
   name: mime floor tile
   spawn: FloorTileItemMime
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileKitchen
   name: kitchen floor tile
   spawn: FloorTileItemKitchen
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileLaundry
   name: laundry floor tile
   spawn: FloorTileItemLaundry
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileConcrete
   name: concrete tile
   spawn: FloorTileItemGrayConcrete
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrayConcrete
   name: gray concrete tile
   spawn: FloorTileItemLaundry
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileOldConcrete
   name: old concrete tile
   spawn: FloorTileItemOldConcrete
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSilver
   name: silver floor tile
   spawn: FloorTileItemSilver
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileBCircuit
   name: bcircuit floor tile
   spawn: FloorTileItemBCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrass
   name: grass floor tile
   spawn: FloorTileItemGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGrassJungle
   name: grass jungle floor tile
   spawn: FloorTileItemGrassJungle
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSnow
   name: snow floor tile
   spawn: FloorTileItemSnow
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWoodPattern
   name: wood pattern floor
   spawn: FloorTileItemWoodPattern
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileFlesh
   name: flesh floor
   spawn: FloorTileItemFlesh
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileSteelMaint
   name: steel maint floor
   spawn: FloorTileItemSteelMaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileGratingMaint
   name: grating maint floor
   spawn: FloorTileItemGratingMaint
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWeb
   name: web tile
   spawn: FloorTileItemWeb
   maxCount: 30
-  itemSize: 5
 
 # Faux science tiles
 - type: stack
@@ -473,38 +406,33 @@
   name: astro-grass floor
   spawn: FloorTileItemAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileMowedAstroGrass
   name: mowed astro-grass floor
   spawn: FloorTileItemMowedAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileJungleAstroGrass
   name: jungle astro-grass floor
   spawn: FloorTileItemJungleAstroGrass
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileAstroIce
   name: astro-ice floor
   spawn: FloorTileItemAstroIce
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileAstroSnow
   name: astro-snow floor
   spawn: FloorTileItemAstroSnow
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWoodLarge
   name: large wood floor
   spawn: FloorTileItemWoodLarge
-  maxCount: 30
\ No newline at end of file
+  maxCount: 30
diff --git a/Resources/Prototypes/Stacks/medical_stacks.yml b/Resources/Prototypes/Stacks/medical_stacks.yml
index 9d2b77ec933f..7ad3c21634c7 100644
--- a/Resources/Prototypes/Stacks/medical_stacks.yml
+++ b/Resources/Prototypes/Stacks/medical_stacks.yml
@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment }
   spawn: Ointment
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: AloeCream
@@ -12,7 +11,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Hydroponics/aloe.rsi", state: cream }
   spawn: AloeCream
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Gauze
@@ -20,7 +18,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Gauze
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Brutepack
@@ -28,7 +25,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: gauze }
   spawn: Brutepack
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: Bloodpack
@@ -36,7 +32,6 @@
   icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: bloodpack }
   spawn: Bloodpack
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: MedicatedSuture
@@ -44,7 +39,6 @@
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: medicated-suture }
   spawn: MedicatedSuture
   maxCount: 10
-  itemSize: 1
 
 - type: stack
   id: RegenerativeMesh
@@ -52,6 +46,4 @@
   icon: {sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: regenerative-mesh}
   spawn: RegenerativeMesh
   maxCount: 10
-  itemSize: 1
-
 
diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml
index 5acf4819dec3..7f015659e92e 100644
--- a/Resources/Prototypes/Stacks/power_stacks.yml
+++ b/Resources/Prototypes/Stacks/power_stacks.yml
@@ -4,7 +4,6 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coil-30 }
   spawn: CableApcStack1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: CableMV
@@ -12,7 +11,6 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilmv-30 }
   spawn: CableMVStack1
   maxCount: 30
-  itemSize: 1
 
 - type: stack
   id: CableHV
@@ -20,4 +18,3 @@
   icon: { sprite: "/Textures/Objects/Tools/cable-coils.rsi", state: coilhv-30 }
   spawn: CableHVStack1
   maxCount: 30
-  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/science_stacks.yml b/Resources/Prototypes/Stacks/science_stacks.yml
index 010a5dc659a4..bf58fad91543 100644
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/science_stacks.yml
@@ -3,4 +3,21 @@
   name: artifact fragment
   spawn: ArtifactFragment1
   maxCount: 30
-  itemSize: 5
\ No newline at end of file
+
+- type: stack
+  id: Capacitor
+  name: capacitor
+  spawn: CapacitorStockPart
+  maxCount: 10
+
+- type: stack
+  id: MicroManipulator
+  name: micro manipulator
+  spawn: MicroManipulatorStockPart
+  maxCount: 10
+
+- type: stack
+  id: MatterBin
+  name: matter bin
+  spawn: MatterBinStockPart
+  maxCount: 10

From 6501a5b180f61b4e5e5f05f7238a8f7a093dfe2d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 1 Jun 2024 17:50:34 +0000
Subject: [PATCH 203/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 449f9bf43b5c..535a93e87e31 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: lzk228
-  changes:
-  - message: Refill light replacer from box popup now shows properly.
-    type: Fix
-  id: 6161
-  time: '2024-03-15T15:23:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26136
 - author: FairlySadPanda
   changes:
   - message: Food and drink stocks in vending machines has been reduced to encourage
@@ -3853,3 +3846,10 @@
   id: 6660
   time: '2024-06-01T17:29:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28462
+- author: AJCM-git
+  changes:
+  - message: Machine parts are now stackable
+    type: Tweak
+  id: 6661
+  time: '2024-06-01T17:49:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28434

From 8c32072f67cbab2f69647ff1e78c3f62e705639a Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 1 Jun 2024 12:00:31 -0700
Subject: [PATCH 204/568] Fix error when removing chasm falling component on a
 terminating entity (#28471)

---
 Content.Client/Chasm/ChasmFallingVisualsSystem.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Chasm/ChasmFallingVisualsSystem.cs b/Content.Client/Chasm/ChasmFallingVisualsSystem.cs
index 4b04aa9dd713..ddcd509cb336 100644
--- a/Content.Client/Chasm/ChasmFallingVisualsSystem.cs
+++ b/Content.Client/Chasm/ChasmFallingVisualsSystem.cs
@@ -24,8 +24,11 @@ public override void Initialize()
 
     private void OnComponentInit(EntityUid uid, ChasmFallingComponent component, ComponentInit args)
     {
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
+        if (!TryComp<SpriteComponent>(uid, out var sprite) ||
+            TerminatingOrDeleted(uid))
+        {
             return;
+        }
 
         component.OriginalScale = sprite.Scale;
 

From 5d970b0861d5c8327ba8e62fd3dd81333dc125af Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Sat, 1 Jun 2024 23:34:58 +0300
Subject: [PATCH 205/568] Station event component and system tweaks (#28331)

* Make anomaly, artifact and gifts events announcement sound optional

* Requested changes + Added new "GameRuleAfterAddedEvent" for StationEventSystem

We need to call "Add" in "StationEventSystem" after others GameRule's in case if we need to change StationEventComponent variables.

* Fix margins

* Makes use of GameRuleComponent.Delay and remove station system handling of delays plus small cleanup

* Fix merge

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
---
 Content.Server/Chat/Systems/ChatSystem.cs     |   4 +-
 .../Components/StationEventComponent.cs       |  19 +-
 .../StationEvents/Events/AnomalySpawnRule.cs  |   8 +-
 .../Events/BluespaceArtifactRule.cs           |   8 +-
 .../StationEvents/Events/BreakerFlipRule.cs   |   9 +-
 .../StationEvents/Events/CargoGiftsRule.cs    |   8 +-
 .../StationEvents/Events/FalseAlarmRule.cs    |  15 +-
 .../StationEvents/Events/GasLeakRule.cs       |   4 +-
 .../Events/StationEventSystem.cs              |  20 +-
 .../SurveillanceCameraMicrophoneSystem.cs     |   4 +-
 .../station-events/events/anomaly-spawn.ftl   |   2 +-
 .../Prototypes/GameRules/cargo_gifts.yml      | 294 +++++++++---------
 Resources/Prototypes/GameRules/events.yml     |  79 +++--
 13 files changed, 244 insertions(+), 230 deletions(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 531c4259efea..b79e16a8df97 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -823,7 +823,7 @@ private Dictionary<ICommonSession, ICChatRecipientData> GetRecipients(EntityUid
                 recipients.Add(player, new ICChatRecipientData(-1, true));
         }
 
-        RaiseLocalEvent(new ExpandICChatRecipientstEvent(source, voiceGetRange, recipients));
+        RaiseLocalEvent(new ExpandICChatRecipientsEvent(source, voiceGetRange, recipients));
         return recipients;
     }
 
@@ -868,7 +868,7 @@ public string BuildGibberishString(IReadOnlyList<char> charOptions, int length)
 ///     This event is raised before chat messages are sent out to clients. This enables some systems to send the chat
 ///     messages to otherwise out-of view entities (e.g. for multiple viewports from cameras).
 /// </summary>
-public record ExpandICChatRecipientstEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
+public record ExpandICChatRecipientsEvent(EntityUid Source, float VoiceRange, Dictionary<ICommonSession, ChatSystem.ICChatRecipientData> Recipients)
 {
 }
 
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index cc17007d90e5..fdd1d3962e74 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -24,6 +24,12 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public string? EndAnnouncement;
 
+    [DataField]
+    public Color StartAnnouncementColor = Color.Gold;
+
+    [DataField]
+    public Color EndAnnouncementColor = Color.Gold;
+
     [DataField]
     public SoundSpecifier? StartAudio;
 
@@ -42,12 +48,6 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public int ReoccurrenceDelay = 30;
 
-    /// <summary>
-    ///     How long after being added does the event start
-    /// </summary>
-    [DataField]
-    public TimeSpan StartDelay = TimeSpan.Zero;
-
     /// <summary>
     ///     How long the event lasts.
     /// </summary>
@@ -75,13 +75,6 @@ public sealed partial class StationEventComponent : Component
     [DataField]
     public int? MaxOccurrences;
 
-    /// <summary>
-    /// When the station event starts.
-    /// </summary>
-    [DataField("startTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan StartTime;
-
     /// <summary>
     /// When the station event ends.
     /// </summary>
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index 96633834ee10..cf66a7c052e4 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,6 +1,5 @@
 using Content.Server.Anomaly;
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 
@@ -12,11 +11,14 @@ public sealed class AnomalySpawnRule : StationEventSystem<AnomalySpawnRuleCompon
 
     protected override void Added(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("anomaly-spawn-event-announcement",
             ("sighting", Loc.GetString($"anomaly-spawn-sighting-{RobustRandom.Next(1, 6)}")));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     protected override void Started(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
index b3ed10999ed3..aaa0f0cffc32 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -1,5 +1,4 @@
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Random;
 
@@ -9,11 +8,14 @@ public sealed class BluespaceArtifactRule : StationEventSystem<BluespaceArtifact
 {
     protected override void Added(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("bluespace-artifact-event-announcement",
             ("sighting", Loc.GetString(RobustRandom.Pick(component.PossibleSighting))));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     protected override void Started(EntityUid uid, BluespaceArtifactRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index 16d3fd8c95df..ef2825938974 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -1,5 +1,4 @@
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Station.Components;
@@ -15,10 +14,14 @@ public sealed class BreakerFlipRule : StationEventSystem<BreakerFlipRuleComponen
 
     protected override void Added(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString("station-event-breaker-flip-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{RobustRandom.Next(1, 6)}"))));
-        ChatSystem.DispatchGlobalAnnouncement(str, playSound: false, colorOverride: Color.Gold);
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
+
     }
 
     protected override void Started(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index c27cd302784a..4cddf4674b30 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -3,7 +3,6 @@
 using Content.Server.Cargo.Systems;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Prototypes;
@@ -18,11 +17,14 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
 
     protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
     {
-        base.Added(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var str = Loc.GetString(component.Announce,
             ("sender", Loc.GetString(component.Sender)), ("description", Loc.GetString(component.Description)), ("dest", Loc.GetString(component.Dest)));
-        ChatSystem.DispatchGlobalAnnouncement(str, colorOverride: Color.FromHex("#18abf5"));
+        stationEvent.StartAnnouncement = str;
+
+        base.Added(uid, component, gameRule, args);
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
index e5317a5449f1..115b6d905eae 100644
--- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -1,9 +1,7 @@
 using System.Linq;
 using Content.Server.GameTicking.Components;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using JetBrains.Annotations;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -15,15 +13,16 @@ public sealed class FalseAlarmRule : StationEventSystem<FalseAlarmRuleComponent>
 
     protected override void Started(EntityUid uid, FalseAlarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
-        base.Started(uid, component, gameRule, args);
+        if (!TryComp<StationEventComponent>(uid, out var stationEvent))
+            return;
 
         var allEv = _event.AllEvents().Select(p => p.Value).ToList();
         var picked = RobustRandom.Pick(allEv);
 
-        if (picked.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(picked.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
-        Audio.PlayGlobal(picked.StartAudio, Filter.Broadcast(), true);
+        stationEvent.StartAnnouncement = picked.StartAnnouncement;
+        stationEvent.StartAudio = picked.StartAudio;
+        stationEvent.StartAnnouncementColor = picked.StartAnnouncementColor;
+
+        base.Started(uid, component, gameRule, args);
     }
 }
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index 1221612171d9..c17f17a8279d 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -29,10 +29,10 @@ protected override void Started(EntityUid uid, GasLeakRuleComponent component, G
                 component.LeakGas = RobustRandom.Pick(component.LeakableGases);
                 // Was 50-50 on using normal distribution.
                 var totalGas = RobustRandom.Next(component.MinimumGas, component.MaximumGas);
-                var startAfter = stationEvent.StartDelay;
                 component.MolesPerSecond = RobustRandom.Next(component.MinimumMolesPerSecond, component.MaximumMolesPerSecond);
 
-                stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / component.MolesPerSecond + startAfter.TotalSeconds);
+                if (gameRule.Delay is {} startAfter)
+                    stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / component.MolesPerSecond + startAfter.Next(RobustRandom));
             }
 
             // Look technically if you wanted to guarantee a leak you'd do this in announcement but having the announcement
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index bd377ec16c83..38390cedb1a9 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -1,14 +1,11 @@
-using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
@@ -20,7 +17,6 @@ namespace Content.Server.StationEvents.Events;
 public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : IComponent
 {
     [Dependency] protected readonly IAdminLogManager AdminLogManager = default!;
-    [Dependency] protected readonly IMapManager MapManager = default!;
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly ChatSystem ChatSystem = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
@@ -43,16 +39,12 @@ protected override void Added(EntityUid uid, T component, GameRuleComponent game
         if (!TryComp<StationEventComponent>(uid, out var stationEvent))
             return;
 
-
         AdminLogManager.Add(LogType.EventAnnounced, $"Event added / announced: {ToPrettyString(uid)}");
 
         if (stationEvent.StartAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
+            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: stationEvent.StartAnnouncementColor);
 
         Audio.PlayGlobal(stationEvent.StartAudio, Filter.Broadcast(), true);
-        stationEvent.StartTime = Timing.CurTime + stationEvent.StartDelay;
     }
 
     /// <inheritdoc/>
@@ -86,9 +78,7 @@ protected override void Ended(EntityUid uid, T component, GameRuleComponent game
         AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(uid)}");
 
         if (stationEvent.EndAnnouncement != null)
-        {
-            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: Color.Gold);
-        }
+            ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: stationEvent.EndAnnouncementColor);
 
         Audio.PlayGlobal(stationEvent.EndAudio, Filter.Broadcast(), true);
     }
@@ -108,11 +98,7 @@ public override void Update(float frameTime)
             if (!GameTicker.IsGameRuleAdded(uid, ruleData))
                 continue;
 
-            if (!GameTicker.IsGameRuleActive(uid, ruleData) && Timing.CurTime >= stationEvent.StartTime)
-            {
-                GameTicker.StartGameRule(uid, ruleData);
-            }
-            else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
+            if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
             {
                 GameTicker.EndGameRule(uid, ruleData);
             }
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index f411001bd3a3..1adab9930d91 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -16,10 +16,10 @@ public override void Initialize()
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ListenEvent>(RelayEntityMessage);
         SubscribeLocalEvent<SurveillanceCameraMicrophoneComponent, ListenAttemptEvent>(CanListen);
-        SubscribeLocalEvent<ExpandICChatRecipientstEvent>(OnExpandRecipients);
+        SubscribeLocalEvent<ExpandICChatRecipientsEvent>(OnExpandRecipients);
     }
 
-    private void OnExpandRecipients(ExpandICChatRecipientstEvent ev)
+    private void OnExpandRecipients(ExpandICChatRecipientsEvent ev)
     {
         var xformQuery = GetEntityQuery<TransformComponent>();
         var sourceXform = Transform(ev.Source);
diff --git a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
index 0e4b5f6e39c2..907c14ce5621 100644
--- a/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
+++ b/Resources/Locale/en-US/station-events/events/anomaly-spawn.ftl
@@ -1,4 +1,4 @@
-anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team of { $sighting }.
+anomaly-spawn-event-announcement = Our readings have detected a dangerous interspacial anomaly. Please inform the research team about { $sighting }.
 
 anomaly-spawn-sighting-1 = low pulsating sounds heard throughout the station
 anomaly-spawn-sighting-2 = strange sources of light
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 62ec96d6a6df..c5a525129707 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -1,16 +1,30 @@
 - type: entity
-  id: GiftsPizzaPartySmall
+  id: CargoGiftsBase
   parent: BaseGameRule
+  abstract: true
+  components:
+  - type: GameRule
+    delay:
+      min: 10
+      max: 10
+  - type: StationEvent
+    startColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
+  - type: CargoGiftsRule
+    sender: cargo-gift-default-sender
+
+- type: entity
+  id: GiftsPizzaPartySmall
+  parent: CargoGiftsBase
   noSpawn: true
   components:
   - type: StationEvent
     weight: 5
-    startDelay: 10
     duration: 120
     earliestStart: 20
   - type: CargoGiftsRule
     description: cargo-gift-pizza-small
-    sender: cargo-gift-default-sender
     dest: cargo-gift-dest-bar
     gifts:
       FoodPizza: 1              # 4 pizzas
@@ -20,191 +34,173 @@
 
 - type: entity
   id: GiftsPizzaPartyLarge
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 2
-      startDelay: 10
-      duration: 240
-      earliestStart: 20
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-pizza-large
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-bar
-      gifts:
-        FoodPizzaLarge: 1              # 16 pizzas
-        FoodBarSupply: 1
-        FoodSoftdrinksLarge: 1
+  - type: StationEvent
+    weight: 2
+    duration: 240
+    earliestStart: 20
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-pizza-large
+    dest: cargo-gift-dest-bar
+    gifts:
+      FoodPizzaLarge: 1              # 16 pizzas
+      FoodBarSupply: 1
+      FoodSoftdrinksLarge: 1
 
 - type: entity
   id: GiftsEngineering
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 5
-      startDelay: 10
-      duration: 240
-      earliestStart: 30
-      minimumPlayers: 10
-    - type: CargoGiftsRule
-      description: cargo-gift-eng
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-eng
-      gifts:
-        EngineeringCableBulk: 1
-        AirlockKit: 1
-        MaterialSteel: 1
-        MaterialPlasteel: 1
-        MaterialGlass: 1
-        CrateVendingMachineRestockEngineering: 1
+  - type: StationEvent
+    weight: 5
+    duration: 240
+    earliestStart: 30
+    minimumPlayers: 10
+  - type: CargoGiftsRule
+    description: cargo-gift-eng
+    dest: cargo-gift-dest-eng
+    gifts:
+      EngineeringCableBulk: 1
+      AirlockKit: 1
+      MaterialSteel: 1
+      MaterialPlasteel: 1
+      MaterialGlass: 1
+      CrateVendingMachineRestockEngineering: 1
 
 - type: entity
   id: GiftsVendingRestock
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      minimumPlayers: 40
-      earliestStart: 30
-    - type: CargoGiftsRule
-      description: cargo-gift-vending
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        CrateVendingMachineRestockHotDrinks: 3
-        CrateVendingMachineRestockBooze: 1
-        CrateVendingMachineRestockNutriMax: 1
-        CrateVendingMachineRestockRobustSoftdrinks: 2
-        CrateVendingMachineRestockVendomat: 1
-        CrateVendingMachineRestockGetmoreChocolateCorp: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    minimumPlayers: 40
+    earliestStart: 30
+  - type: CargoGiftsRule
+    description: cargo-gift-vending
+    dest: cargo-gift-dest-supp
+    gifts:
+      CrateVendingMachineRestockHotDrinks: 3
+      CrateVendingMachineRestockBooze: 1
+      CrateVendingMachineRestockNutriMax: 1
+      CrateVendingMachineRestockRobustSoftdrinks: 2
+      CrateVendingMachineRestockVendomat: 1
+      CrateVendingMachineRestockGetmoreChocolateCorp: 1
 
 - type: entity
   id: GiftsJanitor
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 6
-      startDelay: 10
-      duration: 120
-      minimumPlayers: 30
-      earliestStart: 20
-    - type: CargoGiftsRule
-      description: cargo-gift-cleaning
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-janitor
-      gifts:
-        ServiceJanitorial: 2
-        ServiceLightsReplacement: 2
-        ServiceJanitorBiosuit: 1
+  - type: StationEvent
+    weight: 6
+    duration: 120
+    minimumPlayers: 30
+    earliestStart: 20
+  - type: CargoGiftsRule
+    description: cargo-gift-cleaning
+    dest: cargo-gift-dest-janitor
+    gifts:
+      ServiceJanitorial: 2
+      ServiceLightsReplacement: 2
+      ServiceJanitorBiosuit: 1
 
 - type: entity
   id: GiftsMedical
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 8
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 30
-    - type: CargoGiftsRule
-      description: cargo-gift-medical-supply
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-med
-      gifts:
-        MedicalSupplies: 1
-        MedicalChemistrySupplies: 1
-        EmergencyBruteKit: 1
-        EmergencyAdvancedKit: 1
-        MedicalBiosuit: 1
+  - type: StationEvent
+    weight: 8
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 30
+  - type: CargoGiftsRule
+    description: cargo-gift-medical-supply
+    dest: cargo-gift-dest-med
+    gifts:
+      MedicalSupplies: 1
+      MedicalChemistrySupplies: 1
+      EmergencyBruteKit: 1
+      EmergencyAdvancedKit: 1
+      MedicalBiosuit: 1
 
 - type: entity
   id: GiftsSpacingSupplies
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 10
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-space-protection
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        EmergencyInternalsLarge: 2
-        EmergencyInflatablewall: 1
-        EmergencyAdvancedKit: 1
-        MedicalBiosuit: 1
-        EmergencyO2Kit: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 10
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-space-protection
+    dest: cargo-gift-dest-supp
+    gifts:
+      EmergencyInternalsLarge: 2
+      EmergencyInflatablewall: 1
+      EmergencyAdvancedKit: 1
+      MedicalBiosuit: 1
+      EmergencyO2Kit: 1
 
 - type: entity
   id: GiftsFireProtection
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 40
-    - type: CargoGiftsRule
-      description: cargo-gift-fire-protection
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-supp
-      gifts:
-        EmergencyFire: 2
-        EmergencyBurnKit: 1
-        EmergencyBruteKit: 1
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 40
+  - type: CargoGiftsRule
+    description: cargo-gift-fire-protection
+    dest: cargo-gift-dest-supp
+    gifts:
+      EmergencyFire: 2
+      EmergencyBurnKit: 1
+      EmergencyBruteKit: 1
 
 - type: entity
   id: GiftsSecurityGuns
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 3
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 50
-    - type: CargoGiftsRule
-      description: cargo-gift-security-guns
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-sec
-      gifts:
-        SecurityArmor: 3
-        ArmorySmg: 1
-        ArmoryShotgun: 1
-        ArmoryLaser: 1
+  - type: StationEvent
+    weight: 3
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 50
+  - type: CargoGiftsRule
+    description: cargo-gift-security-guns
+    dest: cargo-gift-dest-sec
+    gifts:
+      SecurityArmor: 3
+      ArmorySmg: 1
+      ArmoryShotgun: 1
+      ArmoryLaser: 1
 
 - type: entity
   id: GiftsSecurityRiot
-  parent: BaseGameRule
+  parent: CargoGiftsBase
   noSpawn: true
   components:
-    - type: StationEvent
-      weight: 4
-      startDelay: 10
-      duration: 120
-      earliestStart: 20
-      minimumPlayers: 50
-    - type: CargoGiftsRule
-      description: cargo-gift-security-riot
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-sec
-      gifts:
-        SecurityRiot: 2
-        SecurityRestraints: 2
-        SecurityNonLethal: 2
+  - type: StationEvent
+    weight: 4
+    duration: 120
+    earliestStart: 20
+    minimumPlayers: 50
+  - type: CargoGiftsRule
+    description: cargo-gift-security-riot
+    dest: cargo-gift-dest-sec
+    gifts:
+      SecurityRiot: 2
+      SecurityRestraints: 2
+      SecurityNonLethal: 2
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 9dabc14a344e..9f6e6a812574 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -1,22 +1,63 @@
 - type: entity
-  id: AnomalySpawn
+  id: BaseStationEvent
+  parent: BaseGameRule
+  abstract: true
+  noSpawn: true
+  components:
+    - type: GameRule
+      delay:
+        min:  10
+        max:  20
+
+- type: entity
+  id: BaseStationEventShortDelay
   parent: BaseGameRule
+  abstract: true
+  noSpawn: true
+  components:
+    - type: GameRule
+      delay:
+        min:  10
+        max:  20
+
+- type: entity
+  id: BaseStationEventLongDelay
+  parent: BaseGameRule
+  abstract: true
+  noSpawn: true
+  components:
+    - type: GameRule
+      delay:
+        min:  40
+        max:  60
+
+- type: entity
+  id: AnomalySpawn
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
+    startAnnouncementColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
     weight: 8
-    startDelay: 30
     duration: 35
   - type: AnomalySpawnRule
 
 - type: entity
   id: BluespaceArtifact
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
+  - type: GameRule
+    delay:
+      min:  30
+      max:  30
   - type: StationEvent
+    startAnnouncementColor: "#18abf5"
+    startAudio:
+      path: /Audio/Announcements/announce.ogg
     weight: 8
-    startDelay: 30
     duration: 35
   - type: BluespaceArtifactRule
 
@@ -148,7 +189,7 @@
 
 - type: entity
   id: GasLeak
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -157,25 +198,23 @@
       path: /Audio/Announcements/attention.ogg
     endAnnouncement: station-event-gas-leak-end-announcement
     weight: 8
-    startDelay: 20
   - type: GasLeakRule
 
 - type: entity
   id: KudzuGrowth
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 15
     minimumPlayers: 15
     weight: 7
-    startDelay: 50
     duration: 240
   - type: KudzuGrowthRule
 
 - type: entity
   id: MeteorSwarm
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -189,19 +228,17 @@
       params:
         volume: -4
     duration: null #ending is handled by MeteorSwarmRule
-    startDelay: 30
   - type: MeteorSwarmRule
 
 - type: entity
   id: MouseMigration
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 15
     weight: 6
     duration: 50
@@ -221,14 +258,13 @@
 
 - type: entity
   id: CockroachMigration
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     weight: 6
     duration: 50
   - type: VentCrittersRule
@@ -240,7 +276,7 @@
 
 - type: entity
   id: PowerGridCheck
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -251,7 +287,6 @@
       path: /Audio/Announcements/power_off.ogg
       params:
        volume: -4
-    startDelay: 24
     duration: 60
     maxDuration: 120
   - type: PowerGridCheckRule
@@ -300,7 +335,7 @@
 
 - type: entity
   id: VentClog
-  parent: BaseGameRule
+  parent: BaseStationEventLongDelay
   noSpawn: true
   components:
   - type: StationEvent
@@ -310,20 +345,18 @@
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
-    startDelay: 50
     duration: 60
   - type: VentClogRule
 
 - type: entity
   id: SlimesSpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -339,14 +372,13 @@
 
 - type: entity
   id: SpiderSpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
@@ -358,14 +390,13 @@
 
 - type: entity
   id: SpiderClownSpawn
-  parent: BaseGameRule
+  parent: BaseStationEventShortDelay
   noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
     earliestStart: 20
     minimumPlayers: 20
     weight: 1.5

From ad1fc0cdba0f07f45ff18cee46b28738c226a8b4 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Sat, 1 Jun 2024 12:56:57 -0800
Subject: [PATCH 206/568] Adjust power monitor power display (#28487)

---
 Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs    | 4 +++-
 .../Locale/en-US/components/power-monitoring-component.ftl    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index 25a586a75de8..1427df051534 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -102,7 +102,8 @@ public void UpdateWindowEntryButton(NetEntity netEntity, PowerMonitoringButton b
         button.ToolTip = Loc.GetString(name);
 
         // Update power value
-        button.PowerValue.Text = Loc.GetString("power-monitoring-window-value", ("value", entry.PowerValue));
+        // Don't use SI prefixes, just give the number in W, so that it is readily apparent which consumer is using a lot of power.
+        button.PowerValue.Text = Loc.GetString("power-monitoring-window-button-value", ("value", Math.Round(entry.PowerValue).ToString("N0")));
     }
 
     private void UpdateEntrySourcesOrLoads(BoxContainer masterContainer, BoxContainer currentContainer, PowerMonitoringConsoleEntry[]? entries, SpriteSpecifier.Texture icon)
@@ -480,6 +481,7 @@ public PowerMonitoringButton()
         PowerValue = new Label()
         {
             HorizontalAlignment = HAlignment.Right,
+            Align = Label.AlignMode.Right,
             SetWidth = 72f,
             Margin = new Thickness(10, 0, 0, 0),
             ClipText = true,
diff --git a/Resources/Locale/en-US/components/power-monitoring-component.ftl b/Resources/Locale/en-US/components/power-monitoring-component.ftl
index e84c09e60d5b..9433c9ea9ef9 100644
--- a/Resources/Locale/en-US/components/power-monitoring-component.ftl
+++ b/Resources/Locale/en-US/components/power-monitoring-component.ftl
@@ -14,6 +14,7 @@ power-monitoring-window-total-sources = Total generator output
 power-monitoring-window-total-battery-usage = Total battery usage
 power-monitoring-window-total-loads = Total network loads
 power-monitoring-window-value = { POWERWATTS($value) }
+power-monitoring-window-button-value = {$value} W
 power-monitoring-window-show-inactive-consumers = Show Inactive Consumers
 
 power-monitoring-window-show-cable-networks = Toggle cable networks

From 07dfefc4a29927aa74cfd5c7e75c6cb344d713f6 Mon Sep 17 00:00:00 2001
From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Date: Sun, 2 Jun 2024 09:49:34 +1000
Subject: [PATCH 207/568] Hiding and clearing department prototype code
 (#28114)

---
 .../UI/BanPanel/BanPanel.xaml.cs              |  2 +-
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    | 34 ++++++++++++-----
 .../Conditions/BuyerDepartmentCondition.cs    |  4 +-
 Content.Shared/Roles/DepartmentPrototype.cs   | 37 +++++++++++--------
 4 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
index dc263d6055ce..588d62e56036 100644
--- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
+++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
@@ -147,7 +147,7 @@ public BanPanel()
         var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
         foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
-            CreateRoleGroup(proto.ID, proto.Roles, proto.Color);
+            CreateRoleGroup(proto.ID, proto.Roles.Select(p =>  p.Id), proto.Color);
         }
 
         CreateRoleGroup("Antagonist", prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID), Color.Red);
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index a0e32a3a4997..eb182c83ee11 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -719,8 +719,17 @@ public void RefreshJobs()
             _jobPriorities.Clear();
             var firstCategory = true;
 
-            var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>().ToArray();
-            Array.Sort(departments, DepartmentUIComparer.Instance);
+            // Get all displayed departments
+            var departments = new List<DepartmentPrototype>();
+            foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
+            {
+                if (department.EditorHidden)
+                    continue;
+
+                departments.Add(department);
+            }
+
+            departments.Sort(DepartmentUIComparer.Instance);
 
             var items = new[]
             {
@@ -774,7 +783,7 @@ public void RefreshJobs()
                     JobList.AddChild(category);
                 }
 
-                var jobs = department.Roles.Select(jobId => _prototypeManager.Index<JobPrototype>(jobId))
+                var jobs = department.Roles.Select(jobId => _prototypeManager.Index(jobId))
                     .Where(job => job.SetPreference)
                     .ToArray();
 
@@ -821,13 +830,15 @@ public void RefreshJobs()
                             if (jobId == job.ID)
                             {
                                 other.Select(selectedPrio);
+                                continue;
                             }
-                            else if (selectedJobPrio == JobPriority.High && (JobPriority) other.Selected == JobPriority.High)
-                            {
-                                // Lower any other high priorities to medium.
-                                other.Select((int) JobPriority.Medium);
-                                Profile = Profile?.WithJobPriority(jobId, JobPriority.Medium);
-                            }
+
+                            if (selectedJobPrio != JobPriority.High || (JobPriority) other.Selected != JobPriority.High)
+                                continue;
+
+                            // Lower any other high priorities to medium.
+                            other.Select((int)JobPriority.Medium);
+                            Profile = Profile?.WithJobPriority(jobId, JobPriority.Medium);
                         }
 
                         // TODO: Only reload on high change (either to or from).
@@ -932,6 +943,11 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo
                 SetDirty();
                 ReloadPreview();
             };
+
+            if (Profile is null)
+                return;
+
+            UpdateJobPriorities();
         }
 
         private void OnFlavorTextChange(string content)
diff --git a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
index 4e5e504aec4b..ea8de4a9ccd6 100644
--- a/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerDepartmentCondition.cs
@@ -43,7 +43,7 @@ public override bool Condition(ListingConditionArgs args)
         {
             foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
             {
-                if (department.Roles.Contains(job.Prototype) && Blacklist.Contains(department.ID))
+                if (department.Roles.Contains(job.Prototype.Value) && Blacklist.Contains(department.ID))
                     return false;
             }
         }
@@ -56,7 +56,7 @@ public override bool Condition(ListingConditionArgs args)
             {
                 foreach (var department in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
                 {
-                    if (department.Roles.Contains(job.Prototype) && Whitelist.Contains(department.ID))
+                    if (department.Roles.Contains(job.Prototype.Value) && Whitelist.Contains(department.ID))
                     {
                         found = true;
                         break;
diff --git a/Content.Shared/Roles/DepartmentPrototype.cs b/Content.Shared/Roles/DepartmentPrototype.cs
index 024eca37fa2d..d6288bec9098 100644
--- a/Content.Shared/Roles/DepartmentPrototype.cs
+++ b/Content.Shared/Roles/DepartmentPrototype.cs
@@ -1,28 +1,27 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Roles;
 
 [Prototype("department")]
 public sealed partial class DepartmentPrototype : IPrototype
 {
-    [IdDataField] public string ID { get; } = default!;
+    [IdDataField]
+    public string ID { get; } = string.Empty;
 
     /// <summary>
-    ///     A description string to display in the character menu as an explanation of the department's function.
+    /// A description string to display in the character menu as an explanation of the department's function.
     /// </summary>
-    [DataField("description", required: true)]
-    public string Description = default!;
+    [DataField(required: true)]
+    public string Description = string.Empty;
 
     /// <summary>
-    ///     A color representing this department to use for text.
+    /// A color representing this department to use for text.
     /// </summary>
-    [DataField("color", required: true)]
-    public Color Color = default!;
+    [DataField(required: true)]
+    public Color Color;
 
-    [ViewVariables(VVAccess.ReadWrite),
-     DataField("roles", customTypeSerializer: typeof(PrototypeIdListSerializer<JobPrototype>))]
-    public List<string> Roles = new();
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public List<ProtoId<JobPrototype>> Roles = new();
 
     /// <summary>
     /// Whether this is a primary department or not.
@@ -34,8 +33,14 @@ public sealed partial class DepartmentPrototype : IPrototype
     /// <summary>
     /// Departments with a higher weight sorted before other departments in UI.
     /// </summary>
-    [DataField("weight")]
-    public int Weight { get; private set; } = 0;
+    [DataField]
+    public int Weight { get; private set; }
+
+    /// <summary>
+    /// Toggles the display of the department in the priority setting menu in the character editor.
+    /// </summary>
+    [DataField]
+    public bool EditorHidden;
 }
 
 /// <summary>
@@ -50,14 +55,14 @@ public int Compare(DepartmentPrototype? x, DepartmentPrototype? y)
     {
         if (ReferenceEquals(x, y))
             return 0;
+
         if (ReferenceEquals(null, y))
             return 1;
+
         if (ReferenceEquals(null, x))
             return -1;
 
         var cmp = -x.Weight.CompareTo(y.Weight);
-        if (cmp != 0)
-            return cmp;
-        return string.Compare(x.ID, y.ID, StringComparison.Ordinal);
+        return cmp != 0 ? cmp : string.Compare(x.ID, y.ID, StringComparison.Ordinal);
     }
 }

From da6a1bbdd4a0d69b101d2c85e858b0b3cbf7d552 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 03:03:51 +0200
Subject: [PATCH 208/568] Update Credits (#28493)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
---
 Resources/Credits/GitHub.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index b7ec22c0b0db..b3627580b1b8 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, KEEYNy, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem

From 21bc3bfa22b6e234a8ae96c3332bffee6840a66f 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 209/568] 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     |  11 +-
 .../Mech/Systems/MechAssemblySystem.cs        |   3 +-
 .../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          |   5 +-
 Content.Shared/Tag/TagComponent.cs            |  16 +-
 Content.Shared/Tag/TagComponentState.cs       |  15 -
 Content.Shared/Tag/TagPrototype.cs            |  24 +-
 Content.Shared/Tag/TagSystem.cs               | 768 +++++++++---------
 18 files changed, 559 insertions(+), 505 deletions(-)
 delete mode 100644 Content.Shared/Tag/TagComponentState.cs

diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 2e6c5f58099e..5f1f49e5fd08 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 cbcdd1c6c623..e6cd2accaf56 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 1af27797660d..e1cf53e1b1ab 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;
@@ -13,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>>();
         });
     }
 
@@ -72,7 +73,7 @@ [CommandArgument] ValueRef<IEnumerable<string>, IEnumerable<string>> @ref
     )
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.AddTags(input, @ref.Evaluate(ctx)!);
+        _tag.AddTags(input, (IEnumerable<ProtoId<TagPrototype>>)@ref.Evaluate(ctx)!);
         return input;
     }
 
@@ -92,7 +93,7 @@ [CommandArgument] ValueRef<IEnumerable<string>, IEnumerable<string>> @ref
     )
     {
         _tag ??= GetSys<TagSystem>();
-        _tag.RemoveTags(input, @ref.Evaluate(ctx)!);
+        _tag.RemoveTags(input, (IEnumerable<ProtoId<TagPrototype>>)@ref.Evaluate(ctx)!);
         return input;
     }
 
diff --git a/Content.Server/Mech/Systems/MechAssemblySystem.cs b/Content.Server/Mech/Systems/MechAssemblySystem.cs
index e5b7bfaac3c8..c1fff819b4c9 100644
--- a/Content.Server/Mech/Systems/MechAssemblySystem.cs
+++ b/Content.Server/Mech/Systems/MechAssemblySystem.cs
@@ -14,6 +14,7 @@ namespace Content.Server.Mech.Systems;
 public sealed class MechAssemblySystem : EntitySystem
 {
     [Dependency] private readonly ContainerSystem _container = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -44,7 +45,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 b326bcc378f6..cb9e64f04e25 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 8fecf1c9e8e5..bf2822ff4237 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 069508bcbbba..36009896a2cb 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 fd7d15ea5dce..670c64577a48 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -246,7 +246,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 fe14d86aa1da..7de8a43d354f 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 a447a54df170..fced03bfabfc 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 be6bc2cfacbb..3ae3b5936278 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 c041cf1ba069..e9ef053f629f 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 668952dac23d..07ba46946a61 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 7c12321b5db6..3ced5f3c9ed5 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using Content.Shared.Tag;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -24,7 +25,7 @@ public abstract class SharedNavMapSystem : EntitySystem
 
     [Robust.Shared.IoC.Dependency] private readonly TagSystem _tagSystem = default!;
 
-    private readonly string[] _wallTags = ["Wall", "Window"];
+    private static readonly ProtoId<TagPrototype>[] WallTags = {"Wall", "Window"};
     private EntityQuery<NavMapDoorComponent> _doorQuery;
 
     public override void Initialize()
@@ -58,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 b5b8a48a4415..ad4240ba06c7 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 9919aba108da..000000000000
--- 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 2a06e22cf907..97f8c1af7d44 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;
 }
diff --git a/Content.Shared/Tag/TagSystem.cs b/Content.Shared/Tag/TagSystem.cs
index 7bcb887a410a..f1f620a69494 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 _tagQuery.TryComp(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 _tagQuery.TryComp(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 _tagQuery.TryComp(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 _tagQuery.TryComp(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 _tagQuery.TryComp(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 _tagQuery.TryComp(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 29e34cae350acde79412f3781c9fcfddbda8b949 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 1 Jun 2024 18:41:06 -0700
Subject: [PATCH 210/568] Disable rainbow overlay when reduced motion is
 enabled (#28496)

Disable rainbow ovelray when reduced motion is enabled
---
 Content.Client/Drugs/RainbowOverlay.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index e62b0dfa66cd..fb48c9101096 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -1,7 +1,9 @@
+using Content.Shared.CCVar;
 using Content.Shared.Drugs;
 using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -10,6 +12,7 @@ namespace Content.Client.Drugs;
 
 public sealed class RainbowOverlay : Overlay
 {
+    [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -75,6 +78,10 @@ protected override bool BeforeDraw(in OverlayDrawArgs args)
 
     protected override void Draw(in OverlayDrawArgs args)
     {
+        // TODO disable only the motion part or ike's idea (single static frame of the overlay)
+        if (_config.GetCVar(CCVars.ReducedMotion))
+            return;
+
         if (ScreenTexture == null)
             return;
 

From dce68e48e83d22d76c08bd33c27cd4e8597fa43d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 2 Jun 2024 01:42:12 +0000
Subject: [PATCH 211/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 535a93e87e31..0c671f49eec1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: FairlySadPanda
-  changes:
-  - message: Food and drink stocks in vending machines has been reduced to encourage
-      people to use the kitchen and bar.
-    type: Tweak
-  id: 6162
-  time: '2024-03-15T23:28:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25999
 - author: Plykiya
   changes:
   - message: Ion storms now have a chance of happening from the start of shift.
@@ -3853,3 +3845,11 @@
   id: 6661
   time: '2024-06-01T17:49:28.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28434
+- author: DrSmugleaf
+  changes:
+  - message: Disabled the seeing rainbows screen effect when reduced motion is enabled
+      in the options menu.
+    type: Tweak
+  id: 6662
+  time: '2024-06-02T01:41:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28496

From d6ba166d3bb57f6f6438adee89ffdd7b20fb9635 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Sat, 1 Jun 2024 20:10:24 -0700
Subject: [PATCH 212/568] Replace obsolete EntityWhitelist IsValid usages
 (#28465)

* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Client/Chat/UI/EmotesMenu.xaml.cs     |  9 +-
 .../UI/ConstructionMenuPresenter.cs           |  6 +-
 .../Chat/Systems/ChatSystem.Emote.cs          |  4 +-
 Content.Server/Chat/Systems/ChatSystem.cs     |  2 +
 Content.Server/Gatherable/GatherableSystem.cs |  6 +-
 .../NPCImprintingOnSpawnBehaviourSystem.cs    |  4 +-
 .../NPC/Systems/NPCUtilitySystem.cs           |  4 +-
 .../Power/EntitySystems/ChargerSystem.cs      |  4 +-
 .../EntitySystems/RevenantSystem.Abilities.cs |  8 +-
 .../Silicons/Borgs/BorgSystem.Modules.cs      |  2 +-
 Content.Server/Silicons/Borgs/BorgSystem.cs   |  8 +-
 .../Storage/EntitySystems/PickRandomSystem.cs |  6 +-
 .../XenoArtifacts/ArtifactSystem.Nodes.cs     | 11 ++-
 .../Containers/ItemSlot/ItemSlotsSystem.cs    |  5 +-
 .../Damage/Systems/DamageContactsSystem.cs    |  4 +-
 Content.Shared/Devour/SharedDevourSystem.cs   |  4 +-
 .../Disposal/SharedDisposalUnitSystem.cs      |  8 +-
 .../Implants/SharedImplanterSystem.cs         |  5 +-
 .../Interaction/SmartEquipSystem.cs           |  6 +-
 .../Materials/SharedMaterialStorageSystem.cs  |  6 +-
 .../Systems/SharedChameleonProjectorSystem.cs |  6 +-
 .../Salvage/Fulton/SharedFultonSystem.cs      |  4 +-
 .../Shuttles/Systems/SharedShuttleSystem.cs   |  4 +-
 .../EntitySystems/MagnetPickupSystem.cs       |  5 +-
 .../SharedEntityStorageSystem.cs              |  4 +-
 .../EntitySystems/SharedStorageSystem.cs      | 10 +--
 .../Marker/SharedDamageMarkerSystem.cs        |  4 +-
 .../Systems/SharedGunSystem.Ballistic.cs      |  5 +-
 .../Systems/SharedGunSystem.Revolver.cs       |  2 +-
 .../Weapons/Ranged/Systems/SharedGunSystem.cs |  2 +
 .../Whitelist/EntityWhitelistSystem.cs        | 84 +++++++++++++++++++
 31 files changed, 186 insertions(+), 56 deletions(-)

diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml.cs b/Content.Client/Chat/UI/EmotesMenu.xaml.cs
index a26d319920bf..334075534389 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml.cs
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml.cs
@@ -1,7 +1,8 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Speech;
+using Content.Shared.Whitelist;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
@@ -19,6 +20,7 @@ public sealed partial class EmotesMenu : RadialMenu
     [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
 
     private readonly SpriteSystem _spriteSystem;
+    private readonly EntityWhitelistSystem _whitelistSystem;
 
     public event Action<ProtoId<EmotePrototype>>? OnPlayEmote;
 
@@ -28,6 +30,7 @@ public EmotesMenu()
         RobustXamlLoader.Load(this);
 
         _spriteSystem = _entManager.System<SpriteSystem>();
+        _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
 
         var main = FindControl<RadialContainer>("Main");
 
@@ -37,8 +40,8 @@ public EmotesMenu()
             var player = _playerManager.LocalSession?.AttachedEntity;
             if (emote.Category == EmoteCategory.Invalid ||
                 emote.ChatTriggers.Count == 0 ||
-                !(player.HasValue && (emote.Whitelist?.IsValid(player.Value, _entManager) ?? true)) ||
-                (emote.Blacklist?.IsValid(player.Value, _entManager) ?? false))
+                !(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
+                _whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))
                 continue;
 
             if (!emote.Available &&
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index 9a0943617665..0c7912e0bcd5 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -2,6 +2,7 @@
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.Tag;
+using Content.Shared.Whitelist;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Placement;
@@ -23,6 +24,7 @@ namespace Content.Client.Construction.UI
     /// </summary>
     internal sealed class ConstructionMenuPresenter : IDisposable
     {
+        [Dependency] private readonly EntityManager _entManager = default!;
         [Dependency] private readonly IEntitySystemManager _systemManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IPlacementManager _placementManager = default!;
@@ -30,6 +32,7 @@ internal sealed class ConstructionMenuPresenter : IDisposable
         [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         private readonly IConstructionMenuView _constructionView;
+        private readonly EntityWhitelistSystem _whitelistSystem;
 
         private ConstructionSystem? _constructionSystem;
         private ConstructionPrototype? _selected;
@@ -78,6 +81,7 @@ public ConstructionMenuPresenter()
             // This is a lot easier than a factory
             IoCManager.InjectDependencies(this);
             _constructionView = new ConstructionMenu();
+            _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
 
             // This is required so that if we load after the system is initialized, we can bind to it immediately
             if (_systemManager.TryGetEntitySystem<ConstructionSystem>(out var constructionSystem))
@@ -157,7 +161,7 @@ private void OnViewPopulateRecipes(object? sender, (string search, string catago
 
                 if (_playerManager.LocalSession == null
                 || _playerManager.LocalEntity == null
-                || (recipe.EntityWhitelist != null && !recipe.EntityWhitelist.IsValid(_playerManager.LocalEntity.Value)))
+                || _whitelistSystem.IsWhitelistFail(recipe.EntityWhitelist, _playerManager.LocalEntity.Value))
                     continue;
 
                 if (!string.IsNullOrEmpty(search))
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index d120812b8801..23e1517d7548 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -81,9 +81,7 @@ public void TryEmoteWithChat(
         bool ignoreActionBlocker = false
         )
     {
-        if (!(emote.Whitelist?.IsValid(source, EntityManager) ?? true))
-            return;
-        if (emote.Blacklist?.IsValid(source, EntityManager) ?? false)
+        if (_whitelistSystem.IsWhitelistFailOrNull(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
             return;
 
         if (!emote.Available &&
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index b79e16a8df97..0fe9dcbc4d85 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -22,6 +22,7 @@
 using Content.Shared.Players;
 using Content.Shared.Radio;
 using Content.Shared.Speech;
+using Content.Shared.Whitelist;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -58,6 +59,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const int VoiceRange = 10; // how far voice goes in world units
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
diff --git a/Content.Server/Gatherable/GatherableSystem.cs b/Content.Server/Gatherable/GatherableSystem.cs
index e24b0da59394..d6a3be451b6a 100644
--- a/Content.Server/Gatherable/GatherableSystem.cs
+++ b/Content.Server/Gatherable/GatherableSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Tag;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
@@ -18,6 +19,7 @@ public sealed partial class GatherableSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -30,7 +32,7 @@ public override void Initialize()
 
     private void OnAttacked(Entity<GatherableComponent> gatherable, ref AttackedEvent args)
     {
-        if (gatherable.Comp.ToolWhitelist?.IsValid(args.Used, EntityManager) != true)
+        if (_whitelistSystem.IsWhitelistFailOrNull(gatherable.Comp.ToolWhitelist, args.Used))
             return;
 
         Gather(gatherable, args.User);
@@ -41,7 +43,7 @@ private void OnActivate(Entity<GatherableComponent> gatherable, ref ActivateInWo
         if (args.Handled || !args.Complex)
             return;
 
-        if (gatherable.Comp.ToolWhitelist?.IsValid(args.User, EntityManager) != true)
+        if (_whitelistSystem.IsWhitelistFailOrNull(gatherable.Comp.ToolWhitelist, args.User))
             return;
 
         Gather(gatherable, args.User);
diff --git a/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs b/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs
index cfd3b08c61a6..c3e0328037d3 100644
--- a/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs
+++ b/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Systems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
@@ -13,6 +14,7 @@ public sealed partial class NPCImprintingOnSpawnBehaviourSystem : SharedNPCImpri
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly NPCSystem _npc = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -27,7 +29,7 @@ private void OnMapInit(Entity<NPCImprintingOnSpawnBehaviourComponent> imprinting
 
         foreach (var friend in friends)
         {
-            if (imprinting.Comp.Whitelist?.IsValid(friend) != false)
+            if (_whitelistSystem.IsWhitelistPassOrNull(imprinting.Comp.Whitelist, friend))
             {
                 AddImprintingTarget(imprinting, friend, imprinting.Comp);
             }
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 2e8c628b5030..ca74d7133574 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Whitelist;
 using Microsoft.Extensions.ObjectPool;
 using Robust.Server.Containers;
 using Robust.Shared.Prototypes;
@@ -46,6 +47,7 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly WeldableSystem _weldable = default!;
     [Dependency] private readonly ExamineSystemShared _examine = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;
@@ -249,7 +251,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
                     return 0f;
                 }
 
-                if (heldGun.Whitelist?.IsValid(targetUid, EntityManager) != true)
+                if (_whitelistSystem.IsWhitelistFailOrNull(heldGun.Whitelist, targetUid))
                 {
                     return 0f;
                 }
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 1ff13a24f2c3..038295eac115 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Storage.Components;
 using Robust.Server.Containers;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Power.EntitySystems;
 
@@ -20,6 +21,7 @@ internal sealed class ChargerSystem : EntitySystem
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -208,7 +210,7 @@ private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerCompone
         if (!receiverComponent.Powered)
             return;
 
-        if (component.Whitelist?.IsValid(targetEntity, EntityManager) == false)
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, targetEntity))
             return;
 
         if (!SearchForBattery(targetEntity, out var batteryUid, out var heldBattery))
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 670c64577a48..c889d59f1556 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -28,6 +28,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
 using Robust.Shared.Map.Components;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Revenant.EntitySystems;
 
@@ -40,6 +41,7 @@ public sealed partial class RevenantSystem
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly GhostSystem _ghost = default!;
     [Dependency] private readonly TileSystem _tile = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private void InitializeAbilities()
     {
@@ -331,10 +333,8 @@ private void OnMalfunctionAction(EntityUid uid, RevenantComponent component, Rev
 
         foreach (var ent in _lookup.GetEntitiesInRange(uid, component.MalfunctionRadius))
         {
-            if (component.MalfunctionWhitelist?.IsValid(ent, EntityManager) == false)
-                continue;
-
-            if (component.MalfunctionBlacklist?.IsValid(ent, EntityManager) == true)
+            if (_whitelistSystem.IsWhitelistFail(component.MalfunctionWhitelist, ent) ||
+                _whitelistSystem.IsBlacklistPass(component.MalfunctionBlacklist, ent))
                 continue;
 
             _emag.DoEmagEffect(uid, ent); //it does not emag itself. adorable.
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index cc57c34c4754..5c600be3f640 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -267,7 +267,7 @@ public bool CanInsertModule(EntityUid uid, EntityUid module, BorgChassisComponen
             return false;
         }
 
-        if (component.ModuleWhitelist?.IsValid(module, EntityManager) == false)
+        if (_whitelistSystem.IsWhitelistFail(component.ModuleWhitelist, module))
         {
             if (user != null)
                 Popup.PopupEntity(Loc.GetString("borg-module-whitelist-deny"), uid, user.Value);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 082e38921a2c..1ab7f5387f31 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -22,6 +22,7 @@
 using Content.Shared.Silicons.Borgs;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Whitelist;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -53,6 +54,8 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
 
     [ValidatePrototypeId<JobPrototype>]
     public const string BorgJobId = "Borg";
@@ -104,9 +107,8 @@ private void OnChassisInteractUsing(EntityUid uid, BorgChassisComponent componen
             return;
         }
 
-        if (component.BrainEntity == null &&
-            brain != null &&
-            component.BrainWhitelist?.IsValid(used) != false)
+        if (component.BrainEntity == null && brain != null &&
+            _whitelistSystem.IsWhitelistPassOrNull(component.BrainWhitelist, used))
         {
             if (_mind.TryGetMind(used, out _, out var mind) && mind.Session != null)
             {
diff --git a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs b/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
index dbbe1dd7785f..f0e986e199bf 100644
--- a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
+++ b/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 
@@ -15,6 +16,7 @@ public sealed class PickRandomSystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -30,7 +32,7 @@ private void OnGetAlternativeVerbs(EntityUid uid, PickRandomComponent comp, GetV
 
         var user = args.User;
 
-        var enabled = storage.Container.ContainedEntities.Any(item => comp.Whitelist?.IsValid(item, EntityManager) ?? true);
+        var enabled = storage.Container.ContainedEntities.Any(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item));
 
         // alt-click / alt-z to pick an item
         args.Verbs.Add(new AlternativeVerb
@@ -48,7 +50,7 @@ private void OnGetAlternativeVerbs(EntityUid uid, PickRandomComponent comp, GetV
 
     private void TryPick(EntityUid uid, PickRandomComponent comp, StorageComponent storage, EntityUid user)
     {
-        var entities = storage.Container.ContainedEntities.Where(item => comp.Whitelist?.IsValid(item, EntityManager) ?? true).ToArray();
+        var entities = storage.Container.ContainedEntities.Where(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item)).ToArray();
 
         if (!entities.Any())
             return;
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
index 895bb0217b3b..65aaabdf0e95 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
@@ -1,15 +1,16 @@
 using System.Linq;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
+using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.XenoArtifacts;
 using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager;
 
 namespace Content.Server.Xenoarchaeology.XenoArtifacts;
 
 public sealed partial class ArtifactSystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
     private const int MaxEdgesPerNode = 4;
 
     private readonly HashSet<int> _usedNodeIds = new();
@@ -81,7 +82,8 @@ private int GetValidNodeId()
     private string GetRandomTrigger(EntityUid artifact, ref ArtifactNode node)
     {
         var allTriggers = _prototype.EnumeratePrototypes<ArtifactTriggerPrototype>()
-            .Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
+            .Where(x => _whitelistSystem.IsWhitelistPassOrNull(x.Whitelist, artifact) &&
+            _whitelistSystem.IsBlacklistFailOrNull(x.Blacklist, artifact)).ToList();
         var validDepth = allTriggers.Select(x => x.TargetDepth).Distinct().ToList();
 
         var weights = GetDepthWeights(validDepth, node.Depth);
@@ -95,7 +97,8 @@ private string GetRandomTrigger(EntityUid artifact, ref ArtifactNode node)
     private string GetRandomEffect(EntityUid artifact, ref ArtifactNode node)
     {
         var allEffects = _prototype.EnumeratePrototypes<ArtifactEffectPrototype>()
-            .Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
+            .Where(x => _whitelistSystem.IsWhitelistPassOrNull(x.Whitelist, artifact) &&
+            _whitelistSystem.IsBlacklistFailOrNull(x.Blacklist, artifact)).ToList();
         var validDepth = allEffects.Select(x => x.TargetDepth).Distinct().ToList();
 
         var weights = GetDepthWeights(validDepth, node.Depth);
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index 2e3f9ed461a3..48f4f07cbe1a 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Interaction.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.GameStates;
@@ -31,6 +32,7 @@ public sealed class ItemSlotsSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+        [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
         public override void Initialize()
         {
@@ -266,8 +268,7 @@ public bool CanInsert(EntityUid uid, EntityUid usedUid, EntityUid? user, ItemSlo
             if (slot.ContainerSlot == null)
                 return false;
 
-            if ((!slot.Whitelist?.IsValid(usedUid) ?? false) ||
-                (slot.Blacklist?.IsValid(usedUid) ?? false))
+            if (_whitelistSystem.IsWhitelistFail(slot.Whitelist, usedUid) || _whitelistSystem.IsBlacklistPass(slot.Blacklist, usedUid))
             {
                 if (popup.HasValue && slot.WhitelistFailPopup.HasValue)
                     _popupSystem.PopupClient(Loc.GetString(slot.WhitelistFailPopup), uid, popup.Value);
diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
index aec3d0766ae9..b08ef77fed5e 100644
--- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Damage.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -11,6 +12,7 @@ public sealed class DamageContactsSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -63,7 +65,7 @@ private void OnEntityEnter(EntityUid uid, DamageContactsComponent component, ref
         if (HasComp<DamagedByContactComponent>(otherUid))
             return;
 
-        if (component.IgnoreWhitelist?.IsValid(otherUid) ?? false)
+        if (_whitelistSystem.IsWhitelistFail(component.IgnoreWhitelist, otherUid))
             return;
 
         var damagedByContact = EnsureComp<DamagedByContactComponent>(otherUid);
diff --git a/Content.Shared/Devour/SharedDevourSystem.cs b/Content.Shared/Devour/SharedDevourSystem.cs
index 3d73b14dd356..14047fba7dd2 100644
--- a/Content.Shared/Devour/SharedDevourSystem.cs
+++ b/Content.Shared/Devour/SharedDevourSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -18,6 +19,7 @@ public abstract class SharedDevourSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -41,7 +43,7 @@ protected void OnInit(EntityUid uid, DevourerComponent component, MapInitEvent a
     /// </summary>
     protected void OnDevourAction(EntityUid uid, DevourerComponent component, DevourActionEvent args)
     {
-        if (args.Handled || component.Whitelist?.IsValid(args.Target, EntityManager) != true)
+        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Target))
             return;
 
         args.Handled = true;
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index c39139f9a57d..9fdb4a6a804d 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Emag.Systems;
 using Content.Shared.Item;
 using Content.Shared.Throwing;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -25,6 +26,7 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
     [Dependency] protected readonly IGameTiming GameTiming = default!;
     [Dependency] protected readonly MetaDataSystem Metadata = default!;
     [Dependency] protected readonly SharedJointSystem Joints = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     protected static TimeSpan ExitAttemptDelay = TimeSpan.FromSeconds(0.5);
 
@@ -113,10 +115,8 @@ public virtual bool CanInsert(EntityUid uid, SharedDisposalUnitComponent compone
         if (!storable && !HasComp<BodyComponent>(entity))
             return false;
 
-        if (component.Blacklist?.IsValid(entity, EntityManager) == true)
-            return false;
-
-        if (component.Whitelist != null && component.Whitelist?.IsValid(entity, EntityManager) != true)
+        if (_whitelistSystem.IsBlacklistPass(component.Blacklist, entity) ||
+            _whitelistSystem.IsWhitelistFail(component.Whitelist, entity))
             return false;
 
         if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide) || storable)
diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs
index d78522b56ccf..44803e721c0d 100644
--- a/Content.Shared/Implants/SharedImplanterSystem.cs
+++ b/Content.Shared/Implants/SharedImplanterSystem.cs
@@ -20,6 +20,7 @@ public abstract class SharedImplanterSystem : EntitySystem
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -105,8 +106,8 @@ public bool CanImplant(
 
     protected bool CheckTarget(EntityUid target, EntityWhitelist? whitelist, EntityWhitelist? blacklist)
     {
-        return whitelist?.IsValid(target, EntityManager) != false &&
-            blacklist?.IsValid(target, EntityManager) != true;
+        return _whitelistSystem.IsWhitelistPassOrNull(whitelist, target) &&
+            _whitelistSystem.IsBlacklistFailOrNull(blacklist, target);
     }
 
     //Draw the implant out of the target
diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs
index fb2bc3c46097..bba294db28d2 100644
--- a/Content.Shared/Interaction/SmartEquipSystem.cs
+++ b/Content.Shared/Interaction/SmartEquipSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -7,6 +7,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
@@ -25,6 +26,7 @@ public sealed class SmartEquipSystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -182,7 +184,7 @@ private void HandleSmartEquip(ICommonSession? session, string equipmentSlot)
             foreach (var slot in slots.Slots.Values)
             {
                 if (!slot.HasItem
-                    && (slot.Whitelist?.IsValid(handItem.Value, EntityManager) ?? true)
+                    && _whitelistSystem.IsWhitelistPassOrNull(slot.Whitelist, handItem.Value)
                     && slot.Priority > (toInsertTo?.Priority ?? int.MinValue))
                 {
                     toInsertTo = slot;
diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
index b1de77d971a0..af815bdb2b7f 100644
--- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Stacks;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -17,6 +18,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     /// <summary>
     /// Default volume for a sheet if the material's entity prototype has no material composition.
@@ -121,7 +123,7 @@ public bool CanChangeMaterialAmount(EntityUid uid, string materialId, int volume
         if (!CanTakeVolume(uid, volume, component))
             return false;
 
-        if (component.MaterialWhiteList != null && !component.MaterialWhiteList.Contains(materialId))
+        if (component.MaterialWhiteList == null ? false : component.MaterialWhiteList.Contains(materialId))
             return false;
 
         var amount = component.Storage.GetValueOrDefault(materialId);
@@ -239,7 +241,7 @@ public virtual bool TryInsertMaterialEntity(EntityUid user,
         if (!Resolve(toInsert, ref material, ref composition, false))
             return false;
 
-        if (storage.Whitelist?.IsValid(toInsert) == false)
+        if (_whitelistSystem.IsWhitelistFail(storage.Whitelist, toInsert))
             return false;
 
         if (HasComp<UnremoveableComponent>(toInsert))
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index c1abfc526f5d..00096b7d4094 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -6,6 +6,7 @@
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Prototypes;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Whitelist;
 
 namespace Content.Shared.Polymorph.Systems;
 
@@ -18,6 +19,7 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly ISerializationManager _serMan = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -49,8 +51,8 @@ private void OnInteract(Entity<ChameleonProjectorComponent> ent, ref AfterIntera
     /// </summary>
     public bool IsInvalid(ChameleonProjectorComponent comp, EntityUid target)
     {
-        return (comp.Whitelist?.IsValid(target, EntityManager) == false)
-            || (comp.Blacklist?.IsValid(target, EntityManager) == true);
+        return _whitelistSystem.IsWhitelistFail(comp.Whitelist, target)
+            || _whitelistSystem.IsBlacklistPass(comp.Blacklist, target);
     }
 
     /// <summary>
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index b355ae587303..f94558b0b30f 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -30,6 +31,7 @@ public abstract partial class SharedFultonSystem : EntitySystem
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
     [Dependency] private   readonly SharedStackSystem _stack = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     [ValidatePrototypeId<EntityPrototype>] public const string EffectProto = "FultonEffect";
     protected static readonly Vector2 EffectOffset = Vector2.Zero;
@@ -176,7 +178,7 @@ protected bool CanApplyFulton(EntityUid targetUid, FultonComponent component)
         if (!CanFulton(targetUid))
             return false;
 
-        if (component.Whitelist?.IsValid(targetUid, EntityManager) != true)
+        if (_whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, targetUid))
             return false;
 
         return true;
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index d859d9f48590..a382e943ff94 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.UI.MapObjects;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Collision.Shapes;
@@ -15,6 +16,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] protected readonly SharedMapSystem Maps = default!;
     [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const float FTLRange = 512f;
     public const float FTLBufferRange = 8f;
@@ -83,7 +85,7 @@ public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap, EntityUid consoleUid
         if (HasComp<FTLMapComponent>(mapUid))
             return false;
 
-        return destination.Whitelist?.IsValid(shuttleUid, EntityManager) != false;
+        return _whitelistSystem.IsWhitelistPassOrNull(destination.Whitelist, shuttleUid);
     }
 
     /// <summary>
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index 03da2d09b0e1..7a8961485d6e 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Storage.Components;
 using Content.Shared.Inventory;
+using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
@@ -16,6 +17,8 @@ public sealed class MagnetPickupSystem : EntitySystem
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedStorageSystem _storage = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
 
     private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1);
 
@@ -63,7 +66,7 @@ public override void Update(float frameTime)
 
             foreach (var near in _lookup.GetEntitiesInRange(uid, comp.Range, LookupFlags.Dynamic | LookupFlags.Sundries))
             {
-                if (storage.Whitelist?.IsValid(near, EntityManager) == false)
+                if (_whitelistSystem.IsWhitelistFail(storage.Whitelist, near))
                     continue;
 
                 if (!_physicsQuery.TryGetComponent(near, out var physics) || physics.BodyStatus != BodyStatus.OnGround)
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 0576e46df4a2..bb49725e0471 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Tools.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Wall;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -45,6 +46,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly WeldableSystem _weldable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const string ContainerName = "entity_storage";
 
@@ -432,7 +434,7 @@ private bool CanFit(EntityUid toInsert, EntityUid container, SharedEntityStorage
 
         var targetIsMob = HasComp<BodyComponent>(toInsert);
         var storageIsItem = HasComp<ItemComponent>(container);
-        var allowedToEat = component.Whitelist?.IsValid(toInsert) ?? HasComp<ItemComponent>(toInsert);
+        var allowedToEat = component.Whitelist == null ? HasComp<ItemComponent>(toInsert) : _whitelistSystem.IsValid(component.Whitelist, toInsert);
 
         // BEFORE REPLACING THIS WITH, I.E. A PROPERTY:
         // Make absolutely 100% sure you have worked out how to stop people ending up in backpacks.
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index ee087901f3ba..d87b57bfc8dd 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -55,6 +55,7 @@ public abstract class SharedStorageSystem : EntitySystem
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<StackComponent> _stackQuery;
@@ -860,13 +861,8 @@ public bool CanInsert(
             return false;
         }
 
-        if (storageComp.Whitelist?.IsValid(insertEnt, EntityManager) == false)
-        {
-            reason = "comp-storage-invalid-container";
-            return false;
-        }
-
-        if (storageComp.Blacklist?.IsValid(insertEnt, EntityManager) == true)
+        if (_whitelistSystem.IsWhitelistFail(storageComp.Whitelist, insertEnt) ||
+            _whitelistSystem.IsBlacklistPass(storageComp.Blacklist, insertEnt))
         {
             reason = "comp-storage-invalid-container";
             return false;
diff --git a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
index d1814020e6e3..eab638a9fc2a 100644
--- a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
+++ b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
@@ -15,6 +16,7 @@ public abstract class SharedDamageMarkerSystem : EntitySystem
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -58,7 +60,7 @@ private void OnMarkerCollide(EntityUid uid, DamageMarkerOnCollideComponent compo
         if (!args.OtherFixture.Hard ||
             args.OurFixtureId != SharedProjectileSystem.ProjectileFixture ||
             component.Amount <= 0 ||
-            component.Whitelist?.IsValid(args.OtherEntity, EntityManager) == false ||
+            _whitelistSystem.IsWhitelistFail(component.Whitelist, args.OtherEntity) ||
             !TryComp<ProjectileComponent>(uid, out var projectile) ||
             projectile.Weapon == null)
         {
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index 784dd0793a89..1f9e6cee76aa 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -41,7 +41,10 @@ private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent compon
 
     private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderComponent component, InteractUsingEvent args)
     {
-        if (args.Handled || component.Whitelist?.IsValid(args.Used, EntityManager) != true)
+        if (args.Handled)
+            return;
+
+        if (_whitelistSystem.IsWhitelistFailOrNull(component.Whitelist, args.Used))
             return;
 
         if (GetBallisticShots(component) >= component.Capacity)
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
index b8b00799c1b0..14aaff5bf70d 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs
@@ -89,7 +89,7 @@ private void OnRevolverHandleState(EntityUid uid, RevolverAmmoProviderComponent
 
     public bool TryRevolverInsert(EntityUid revolverUid, RevolverAmmoProviderComponent component, EntityUid uid, EntityUid? user)
     {
-        if (component.Whitelist?.IsValid(uid, EntityManager) == false)
+        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, uid))
             return false;
 
         // If it's a speedloader try to get ammo from it.
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 4debc289be1f..47648a07ad44 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -21,6 +21,7 @@
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -63,6 +64,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] protected readonly TagSystem TagSystem = default!;
     [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!;
     [Dependency] private   readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private const float InteractNextFire = 0.3f;
     private const double SafetyNextFire = 0.5;
diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
index d73646b7e99e..f311946cf987 100644
--- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs
+++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs
@@ -60,6 +60,90 @@ public bool IsValid(EntityWhitelist list, EntityUid uid)
 
         return list.RequireAll;
     }
+    /// The following are a list of "helper functions" that are basically the same as each other
+    /// to help make code that uses EntityWhitelist a bit more readable because at the moment
+    /// it is quite clunky having to write out component.Whitelist == null ? true : _whitelist.IsValid(component.Whitelist, uid)
+    /// several times in a row and makes comparisons easier to read
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is not null and entity is on list
+    /// </summary>
+    public bool IsWhitelistPass(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return false;
+
+        return IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is not null and entity is not on the list
+    /// </summary>
+    public bool IsWhitelistFail(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return false;
+
+        return !IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is either null or the entity is on the list
+    /// </summary>
+    public bool IsWhitelistPassOrNull(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return true;
+
+        return IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Whitelist is either null or the entity is not on the list
+    /// </summary>
+    public bool IsWhitelistFailOrNull(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return true;
+
+        return !IsValid(whitelist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Blacklist is not null and entity is on list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistPass(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistPass(blacklist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Blacklist is not null and entity is not on the list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistFail(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistFail(blacklist, uid);
+    }
+
+    /// <summary>
+    /// Helper function to determine if Blacklist is either null or the entity is on the list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistPassOrNull(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistPassOrNull(blacklist, uid);
+    }
+
+    /// <summary>                                        
+    /// Helper function to determine if Blacklist is either null or the entity is not on the list
+    /// Duplicate of equivalent Whitelist function
+    /// </summary>
+    public bool IsBlacklistFailOrNull(EntityWhitelist? blacklist, EntityUid uid)
+    {
+        return IsWhitelistFailOrNull(blacklist, uid);
+    }
 
     private void EnsureRegistrations(EntityWhitelist list)
     {

From 21d0b1fd558f417c25e0587cf8d0186ec83a294e Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 1 Jun 2024 23:58:33 -0400
Subject: [PATCH 213/568] Guidebook Tables (#28484)

* PJB's cool table control (it probably doesn't work)

* ok wait wrong file

* Guidebook Tables
---
 Content.Client/Guidebook/Richtext/Box.cs      |   3 +
 Content.Client/Guidebook/Richtext/ColorBox.cs |  49 +++
 Content.Client/Guidebook/Richtext/Table.cs    |  27 ++
 .../UserInterface/Controls/TableContainer.cs  | 285 ++++++++++++++++++
 4 files changed, 364 insertions(+)
 create mode 100644 Content.Client/Guidebook/Richtext/ColorBox.cs
 create mode 100644 Content.Client/Guidebook/Richtext/Table.cs
 create mode 100644 Content.Client/UserInterface/Controls/TableContainer.cs

diff --git a/Content.Client/Guidebook/Richtext/Box.cs b/Content.Client/Guidebook/Richtext/Box.cs
index ecf6cb21f70a..6e18ad9c5754 100644
--- a/Content.Client/Guidebook/Richtext/Box.cs
+++ b/Content.Client/Guidebook/Richtext/Box.cs
@@ -11,6 +11,9 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
         HorizontalExpand = true;
         control = this;
 
+        if (args.TryGetValue("Margin", out var margin))
+            Margin = new Thickness(float.Parse(margin));
+
         if (args.TryGetValue("Orientation", out var orientation))
             Orientation = Enum.Parse<LayoutOrientation>(orientation);
         else
diff --git a/Content.Client/Guidebook/Richtext/ColorBox.cs b/Content.Client/Guidebook/Richtext/ColorBox.cs
new file mode 100644
index 000000000000..84de300d6e01
--- /dev/null
+++ b/Content.Client/Guidebook/Richtext/ColorBox.cs
@@ -0,0 +1,49 @@
+using System.Diagnostics.CodeAnalysis;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Guidebook.Richtext;
+
+[UsedImplicitly]
+public sealed class ColorBox : PanelContainer, IDocumentTag
+{
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        HorizontalExpand = true;
+        VerticalExpand = true;
+        control = this;
+
+        if (args.TryGetValue("Margin", out var margin))
+            Margin = new Thickness(float.Parse(margin));
+
+        if (args.TryGetValue("HorizontalAlignment", out var halign))
+            HorizontalAlignment = Enum.Parse<HAlignment>(halign);
+        else
+            HorizontalAlignment = HAlignment.Stretch;
+
+        if (args.TryGetValue("VerticalAlignment", out var valign))
+            VerticalAlignment = Enum.Parse<VAlignment>(valign);
+        else
+            VerticalAlignment = VAlignment.Stretch;
+
+        var styleBox =  new StyleBoxFlat();
+        if (args.TryGetValue("Color", out var color))
+            styleBox.BackgroundColor = Color.FromHex(color);
+
+        if (args.TryGetValue("OutlineThickness", out var outlineThickness))
+            styleBox.BorderThickness = new Thickness(float.Parse(outlineThickness));
+        else
+            styleBox.BorderThickness = new Thickness(1);
+
+        if (args.TryGetValue("OutlineColor", out var outlineColor))
+            styleBox.BorderColor = Color.FromHex(outlineColor);
+        else
+            styleBox.BorderColor = Color.White;
+
+        PanelOverride = styleBox;
+
+        return true;
+    }
+}
diff --git a/Content.Client/Guidebook/Richtext/Table.cs b/Content.Client/Guidebook/Richtext/Table.cs
new file mode 100644
index 000000000000..b6923c3698ea
--- /dev/null
+++ b/Content.Client/Guidebook/Richtext/Table.cs
@@ -0,0 +1,27 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.UserInterface.Controls;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Guidebook.Richtext;
+
+[UsedImplicitly]
+public sealed class Table : TableContainer, IDocumentTag
+{
+    public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
+    {
+        HorizontalExpand = true;
+        control = this;
+
+        if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
+        {
+            Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
+            control = null;
+            return false;
+        }
+
+        Columns = columnsCount;
+
+        return true;
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/TableContainer.cs b/Content.Client/UserInterface/Controls/TableContainer.cs
new file mode 100644
index 000000000000..3e8d4760015a
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/TableContainer.cs
@@ -0,0 +1,285 @@
+using System.Numerics;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.UserInterface.Controls;
+
+// This control is not part of engine because I quickly wrote it in 2 hours at 2 AM and don't want to deal with
+// API stabilization and/or figuring out relation to GridContainer.
+// Grid layout is a complicated problem and I don't want to commit another half-baked thing into the engine.
+// It's probably sufficient for its use case (RichTextLabel tables for rules/guidebook).
+// Despite that, it's still better comment the shit half of you write on a regular basis.
+//
+// EMO: thank you PJB i was going to kill myself.
+
+/// <summary>
+/// Displays children in a tabular grid. Unlike <see cref="GridContainer"/>,
+/// properly handles layout constraints so putting word-wrapping <see cref="RichTextLabel"/> in it should work.
+/// </summary>
+/// <remarks>
+/// All children are automatically laid out in <see cref="Columns"/> columns.
+/// The first control is in the top left, laid out per row from there.
+/// </remarks>
+[Virtual]
+public class TableContainer : Container
+{
+    private int _columns = 1;
+
+    /// <summary>
+    /// The absolute minimum width a column can be forced to.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// If a column *asks* for less width than this (small contents), it can still be smaller.
+    /// But if it asks for more it cannot go below this width.
+    /// </para>
+    /// </remarks>
+    public float MinForcedColumnWidth { get; set; } = 50;
+
+    // Scratch space used while calculating layout, cached to avoid regular allocations during layout pass.
+    private ColumnData[] _columnDataCache = [];
+    private RowData[] _rowDataCache = [];
+
+    /// <summary>
+    /// How many columns should be displayed.
+    /// </summary>
+    public int Columns
+    {
+        get => _columns;
+        set
+        {
+            ArgumentOutOfRangeException.ThrowIfLessThan(value, 1, nameof(value));
+
+            _columns = value;
+        }
+    }
+
+    protected override Vector2 MeasureOverride(Vector2 availableSize)
+    {
+        ResetCachedArrays();
+
+        // Do a first pass measuring all child controls as if they're given infinite space.
+        // This gives us a maximum width the columns want, which we use to proportion them later.
+        var columnIdx = 0;
+        foreach (var child in Children)
+        {
+            ref var column = ref _columnDataCache[columnIdx];
+
+            child.Measure(new Vector2(float.PositiveInfinity, float.PositiveInfinity));
+            column.MaxWidth = Math.Max(column.MaxWidth, child.DesiredSize.X);
+
+            columnIdx += 1;
+            if (columnIdx == _columns)
+                columnIdx = 0;
+        }
+
+        // Calculate Slack and MinWidth for all columns. Also calculate sums for all columns.
+        var totalMinWidth = 0f;
+        var totalMaxWidth = 0f;
+        var totalSlack = 0f;
+
+        for (var c = 0; c < _columns; c++)
+        {
+            ref var column = ref _columnDataCache[c];
+            column.MinWidth = Math.Min(column.MaxWidth, MinForcedColumnWidth);
+            column.Slack = column.MaxWidth - column.MinWidth;
+
+            totalMinWidth += column.MinWidth;
+            totalMaxWidth += column.MaxWidth;
+            totalSlack += column.Slack;
+        }
+
+        if (totalMaxWidth <= availableSize.X)
+        {
+            // We want less horizontal space than we're given. Huh, that's convenient.
+            // Just set assigned width to be however much they asked for.
+            // We could probably skip the second measure pass in this scenario,
+            // but that's just an optimization, so I don't care right now.
+            //
+            // There's probably a very clever way to make this behavior work with the else block of logic,
+            // just by fiddling with the math.
+            // I'm dumb, it's 4:30 AM. Yeah, I *started* at 2 AM.
+            for (var c = 0; c < _columns; c++)
+            {
+                ref var column = ref _columnDataCache[c];
+
+                column.AssignedWidth = column.MaxWidth;
+            }
+        }
+        else
+        {
+            // We don't have enough horizontal space,
+            // at least without causing *some* sort of word wrapping (assuming text contents).
+            //
+            // Assign horizontal space proportional to the wanted maximum size of the columns.
+            var assignableWidth =  Math.Max(0, availableSize.X - totalMinWidth);
+            for (var c = 0; c < _columns; c++)
+            {
+                ref var column = ref _columnDataCache[c];
+
+                var slackRatio = column.Slack / totalSlack;
+                column.AssignedWidth = column.MinWidth + slackRatio * assignableWidth;
+            }
+        }
+
+        // Go over controls for a second measuring pass, this time giving them their assigned measure width.
+        // This will give us a height to slot into per-row data.
+        // We still measure assuming infinite vertical space.
+        // This control can't properly handle being constrained on the Y axis.
+        columnIdx = 0;
+        var rowIdx = 0;
+        foreach (var child in Children)
+        {
+            ref var column = ref _columnDataCache[columnIdx];
+            ref var row = ref _rowDataCache[rowIdx];
+
+            child.Measure(new Vector2(column.AssignedWidth, float.PositiveInfinity));
+            row.MeasuredHeight = Math.Max(row.MeasuredHeight, child.DesiredSize.Y);
+
+            columnIdx += 1;
+            if (columnIdx == _columns)
+            {
+                columnIdx = 0;
+                rowIdx += 1;
+            }
+        }
+
+        // Sum up height of all rows to get final measured table height.
+        var totalHeight = 0f;
+        for (var r = 0; r < _rowDataCache.Length; r++)
+        {
+            ref var row = ref _rowDataCache[r];
+            totalHeight += row.MeasuredHeight;
+        }
+
+        return new Vector2(Math.Min(availableSize.X, totalMaxWidth), totalHeight);
+    }
+
+    protected override Vector2 ArrangeOverride(Vector2 finalSize)
+    {
+        // TODO: Expand to fit given vertical space.
+
+        // Calculate MinWidth and Slack sums again from column data.
+        // We could've cached these from measure but whatever.
+        var totalMinWidth = 0f;
+        var totalSlack = 0f;
+
+        for (var c = 0; c < _columns; c++)
+        {
+            ref var column = ref _columnDataCache[c];
+            totalMinWidth += column.MinWidth;
+            totalSlack += column.Slack;
+        }
+
+        // Calculate new width based on final given size, also assign horizontal positions of all columns.
+        var assignableWidth = Math.Max(0, finalSize.X - totalMinWidth);
+        var xPos = 0f;
+        for (var c = 0; c < _columns; c++)
+        {
+            ref var column = ref _columnDataCache[c];
+
+            var slackRatio = column.Slack / totalSlack;
+            column.ArrangedWidth = column.MinWidth + slackRatio * assignableWidth;
+            column.ArrangedX = xPos;
+
+            xPos += column.ArrangedWidth;
+        }
+
+        // Do actual arrangement row-by-row.
+        var arrangeY = 0f;
+        for (var r = 0; r < _rowDataCache.Length; r++)
+        {
+            ref var row = ref _rowDataCache[r];
+
+            for (var c = 0; c < _columns; c++)
+            {
+                ref var column = ref _columnDataCache[c];
+                var index = c + r * _columns;
+
+                if (index >= ChildCount) // Quit early if we don't actually fill out the row.
+                    break;
+                var child = GetChild(c + r * _columns);
+
+                child.Arrange(UIBox2.FromDimensions(column.ArrangedX, arrangeY, column.ArrangedWidth, row.MeasuredHeight));
+            }
+
+            arrangeY += row.MeasuredHeight;
+        }
+
+        return finalSize with { Y = arrangeY };
+    }
+
+    /// <summary>
+    /// Ensure cached array space is allocated to correct size and is reset to a clean slate.
+    /// </summary>
+    private void ResetCachedArrays()
+    {
+        // 1-argument Array.Clear() is not currently available in sandbox (added in .NET 6).
+
+        if (_columnDataCache.Length != _columns)
+            _columnDataCache = new ColumnData[_columns];
+
+        Array.Clear(_columnDataCache, 0, _columnDataCache.Length);
+
+        var rowCount = ChildCount / _columns;
+        if (ChildCount % _columns != 0)
+            rowCount += 1;
+
+        if (rowCount != _rowDataCache.Length)
+            _rowDataCache = new RowData[rowCount];
+
+        Array.Clear(_rowDataCache, 0, _rowDataCache.Length);
+    }
+
+    /// <summary>
+    /// Per-column data used during layout.
+    /// </summary>
+    private struct ColumnData
+    {
+        // Measure data.
+
+        /// <summary>
+        /// The maximum width any control in this column wants, if given infinite space.
+        /// Maximum of all controls on the column.
+        /// </summary>
+        public float MaxWidth;
+
+        /// <summary>
+        /// The minimum width this column may be given.
+        /// This is either <see cref="MaxWidth"/> or <see cref="TableContainer.MinForcedColumnWidth"/>.
+        /// </summary>
+        public float MinWidth;
+
+        /// <summary>
+        /// Difference between max and min width; how much this column can expand from its minimum.
+        /// </summary>
+        public float Slack;
+
+        /// <summary>
+        /// How much horizontal space this column was assigned at measure time.
+        /// </summary>
+        public float AssignedWidth;
+
+        // Arrange data.
+
+        /// <summary>
+        /// How much horizontal space this column was assigned at arrange time.
+        /// </summary>
+        public float ArrangedWidth;
+
+        /// <summary>
+        /// The horizontal position this column was assigned at arrange time.
+        /// </summary>
+        public float ArrangedX;
+    }
+
+    private struct RowData
+    {
+        // Measure data.
+
+        /// <summary>
+        /// How much height the tallest control on this row was measured at,
+        /// measuring for infinite vertical space but assigned column width.
+        /// </summary>
+        public float MeasuredHeight;
+    }
+}

From b44b159431630a918356e9625420e8d7fd8d468e Mon Sep 17 00:00:00 2001
From: eoineoineoin <github@eoinrul.es>
Date: Sun, 2 Jun 2024 05:07:41 +0100
Subject: [PATCH 214/568] Replace Matrix3 with System.Numerics.Matrix3x2
 (#27443)

Replace Matrix3 with Matrix3x2
---
 .../SpawnExplosion/ExplosionDebugOverlay.cs   | 16 ++++---
 .../Atmos/Overlays/AtmosDebugOverlay.cs       |  2 +-
 .../Atmos/Overlays/GasTileOverlay.cs          |  4 +-
 .../Clickable/ClickableComponent.cs           | 12 ++---
 .../Decals/Overlays/DecalOverlay.cs           |  3 +-
 .../Decals/Overlays/DecalPlacementOverlay.cs  |  4 +-
 Content.Client/DoAfter/DoAfterOverlay.cs      | 12 ++---
 Content.Client/Explosion/ExplosionOverlay.cs  |  5 +-
 Content.Client/Fluids/PuddleOverlay.cs        |  7 +--
 Content.Client/Maps/GridDraggingSystem.cs     |  4 +-
 Content.Client/NPC/PathfindingSystem.cs       |  8 ++--
 .../NodeContainer/NodeVisualizationOverlay.cs |  2 +-
 .../Overlays/EntityHealthBarOverlay.cs        | 12 ++---
 .../StencilOverlay.RestrictedRange.cs         |  6 +--
 .../Overlays/StencilOverlay.Weather.cs        |  8 ++--
 Content.Client/Overlays/StencilOverlay.cs     |  3 +-
 Content.Client/Paper/UI/StampLabel.xaml.cs    |  2 +-
 Content.Client/Paper/UI/StampWidget.xaml.cs   |  2 +-
 Content.Client/Pinpointer/UI/NavMapControl.cs |  6 +--
 Content.Client/Popups/PopupOverlay.cs         |  5 +-
 .../Systems/ShuttleSystem.EmergencyConsole.cs |  3 +-
 .../Shuttles/UI/BaseShuttleControl.xaml.cs    |  7 +--
 Content.Client/Shuttles/UI/NavScreen.xaml.cs  |  3 +-
 .../Shuttles/UI/ShuttleDockControl.xaml.cs    | 46 +++++++++----------
 .../Shuttles/UI/ShuttleMapControl.xaml.cs     | 26 +++++------
 .../Shuttles/UI/ShuttleNavControl.xaml.cs     | 24 +++++-----
 .../StatusIcon/StatusIconOverlay.cs           | 10 ++--
 .../Storage/Systems/StorageSystem.cs          |  5 +-
 .../UserInterface/Controls/DirectionIcon.cs   |  2 +-
 .../Controls/MapGridControl.xaml.cs           |  2 +-
 Content.Client/Viewport/ScalingViewport.cs    | 18 ++++----
 .../Melee/MeleeWeaponSystem.Effects.cs        |  2 +-
 .../Weapons/Ranged/ItemStatus/BulletRender.cs |  4 +-
 .../EntitySystems/ExplosionGridTileFlood.cs   | 13 +++---
 .../EntitySystems/ExplosionSystem.GridMap.cs  | 12 ++---
 .../ExplosionSystem.Processing.cs             | 20 ++++----
 .../EntitySystems/ExplosionSystem.TileFill.cs |  4 +-
 .../EntitySystems/ExplosionSystem.Visuals.cs  |  3 +-
 .../Fluids/EntitySystems/AbsorbentSystem.cs   |  3 +-
 .../GameTicking/GameTicker.Spawning.cs        |  2 +-
 .../Medical/SuitSensors/SuitSensorSystem.cs   |  5 +-
 .../Pathfinding/PathfindingSystem.Distance.cs |  2 +-
 .../NPC/Pathfinding/PathfindingSystem.Grid.cs |  2 +-
 .../NPC/Pathfinding/PathfindingSystem.cs      |  2 +-
 .../Procedural/DungeonJob.PrefabDunGen.cs     | 24 +++++-----
 .../Procedural/DungeonSystem.Rooms.cs         | 16 +++----
 .../Systems/RadiationSystem.GridCast.cs       |  4 +-
 Content.Server/Salvage/FultonSystem.cs        |  6 ++-
 .../Shuttles/Events/FTLStartedEvent.cs        |  3 +-
 .../Shuttles/Systems/ArrivalsSystem.cs        |  3 +-
 .../Shuttles/Systems/DockingSystem.Shuttle.cs | 16 +++----
 .../Shuttles/Systems/ShuttleSystem.Impact.cs  |  5 +-
 .../EntitySystems/GravityWellSystem.cs        | 16 +++----
 .../Weapons/Ranged/Systems/GunSystem.cs       |  2 +-
 .../Components/ExplosionVisualsComponent.cs   |  7 +--
 Content.Shared/Item/SharedItemSystem.cs       |  2 +-
 Content.Shared/Maps/TurfSystem.cs             |  2 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  |  2 +-
 58 files changed, 236 insertions(+), 215 deletions(-)

diff --git a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
index eede3a6217f0..d60094ad8978 100644
--- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
+++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
@@ -25,7 +25,7 @@ public sealed class ExplosionDebugOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace | OverlaySpace.ScreenSpace;
 
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public MapId Map;
 
     private readonly Font _font;
@@ -78,7 +78,8 @@ private void DrawScreen(OverlayDrawArgs args)
         if (SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds);
+        Matrix3x2.Invert(SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(args.WorldBounds);
 
         DrawText(handle, gridBounds, SpaceMatrix, SpaceTiles, SpaceTileSize);
     }
@@ -86,7 +87,7 @@ private void DrawScreen(OverlayDrawArgs args)
     private void DrawText(
         DrawingHandleScreen handle,
         Box2 gridBounds,
-        Matrix3 transform,
+        Matrix3x2 transform,
         Dictionary<int, List<Vector2i>> tileSets,
         ushort tileSize)
     {
@@ -103,7 +104,7 @@ private void DrawText(
                 if (!gridBounds.Contains(centre))
                     continue;
 
-                var worldCenter = transform.Transform(centre);
+                var worldCenter = Vector2.Transform(centre, transform);
 
                 var screenCenter = _eyeManager.WorldToScreen(worldCenter);
 
@@ -119,7 +120,7 @@ private void DrawText(
         if (tileSets.TryGetValue(0, out var set))
         {
             var epicenter = set.First();
-            var worldCenter = transform.Transform((epicenter + Vector2Helpers.Half) * tileSize);
+            var worldCenter = Vector2.Transform((epicenter + Vector2Helpers.Half) * tileSize, transform);
             var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
             var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
             handle.DrawString(_font, screenCenter, text);
@@ -148,11 +149,12 @@ private void DrawWorld(in OverlayDrawArgs args)
         if (SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(SpaceMatrix).TransformBox(args.WorldBounds).Enlarged(2);
+        Matrix3x2.Invert(SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(args.WorldBounds).Enlarged(2);
         handle.SetTransform(SpaceMatrix);
 
         DrawTiles(handle, gridBounds, SpaceTiles, SpaceTileSize);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawTiles(
diff --git a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
index 6dfbc326ecbf..c85dbd20512c 100644
--- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
+++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
@@ -66,7 +66,7 @@ protected override void Draw(in OverlayDrawArgs args)
             DrawData(msg, handle);
         }
 
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawData(DebugMessage msg,
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
index f4dc274a4e54..17027525e548 100644
--- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -190,7 +190,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
                     var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
                     state.drawHandle.SetTransform(worldMatrix);
-                    var floatBounds = invMatrix.TransformBox(in state.WorldBounds).Enlarged(grid.TileSize);
+                    var floatBounds = invMatrix.TransformBox(state.WorldBounds).Enlarged(grid.TileSize);
                     var localBounds = new Box2i(
                         (int) MathF.Floor(floatBounds.Left),
                         (int) MathF.Floor(floatBounds.Bottom),
@@ -249,7 +249,7 @@ protected override void Draw(in OverlayDrawArgs args)
                 });
 
             drawHandle.UseShader(null);
-            drawHandle.SetTransform(Matrix3.Identity);
+            drawHandle.SetTransform(Matrix3x2.Identity);
         }
 
         private void DrawMapOverlay(
diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
index cfbd1a99d69b..6f75df46830e 100644
--- a/Content.Client/Clickable/ClickableComponent.cs
+++ b/Content.Client/Clickable/ClickableComponent.cs
@@ -38,9 +38,9 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
             renderOrder = sprite.RenderOrder;
             var (spritePos, spriteRot) = transform.GetWorldPositionRotation(xformQuery);
             var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation);
-            bottom = Matrix3.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
+            bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom;
 
-            var invSpriteMatrix = Matrix3.Invert(sprite.GetLocalMatrix());
+            Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix);
 
             // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites.
             var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive();
@@ -48,8 +48,8 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
             Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero;
 
             // First we get `localPos`, the clicked location in the sprite-coordinate frame.
-            var entityXform = Matrix3.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
-            var localPos = invSpriteMatrix.Transform(entityXform.Transform(worldPos));
+            var entityXform = Matrix3Helpers.CreateInverseTransform(transform.WorldPosition, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping);
+            var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix);
 
             // Check explicitly defined click-able bounds
             if (CheckDirBound(sprite, relativeRotation, localPos))
@@ -79,8 +79,8 @@ public bool CheckClick(SpriteComponent sprite, TransformComponent transform, Ent
 
                 // convert to layer-local coordinates
                 layer.GetLayerDrawMatrix(dir, out var matrix);
-                var inverseMatrix = Matrix3.Invert(matrix);
-                var layerLocal = inverseMatrix.Transform(localPos);
+                Matrix3x2.Invert(matrix, out var inverseMatrix);
+                var layerLocal = Vector2.Transform(localPos, inverseMatrix);
 
                 // Convert to image coordinates
                 var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f);
diff --git a/Content.Client/Decals/Overlays/DecalOverlay.cs b/Content.Client/Decals/Overlays/DecalOverlay.cs
index d9904ae80b5e..0de3301e5891 100644
--- a/Content.Client/Decals/Overlays/DecalOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -113,7 +114,7 @@ protected override void Draw(in OverlayDrawArgs args)
                     handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
             }
 
-            handle.SetTransform(Matrix3.Identity);
+            handle.SetTransform(Matrix3x2.Identity);
         }
     }
 }
diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
index be277448eda2..845bd7c03d27 100644
--- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
@@ -51,7 +51,7 @@ protected override void Draw(in OverlayDrawArgs args)
         var handle = args.WorldHandle;
         handle.SetTransform(worldMatrix);
 
-        var localPos = invMatrix.Transform(mousePos.Position);
+        var localPos = Vector2.Transform(mousePos.Position, invMatrix);
 
         if (snap)
         {
@@ -63,6 +63,6 @@ protected override void Draw(in OverlayDrawArgs args)
         var box = new Box2Rotated(aabb, rotation, localPos);
 
         handle.DrawTextureRect(_sprite.Frame0(decal.Sprite), box, color);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 45981159f069..dfbbf1089172 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -56,8 +56,8 @@ protected override void Draw(in OverlayDrawArgs args)
 
         // If you use the display UI scale then need to set max(1f, displayscale) because 0 is valid.
         const float scale = 1f;
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
-        var rotationMatrix = Matrix3.CreateRotation(-rotation);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
 
         var curTime = _timing.CurTime;
 
@@ -91,9 +91,9 @@ protected override void Draw(in OverlayDrawArgs args)
                 ? curTime - _meta.GetPauseTime(uid, meta)
                 : curTime;
 
-            var worldMatrix = Matrix3.CreateTranslation(worldPosition);
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
             handle.SetTransform(matty);
 
             var offset = 0f;
@@ -151,7 +151,7 @@ protected override void Draw(in OverlayDrawArgs args)
         }
 
         handle.UseShader(null);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     public Color GetProgressColor(float progress, float alpha = 1f)
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 2d8c15f1b9f9..8cf7447a5d8e 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -48,7 +48,7 @@ protected override void Draw(in OverlayDrawArgs args)
             DrawExplosion(drawHandle, args.WorldBounds, visuals, index, xforms, textures);
         }
 
-        drawHandle.SetTransform(Matrix3.Identity);
+        drawHandle.SetTransform(Matrix3x2.Identity);
         drawHandle.UseShader(null);
     }
 
@@ -78,7 +78,8 @@ private void DrawExplosion(
         if (visuals.SpaceTiles == null)
             return;
 
-        gridBounds = Matrix3.Invert(visuals.SpaceMatrix).TransformBox(worldBounds).Enlarged(2);
+        Matrix3x2.Invert(visuals.SpaceMatrix, out var invSpace);
+        gridBounds = invSpace.TransformBox(worldBounds).Enlarged(2);
         drawHandle.SetTransform(visuals.SpaceMatrix);
 
         DrawTiles(drawHandle, gridBounds, index, visuals.SpaceTiles, visuals, visuals.SpaceTileSize, textures);
diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
index ac6661cfdd83..a8c1d355105b 100644
--- a/Content.Client/Fluids/PuddleOverlay.cs
+++ b/Content.Client/Fluids/PuddleOverlay.cs
@@ -1,4 +1,5 @@
-using Content.Shared.FixedPoint;
+using System.Numerics;
+using Content.Shared.FixedPoint;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
@@ -73,7 +74,7 @@ private void DrawWorld(in OverlayDrawArgs args)
             }
         }
 
-        drawHandle.SetTransform(Matrix3.Identity);
+        drawHandle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawScreen(in OverlayDrawArgs args)
@@ -99,7 +100,7 @@ private void DrawScreen(in OverlayDrawArgs args)
                 if (!gridBounds.Contains(centre))
                     continue;
 
-                var screenCenter = _eyeManager.WorldToScreen(matrix.Transform(centre));
+                var screenCenter = _eyeManager.WorldToScreen(Vector2.Transform(centre, matrix));
 
                 drawHandle.DrawString(_font, screenCenter, debugOverlayData.CurrentVolume.ToString(), Color.White);
             }
diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs
index e82786847e31..5e9250f0ce96 100644
--- a/Content.Client/Maps/GridDraggingSystem.cs
+++ b/Content.Client/Maps/GridDraggingSystem.cs
@@ -101,7 +101,7 @@ public override void Update(float frameTime)
             if (!_mapManager.TryFindGridAt(mousePos, out var gridUid, out var grid))
                 return;
 
-            StartDragging(gridUid, Transform(gridUid).InvWorldMatrix.Transform(mousePos.Position));
+            StartDragging(gridUid, Vector2.Transform(mousePos.Position, Transform(gridUid).InvWorldMatrix));
         }
 
         if (!TryComp(_dragging, out TransformComponent? xform))
@@ -116,7 +116,7 @@ public override void Update(float frameTime)
             return;
         }
 
-        var localToWorld = xform.WorldMatrix.Transform(_localPosition);
+        var localToWorld = Vector2.Transform(_localPosition, xform.WorldMatrix);
 
         if (localToWorld.EqualsApprox(mousePos.Position, 0.01f)) return;
 
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 709601a57b6e..d3ae5091528a 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -223,7 +223,7 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
 
                         foreach (var crumb in chunk.Value)
                         {
-                            var crumbMapPos = worldMatrix.Transform(_system.GetCoordinate(chunk.Key, crumb.Coordinates));
+                            var crumbMapPos = Vector2.Transform(_system.GetCoordinate(chunk.Key, crumb.Coordinates), worldMatrix);
                             var distance = (crumbMapPos - mouseWorldPos.Position).Length();
 
                             if (distance < nearestDistance)
@@ -292,7 +292,7 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
 
                 foreach (var poly in tile)
                 {
-                    if (poly.Box.Contains(invGridMatrix.Transform(mouseWorldPos.Position)))
+                    if (poly.Box.Contains(Vector2.Transform(mouseWorldPos.Position, invGridMatrix)))
                     {
                         nearest = poly;
                         break;
@@ -488,7 +488,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                                         if (neighborMap.MapId != args.MapId)
                                             continue;
 
-                                        neighborPos = invMatrix.Transform(neighborMap.Position);
+                                        neighborPos = Vector2.Transform(neighborMap.Position, invMatrix);
                                     }
                                     else
                                     {
@@ -576,7 +576,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                 }
             }
 
-            worldHandle.SetTransform(Matrix3.Identity);
+            worldHandle.SetTransform(Matrix3x2.Identity);
         }
     }
 }
diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
index 691bcb41dbd2..4e8a4a10ca6d 100644
--- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
+++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
@@ -199,7 +199,7 @@ private void DrawWorld(in OverlayDrawArgs overlayDrawArgs)
             }
 
 
-            handle.SetTransform(Matrix3.Identity);
+            handle.SetTransform(Matrix3x2.Identity);
             _gridIndex.Clear();
         }
 
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 2b2ff14a22b4..758bb562f92a 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -42,8 +42,8 @@ protected override void Draw(in OverlayDrawArgs args)
         var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
 
         const float scale = 1f;
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
-        var rotationMatrix = Matrix3.CreateRotation(-rotation);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
 
         var query = _entManager.AllEntityQueryEnumerator<MobThresholdsComponent, MobStateComponent, DamageableComponent, SpriteComponent>();
         while (query.MoveNext(out var uid,
@@ -83,10 +83,10 @@ protected override void Draw(in OverlayDrawArgs args)
                 continue;
 
             var worldPosition = _transform.GetWorldPosition(xform);
-            var worldMatrix = Matrix3.CreateTranslation(worldPosition);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
 
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
 
             handle.SetTransform(matty);
 
@@ -115,7 +115,7 @@ protected override void Draw(in OverlayDrawArgs args)
             handle.DrawRect(pixelDarken, Black.WithAlpha(128));
         }
 
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 
     /// <summary>
diff --git a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
index 9581fec37b74..d29564caa932 100644
--- a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
+++ b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
@@ -7,7 +7,7 @@ namespace Content.Client.Overlays;
 
 public sealed partial class StencilOverlay
 {
-    private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeComponent rangeComp, Matrix3 invMatrix)
+    private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeComponent rangeComp, Matrix3x2 invMatrix)
     {
         var worldHandle = args.WorldHandle;
         var renderScale = args.Viewport.RenderScale.X;
@@ -16,7 +16,7 @@ private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeCompone
         var length = zoom.X;
         var bufferRange = MathF.Min(10f, rangeComp.Range);
 
-        var pixelCenter = invMatrix.Transform(rangeComp.Origin);
+        var pixelCenter = Vector2.Transform(rangeComp.Origin, invMatrix);
         // Something something offset?
         var vertical = args.Viewport.Size.Y;
 
@@ -44,7 +44,7 @@ private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeCompone
             worldHandle.DrawRect(localAABB, Color.White);
         }, Color.Transparent);
 
-        worldHandle.SetTransform(Matrix3.Identity);
+        worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index 31bc88af45d1..29ed157a7912 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -10,7 +10,7 @@ public sealed partial class StencilOverlay
 {
     private List<Entity<MapGridComponent>> _grids = new();
 
-    private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto, float alpha, Matrix3 invMatrix)
+    private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto, float alpha, Matrix3x2 invMatrix)
     {
         var worldHandle = args.WorldHandle;
         var mapId = args.MapId;
@@ -32,7 +32,7 @@ private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto,
             foreach (var grid in _grids)
             {
                 var matrix = _transform.GetWorldMatrix(grid, xformQuery);
-                Matrix3.Multiply(in matrix, in invMatrix, out var matty);
+                var matty =  Matrix3x2.Multiply(matrix, invMatrix);
                 worldHandle.SetTransform(matty);
 
                 foreach (var tile in grid.Comp.GetTilesIntersecting(worldAABB))
@@ -52,7 +52,7 @@ private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto,
 
         }, Color.Transparent);
 
-        worldHandle.SetTransform(Matrix3.Identity);
+        worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilMask").Instance());
         worldHandle.DrawTextureRect(_blep!.Texture, worldBounds);
         var curTime = _timing.RealTime;
@@ -62,7 +62,7 @@ private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto,
         worldHandle.UseShader(_protoManager.Index<ShaderPrototype>("StencilDraw").Instance());
         _parallax.DrawParallax(worldHandle, worldAABB, sprite, curTime, position, Vector2.Zero, modulate: (weatherProto.Color ?? Color.White).WithAlpha(alpha));
 
-        worldHandle.SetTransform(Matrix3.Identity);
+        worldHandle.SetTransform(Matrix3x2.Identity);
         worldHandle.UseShader(null);
     }
 }
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index e475dca75947..78b1c4d2b15c 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Client.Parallax;
 using Content.Client.Weather;
 using Content.Shared.Salvage;
@@ -72,6 +73,6 @@ protected override void Draw(in OverlayDrawArgs args)
         }
 
         args.WorldHandle.UseShader(null);
-        args.WorldHandle.SetTransform(Matrix3.Identity);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Paper/UI/StampLabel.xaml.cs b/Content.Client/Paper/UI/StampLabel.xaml.cs
index 6a8eb5f98f94..be6d52baeaf9 100644
--- a/Content.Client/Paper/UI/StampLabel.xaml.cs
+++ b/Content.Client/Paper/UI/StampLabel.xaml.cs
@@ -50,7 +50,7 @@ protected override void Draw(DrawingHandleScreen handle)
         base.Draw(handle);
 
         // Restore a sane transform+shader
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
         handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Paper/UI/StampWidget.xaml.cs b/Content.Client/Paper/UI/StampWidget.xaml.cs
index a04508aeba34..487e0732b46a 100644
--- a/Content.Client/Paper/UI/StampWidget.xaml.cs
+++ b/Content.Client/Paper/UI/StampWidget.xaml.cs
@@ -53,7 +53,7 @@ protected override void Draw(DrawingHandleScreen handle)
         base.Draw(handle);
 
         // Restore a sane transform+shader
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
         handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index f4d2f8e2fb8c..3c99a1881817 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -218,7 +218,7 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
 
             // Convert to a world position
             var unscaledPosition = (localPosition - MidPointVector) / MinimapScale;
-            var worldPosition = _transformSystem.GetWorldMatrix(_xform).Transform(new Vector2(unscaledPosition.X, -unscaledPosition.Y) + offset);
+            var worldPosition = Vector2.Transform(new Vector2(unscaledPosition.X, -unscaledPosition.Y) + offset, _transformSystem.GetWorldMatrix(_xform));
 
             // Find closest tracked entity in range
             var closestEntity = NetEntity.Invalid;
@@ -401,7 +401,7 @@ protected override void Draw(DrawingHandleScreen handle)
 
                 if (mapPos.MapId != MapId.Nullspace)
                 {
-                    var position = _transformSystem.GetInvWorldMatrix(_xform).Transform(mapPos.Position) - offset;
+                    var position = Vector2.Transform(mapPos.Position, _transformSystem.GetInvWorldMatrix(_xform)) - offset;
                     position = ScalePosition(new Vector2(position.X, -position.Y));
 
                     handle.DrawCircle(position, float.Sqrt(MinimapScale) * 2f, value.Color);
@@ -422,7 +422,7 @@ protected override void Draw(DrawingHandleScreen handle)
 
             if (mapPos.MapId != MapId.Nullspace)
             {
-                var position = _transformSystem.GetInvWorldMatrix(_xform).Transform(mapPos.Position) - offset;
+                var position = Vector2.Transform(mapPos.Position, _transformSystem.GetInvWorldMatrix(_xform)) - offset;
                 position = ScalePosition(new Vector2(position.X, -position.Y));
 
                 var scalingCoefficient = MinmapScaleModifier * float.Sqrt(MinimapScale);
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index fb6bb3bf565e..77eeb611f517 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Examine;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -55,7 +56,7 @@ protected override void Draw(in OverlayDrawArgs args)
         if (args.ViewportControl == null)
             return;
 
-        args.DrawingHandle.SetTransform(Matrix3.Identity);
+        args.DrawingHandle.SetTransform(Matrix3x2.Identity);
         args.DrawingHandle.UseShader(_shader);
         var scale = _configManager.GetCVar(CVars.DisplayUIScale);
 
@@ -90,7 +91,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
-            var pos = matrix.Transform(mapPos.Position);
+            var pos = Vector2.Transform(mapPos.Position, matrix);
             _controller.DrawPopup(popup, worldHandle, pos, scale);
         }
     }
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
index 7086fd05411f..d5154a87befe 100644
--- a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Shuttles.Systems;
 using Robust.Client.Graphics;
@@ -75,6 +76,6 @@ protected override void Draw(in OverlayDrawArgs args)
 
         args.WorldHandle.SetTransform(xform.WorldMatrix);
         args.WorldHandle.DrawRect(Position.Value, Color.Red.WithAlpha(100));
-        args.WorldHandle.SetTransform(Matrix3.Identity);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index 8774c1dfb5ce..b50d8fa6b218 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.Components;
 using Robust.Client.AutoGenerated;
@@ -115,7 +116,7 @@ protected void DrawCircles(DrawingHandleScreen handle)
         }
     }
 
-    protected void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
+    protected void DrawGrid(DrawingHandleScreen handle, Matrix3x2 matrix, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
     {
         var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
         var minimapScale = MinimapScale;
@@ -289,7 +290,7 @@ private record struct GridDrawJob : IParallelRobustJob
 
         public float MinimapScale;
         public Vector2 MidPoint;
-        public Matrix3 Matrix;
+        public Matrix3x2 Matrix;
 
         public List<Vector2> Vertices;
         public Vector2[] ScaledVertices;
@@ -297,7 +298,7 @@ private record struct GridDrawJob : IParallelRobustJob
         public void Execute(int index)
         {
             var vert = Vertices[index];
-            var adjustedVert = Matrix.Transform(vert);
+            var adjustedVert = Vector2.Transform(vert, Matrix);
             adjustedVert = adjustedVert with { Y = -adjustedVert.Y };
 
             var scaledVert = ScalePosition(adjustedVert, MinimapScale, MidPoint);
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
index b7b757ea4834..91d95aaa0427 100644
--- a/Content.Client/Shuttles/UI/NavScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Shuttles.BUIStates;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -68,7 +69,7 @@ protected override void Draw(DrawingHandleScreen handle)
         }
 
         var (_, worldRot, worldMatrix) = _xformSystem.GetWorldPositionRotationMatrix(gridXform);
-        var worldPos = worldMatrix.Transform(gridBody.LocalCenter);
+        var worldPos = Vector2.Transform(gridBody.LocalCenter, worldMatrix);
 
         // Get the positive reduced angle.
         var displayRot = -worldRot.Reduced();
diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
index f03c44029525..31f0eecad795 100644
--- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
@@ -108,10 +108,10 @@ protected override void Draw(DrawingHandleScreen handle)
         var gridNent = EntManager.GetNetEntity(GridEntity);
         var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
         var ourGridMatrix = _xformSystem.GetWorldMatrix(gridXform.Owner);
-        var dockMatrix = Matrix3.CreateTransform(_coordinates.Value.Position, Angle.Zero);
-        Matrix3.Multiply(dockMatrix, ourGridMatrix, out var offsetMatrix);
+        var dockMatrix = Matrix3Helpers.CreateTransform(_coordinates.Value.Position, Angle.Zero);
+        var worldFromDock = Matrix3x2.Multiply(dockMatrix, ourGridMatrix);
 
-        offsetMatrix = offsetMatrix.Invert();
+        Matrix3x2.Invert(worldFromDock, out var offsetMatrix);
 
         // Draw nearby grids
         var controlBounds = PixelSizeBox;
@@ -137,7 +137,7 @@ protected override void Draw(DrawingHandleScreen handle)
                 continue;
 
             var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
-            Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty);
+            var matty = Matrix3x2.Multiply(gridMatrix, offsetMatrix);
             var color = _shuttles.GetIFFColor(grid.Owner, grid.Owner == GridEntity, component: iffComp);
 
             DrawGrid(handle, matty, grid, color);
@@ -151,23 +151,23 @@ protected override void Draw(DrawingHandleScreen handle)
                 if (ViewedDock == dock.Entity)
                     continue;
 
-                var position = matty.Transform(dock.Coordinates.Position);
+                var position = Vector2.Transform(dock.Coordinates.Position, matty);
 
-                var otherDockRotation = Matrix3.CreateRotation(dock.Angle);
+                var otherDockRotation = Matrix3Helpers.CreateRotation(dock.Angle);
                 var scaledPos = ScalePosition(position with {Y = -position.Y});
 
                 if (!controlBounds.Contains(scaledPos.Floored()))
                     continue;
 
                 // Draw the dock's collision
-                var collisionBL = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(-0.2f, -0.7f)));
-                var collisionBR = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(0.2f, -0.7f)));
-                var collisionTR = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(0.2f, -0.5f)));
-                var collisionTL = matty.Transform(dock.Coordinates.Position +
-                                                  otherDockRotation.Transform(new Vector2(-0.2f, -0.5f)));
+                var collisionBL = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(-0.2f, -0.7f), otherDockRotation), matty);
+                var collisionBR = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(0.2f, -0.7f), otherDockRotation), matty);
+                var collisionTR = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(0.2f, -0.5f), otherDockRotation), matty);
+                var collisionTL = Vector2.Transform(dock.Coordinates.Position +
+                                                  Vector2.Transform(new Vector2(-0.2f, -0.5f), otherDockRotation), matty);
 
                 var verts = new[]
                 {
@@ -195,10 +195,10 @@ protected override void Draw(DrawingHandleScreen handle)
                 handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockConnection);
 
                 // Draw the dock itself
-                var dockBL = matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f));
-                var dockBR = matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f));
-                var dockTR = matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f));
-                var dockTL = matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f));
+                var dockBL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f), matty);
+                var dockBR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f), matty);
+                var dockTR = Vector2.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f), matty);
+                var dockTL = Vector2.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f), matty);
 
                 verts = new[]
                 {
@@ -308,14 +308,14 @@ protected override void Draw(DrawingHandleScreen handle)
         // Draw the dock's collision
         var invertedPosition = Vector2.Zero;
         invertedPosition.Y = -invertedPosition.Y;
-        var rotation = Matrix3.CreateRotation(-_angle.Value + MathF.PI);
+        var rotation = Matrix3Helpers.CreateRotation(-_angle.Value + MathF.PI);
         var ourDockConnection = new UIBox2(
-            ScalePosition(rotation.Transform(new Vector2(-0.2f, -0.7f))),
-            ScalePosition(rotation.Transform(new Vector2(0.2f, -0.5f))));
+            ScalePosition(Vector2.Transform(new Vector2(-0.2f, -0.7f), rotation)),
+            ScalePosition(Vector2.Transform(new Vector2(0.2f, -0.5f), rotation)));
 
         var ourDock = new UIBox2(
-            ScalePosition(rotation.Transform(new Vector2(-0.5f, 0.5f))),
-            ScalePosition(rotation.Transform(new Vector2(0.5f, -0.5f))));
+            ScalePosition(Vector2.Transform(new Vector2(-0.5f, 0.5f), rotation)),
+            ScalePosition(Vector2.Transform(new Vector2(0.5f, -0.5f), rotation)));
 
         var dockColor = Color.Magenta;
         var connectionColor = Color.Pink;
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
index 2f35a8dffd7e..8bd4a338cb0c 100644
--- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -114,7 +114,7 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
                 var beaconsOnly = EntManager.TryGetComponent(mapUid, out FTLDestinationComponent? destComp) &&
                                   destComp.BeaconsOnly;
 
-                var mapTransform = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
+                var mapTransform = Matrix3Helpers.CreateInverseTransform(Offset, Angle.Zero);
 
                 if (beaconsOnly && TryGetBeacon(_beacons, mapTransform, args.RelativePixelPosition, PixelRect, out var foundBeacon, out _))
                 {
@@ -203,7 +203,7 @@ private void DrawParallax(DrawingHandleScreen handle)
     /// </summary>
     /// <param name="mapObjects"></param>
     /// <returns></returns>
-    private List<IMapObject> GetViewportMapObjects(Matrix3 matty, List<IMapObject> mapObjects)
+    private List<IMapObject> GetViewportMapObjects(Matrix3x2 matty, List<IMapObject> mapObjects)
     {
         var results = new List<IMapObject>();
         var enlargement = new Vector2i((int) (16 * UIScale), (int) (16 * UIScale));
@@ -217,7 +217,7 @@ private List<IMapObject> GetViewportMapObjects(Matrix3 matty, List<IMapObject> m
 
             var mapCoords = _shuttles.GetMapCoordinates(mapObj);
 
-            var relativePos = matty.Transform(mapCoords.Position);
+            var relativePos = Vector2.Transform(mapCoords.Position, matty);
             relativePos = relativePos with { Y = -relativePos.Y };
             var uiPosition = ScalePosition(relativePos);
 
@@ -250,7 +250,7 @@ protected override void Draw(DrawingHandleScreen handle)
         DrawParallax(handle);
 
         var viewedMapUid = _mapManager.GetMapEntityId(ViewingMap);
-        var matty = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
+        var matty = Matrix3Helpers.CreateInverseTransform(Offset, Angle.Zero);
         var realTime = _timing.RealTime;
         var viewBox = new Box2(Offset - WorldRangeVector, Offset + WorldRangeVector);
         var viewportObjects = GetViewportMapObjects(matty, mapObjects);
@@ -267,7 +267,7 @@ protected override void Draw(DrawingHandleScreen handle)
                 var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(shuttleXform);
                 gridPos = Maps.GetGridPosition((gridUid, gridPhysics), gridPos, gridRot);
 
-                var gridRelativePos = matty.Transform(gridPos);
+                var gridRelativePos = Vector2.Transform(gridPos, matty);
                 gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
                 var gridUiPos = ScalePosition(gridRelativePos);
 
@@ -296,7 +296,7 @@ protected override void Draw(DrawingHandleScreen handle)
                 continue;
             }
 
-            var adjustedPos = matty.Transform(mapCoords.Position);
+            var adjustedPos = Vector2.Transform(mapCoords.Position, matty);
             var localPos = ScalePosition(adjustedPos with { Y = -adjustedPos.Y});
             handle.DrawCircle(localPos, exclusion.Range * MinimapScale, exclusionColor.WithAlpha(0.05f));
             handle.DrawCircle(localPos, exclusion.Range * MinimapScale, exclusionColor, filled: false);
@@ -319,7 +319,7 @@ protected override void Draw(DrawingHandleScreen handle)
 
             foreach (var (beaconName, coords, mapO) in GetBeacons(viewportObjects, matty, controlLocalBounds))
             {
-                var localPos = matty.Transform(coords.Position);
+                var localPos = Vector2.Transform(coords.Position, matty);
                 localPos = localPos with { Y = -localPos.Y };
                 var beaconUiPos = ScalePosition(localPos);
                 var mapObject = GetMapObject(localPos, Angle.Zero, scale: 0.75f, scalePosition: true);
@@ -360,7 +360,7 @@ protected override void Draw(DrawingHandleScreen handle)
             var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(grid.Owner);
             gridPos = Maps.GetGridPosition((grid, gridPhysics), gridPos, gridRot);
 
-            var gridRelativePos = matty.Transform(gridPos);
+            var gridRelativePos = Vector2.Transform(gridPos, matty);
             gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
             var gridUiPos = ScalePosition(gridRelativePos);
 
@@ -439,7 +439,7 @@ protected override void Draw(DrawingHandleScreen handle)
 
                     var color = ftlFree ? Color.LimeGreen : Color.Magenta;
 
-                    var gridRelativePos = matty.Transform(gridPos);
+                    var gridRelativePos = Vector2.Transform(gridPos, matty);
                     gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
                     var gridUiPos = ScalePosition(gridRelativePos);
 
@@ -512,7 +512,7 @@ private void AddMapObject(List<Vector2> edges, List<Vector2> verts, ValueList<Ve
     /// <summary>
     /// Returns the beacons that intersect the viewport.
     /// </summary>
-    private IEnumerable<(string Beacon, MapCoordinates Coordinates, IMapObject MapObject)> GetBeacons(List<IMapObject> mapObjs, Matrix3 mapTransform, UIBox2i area)
+    private IEnumerable<(string Beacon, MapCoordinates Coordinates, IMapObject MapObject)> GetBeacons(List<IMapObject> mapObjs, Matrix3x2 mapTransform, UIBox2i area)
     {
         foreach (var mapO in mapObjs)
         {
@@ -520,7 +520,7 @@ private void AddMapObject(List<Vector2> edges, List<Vector2> verts, ValueList<Ve
                 continue;
 
             var beaconCoords = EntManager.GetCoordinates(beacon.Coordinates).ToMap(EntManager, _xformSystem);
-            var position = mapTransform.Transform(beaconCoords.Position);
+            var position = Vector2.Transform(beaconCoords.Position, mapTransform);
             var localPos = ScalePosition(position with {Y = -position.Y});
 
             // If beacon not on screen then ignore it.
@@ -557,7 +557,7 @@ private ValueList<Vector2> GetMapObject(Vector2 localPos, Angle angle, float sca
         return mapObj;
     }
 
-    private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3 mapTransform, Vector2 mousePos, UIBox2i area, out ShuttleBeaconObject foundBeacon, out Vector2 foundLocalPos)
+    private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3x2 mapTransform, Vector2 mousePos, UIBox2i area, out ShuttleBeaconObject foundBeacon, out Vector2 foundLocalPos)
     {
         // In pixels
         const float BeaconSnapRange = 32f;
@@ -579,7 +579,7 @@ private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3 mapTransfo
             if (!_shuttles.CanFTLBeacon(beaconObj.Coordinates))
                 continue;
 
-            var position = mapTransform.Transform(beaconCoords.Position);
+            var position = Vector2.Transform(beaconCoords.Position, mapTransform);
             var localPos = ScalePosition(position with {Y = -position.Y});
 
             // If beacon not on screen then ignore it.
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
index 00ee6890b28f..0b8720add217 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -137,10 +137,10 @@ protected override void Draw(DrawingHandleScreen handle)
 
         var mapPos = _transform.ToMapCoordinates(_coordinates.Value);
         var offset = _coordinates.Value.Position;
-        var posMatrix = Matrix3.CreateTransform(offset, _rotation.Value);
+        var posMatrix = Matrix3Helpers.CreateTransform(offset, _rotation.Value);
         var (_, ourEntRot, ourEntMatrix) = _transform.GetWorldPositionRotationMatrix(_coordinates.Value.EntityId);
-        Matrix3.Multiply(posMatrix, ourEntMatrix, out var ourWorldMatrix);
-        var ourWorldMatrixInvert = ourWorldMatrix.Invert();
+        var ourWorldMatrix = Matrix3x2.Multiply(posMatrix, ourEntMatrix);
+        Matrix3x2.Invert(ourWorldMatrix, out var ourWorldMatrixInvert);
 
         // Draw our grid in detail
         var ourGridId = xform.GridUid;
@@ -148,7 +148,7 @@ protected override void Draw(DrawingHandleScreen handle)
             fixturesQuery.HasComponent(ourGridId.Value))
         {
             var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
-            Matrix3.Multiply(in ourGridMatrix, in ourWorldMatrixInvert, out var matrix);
+            var matrix = Matrix3x2.Multiply(ourGridMatrix, ourWorldMatrixInvert);
             var color = _shuttles.GetIFFColor(ourGridId.Value, self: true);
 
             DrawGrid(handle, matrix, (ourGridId.Value, ourGrid), color);
@@ -194,7 +194,7 @@ protected override void Draw(DrawingHandleScreen handle)
                 continue;
 
             var gridMatrix = _transform.GetWorldMatrix(gUid);
-            Matrix3.Multiply(in gridMatrix, in ourWorldMatrixInvert, out var matty);
+            var matty = Matrix3x2.Multiply(gridMatrix, ourWorldMatrixInvert);
             var color = _shuttles.GetIFFColor(grid, self: false, iff);
 
             // Others default:
@@ -207,7 +207,7 @@ protected override void Draw(DrawingHandleScreen handle)
             {
                 var gridBounds = grid.Comp.LocalAABB;
 
-                var gridCentre = matty.Transform(gridBody.LocalCenter);
+                var gridCentre = Vector2.Transform(gridBody.LocalCenter, matty);
                 gridCentre.Y = -gridCentre.Y;
                 var distance = gridCentre.Length();
                 var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
@@ -242,7 +242,7 @@ protected override void Draw(DrawingHandleScreen handle)
         }
     }
 
-    private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3 matrix)
+    private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 matrix)
     {
         if (!ShowDocks)
             return;
@@ -255,7 +255,7 @@ private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3 matrix
             foreach (var state in docks)
             {
                 var position = state.Coordinates.Position;
-                var uiPosition = matrix.Transform(position);
+                var uiPosition = Vector2.Transform(position, matrix);
 
                 if (uiPosition.Length() > (WorldRange * 2f) - DockScale)
                     continue;
@@ -264,10 +264,10 @@ private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3 matrix
 
                 var verts = new[]
                 {
-                    matrix.Transform(position + new Vector2(-DockScale, -DockScale)),
-                    matrix.Transform(position + new Vector2(DockScale, -DockScale)),
-                    matrix.Transform(position + new Vector2(DockScale, DockScale)),
-                    matrix.Transform(position + new Vector2(-DockScale, DockScale)),
+                    Vector2.Transform(position + new Vector2(-DockScale, -DockScale), matrix),
+                    Vector2.Transform(position + new Vector2(DockScale, -DockScale), matrix),
+                    Vector2.Transform(position + new Vector2(DockScale, DockScale), matrix),
+                    Vector2.Transform(position + new Vector2(-DockScale, DockScale), matrix),
                 };
 
                 for (var i = 0; i < verts.Length; i++)
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 56107cbc0257..f1473bda7a2a 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -39,8 +39,8 @@ protected override void Draw(in OverlayDrawArgs args)
         var eyeRot = args.Viewport.Eye?.Rotation ?? default;
 
         var xformQuery = _entity.GetEntityQuery<TransformComponent>();
-        var scaleMatrix = Matrix3.CreateScale(new Vector2(1, 1));
-        var rotationMatrix = Matrix3.CreateRotation(-eyeRot);
+        var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(1, 1));
+        var rotationMatrix = Matrix3Helpers.CreateRotation(-eyeRot);
 
         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))
@@ -59,9 +59,9 @@ protected override void Draw(in OverlayDrawArgs args)
             if (icons.Count == 0)
                 continue;
 
-            var worldMatrix = Matrix3.CreateTranslation(worldPos);
-            Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
-            Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+            var worldMatrix = Matrix3Helpers.CreateTranslation(worldPos);
+            var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+            var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
             handle.SetTransform(matty);
 
             var countL = 0;
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index 8bf0dcd98129..b80a855f9865 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using System.Numerics;
 using Content.Client.Animations;
 using Content.Shared.Hands;
 using Content.Shared.Storage;
@@ -149,7 +150,7 @@ public void PickupAnimation(EntityUid item, EntityCoordinates initialCoords, Ent
         }
 
         var finalMapPos = finalCoords.ToMapPos(EntityManager, TransformSystem);
-        var finalPos = TransformSystem.GetInvWorldMatrix(initialCoords.EntityId).Transform(finalMapPos);
+        var finalPos = Vector2.Transform(finalMapPos, TransformSystem.GetInvWorldMatrix(initialCoords.EntityId));
 
         _entityPickupAnimation.AnimateEntityPickup(item, initialCoords, finalPos, initialAngle);
     }
diff --git a/Content.Client/UserInterface/Controls/DirectionIcon.cs b/Content.Client/UserInterface/Controls/DirectionIcon.cs
index a6cc428091ac..c8fd63b43c9e 100644
--- a/Content.Client/UserInterface/Controls/DirectionIcon.cs
+++ b/Content.Client/UserInterface/Controls/DirectionIcon.cs
@@ -65,7 +65,7 @@ protected override void Draw(DrawingHandleScreen handle)
         if (_rotation != null)
         {
             var offset = (-_rotation.Value).RotateVec(Size * UIScale / 2) - Size * UIScale / 2;
-            handle.SetTransform(Matrix3.CreateTransform(GlobalPixelPosition - offset, -_rotation.Value));
+            handle.SetTransform(Matrix3Helpers.CreateTransform(GlobalPixelPosition - offset, -_rotation.Value));
         }
 
         base.Draw(handle);
diff --git a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
index f6b0929f3b23..a10155f3e8ce 100644
--- a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
+++ b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
@@ -169,7 +169,7 @@ protected Vector2 InverseMapPosition(Vector2 value)
         var inversePos = (value - MidPointVector) / MinimapScale;
 
         inversePos = inversePos with { Y = -inversePos.Y };
-        inversePos = Matrix3.CreateTransform(Offset, Angle.Zero).Transform(inversePos);
+        inversePos = Vector2.Transform(inversePos, Matrix3Helpers.CreateTransform(Offset, Angle.Zero));
         return inversePos;
     }
 
diff --git a/Content.Client/Viewport/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs
index 1fa8f17161e2..ccd9636d7764 100644
--- a/Content.Client/Viewport/ScalingViewport.cs
+++ b/Content.Client/Viewport/ScalingViewport.cs
@@ -277,8 +277,8 @@ public MapCoordinates ScreenToMap(Vector2 coords)
 
             EnsureViewportCreated();
 
-            var matrix = Matrix3.Invert(GetLocalToScreenMatrix());
-            coords = matrix.Transform(coords);
+            Matrix3x2.Invert(GetLocalToScreenMatrix(), out var matrix);
+            coords = Vector2.Transform(coords, matrix);
 
             return _viewport!.LocalToWorld(coords);
         }
@@ -291,8 +291,8 @@ public MapCoordinates PixelToMap(Vector2 coords)
 
             EnsureViewportCreated();
 
-            var matrix = Matrix3.Invert(GetLocalToScreenMatrix());
-            coords = matrix.Transform(coords);
+            Matrix3x2.Invert(GetLocalToScreenMatrix(), out var matrix);
+            coords = Vector2.Transform(coords, matrix);
 
             var ev = new PixelToMapEvent(coords, this, _viewport!);
             _entityManager.EventBus.RaiseEvent(EventSource.Local, ref ev);
@@ -311,16 +311,16 @@ public Vector2 WorldToScreen(Vector2 map)
 
             var matrix = GetLocalToScreenMatrix();
 
-            return matrix.Transform(vpLocal);
+            return Vector2.Transform(vpLocal, matrix);
         }
 
-        public Matrix3 GetWorldToScreenMatrix()
+        public Matrix3x2 GetWorldToScreenMatrix()
         {
             EnsureViewportCreated();
             return _viewport!.GetWorldToLocalMatrix() * GetLocalToScreenMatrix();
         }
 
-        public Matrix3 GetLocalToScreenMatrix()
+        public Matrix3x2 GetLocalToScreenMatrix()
         {
             EnsureViewportCreated();
 
@@ -329,9 +329,9 @@ public Matrix3 GetLocalToScreenMatrix()
 
             if (scaleFactor.X == 0 || scaleFactor.Y == 0)
                 // Basically a nonsense scenario, at least make sure to return something that can be inverted.
-                return Matrix3.Identity;
+                return Matrix3x2.Identity;
 
-            return Matrix3.CreateTransform(GlobalPixelPosition + drawBox.TopLeft, 0, scaleFactor);
+            return Matrix3Helpers.CreateTransform(GlobalPixelPosition + drawBox.TopLeft, 0, scaleFactor);
         }
 
         private void EnsureViewportCreated()
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
index baac42d1937c..3e1a4b1906d5 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
@@ -81,7 +81,7 @@ public override void DoLunge(EntityUid user, EntityUid weapon, Angle angle, Vect
             case WeaponArcAnimation.None:
                 var (mapPos, mapRot) = TransformSystem.GetWorldPositionRotation(userXform);
                 var worldPos = mapPos + (mapRot - userXform.LocalRotation).RotateVec(localPos);
-                var newLocalPos = TransformSystem.GetInvWorldMatrix(xform.ParentUid).Transform(worldPos);
+                var newLocalPos = Vector2.Transform(worldPos, TransformSystem.GetInvWorldMatrix(xform.ParentUid));
                 TransformSystem.SetLocalPositionNoLerp(animationUid, newLocalPos, xform);
                 if (arcComponent.Fadeout)
                     _animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey);
diff --git a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
index 8aea5d7ee627..e6cb596b9441 100644
--- a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
+++ b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Client.Resources;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -53,7 +53,7 @@ protected override void Draw(DrawingHandleScreen handle)
     {
         // Scale rendering in this control by UIScale.
         var currentTransform = handle.GetTransform();
-        handle.SetTransform(Matrix3.CreateScale(new Vector2(UIScale)) * currentTransform);
+        handle.SetTransform(Matrix3Helpers.CreateScale(new Vector2(UIScale)) * currentTransform);
 
         var countPerRow = CountPerRow(Size.X);
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
index 7db1f513f7c4..2ddcc052d85a 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionGridTileFlood.cs
@@ -14,7 +14,7 @@ public sealed class ExplosionGridTileFlood : ExplosionTileFlood
     public MapGridComponent Grid;
     private bool _needToTransform = false;
 
-    private Matrix3 _matrix = Matrix3.Identity;
+    private Matrix3x2 _matrix = Matrix3x2.Identity;
     private Vector2 _offset;
 
     // Tiles which neighbor an exploding tile, but have not yet had the explosion spread to them due to an
@@ -44,7 +44,7 @@ public ExplosionGridTileFlood(
         int typeIndex,
         Dictionary<Vector2i, NeighborFlag> edgeTiles,
         EntityUid? referenceGrid,
-        Matrix3 spaceMatrix,
+        Matrix3x2 spaceMatrix,
         Angle spaceAngle)
     {
         Grid = grid;
@@ -72,9 +72,10 @@ public ExplosionGridTileFlood(
         var transform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Grid.Owner);
         var size = (float) Grid.TileSize;
 
-        _matrix.R0C2 = size / 2;
-        _matrix.R1C2 = size / 2;
-        _matrix *= transform.WorldMatrix * Matrix3.Invert(spaceMatrix);
+        _matrix.M31 = size / 2;
+        _matrix.M32 = size / 2;
+        Matrix3x2.Invert(spaceMatrix, out var invSpace);
+        _matrix *= transform.WorldMatrix * invSpace;
         var relativeAngle = transform.WorldRotation - spaceAngle;
         _offset = relativeAngle.RotateVec(new Vector2(size / 4, size / 4));
     }
@@ -228,7 +229,7 @@ private void JumpToSpace(Vector2i tile)
             return;
         }
 
-        var center = _matrix.Transform(tile);
+        var center = Vector2.Transform(tile, _matrix);
         SpaceJump.Add(new((int) MathF.Floor(center.X + _offset.X), (int) MathF.Floor(center.Y + _offset.Y)));
         SpaceJump.Add(new((int) MathF.Floor(center.X - _offset.Y), (int) MathF.Floor(center.Y + _offset.X)));
         SpaceJump.Add(new((int) MathF.Floor(center.X - _offset.X), (int) MathF.Floor(center.Y - _offset.Y)));
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
index 719a2eca7970..556fe7c14158 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
@@ -60,7 +60,7 @@ private void OnGridRemoved(GridRemovalEvent ev)
     {
         Dictionary<Vector2i, BlockedSpaceTile> transformedEdges = new();
 
-        var targetMatrix = Matrix3.Identity;
+        var targetMatrix = Matrix3x2.Identity;
         Angle targetAngle = new();
         var tileSize = DefaultTileSize;
         var maxDistanceSq = (int) (maxDistance * maxDistance);
@@ -75,9 +75,9 @@ private void OnGridRemoved(GridRemovalEvent ev)
             tileSize = targetGrid.TileSize;
         }
 
-        var offsetMatrix = Matrix3.Identity;
-        offsetMatrix.R0C2 = tileSize / 2f;
-        offsetMatrix.R1C2 = tileSize / 2f;
+        var offsetMatrix = Matrix3x2.Identity;
+        offsetMatrix.M31 = tileSize / 2f;
+        offsetMatrix.M32 = tileSize / 2f;
 
         // Here we can end up with a triple nested for loop:
         // foreach other grid
@@ -106,7 +106,7 @@ private void OnGridRemoved(GridRemovalEvent ev)
             var xform = xforms.GetComponent(gridToTransform);
             var  (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = xform.GetWorldPositionRotationMatrixWithInv(xforms);
 
-            var localEpicentre = (Vector2i) invGridWorldMatrid.Transform(epicentre.Position);
+            var localEpicentre = (Vector2i) Vector2.Transform(epicentre.Position, invGridWorldMatrid);
             var matrix = offsetMatrix * gridWorldMatrix * targetMatrix;
             var angle = gridWorldRotation - targetAngle;
 
@@ -119,7 +119,7 @@ private void OnGridRemoved(GridRemovalEvent ev)
                 if (delta.X * delta.X + delta.Y * delta.Y > maxDistanceSq) // no Vector2.Length???
                     continue;
 
-                var center = matrix.Transform(tile);
+                var center = Vector2.Transform(tile, matrix);
 
                 if ((dir & NeighborFlag.Cardinal) == 0)
                 {
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index bce3dc21c233..c30a9ce30064 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -298,8 +298,8 @@ private static bool GridQueryCallback(
     ///     Same as <see cref="ExplodeTile"/>, but for SPAAAAAAACE.
     /// </summary>
     internal void ExplodeSpace(BroadphaseComponent lookup,
-        Matrix3 spaceMatrix,
-        Matrix3 invSpaceMatrix,
+        Matrix3x2 spaceMatrix,
+        Matrix3x2 invSpaceMatrix,
         Vector2i tile,
         float throwForce,
         DamageSpecifier damage,
@@ -341,7 +341,7 @@ internal void ExplodeSpace(BroadphaseComponent lookup,
     }
 
     private static bool SpaceQueryCallback(
-        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
+        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3x2 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
         in EntityUid uid)
     {
         if (state.Processed.Contains(uid))
@@ -352,7 +352,7 @@ private static bool SpaceQueryCallback(
         if (xform.ParentUid == state.LookupOwner)
         {
             // parented directly to the map, use local position
-            if (state.GridBox.Contains(state.InvSpaceMatrix.Transform(xform.LocalPosition)))
+            if (state.GridBox.Contains(Vector2.Transform(xform.LocalPosition, state.InvSpaceMatrix)))
                 state.List.Add((uid, xform));
 
             return true;
@@ -360,14 +360,14 @@ private static bool SpaceQueryCallback(
 
         // finally check if it intersects our tile
         var wpos = state.System.GetWorldPosition(xform);
-        if (state.GridBox.Contains(state.InvSpaceMatrix.Transform(wpos)))
+        if (state.GridBox.Contains(Vector2.Transform(wpos, state.InvSpaceMatrix)))
             state.List.Add((uid, xform));
 
         return true;
     }
 
     private static bool SpaceQueryCallback(
-        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
+        ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3x2 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
         in FixtureProxy proxy)
     {
         var uid = proxy.Entity;
@@ -585,12 +585,12 @@ struct ExplosionData
     /// <summary>
     ///     The matrix that defines the reference frame for the explosion in space.
     /// </summary>
-    private readonly Matrix3 _spaceMatrix;
+    private readonly Matrix3x2 _spaceMatrix;
 
     /// <summary>
     ///     Inverse of <see cref="_spaceMatrix"/>
     /// </summary>
-    private readonly Matrix3 _invSpaceMatrix;
+    private readonly Matrix3x2 _invSpaceMatrix;
 
     /// <summary>
     ///     Have all the tiles on all the grids been processed?
@@ -656,7 +656,7 @@ public Explosion(ExplosionSystem system,
         List<ExplosionGridTileFlood> gridData,
         List<float> tileSetIntensity,
         MapCoordinates epicenter,
-        Matrix3 spaceMatrix,
+        Matrix3x2 spaceMatrix,
         int area,
         float tileBreakScale,
         int maxTileBreak,
@@ -695,7 +695,7 @@ public Explosion(ExplosionSystem system,
             });
 
             _spaceMatrix = spaceMatrix;
-            _invSpaceMatrix = Matrix3.Invert(spaceMatrix);
+            Matrix3x2.Invert(spaceMatrix, out _invSpaceMatrix);
         }
 
         foreach (var grid in gridData)
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index a42dd1108313..8b4c0e14c5fa 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -26,7 +26,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     /// <param name="maxIntensity">The maximum intensity that the explosion can have at any given tile. This
     /// effectively caps the damage that this explosion can do.</param>
     /// <returns>A list of tile-sets and a list of intensity values which describe the explosion.</returns>
-    private (int, List<float>, ExplosionSpaceTileFlood?, Dictionary<EntityUid, ExplosionGridTileFlood>, Matrix3)? GetExplosionTiles(
+    private (int, List<float>, ExplosionSpaceTileFlood?, Dictionary<EntityUid, ExplosionGridTileFlood>, Matrix3x2)? GetExplosionTiles(
         MapCoordinates epicenter,
         string typeID,
         float totalIntensity,
@@ -84,7 +84,7 @@ public sealed partial class ExplosionSystem : EntitySystem
         Dictionary<EntityUid, HashSet<Vector2i>>? previousGridJump;
 
         // variables for transforming between grid and space-coordinates
-        var spaceMatrix = Matrix3.Identity;
+        var spaceMatrix = Matrix3x2.Identity;
         var spaceAngle = Angle.Zero;
         if (referenceGrid != null)
         {
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
index d332531502c7..5db8b55bf965 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
 using Robust.Server.GameObjects;
@@ -35,7 +36,7 @@ private void OnGetState(EntityUid uid, ExplosionVisualsComponent component, ref
     /// <summary>
     ///     Constructor for the shared <see cref="ExplosionEvent"/> using the server-exclusive explosion classes.
     /// </summary>
-    private EntityUid CreateExplosionVisualEntity(MapCoordinates epicenter, string prototype, Matrix3 spaceMatrix, ExplosionSpaceTileFlood? spaceData, IEnumerable<ExplosionGridTileFlood> gridData, List<float> iterationIntensity)
+    private EntityUid CreateExplosionVisualEntity(MapCoordinates epicenter, string prototype, Matrix3x2 spaceMatrix, ExplosionSpaceTileFlood? spaceData, IEnumerable<ExplosionGridTileFlood> gridData, List<float> iterationIntensity)
     {
         var explosionEntity = Spawn(null, MapCoordinates.Nullspace);
         var comp = AddComp<ExplosionVisualsComponent>(explosionEntity);
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index a3717fd94ce8..52afdcf8b491 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Chemistry.Components;
@@ -317,7 +318,7 @@ private bool TryPuddleInteract(EntityUid user, EntityUid used, EntityUid target,
 
         var userXform = Transform(user);
         var targetPos = _transform.GetWorldPosition(target);
-        var localPos = _transform.GetInvWorldMatrix(userXform).Transform(targetPos);
+        var localPos = Vector2.Transform(targetPos, _transform.GetInvWorldMatrix(userXform));
         localPos = userXform.LocalRotation.RotateVec(localPos);
 
         _melee.DoLunge(user, used, Angle.Zero, localPos, null, false);
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 22d368e57bde..5e2ef0c02c0f 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -417,7 +417,7 @@ public EntityCoordinates GetObserverSpawnPoint()
                 {
                     var gridXform = Transform(gridUid);
 
-                    return new EntityCoordinates(gridUid, gridXform.InvWorldMatrix.Transform(toMap.Position));
+                    return new EntityCoordinates(gridUid, Vector2.Transform(toMap.Position, gridXform.InvWorldMatrix));
                 }
 
                 return spawn;
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 38e88f6e1ed8..1acbf292f03a 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Access.Systems;
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
@@ -366,8 +367,8 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
                 if (transform.GridUid != null)
                 {
                     coordinates = new EntityCoordinates(transform.GridUid.Value,
-                        _transform.GetInvWorldMatrix(xformQuery.GetComponent(transform.GridUid.Value), xformQuery)
-                        .Transform(_transform.GetWorldPosition(transform, xformQuery)));
+                        Vector2.Transform(_transform.GetWorldPosition(transform, xformQuery),
+                            _transform.GetInvWorldMatrix(xformQuery.GetComponent(transform.GridUid.Value), xformQuery)));
                 }
                 else if (transform.MapUid != null)
                 {
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
index 5daf38c4209e..b986ed5259e9 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Distance.cs
@@ -36,7 +36,7 @@ private Vector2 GetDiff(PathPoly start, PathPoly end)
                 return Vector2.Zero;
             }
 
-            endPos = startXform.InvWorldMatrix.Transform(endXform.WorldMatrix.Transform(endPos));
+            endPos = Vector2.Transform(Vector2.Transform(endPos, endXform.WorldMatrix), startXform.InvWorldMatrix);
         }
 
         // TODO: Numerics when we changeover.
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
index 52f7db77ed65..f4af65c61741 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
@@ -395,7 +395,7 @@ private Vector2i GetOrigin(Vector2 localPos)
 
     private Vector2i GetOrigin(EntityCoordinates coordinates, EntityUid gridUid)
     {
-        var localPos = _transform.GetInvWorldMatrix(gridUid).Transform(coordinates.ToMapPos(EntityManager, _transform));
+        var localPos = Vector2.Transform(coordinates.ToMapPos(EntityManager, _transform), _transform.GetInvWorldMatrix(gridUid));
         return new Vector2i((int) Math.Floor(localPos.X / ChunkSize), (int) Math.Floor(localPos.Y / ChunkSize));
     }
 
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index 3672ad047b44..b2958f0ccb55 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -405,7 +405,7 @@ public async void GetPathEvent(
                 return null;
             }
 
-            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager, _transform));
+            var localPos = Vector2.Transform(coordinates.ToMapPos(EntityManager, _transform), xform.InvWorldMatrix);
             var origin = GetOrigin(localPos);
 
             if (!TryGetChunk(origin, comp, out var chunk))
diff --git a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs b/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
index 1783a5679047..a19f7e4701d9 100644
--- a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
@@ -19,7 +19,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
         var gen = _prototype.Index<DungeonPresetPrototype>(preset);
 
         var dungeonRotation = _dungeon.GetDungeonRotation(seed);
-        var dungeonTransform = Matrix3.CreateTransform(_position, dungeonRotation);
+        var dungeonTransform = Matrix3Helpers.CreateTransform(_position, dungeonRotation);
         var roomPackProtos = new Dictionary<Vector2i, List<DungeonRoomPackPrototype>>();
 
         foreach (var pack in _prototype.EnumeratePrototypes<DungeonRoomPackPrototype>())
@@ -69,7 +69,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
         var dungeon = new Dungeon();
         var availablePacks = new List<DungeonRoomPackPrototype>();
         var chosenPacks = new DungeonRoomPackPrototype?[gen.RoomPacks.Count];
-        var packTransforms = new Matrix3[gen.RoomPacks.Count];
+        var packTransforms = new Matrix3x2[gen.RoomPacks.Count];
         var packRotations = new Angle[gen.RoomPacks.Count];
 
         // Actually pick the room packs and rooms
@@ -97,7 +97,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
 
             // Iterate every pack
             random.Shuffle(availablePacks);
-            Matrix3 packTransform = default!;
+            Matrix3x2 packTransform = default!;
             var found = false;
             DungeonRoomPackPrototype pack = default!;
 
@@ -128,7 +128,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                     var aRotation = dir.AsDir().ToAngle();
 
                     // Use this pack
-                    packTransform = Matrix3.CreateTransform(bounds.Center, aRotation);
+                    packTransform = Matrix3Helpers.CreateTransform(bounds.Center, aRotation);
                     packRotations[i] = aRotation;
                     pack = aPack;
                     break;
@@ -168,7 +168,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
             {
                 var roomDimensions = new Vector2i(roomSize.Width, roomSize.Height);
                 Angle roomRotation = Angle.Zero;
-                Matrix3 matty;
+                Matrix3x2 matty;
 
                 if (!roomProtos.TryGetValue(roomDimensions, out var roomProto))
                 {
@@ -176,13 +176,13 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
 
                     if (!roomProtos.TryGetValue(roomDimensions, out roomProto))
                     {
-                        Matrix3.Multiply(packTransform, dungeonTransform, out matty);
+                        matty = Matrix3x2.Multiply(packTransform, dungeonTransform);
 
                         for (var x = roomSize.Left; x < roomSize.Right; x++)
                         {
                             for (var y = roomSize.Bottom; y < roomSize.Top; y++)
                             {
-                                var index = matty.Transform(new Vector2(x, y) + grid.TileSizeHalfVector - packCenter).Floored();
+                                var index = Vector2.Transform(new Vector2(x, y) + grid.TileSizeHalfVector - packCenter, matty).Floored();
                                 tiles.Add((index, new Tile(_tileDefManager["FloorPlanetGrass"].TileId)));
                             }
                         }
@@ -209,10 +209,10 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                     roomRotation += Math.PI;
                 }
 
-                var roomTransform = Matrix3.CreateTransform(roomSize.Center - packCenter, roomRotation);
+                var roomTransform = Matrix3Helpers.CreateTransform(roomSize.Center - packCenter, roomRotation);
 
-                Matrix3.Multiply(roomTransform, packTransform, out matty);
-                Matrix3.Multiply(matty, dungeonTransform, out var dungeonMatty);
+                matty = Matrix3x2.Multiply(roomTransform, packTransform);
+                var dungeonMatty = Matrix3x2.Multiply(matty, dungeonTransform);
 
                 // The expensive bit yippy.
                 _dungeon.SpawnRoom(gridUid, grid, dungeonMatty, room);
@@ -232,7 +232,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                             continue;
                         }
 
-                        var tilePos = dungeonMatty.Transform(new Vector2i(x + room.Offset.X, y + room.Offset.Y) + tileOffset);
+                        var tilePos = Vector2.Transform(new Vector2i(x + room.Offset.X, y + room.Offset.Y) + tileOffset, dungeonMatty);
                         exterior.Add(tilePos.Floored());
                     }
                 }
@@ -244,7 +244,7 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
                     for (var y = 0; y < room.Size.Y; y++)
                     {
                         var roomTile = new Vector2i(x + room.Offset.X, y + room.Offset.Y);
-                        var tilePos = dungeonMatty.Transform(roomTile + tileOffset);
+                        var tilePos = Vector2.Transform(roomTile + tileOffset, dungeonMatty);
                         var tileIndex = tilePos.Floored();
                         roomTiles.Add(tileIndex);
 
diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs
index 03bcc2b4b13d..5b4de34906e6 100644
--- a/Content.Server/Procedural/DungeonSystem.Rooms.cs
+++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs
@@ -67,7 +67,7 @@ public void SpawnRoom(
         bool clearExisting = false,
         bool rotation = false)
     {
-        var originTransform = Matrix3.CreateTranslation(origin);
+        var originTransform = Matrix3Helpers.CreateTranslation(origin.X, origin.Y);
         var roomRotation = Angle.Zero;
 
         if (rotation)
@@ -75,8 +75,8 @@ public void SpawnRoom(
             roomRotation = GetRoomRotation(room, random);
         }
 
-        var roomTransform = Matrix3.CreateTransform((Vector2) room.Size / 2f, roomRotation);
-        Matrix3.Multiply(roomTransform, originTransform, out var finalTransform);
+        var roomTransform = Matrix3Helpers.CreateTransform((Vector2) room.Size / 2f, roomRotation);
+        var finalTransform = Matrix3x2.Multiply(roomTransform, originTransform);
 
         SpawnRoom(gridUid, grid, finalTransform, room, clearExisting);
     }
@@ -101,7 +101,7 @@ public Angle GetRoomRotation(DungeonRoomPrototype room, Random random)
     public void SpawnRoom(
         EntityUid gridUid,
         MapGridComponent grid,
-        Matrix3 roomTransform,
+        Matrix3x2 roomTransform,
         DungeonRoomPrototype room,
         bool clearExisting = false)
     {
@@ -116,7 +116,7 @@ public void SpawnRoom(
         // go BRRNNTTT on existing stuff
         if (clearExisting)
         {
-            var gridBounds = new Box2(roomTransform.Transform(Vector2.Zero), roomTransform.Transform(room.Size));
+            var gridBounds = new Box2(Vector2.Transform(Vector2.Zero, roomTransform), Vector2.Transform(room.Size, roomTransform));
             _entitySet.Clear();
             // Polygon skin moment
             gridBounds = gridBounds.Enlarged(-0.05f);
@@ -148,7 +148,7 @@ public void SpawnRoom(
                 var indices = new Vector2i(x + room.Offset.X, y + room.Offset.Y);
                 var tileRef = _maps.GetTileRef(templateMapUid, templateGrid, indices);
 
-                var tilePos = roomTransform.Transform(indices + tileOffset);
+                var tilePos = Vector2.Transform(indices + tileOffset, roomTransform);
                 var rounded = tilePos.Floored();
                 _tiles.Add((rounded, tileRef.Tile));
             }
@@ -164,7 +164,7 @@ public void SpawnRoom(
         foreach (var templateEnt in _lookup.GetEntitiesIntersecting(templateMapUid, bounds, LookupFlags.Uncontained))
         {
             var templateXform = _xformQuery.GetComponent(templateEnt);
-            var childPos = roomTransform.Transform(templateXform.LocalPosition - roomCenter);
+            var childPos = Vector2.Transform(templateXform.LocalPosition - roomCenter, roomTransform);
             var childRot = templateXform.LocalRotation + finalRoomRotation;
             var protoId = _metaQuery.GetComponent(templateEnt).EntityPrototype?.ID;
 
@@ -192,7 +192,7 @@ public void SpawnRoom(
                 // Offset by 0.5 because decals are offset from bot-left corner
                 // So we convert it to center of tile then convert it back again after transform.
                 // Do these shenanigans because 32x32 decals assume as they are centered on bottom-left of tiles.
-                var position = roomTransform.Transform(decal.Coordinates + Vector2Helpers.Half - roomCenter);
+                var position = Vector2.Transform(decal.Coordinates + Vector2Helpers.Half - roomCenter, roomTransform);
                 position -= Vector2Helpers.Half;
 
                 // Umm uhh I love decals so uhhhh idk what to do about this
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
index b8193c4d2f39..ccee7cf227cb 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs
@@ -195,11 +195,11 @@ private RadiationRay Gridcast(Entity<MapGridComponent> grid, RadiationRay ray, b
 
         Vector2 srcLocal = sourceTrs.ParentUid == grid.Owner
             ? sourceTrs.LocalPosition
-            : gridTrs.InvLocalMatrix.Transform(ray.Source);
+            : Vector2.Transform(ray.Source, gridTrs.InvLocalMatrix);
 
         Vector2 dstLocal = destTrs.ParentUid == grid.Owner
             ? destTrs.LocalPosition
-            : gridTrs.InvLocalMatrix.Transform(ray.Destination);
+            : Vector2.Transform(ray.Destination, gridTrs.InvLocalMatrix);
 
         Vector2i sourceGrid = new(
             (int) Math.Floor(srcLocal.X / grid.Comp.TileSize),
diff --git a/Content.Server/Salvage/FultonSystem.cs b/Content.Server/Salvage/FultonSystem.cs
index ad998e535989..e2c0a6b4c5e2 100644
--- a/Content.Server/Salvage/FultonSystem.cs
+++ b/Content.Server/Salvage/FultonSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Salvage.Fulton;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -61,8 +62,9 @@ private void Fulton(EntityUid uid, FultonedComponent component)
             var metadata = MetaData(uid);
             var oldCoords = xform.Coordinates;
             var offset = _random.NextVector2(1.5f);
-            var localPos = TransformSystem.GetInvWorldMatrix(beaconXform.ParentUid)
-                .Transform(TransformSystem.GetWorldPosition(beaconXform)) + offset;
+            var localPos = Vector2.Transform(
+                    TransformSystem.GetWorldPosition(beaconXform),
+                    TransformSystem.GetInvWorldMatrix(beaconXform.ParentUid)) + offset;
 
             TransformSystem.SetCoordinates(uid, new EntityCoordinates(beaconXform.ParentUid, localPos));
 
diff --git a/Content.Server/Shuttles/Events/FTLStartedEvent.cs b/Content.Server/Shuttles/Events/FTLStartedEvent.cs
index 965da7f0c5e9..eafbeddd5c47 100644
--- a/Content.Server/Shuttles/Events/FTLStartedEvent.cs
+++ b/Content.Server/Shuttles/Events/FTLStartedEvent.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Robust.Shared.Map;
 
 namespace Content.Server.Shuttles.Events;
@@ -6,4 +7,4 @@ namespace Content.Server.Shuttles.Events;
 /// Raised when a shuttle has moved to FTL space.
 /// </summary>
 [ByRefEvent]
-public readonly record struct FTLStartedEvent(EntityUid Entity, EntityCoordinates TargetCoordinates, EntityUid? FromMapUid, Matrix3 FTLFrom, Angle FromRotation);
+public readonly record struct FTLStartedEvent(EntityUid Entity, EntityCoordinates TargetCoordinates, EntityUid? FromMapUid, Matrix3x2 FTLFrom, Angle FromRotation);
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index e87e781e620e..eb1f9796b27a 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Numerics;
 using Content.Server.Administration;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
@@ -277,7 +278,7 @@ private void DumpChildren(EntityUid uid, ref FTLStartedEvent args)
         foreach (var (ent, xform) in toDump)
         {
             var rotation = xform.LocalRotation;
-            _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, args.FTLFrom.Transform(xform.LocalPosition)));
+            _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom)));
             _transform.SetWorldRotation(ent, args.FromRotation + rotation);
         }
     }
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
index e46a7c715ffa..1a95ef9cb22b 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -46,13 +46,13 @@ private bool CanDock(
        FixturesComponent shuttleFixtures,
        MapGridComponent grid,
        bool isMap,
-       out Matrix3 matty,
+       out Matrix3x2 matty,
        out Box2 shuttleDockedAABB,
        out Angle gridRotation)
    {
        shuttleDockedAABB = Box2.UnitCentered;
        gridRotation = Angle.Zero;
-       matty = Matrix3.Identity;
+       matty = Matrix3x2.Identity;
 
        if (shuttleDock.Docked ||
            gridDock.Docked ||
@@ -71,9 +71,9 @@ private bool CanDock(
        var gridDockAngle = gridDockXform.LocalRotation.Opposite();
        var offsetAngle = gridDockAngle - shuttleDockAngle;
 
-       var stationDockMatrix = Matrix3.CreateInverseTransform(stationDockPos, shuttleDockAngle);
-       var gridXformMatrix = Matrix3.CreateTransform(gridDockXform.LocalPosition, gridDockAngle);
-       Matrix3.Multiply(in stationDockMatrix, in gridXformMatrix, out matty);
+       var stationDockMatrix = Matrix3Helpers.CreateInverseTransform(stationDockPos, shuttleDockAngle);
+       var gridXformMatrix = Matrix3Helpers.CreateTransform(gridDockXform.LocalPosition, gridDockAngle);
+       matty = Matrix3x2.Multiply(stationDockMatrix, gridXformMatrix);
 
        if (!ValidSpawn(grid, matty, offsetAngle, shuttleFixtures, isMap))
            return false;
@@ -193,7 +193,7 @@ private List<DockingConfig> GetDockingConfigs(
                    }
 
                    // Can't just use the AABB as we want to get bounds as tight as possible.
-                   var gridPosition = new EntityCoordinates(targetGrid, matty.Transform(Vector2.Zero));
+                   var gridPosition = new EntityCoordinates(targetGrid, Vector2.Transform(Vector2.Zero, matty));
                    var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, gridPosition.ToMapPos(EntityManager, _transform));
 
                    // TODO: use tight bounds
@@ -303,9 +303,9 @@ private List<DockingConfig> GetDockingConfigs(
    /// <summary>
    /// Checks whether the shuttle can warp to the specified position.
    /// </summary>
-   private bool ValidSpawn(MapGridComponent grid, Matrix3 matty, Angle angle, FixturesComponent shuttleFixturesComp, bool isMap)
+   private bool ValidSpawn(MapGridComponent grid, Matrix3x2 matty, Angle angle, FixturesComponent shuttleFixturesComp, bool isMap)
    {
-       var transform = new Transform(matty.Transform(Vector2.Zero), angle);
+       var transform = new Transform(Vector2.Transform(Vector2.Zero, matty), angle);
 
        // Because some docking bounds are tight af need to check each chunk individually
        foreach (var fix in shuttleFixturesComp.Fixtures.Values)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index f346398cdaaa..8a8d2d883d09 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Shuttles.Components;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
@@ -38,8 +39,8 @@ private void OnShuttleCollide(EntityUid uid, ShuttleComponent component, ref Sta
 
         var otherXform = Transform(args.OtherEntity);
 
-        var ourPoint = ourXform.InvWorldMatrix.Transform(args.WorldPoint);
-        var otherPoint = otherXform.InvWorldMatrix.Transform(args.WorldPoint);
+        var ourPoint = Vector2.Transform(args.WorldPoint, ourXform.InvWorldMatrix);
+        var otherPoint = Vector2.Transform(args.WorldPoint, otherXform.InvWorldMatrix);
 
         var ourVelocity = _physics.GetLinearVelocity(uid, ourPoint, ourBody, ourXform);
         var otherVelocity = _physics.GetLinearVelocity(args.OtherEntity, otherPoint, otherBody, otherXform);
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index f1d0af6f9050..779b2f59719d 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Server.Atmos.Components;
 using Content.Server.Singularity.Components;
 using Content.Shared.Ghost;
@@ -126,7 +127,7 @@ private bool CanGravPulseAffect(EntityUid entity)
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
     /// <param name="xform">(optional) The transform of the entity at the epicenter of the gravitational pulse.</param>
-    public void GravPulse(EntityUid uid, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV, TransformComponent? xform = null)
+    public void GravPulse(EntityUid uid, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV, TransformComponent? xform = null)
     {
         if (Resolve(uid, ref xform))
             GravPulse(xform.Coordinates, maxRange, minRange, in baseMatrixDeltaV);
@@ -154,7 +155,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR
     /// <param name="maxRange">The maximum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
-    public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
+    public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV)
         => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
 
     /// <summary>
@@ -175,7 +176,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang
     /// <param name="maxRange">The maximum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse. Exists to prevent div/0 errors.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
-    public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
+    public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in Matrix3x2 baseMatrixDeltaV)
     {
         if (mapPos == MapCoordinates.Nullspace)
             return; // No gravpulses in nullspace please.
@@ -205,7 +206,7 @@ public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in
                 continue;
 
             var scaling = (1f / distance2) * physics.Mass; // TODO: Variable falloff gradiants.
-            _physics.ApplyLinearImpulse(entity, (displacement * baseMatrixDeltaV) * scaling, body: physics);
+            _physics.ApplyLinearImpulse(entity, Vector2.Transform(displacement, baseMatrixDeltaV) * scaling, body: physics);
         }
     }
 
@@ -218,10 +219,9 @@ public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange, in
     /// <param name="baseRadialDeltaV">The base amount of velocity that will be added to entities in range towards the epicenter of the pulse.</param>
     /// <param name="baseTangentialDeltaV">The base amount of velocity that will be added to entities in range counterclockwise relative to the epicenter of the pulse.</param>
     public void GravPulse(MapCoordinates mapPos, float maxRange, float minRange = 0.0f, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(mapPos, maxRange, minRange, new Matrix3(
-            baseRadialDeltaV, +baseTangentialDeltaV, 0.0f,
-            -baseTangentialDeltaV, baseRadialDeltaV, 0.0f,
-            0.0f, 0.0f, 1.0f
+        => GravPulse(mapPos, maxRange, minRange, new Matrix3x2(
+            baseRadialDeltaV, -baseTangentialDeltaV, 0.0f,
+            +baseTangentialDeltaV, baseRadialDeltaV, 0.0f
         ));
 
     #endregion GravPulse
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 7247109e37fd..cb893299a935 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -396,7 +396,7 @@ private void FireEffects(EntityCoordinates fromCoordinates, float distance, Angl
             var (_, gridRot, gridInvMatrix) = TransformSystem.GetWorldPositionRotationInvMatrix(gridXform, xformQuery);
 
             fromCoordinates = new EntityCoordinates(gridUid.Value,
-                gridInvMatrix.Transform(fromCoordinates.ToMapPos(EntityManager, TransformSystem)));
+                Vector2.Transform(fromCoordinates.ToMapPos(EntityManager, TransformSystem), gridInvMatrix));
 
             // Use the fallback angle I guess?
             angle -= gridRot;
diff --git a/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs b/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs
index 7477b6c26eae..88e81c93c528 100644
--- a/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs
+++ b/Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
@@ -15,7 +16,7 @@ public sealed partial class ExplosionVisualsComponent : Component
     public Dictionary<EntityUid, Dictionary<int, List<Vector2i>>> Tiles = new();
     public List<float> Intensity = new();
     public string ExplosionType = string.Empty;
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public ushort SpaceTileSize;
 }
 
@@ -27,7 +28,7 @@ public sealed class ExplosionVisualsState : ComponentState
     public Dictionary<NetEntity, Dictionary<int, List<Vector2i>>> Tiles;
     public List<float> Intensity;
     public string ExplosionType = string.Empty;
-    public Matrix3 SpaceMatrix;
+    public Matrix3x2 SpaceMatrix;
     public ushort SpaceTileSize;
 
     public ExplosionVisualsState(
@@ -36,7 +37,7 @@ public ExplosionVisualsState(
         List<float> intensity,
         Dictionary<int, List<Vector2i>>? spaceTiles,
         Dictionary<NetEntity, Dictionary<int, List<Vector2i>>> tiles,
-        Matrix3 spaceMatrix,
+        Matrix3x2 spaceMatrix,
         ushort spaceTileSize)
     {
         Epicenter = epicenter;
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index 29e82f8adeba..5eaa25f48475 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -192,7 +192,7 @@ public IReadOnlyList<Box2i> GetAdjustedItemShape(Entity<ItemComponent?> entity,
         var shapes = GetItemShape(entity);
         var boundingShape = shapes.GetBoundingBox();
         var boundingCenter = ((Box2) boundingShape).Center;
-        var matty = Matrix3.CreateTransform(boundingCenter, rotation);
+        var matty = Matrix3Helpers.CreateTransform(boundingCenter, rotation);
         var drift = boundingShape.BottomLeft - matty.TransformBox(boundingShape).BottomLeft;
 
         var adjustedShapes = new List<Box2i>();
diff --git a/Content.Shared/Maps/TurfSystem.cs b/Content.Shared/Maps/TurfSystem.cs
index ad8b3ddea8d1..8a4bbf68bed3 100644
--- a/Content.Shared/Maps/TurfSystem.cs
+++ b/Content.Shared/Maps/TurfSystem.cs
@@ -44,7 +44,7 @@ public bool IsTileBlocked(EntityUid gridUid,
 
         var size = grid.TileSize;
         var localPos = new Vector2(indices.X * size + (size / 2f), indices.Y * size + (size / 2f));
-        var worldPos = matrix.Transform(localPos);
+        var worldPos = Vector2.Transform(localPos, matrix);
 
         // This is scaled to 95 % so it doesn't encompass walls on other tiles.
         var tileAabb = Box2.UnitCentered.Scale(0.95f * size);
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 2d9993096bc5..b67acdea4f99 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -751,7 +751,7 @@ private void DoLungeAnimation(EntityUid user, EntityUid weapon, Angle angle, Map
             return;
 
         var invMatrix = TransformSystem.GetInvWorldMatrix(userXform);
-        var localPos = invMatrix.Transform(coordinates.Position);
+        var localPos = Vector2.Transform(coordinates.Position, invMatrix);
 
         if (localPos.LengthSquared() <= 0f)
             return;

From 6235fa1ac69f72d0ed9ef4b089245f04e7ca01f9 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 2 Jun 2024 16:08:15 +1200
Subject: [PATCH 215/568] Content changes for entity categories PR (#27232)

* Content changes for entity categories PR

* Poke tests

* Why are tests suddenly working?
---
 Content.IntegrationTests/Tests/EntityTest.cs          | 11 +++--------
 .../Rules/Components/NukeOperativeSpawnerComponent.cs |  5 +++--
 .../Roles/Components/GhostRoleMobSpawnerComponent.cs  |  2 +-
 .../Components/RandomHumanoidSpawnerComponent.cs      |  2 +-
 .../Components/ConditionalSpawnerComponent.cs         |  2 +-
 .../Spawners/Components/RandomSpawnerComponent.cs     |  2 +-
 .../Spawners/Components/TimedSpawnerComponent.cs      |  2 +-
 Content.Shared/Actions/BaseActionComponent.cs         |  4 +++-
 .../Body/Prototypes/BodyPrototypeSerializer.cs        |  2 +-
 Content.Shared/Dragon/SharedDragonRiftComponent.cs    |  3 ++-
 Resources/Locale/en-US/entity-categories.ftl          |  1 +
 Resources/Prototypes/Alerts/alerts.yml                |  2 +-
 Resources/Prototypes/Alerts/revenant.yml              |  2 +-
 .../Prototypes/Entities/Objects/Devices/flatpack.yml  |  2 +-
 .../Entities/Structures/Machines/flatpacker.yml       |  2 +-
 Resources/Prototypes/Entities/categories.yml          |  4 ++++
 16 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 Resources/Locale/en-US/entity-categories.ftl
 create mode 100644 Resources/Prototypes/Entities/categories.yml

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 54af64122be0..926374cf0500 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -19,6 +19,8 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(EntityUid))]
     public sealed class EntityTest
     {
+        private static readonly ProtoId<EntityCategoryPrototype> SpawnerCategory = "Spawner";
+
         [Test]
         public async Task SpawnAndDeleteAllEntitiesOnDifferentMaps()
         {
@@ -234,14 +236,6 @@ public async Task SpawnAndDeleteEntityCountTest()
                 "StationEvent",
                 "TimedDespawn",
 
-                // Spawner entities
-                "DragonRift",
-                "RandomHumanoidSpawner",
-                "RandomSpawner",
-                "ConditionalSpawner",
-                "GhostRoleMobSpawner",
-                "NukeOperativeSpawner",
-                "TimedSpawner",
                 // makes an announcement on mapInit.
                 "AnnounceOnSpawn",
             };
@@ -253,6 +247,7 @@ public async Task SpawnAndDeleteEntityCountTest()
                 .Where(p => !p.Abstract)
                 .Where(p => !pair.IsTestPrototype(p))
                 .Where(p => !excluded.Any(p.Components.ContainsKey))
+                .Where(p => p.Categories.All(x => x.ID != SpawnerCategory))
                 .Select(p => p.ID)
                 .ToList();
 
diff --git a/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
index bb1b7c874606..54eaa6e32e4c 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
@@ -1,3 +1,5 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
@@ -5,6 +7,5 @@ namespace Content.Server.GameTicking.Rules.Components;
 /// and providing loadout + name for the operative on spawn.
 /// TODO: Remove once systems can request spawns from the ghost role system directly.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("Spawner")]
 public sealed partial class NukeOperativeSpawnerComponent : Component;
-
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
index 6c2a6986fc96..6116173f904b 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Server.Ghost.Roles.Components
     /// <summary>
     ///     Allows a ghost to take this role, spawning a new entity.
     /// </summary>
-    [RegisterComponent]
+    [RegisterComponent, EntityCategory("Spawner")]
     [Access(typeof(GhostRoleSystem))]
     public sealed partial class GhostRoleMobSpawnerComponent : Component
     {
diff --git a/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs b/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs
index b56664fe19e3..bb38e94e04ab 100644
--- a/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs
+++ b/Content.Server/Humanoid/Components/RandomHumanoidSpawnerComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Server.Humanoid.Components;
 ///     This is added to a marker entity in order to spawn a randomized
 ///     humanoid ingame.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("Spawner")]
 public sealed partial class RandomHumanoidSpawnerComponent : Component
 {
     [DataField("settings", customTypeSerializer: typeof(PrototypeIdSerializer<RandomHumanoidSettingsPrototype>))]
diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
index 5b98989bb3ee..1b06367b0d86 100644
--- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
@@ -2,7 +2,7 @@
 
 namespace Content.Server.Spawners.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, EntityCategory("Spawner")]
     [Virtual]
     public partial class ConditionalSpawnerComponent : Component
     {
diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
index 9bf4d6d25317..e6a597f36586 100644
--- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
@@ -2,7 +2,7 @@
 
 namespace Content.Server.Spawners.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, EntityCategory("Spawner")]
     public sealed partial class RandomSpawnerComponent : ConditionalSpawnerComponent
     {
         [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index b60afbc88ba3..828e5417177e 100644
--- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Spawners.Components;
 /// Can configure the set of entities, spawn timing, spawn chance,
 /// and min/max number of entities to spawn.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("Spawner")]
 public sealed partial class TimedSpawnerComponent : Component, ISerializationHooks
 {
     /// <summary>
diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs
index 57c145a0ecf3..9156f747f5c9 100644
--- a/Content.Shared/Actions/BaseActionComponent.cs
+++ b/Content.Shared/Actions/BaseActionComponent.cs
@@ -1,14 +1,16 @@
 using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Actions;
 
-// TODO ACTIONS make this a seprate component and remove the inheritance stuff.
+// TODO ACTIONS make this a separate component and remove the inheritance stuff.
 // TODO ACTIONS convert to auto comp state?
 
 // TODO add access attribute. Need to figure out what to do with decal & mapping actions.
 // [Access(typeof(SharedActionsSystem))]
+[EntityCategory("Actions")]
 public abstract partial class BaseActionComponent : Component
 {
     public abstract BaseActionEvent? BaseEvent { get; }
diff --git a/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs b/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
index e2b54bf951e0..ae099767049b 100644
--- a/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
+++ b/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
@@ -182,7 +182,7 @@ public BodyPrototype Read(ISerializationManager serializationManager, MappingDat
 
         foreach (var (slotId, (part, connections, organs)) in allConnections)
         {
-            var slot = new BodyPrototypeSlot(part != null ? new EntProtoId(part) : null!, connections ?? new HashSet<string>(), organs ?? new Dictionary<string, string>());
+            var slot = new BodyPrototypeSlot(part, connections ?? new HashSet<string>(), organs ?? new Dictionary<string, string>());
             slots.Add(slotId, slot);
         }
 
diff --git a/Content.Shared/Dragon/SharedDragonRiftComponent.cs b/Content.Shared/Dragon/SharedDragonRiftComponent.cs
index 0d2bf4401803..8377dbfee7a6 100644
--- a/Content.Shared/Dragon/SharedDragonRiftComponent.cs
+++ b/Content.Shared/Dragon/SharedDragonRiftComponent.cs
@@ -1,9 +1,10 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Dragon;
 
-[NetworkedComponent]
+[NetworkedComponent, EntityCategory("Spawner")]
 public abstract partial class SharedDragonRiftComponent : Component
 {
     [DataField("state")]
diff --git a/Resources/Locale/en-US/entity-categories.ftl b/Resources/Locale/en-US/entity-categories.ftl
new file mode 100644
index 000000000000..190fe5713ac4
--- /dev/null
+++ b/Resources/Locale/en-US/entity-categories.ftl
@@ -0,0 +1 @@
+entity-category-name-actions = Actions
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 7881cddd4aab..72412fde7cc3 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -28,7 +28,7 @@
 
 - type: entity
   id: AlertSpriteView
-  categories: [ hideSpawnMenu ]
+  categories: [ HideSpawnMenu  ]
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Alerts/revenant.yml b/Resources/Prototypes/Alerts/revenant.yml
index 7f3f98949e00..38933df4fe0c 100644
--- a/Resources/Prototypes/Alerts/revenant.yml
+++ b/Resources/Prototypes/Alerts/revenant.yml
@@ -16,7 +16,7 @@
 
 - type: entity
   id: AlertEssenceSpriteView
-  categories: [ hideSpawnMenu ]
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: /Textures/Interface/Alerts/essence_counter.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index e3e77d5c88ef..b9c2b752dba4 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -4,7 +4,7 @@
   name: base flatpack
   description: A flatpack used for constructing something.
   categories:
-  - hideSpawnMenu
+  - HideSpawnMenu
   components:
   - type: Item
     size: Large
diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
index b4f05cf68a7b..78f150400306 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml
@@ -84,7 +84,7 @@
 - type: entity
   id: FlatpackerNoBoardEffect
   categories:
-  - hideSpawnMenu
+  - HideSpawnMenu
   components:
   - type: Sprite
     sprite: Structures/Machines/autolathe.rsi
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
new file mode 100644
index 000000000000..2fb56818f944
--- /dev/null
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -0,0 +1,4 @@
+- type: entityCategory
+  id: Actions
+  name: entity-category-name-actions
+  hideSpawnMenu: true

From 4c667b2d8f898abc4f7b9fcf9d8753f9cbee9afd Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Sat, 1 Jun 2024 23:13:12 -0500
Subject: [PATCH 216/568] Fix Lasers Being Blocked by External Airlocks and
 Shuttle Airlocks (#28065)

---
 .../Structures/Doors/Airlocks/external.yml    | 11 +++++
 .../Structures/Doors/Airlocks/shuttle.yml     | 47 +++----------------
 2 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index 293aaac273d8..3197ba417f9e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -33,3 +33,14 @@
     sprite: Structures/Doors/Airlocks/Glass/external.rsi
   - type: PaintableAirlock
     group: ExternalGlass
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
+        density: 100
+        mask:
+        - FullTileMask
+        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
+        - GlassAirlockLayer
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 43d1228a408c..5d27cec1815e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -82,29 +82,17 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
-    snapCardinals: false
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
-    - state: closed_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseUnlit"]
-    - state: welded
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: bolted_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseBolted"]
-    - state: emergency_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
-    - state: panel_open
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Occluder
     enabled: false
   - type: PaintableAirlock
     group: ShuttleGlass
   - type: Door
     occludes: false
+  - type: Fixtures
+    fixtures:
+      fix1:
+        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
+        - GlassAirlockLayer
 
 - type: entity
   id: AirlockShuttleAssembly
@@ -126,36 +114,13 @@
 
 - type: entity
   id: AirlockGlassShuttleSyndicate
-  parent: AirlockShuttle
+  parent: AirlockGlassShuttle
   name: external airlock
   suffix: Glass, Docking
   description: Necessary for connecting two space craft together.
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
-    snapCardinals: false
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
-    - state: closed_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseUnlit"]
-    - state: welded
-      map: ["enum.WeldableLayers.BaseWelded"]
-    - state: bolted_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseBolted"]
-    - state: emergency_unlit
-      shader: unshaded
-      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
-    - state: panel_open
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Occluder
-    enabled: false
-  - type: PaintableAirlock
-    group: ShuttleGlass
-  - type: Door
-    occludes: false
 
 - type: entity
   parent: AirlockShuttle

From f5bc921bdd7e0c2c0c8a4ea7620b6022aa4e503e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 2 Jun 2024 04:14:18 +0000
Subject: [PATCH 217/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0c671f49eec1..de9e112c59da 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: Ion storms now have a chance of happening from the start of shift.
-    type: Tweak
-  id: 6163
-  time: '2024-03-16T03:47:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26165
 - author: Krunk
   changes:
   - message: Zombies and animals can be stripped once again.
@@ -3853,3 +3846,10 @@
   id: 6662
   time: '2024-06-02T01:41:06.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28496
+- author: Cojoke-dot
+  changes:
+  - message: Lasers now pass through Glass External Airlocks and Glass Shuttle Airlocks
+    type: Fix
+  id: 6663
+  time: '2024-06-02T04:13:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28065

From 12839893464ef4af1bf3279e9f76f92e82b0afe1 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Sun, 2 Jun 2024 06:17:53 +0200
Subject: [PATCH 218/568] Flash overlay rework and bugfixes (#27369)

---
 Content.Client/Entry/EntryPoint.cs            |  1 -
 Content.Client/Flash/FlashOverlay.cs          | 76 ++++++++------
 Content.Client/Flash/FlashSystem.cs           | 99 ++++++++++---------
 .../Components/DamagedByFlashingComponent.cs  |  3 +-
 .../Components/FlashImmunityComponent.cs      | 19 ++--
 Content.Server/Flash/FlashSystem.cs           | 70 ++++++-------
 .../Flash/Components/FlashComponent.cs        | 11 ++-
 .../Flash/Components/FlashedComponent.cs      |  9 ++
 Content.Shared/Flash/FlashableComponent.cs    | 40 --------
 Content.Shared/Flash/SharedFlashSystem.cs     | 15 +--
 .../Mobs/Cyborgs/base_borg_chassis.yml        |  2 +-
 .../Entities/Mobs/NPCs/argocyte.yml           |  1 -
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |  2 -
 .../Entities/Mobs/NPCs/simplemob.yml          |  2 +
 .../Prototypes/Entities/Mobs/Species/base.yml | 21 +---
 .../Entities/Objects/base_shadow.yml          |  3 -
 Resources/Prototypes/status_effects.yml       |  3 +
 .../Textures/Shaders/flashed_effect.swsl      |  2 +-
 18 files changed, 179 insertions(+), 200 deletions(-)
 create mode 100644 Content.Shared/Flash/Components/FlashedComponent.cs
 delete mode 100644 Content.Shared/Flash/FlashableComponent.cs

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index b28c6a11fbfb..51210a8a93d4 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -152,7 +152,6 @@ public override void PostInit()
             _parallaxManager.LoadDefaultParallax();
 
             _overlayManager.AddOverlay(new SingularityOverlay());
-            _overlayManager.AddOverlay(new FlashOverlay());
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
             _chatManager.Initialize();
             _clientPreferencesManager.Initialize();
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index fe9c888227ec..9ea00275e842 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -1,12 +1,11 @@
-using System.Numerics;
+using Content.Shared.Flash;
+using Content.Shared.Flash.Components;
+using Content.Shared.StatusEffect;
 using Content.Client.Viewport;
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using SixLabors.ImageSharp.PixelFormats;
@@ -17,66 +16,87 @@ public sealed class FlashOverlay : Overlay
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClyde _displayManager = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IGameTiming _timing = default!;
+
+       private readonly StatusEffectsSystem _statusSys;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;
-        private double _startTime = -1;
-        private double _lastsFor = 1;
-        private Texture? _screenshotTexture;
+        public float PercentComplete = 0.0f;
+        public Texture? ScreenshotTexture;
 
         public FlashOverlay()
         {
             IoCManager.InjectDependencies(this);
-            _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").Instance().Duplicate();
+            _shader = _prototypeManager.Index<ShaderPrototype>("FlashedEffect").InstanceUnique();
+            _statusSys = _entityManager.System<StatusEffectsSystem>();
         }
 
-        public void ReceiveFlash(double duration)
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            var playerEntity = _playerManager.LocalEntity;
+
+            if (playerEntity == null)
+                return;
+
+            if (!_entityManager.HasComponent<FlashedComponent>(playerEntity)
+                || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+                return;
+
+            if (!_statusSys.TryGetTime(playerEntity.Value, SharedFlashSystem.FlashedKey, out var time, status))
+                return;
+
+            var curTime = _timing.CurTime;
+            var lastsFor = (float) (time.Value.Item2 - time.Value.Item1).TotalSeconds;
+            var timeDone = (float) (curTime - time.Value.Item1).TotalSeconds;
+
+            PercentComplete = timeDone / lastsFor;
+        }
+
+        public void ReceiveFlash()
         {
             if (_stateManager.CurrentState is IMainViewportState state)
             {
+                // take a screenshot
+                // note that the callback takes a while and ScreenshotTexture will be null the first few Draws
                 state.Viewport.Viewport.Screenshot(image =>
                 {
                     var rgba32Image = image.CloneAs<Rgba32>(SixLabors.ImageSharp.Configuration.Default);
-                    _screenshotTexture = _displayManager.LoadTextureFromImage(rgba32Image);
+                    ScreenshotTexture = _displayManager.LoadTextureFromImage(rgba32Image);
                 });
             }
-
-            _startTime = _gameTiming.CurTime.TotalSeconds;
-            _lastsFor = duration;
         }
 
-        protected override void Draw(in OverlayDrawArgs args)
+        protected override bool BeforeDraw(in OverlayDrawArgs args)
         {
             if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
-                return;
-
+                return false;
             if (args.Viewport.Eye != eyeComp.Eye)
-                return;
+                return false;
+
+            return PercentComplete < 1.0f;
+        }
 
-            var percentComplete = (float) ((_gameTiming.CurTime.TotalSeconds - _startTime) / _lastsFor);
-            if (percentComplete >= 1.0f)
+        protected override void Draw(in OverlayDrawArgs args)
+        {
+            if (ScreenshotTexture == null)
                 return;
 
             var worldHandle = args.WorldHandle;
+            _shader.SetParameter("percentComplete", PercentComplete);
             worldHandle.UseShader(_shader);
-            _shader.SetParameter("percentComplete", percentComplete);
-
-            if (_screenshotTexture != null)
-            {
-                worldHandle.DrawTextureRectRegion(_screenshotTexture, args.WorldBounds);
-            }
-
+            worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
             worldHandle.UseShader(null);
         }
 
         protected override void DisposeBehavior()
         {
             base.DisposeBehavior();
-            _screenshotTexture = null;
+            ScreenshotTexture = null;
+            PercentComplete = 1.0f;
         }
     }
 }
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index ad8f8b0b82bf..9a0579f6aa38 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -1,62 +1,67 @@
 using Content.Shared.Flash;
+using Content.Shared.Flash.Components;
+using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Robust.Shared.GameStates;
-using Robust.Shared.Timing;
+using Robust.Shared.Player;
 
-namespace Content.Client.Flash
+namespace Content.Client.Flash;
+
+public sealed class FlashSystem : SharedFlashSystem
 {
-    public sealed class FlashSystem : SharedFlashSystem
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private FlashOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlashedComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<FlashedComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<FlashedComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<FlashedComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<FlashedComponent, StatusEffectAddedEvent>(OnStatusAdded);
+
+        _overlay = new();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, FlashedComponent component, LocalPlayerAttachedEvent args)
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IOverlayManager _overlayManager = default!;
+        _overlayMan.AddOverlay(_overlay);
+    }
 
-        public override void Initialize()
+    private void OnPlayerDetached(EntityUid uid, FlashedComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlay.PercentComplete = 1.0f;
+        _overlay.ScreenshotTexture = null;
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnInit(EntityUid uid, FlashedComponent component, ComponentInit args)
+    {
+        if (_player.LocalEntity == uid)
         {
-            base.Initialize();
+            _overlayMan.AddOverlay(_overlay);
+        }
+    }
 
-            SubscribeLocalEvent<FlashableComponent, ComponentHandleState>(OnFlashableHandleState);
+    private void OnShutdown(EntityUid uid, FlashedComponent component, ComponentShutdown args)
+    {
+        if (_player.LocalEntity == uid)
+        {
+            _overlay.PercentComplete = 1.0f;
+            _overlay.ScreenshotTexture = null;
+            _overlayMan.RemoveOverlay(_overlay);
         }
+    }
 
-        private void OnFlashableHandleState(EntityUid uid, FlashableComponent component, ref ComponentHandleState args)
+    private void OnStatusAdded(EntityUid uid, FlashedComponent component, StatusEffectAddedEvent args)
+    {
+        if (_player.LocalEntity == uid && args.Key == FlashedKey)
         {
-            if (args.Current is not FlashableComponentState state)
-                return;
-
-            // Yes, this code is awful. I'm just porting it to an entity system so don't blame me.
-            if (_playerManager.LocalEntity != uid)
-            {
-                return;
-            }
-
-            if (state.Time == default)
-            {
-                return;
-            }
-
-            // Few things here:
-            // 1. If a shorter duration flash is applied then don't do anything
-            // 2. If the client-side time is later than when the flash should've ended don't do anything
-            var currentTime = _gameTiming.CurTime.TotalSeconds;
-            var newEndTime = state.Time.TotalSeconds + state.Duration;
-            var currentEndTime = component.LastFlash.TotalSeconds + component.Duration;
-
-            if (currentEndTime > newEndTime)
-            {
-                return;
-            }
-
-            if (currentTime > newEndTime)
-            {
-                return;
-            }
-
-            component.LastFlash = state.Time;
-            component.Duration = state.Duration;
-
-            var overlay = _overlayManager.GetOverlay<FlashOverlay>();
-            overlay.ReceiveFlash(component.Duration);
+            _overlay.ReceiveFlash();
         }
     }
 }
diff --git a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
index 2a9024607d6a..ef3345429524 100644
--- a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
+++ b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
@@ -3,7 +3,6 @@
 
 namespace Content.Server.Flash.Components;
 
-// Also needed FlashableComponent on entity to work
 [RegisterComponent, Access(typeof(DamagedByFlashingSystem))]
 public sealed partial class DamagedByFlashingComponent : Component
 {
@@ -11,5 +10,5 @@ public sealed partial class DamagedByFlashingComponent : Component
     /// damage from flashing
     /// </summary>
     [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier FlashDamage = new ();
+    public DamageSpecifier FlashDamage = new();
 }
diff --git a/Content.Server/Flash/Components/FlashImmunityComponent.cs b/Content.Server/Flash/Components/FlashImmunityComponent.cs
index 80bbdd12828d..a982a9059f06 100644
--- a/Content.Server/Flash/Components/FlashImmunityComponent.cs
+++ b/Content.Server/Flash/Components/FlashImmunityComponent.cs
@@ -1,10 +1,13 @@
-namespace Content.Server.Flash.Components
+namespace Content.Server.Flash.Components;
+
+/// <summary>
+///     Makes the entity immune to being flashed.
+///     When given to clothes in the "head", "eyes" or "mask" slot it protects the wearer.
+/// </summary>
+[RegisterComponent, Access(typeof(FlashSystem))]
+public sealed partial class FlashImmunityComponent : Component
 {
-    [RegisterComponent, Access(typeof(FlashSystem))]
-    public sealed partial class FlashImmunityComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("enabled")]
-        public bool Enabled { get; set; } = true;
-    }
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("enabled")]
+    public bool Enabled { get; set; } = true;
 }
diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index dd8cdab426cb..ccb58e94f814 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -9,18 +9,17 @@
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash;
 using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
-using Content.Shared.Physics;
 using Content.Shared.Tag;
 using Content.Shared.Traits.Assorted;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.StatusEffect;
+using Content.Shared.Examine;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
 
 namespace Content.Server.Flash
@@ -31,14 +30,14 @@ internal sealed class FlashSystem : SharedFlashSystem
         [Dependency] private readonly AudioSystem _audio = default!;
         [Dependency] private readonly SharedChargesSystem _charges = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly StunSystem _stun = default!;
         [Dependency] private readonly TagSystem _tag = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
 
         public override void Initialize()
         {
@@ -46,7 +45,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<FlashComponent, MeleeHitEvent>(OnFlashMeleeHit);
             // ran before toggling light for extra-bright lantern
-            SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand, before: new []{ typeof(HandheldLightSystem) });
+            SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand, before: new[] { typeof(HandheldLightSystem) });
             SubscribeLocalEvent<InventoryComponent, FlashAttemptEvent>(OnInventoryFlashAttempt);
             SubscribeLocalEvent<FlashImmunityComponent, FlashAttemptEvent>(OnFlashImmunityFlashAttempt);
             SubscribeLocalEvent<PermanentBlindnessComponent, FlashAttemptEvent>(OnPermanentBlindnessFlashAttempt);
@@ -114,31 +113,18 @@ public void Flash(EntityUid target,
             float flashDuration,
             float slowTo,
             bool displayPopup = true,
-            FlashableComponent? flashable = null,
             bool melee = false,
             TimeSpan? stunDuration = null)
         {
-            if (!Resolve(target, ref flashable, false))
-                return;
-
             var attempt = new FlashAttemptEvent(target, user, used);
             RaiseLocalEvent(target, attempt, true);
 
             if (attempt.Cancelled)
                 return;
 
-            if (melee)
-            {
-                var ev = new AfterFlashedEvent(target, user, used);
-                if (user != null)
-                    RaiseLocalEvent(user.Value, ref ev);
-                if (used != null)
-                    RaiseLocalEvent(used.Value, ref ev);
-            }
-
-            flashable.LastFlash = _timing.CurTime;
-            flashable.Duration = flashDuration / 1000f; // TODO: Make this sane...
-            Dirty(target, flashable);
+            // don't paralyze, slowdown or convert to rev if the target is immune to flashes
+            if (!_statusEffectsSystem.TryAddStatusEffect<FlashedComponent>(target, FlashedKey, TimeSpan.FromSeconds(flashDuration / 1000f), true))
+                return;
 
             if (stunDuration != null)
             {
@@ -146,7 +132,7 @@ public void Flash(EntityUid target,
             }
             else
             {
-                _stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration/1000f), true,
+                _stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration / 1000f), true,
                 slowTo, slowTo);
             }
 
@@ -155,28 +141,40 @@ public void Flash(EntityUid target,
                 _popup.PopupEntity(Loc.GetString("flash-component-user-blinds-you",
                     ("user", Identity.Entity(user.Value, EntityManager))), target, target);
             }
+
+            if (melee)
+            {
+                var ev = new AfterFlashedEvent(target, user, used);
+                if (user != null)
+                    RaiseLocalEvent(user.Value, ref ev);
+                if (used != null)
+                    RaiseLocalEvent(used.Value, ref ev);
+            }
         }
 
         public void FlashArea(Entity<FlashComponent?> source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null)
         {
             var transform = Transform(source);
             var mapPosition = _transform.GetMapCoordinates(transform);
-            var flashableQuery = GetEntityQuery<FlashableComponent>();
+            var statusEffectsQuery = GetEntityQuery<StatusEffectsComponent>();
+            var damagedByFlashingQuery = GetEntityQuery<DamagedByFlashingComponent>();
 
             foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
             {
                 if (!_random.Prob(probability))
                     continue;
 
-                if (!flashableQuery.TryGetComponent(entity, out var flashable))
+                // Is the entity affected by the flash either through status effects or by taking damage?
+                if (!statusEffectsQuery.HasComponent(entity) && !damagedByFlashingQuery.HasComponent(entity))
                     continue;
 
-                // Check for unobstructed entities while ignoring the mobs with flashable components.
-                if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, flashable.CollisionGroup, predicate: (e) => flashableQuery.HasComponent(e) || e == source.Owner))
+                // Check for entites in view
+                // put damagedByFlashingComponent in the predicate because shadow anomalies block vision.
+                if (!_examine.InRangeUnOccluded(entity, mapPosition, range, predicate: (e) => damagedByFlashingQuery.HasComponent(e)))
                     continue;
 
                 // They shouldn't have flash removed in between right?
-                Flash(entity, user, source, duration, slowTo, displayPopup, flashableQuery.GetComponent(entity));
+                Flash(entity, user, source, duration, slowTo, displayPopup);
             }
 
             _audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
@@ -195,13 +193,15 @@ private void OnInventoryFlashAttempt(EntityUid uid, InventoryComponent component
 
         private void OnFlashImmunityFlashAttempt(EntityUid uid, FlashImmunityComponent component, FlashAttemptEvent args)
         {
-            if(component.Enabled)
+            if (component.Enabled)
                 args.Cancel();
         }
 
         private void OnPermanentBlindnessFlashAttempt(EntityUid uid, PermanentBlindnessComponent component, FlashAttemptEvent args)
         {
-            args.Cancel();
+            // check for total blindness
+            if (component.Blindness == 0)
+                args.Cancel();
         }
 
         private void OnTemporaryBlindnessFlashAttempt(EntityUid uid, TemporaryBlindnessComponent component, FlashAttemptEvent args)
@@ -210,6 +210,10 @@ private void OnTemporaryBlindnessFlashAttempt(EntityUid uid, TemporaryBlindnessC
         }
     }
 
+    /// <summary>
+    ///     Called before a flash is used to check if the attempt is cancelled by blindness, items or FlashImmunityComponent.
+    ///     Raised on the target hit by the flash, the user of the flash and the flash used.
+    /// </summary>
     public sealed class FlashAttemptEvent : CancellableEntityEventArgs
     {
         public readonly EntityUid Target;
@@ -224,8 +228,8 @@ public FlashAttemptEvent(EntityUid target, EntityUid? user, EntityUid? used)
         }
     }
     /// <summary>
-    /// Called after a flash is used via melee on another person to check for rev conversion.
-    /// Raised on the user of the flash, the target hit by the flash, and the flash used.
+    ///     Called after a flash is used via melee on another person to check for rev conversion.
+    ///     Raised on the target hit by the flash, the user of the flash and the flash used.
     /// </summary>
     [ByRefEvent]
     public readonly struct AfterFlashedEvent
@@ -241,6 +245,4 @@ public AfterFlashedEvent(EntityUid target, EntityUid? user, EntityUid? used)
             Used = used;
         }
     }
-
-
 }
diff --git a/Content.Shared/Flash/Components/FlashComponent.cs b/Content.Shared/Flash/Components/FlashComponent.cs
index a9098bc85a97..29f92eb94fc5 100644
--- a/Content.Shared/Flash/Components/FlashComponent.cs
+++ b/Content.Shared/Flash/Components/FlashComponent.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Flash;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Flash.Components
 {
@@ -43,4 +43,13 @@ public sealed partial class FlashComponent : Component
         [DataField]
         public float Probability = 1f;
     }
+
+    [Serializable, NetSerializable]
+    public enum FlashVisuals : byte
+    {
+        BaseLayer,
+        LightLayer,
+        Burnt,
+        Flashing,
+    }
 }
diff --git a/Content.Shared/Flash/Components/FlashedComponent.cs b/Content.Shared/Flash/Components/FlashedComponent.cs
new file mode 100644
index 000000000000..75bbb12304ac
--- /dev/null
+++ b/Content.Shared/Flash/Components/FlashedComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+///     Exists for use as a status effect. Adds a shader to the client that obstructs vision.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class FlashedComponent : Component { }
diff --git a/Content.Shared/Flash/FlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
deleted file mode 100644
index c4f8074ceaf6..000000000000
--- a/Content.Shared/Flash/FlashableComponent.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Physics;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Flash
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class FlashableComponent : Component
-    {
-        public float Duration;
-        public TimeSpan LastFlash;
-
-        [DataField]
-        public CollisionGroup CollisionGroup = CollisionGroup.Opaque;
-
-        public override bool SendOnlyToOwner => true;
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class FlashableComponentState : ComponentState
-    {
-        public float Duration { get; }
-        public TimeSpan Time { get; }
-
-        public FlashableComponentState(float duration, TimeSpan time)
-        {
-            Duration = duration;
-            Time = time;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public enum FlashVisuals : byte
-    {
-        BaseLayer,
-        LightLayer,
-        Burnt,
-        Flashing,
-    }
-}
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 16fdbfc2f3e5..f83f02a31058 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -1,19 +1,10 @@
-using Robust.Shared.GameStates;
+using Content.Shared.StatusEffect;
 
 namespace Content.Shared.Flash
 {
     public abstract class SharedFlashSystem : EntitySystem
     {
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<FlashableComponent, ComponentGetState>(OnFlashableGetState);
-        }
-
-        private static void OnFlashableGetState(EntityUid uid, FlashableComponent component, ref ComponentGetState args)
-        {
-            args.State = new FlashableComponentState(component.Duration, component.LastFlash);
-        }
+        [ValidatePrototypeId<StatusEffectPrototype>]
+        public const string FlashedKey = "Flashed";
     }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 8bf55e48bd3e..baea453cb88e 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -126,6 +126,7 @@
     - Stun
     - KnockedDown
     - SlowedDown
+    - Flashed
   - type: TypingIndicator
     proto: robot
   - type: Speech
@@ -147,7 +148,6 @@
     locked: true
   - type: ActivatableUIRequiresLock
   - type: LockedWiresPanel
-  - type: Flashable
   - type: Damageable
     damageContainer: Silicon
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 39e68b63a789..3b6c4e8ed920 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -48,7 +48,6 @@
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning
   - type: Climbing
-  - type: Flashable
   - type: NameIdentifier
     group: GenericNumber
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 23eb462db18f..c1cfa4083604 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -781,7 +781,6 @@
       amount: 3
     - id: DrinkTequilaBottleFull
       amount: 1
-  - type: Flashable
   - type: Tag
     tags:
     - CannotSuicide
@@ -808,7 +807,6 @@
 #    name: ghost-role-information-tropico-name
 #    description: ghost-role-information-tropico-description
 #  - type: GhostTakeoverAvailable
-#  - type: Flashable
   - type: Tag
     tags:
     - VimPilot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 12ea40b1e3c5..4936d883e578 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -25,6 +25,7 @@
     - ForcedSleep
     - TemporaryBlindness
     - Pacified
+    - Flashed
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -99,6 +100,7 @@
       - TemporaryBlindness
       - Pacified
       - StaminaModifier
+      - Flashed
   - 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 a49f8ff34c35..eeabecef8b2c 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -140,6 +140,7 @@
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
+    - Flashed
   - type: Reflect
     enabled: false
     reflectProb: 0
@@ -234,7 +235,6 @@
   id: BaseMobSpeciesOrganic
   abstract: true
   components:
-  - type: Flashable
   - type: Barotrauma
     damage:
       types:
@@ -249,24 +249,7 @@
         Heat: -0.07
       groups:
         Brute: -0.07
-  # Organs
-  - type: StatusEffects
-    allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
-    - Stutter
-    - SeeingRainbows
-    - Electrocution
-    - ForcedSleep
-    - TemporaryBlindness
-    - Drunk
-    - SlurredSpeech
-    - RatvarianLanguage
-    - PressureImmunity
-    - Muted
-    - Pacified
-    - StaminaModifier
+
   - type: Blindable
   # Other
   - type: Temperature
diff --git a/Resources/Prototypes/Entities/Objects/base_shadow.yml b/Resources/Prototypes/Entities/Objects/base_shadow.yml
index 2375855bf90b..1cefef9e5648 100644
--- a/Resources/Prototypes/Entities/Objects/base_shadow.yml
+++ b/Resources/Prototypes/Entities/Objects/base_shadow.yml
@@ -15,9 +15,6 @@
               path: /Audio/Items/hiss.ogg
               params:
                 variation: 0.08
-  - type: Flashable
-    collisionGroup:
-    - None
   - type: DamagedByFlashing
     flashDamage:
       types:
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index a991bf4035f8..27609b1bb542 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -59,3 +59,6 @@
 
 - type: statusEffect
   id: StaminaModifier
+
+- type: statusEffect
+  id: Flashed
diff --git a/Resources/Textures/Shaders/flashed_effect.swsl b/Resources/Textures/Shaders/flashed_effect.swsl
index ec486ab53130..519a9fdd99a0 100644
--- a/Resources/Textures/Shaders/flashed_effect.swsl
+++ b/Resources/Textures/Shaders/flashed_effect.swsl
@@ -11,7 +11,7 @@ void fragment() {
 
     highp vec4 textureMix = mix(tex1, tex2, 0.5);
 
-    // Gradually mixes between the texture mix and a full-white texture, causing the "blinding" effect
+    // Gradually mixes between the texture mix and a full-black texture, causing the "blinding" effect
     highp vec4 mixed = mix(vec4(0.0, 0.0, 0.0, 1.0), textureMix, percentComplete);
 
     COLOR = vec4(mixed.rgb, remaining);

From 827211369cd18c9377a9994ec97fd242a74b87fd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 2 Jun 2024 04:18:59 +0000
Subject: [PATCH 219/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index de9e112c59da..a6e7cbbc7112 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: Krunk
-  changes:
-  - message: Zombies and animals can be stripped once again.
-    type: Fix
-  - message: Dead or critical mobs can no longer be stripped instantly.
-    type: Fix
-  id: 6164
-  time: '2024-03-16T03:50:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26166
 - author: metalgearsloth
   changes:
   - message: Fix store refunds.
@@ -3853,3 +3844,12 @@
   id: 6663
   time: '2024-06-02T04:13:12.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28065
+- author: slarticodefast
+  changes:
+  - message: Fixed the flash effect getting darker with each appearence.
+    type: Fix
+  - message: Fixed short-sightedness making you immune to flashes.
+    type: Fix
+  id: 6664
+  time: '2024-06-02T04:17:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27369

From 452b53988c336ba6c45c16e9082f5bc91108bce1 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 2 Jun 2024 16:26:42 +1200
Subject: [PATCH 220/568] Add debug asserts to ensure that network groups are
 up to date (#28495)

---
 .../Power/Pow3r/BatteryRampPegSolver.cs       | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
index 0afd86679b17..12118968b70f 100644
--- a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
+++ b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Robust.Shared.Utility;
 using System.Linq;
 using Robust.Shared.Threading;
@@ -37,6 +38,7 @@ public void Tick(float frameTime, PowerState state, IParallelManager parallel)
             DebugTools.Assert(state.GroupedNets.Select(x => x.Count).Sum() == state.Networks.Count);
             _networkJob.State = state;
             _networkJob.FrameTime = frameTime;
+            ValidateNetworkGroups(state, state.GroupedNets);
 
             // Each network height layer can be run in parallel without issues.
             foreach (var group in state.GroupedNets)
@@ -321,9 +323,69 @@ private List<List<Network>> GroupByNetworkDepth(PowerState state)
                     RecursivelyEstimateNetworkDepth(state, network, groupedNetworks);
             }
 
+            ValidateNetworkGroups(state, groupedNetworks);
             return groupedNetworks;
         }
 
+        /// <summary>
+        /// Validate that network grouping is up to date. I.e., that it is safe to solve each networking in a given
+        /// group in parallel. This assumes that batteries are the only device that connects to multiple networks, and
+        /// is thus the only obstacle to solving everything in parallel.
+        /// </summary>
+        [Conditional("DEBUG")]
+        private void ValidateNetworkGroups(PowerState state, List<List<Network>> groupedNetworks)
+        {
+            HashSet<Network> nets = new();
+            HashSet<NodeId> netIds = new();
+            foreach (var layer in groupedNetworks)
+            {
+                nets.Clear();
+                netIds.Clear();
+
+                foreach (var net in layer)
+                {
+                    foreach (var batteryId in net.BatteryLoads)
+                    {
+                        var battery = state.Batteries[batteryId];
+                        if (battery.LinkedNetworkDischarging == default)
+                            continue;
+
+                        var subNet = state.Networks[battery.LinkedNetworkDischarging];
+                        if (battery.LinkedNetworkDischarging == net.Id)
+                        {
+                            DebugTools.Assert(subNet == net);
+                            continue;
+                        }
+
+                        DebugTools.Assert(!nets.Contains(subNet));
+                        DebugTools.Assert(!netIds.Contains(subNet.Id));
+                        DebugTools.Assert(subNet.Height < net.Height);
+                    }
+
+                    foreach (var batteryId in net.BatterySupplies)
+                    {
+                        var battery = state.Batteries[batteryId];
+                        if (battery.LinkedNetworkCharging == default)
+                            continue;
+
+                        var parentNet = state.Networks[battery.LinkedNetworkCharging];
+                        if (battery.LinkedNetworkCharging == net.Id)
+                        {
+                            DebugTools.Assert(parentNet == net);
+                            continue;
+                        }
+
+                        DebugTools.Assert(!nets.Contains(parentNet));
+                        DebugTools.Assert(!netIds.Contains(parentNet.Id));
+                        DebugTools.Assert(parentNet.Height > net.Height);
+                    }
+
+                    DebugTools.Assert(nets.Add(net));
+                    DebugTools.Assert(netIds.Add(net.Id));
+                }
+            }
+        }
+
         private static void RecursivelyEstimateNetworkDepth(PowerState state, Network network, List<List<Network>> groupedNetworks)
         {
             network.Height = -2;

From 79e841056ba2b4eb7f32c6c46c3c0c7d547c0f53 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 2 Jun 2024 16:27:48 +1200
Subject: [PATCH 221/568] Update engine to v224.0.0 (#28502)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index c89c529ba4fa..ff4548f108a5 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit c89c529ba4fa7516e2265f3c47549da35ab6c3d8
+Subproject commit ff4548f108a5b11e1a81cb7c01f7462400e4af2b

From ba04f94e480f9aed5f72eec0953396945f5d5d88 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Sat, 1 Jun 2024 23:21:07 -0700
Subject: [PATCH 222/568] Emergency Fix for Whitelist logic (#28510)

fix issue

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Shared/Materials/SharedMaterialStorageSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
index af815bdb2b7f..a27e0fb9cf0b 100644
--- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
@@ -123,7 +123,7 @@ public bool CanChangeMaterialAmount(EntityUid uid, string materialId, int volume
         if (!CanTakeVolume(uid, volume, component))
             return false;
 
-        if (component.MaterialWhiteList == null ? false : component.MaterialWhiteList.Contains(materialId))
+        if (component.MaterialWhiteList == null ? false : !component.MaterialWhiteList.Contains(materialId))
             return false;
 
         var amount = component.Storage.GetValueOrDefault(materialId);

From 16be126ca1e65ebc94a0d688d7d5eca749fc272d Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 2 Jun 2024 20:11:48 +1200
Subject: [PATCH 223/568] Remove `noSpawn: true` from action entity prototypes
 (#28508)

---
 Resources/Prototypes/Actions/borgs.yml        |  1 -
 Resources/Prototypes/Actions/crit.yml         |  3 ---
 Resources/Prototypes/Actions/diona.yml        |  2 --
 Resources/Prototypes/Actions/internals.yml    |  1 -
 Resources/Prototypes/Actions/mech.yml         |  3 ---
 Resources/Prototypes/Actions/ninja.yml        |  6 -----
 Resources/Prototypes/Actions/polymorph.yml    |  4 ---
 Resources/Prototypes/Actions/revenant.yml     |  5 ----
 Resources/Prototypes/Actions/speech.yml       |  1 -
 Resources/Prototypes/Actions/spider.yml       |  2 --
 Resources/Prototypes/Actions/types.yml        | 27 -------------------
 .../Clothing/Masks/base_clothingmask.yml      |  3 +--
 .../Entities/Clothing/Neck/misc.yml           |  1 -
 .../Entities/Clothing/Shoes/magboots.yml      |  5 ----
 .../Entities/Clothing/Shoes/misc.yml          |  1 -
 .../Entities/Mobs/NPCs/regalrat.yml           |  6 -----
 .../Entities/Mobs/Player/admin_ghost.yml      |  6 -----
 .../Entities/Mobs/Player/dragon.yml           |  3 ---
 .../Entities/Mobs/Player/guardian.yml         |  1 -
 .../Entities/Mobs/Player/observer.yml         |  5 ----
 .../Objects/Devices/chameleon_projector.yml   |  2 --
 .../Prototypes/Entities/Objects/Fun/pai.yml   |  2 --
 .../Objects/Specific/Chapel/bibles.yml        |  1 -
 .../Specific/Robotics/borg_modules.yml        |  1 -
 .../Entities/Objects/Tools/jetpacks.yml       |  1 -
 Resources/Prototypes/Magic/event_spells.yml   |  1 -
 .../Prototypes/Magic/forcewall_spells.yml     |  1 -
 Resources/Prototypes/Magic/knock_spell.yml    |  1 -
 .../Prototypes/Magic/projectile_spells.yml    |  3 ---
 Resources/Prototypes/Magic/rune_spells.yml    |  4 ---
 Resources/Prototypes/Magic/smite_spells.yml   |  1 -
 Resources/Prototypes/Magic/spawn_spells.yml   |  1 -
 Resources/Prototypes/Magic/staves.yml         |  1 -
 .../Prototypes/Magic/teleport_spells.yml      |  1 -
 Resources/Prototypes/Magic/utility_spells.yml |  1 -
 .../Prototypes/Roles/Jobs/Civilian/mime.yml   |  1 -
 36 files changed, 1 insertion(+), 108 deletions(-)

diff --git a/Resources/Prototypes/Actions/borgs.yml b/Resources/Prototypes/Actions/borgs.yml
index 6d35c69cf6ac..a0168ef00fc4 100644
--- a/Resources/Prototypes/Actions/borgs.yml
+++ b/Resources/Prototypes/Actions/borgs.yml
@@ -2,7 +2,6 @@
   id: ActionViewLaws
   name: View Laws
   description: View the laws that you must follow.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
diff --git a/Resources/Prototypes/Actions/crit.yml b/Resources/Prototypes/Actions/crit.yml
index 705ee6ee6b39..c5712844bf47 100644
--- a/Resources/Prototypes/Actions/crit.yml
+++ b/Resources/Prototypes/Actions/crit.yml
@@ -3,7 +3,6 @@
   id: ActionCritSuccumb
   name: Succumb
   description: Accept your fate.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -18,7 +17,6 @@
   id: ActionCritFakeDeath
   name: Fake Death
   description: Pretend to take your final breath while staying alive.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -34,7 +32,6 @@
   id: ActionCritLastWords
   name: Say Last Words
   description: Whisper your last words to anyone nearby, and then succumb to your fate. You only have 30 characters to work with.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
diff --git a/Resources/Prototypes/Actions/diona.yml b/Resources/Prototypes/Actions/diona.yml
index 11db30386a52..9f80f18178e7 100644
--- a/Resources/Prototypes/Actions/diona.yml
+++ b/Resources/Prototypes/Actions/diona.yml
@@ -2,7 +2,6 @@
   id: DionaGibAction
   name: Gib Yourself!
   description: Split apart into 3 nymphs.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -16,7 +15,6 @@
   id: DionaReformAction
   name: Reform
   description: Reform back into a whole Diona.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
diff --git a/Resources/Prototypes/Actions/internals.yml b/Resources/Prototypes/Actions/internals.yml
index dd83a45332fb..5982c3daa2a2 100644
--- a/Resources/Prototypes/Actions/internals.yml
+++ b/Resources/Prototypes/Actions/internals.yml
@@ -2,7 +2,6 @@
   id: ActionToggleInternals
   name: Toggle Internals
   description: Breathe from the equipped gas tank. Also requires equipped breath mask.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
diff --git a/Resources/Prototypes/Actions/mech.yml b/Resources/Prototypes/Actions/mech.yml
index 2005133a70b7..48092f9c5adf 100644
--- a/Resources/Prototypes/Actions/mech.yml
+++ b/Resources/Prototypes/Actions/mech.yml
@@ -2,7 +2,6 @@
   id: ActionMechCycleEquipment
   name: Cycle
   description: Cycles currently selected equipment
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -16,7 +15,6 @@
   id: ActionMechOpenUI
   name: Control Panel
   description: Opens the control panel for the mech
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -30,7 +28,6 @@
   id: ActionMechEject
   name: Eject
   description: Ejects the pilot from the mech
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
diff --git a/Resources/Prototypes/Actions/ninja.yml b/Resources/Prototypes/Actions/ninja.yml
index 5fe6f23b2767..adaf563692d9 100644
--- a/Resources/Prototypes/Actions/ninja.yml
+++ b/Resources/Prototypes/Actions/ninja.yml
@@ -3,7 +3,6 @@
   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.
-  noSpawn: true
   components:
   - type: InstantAction
     priority: -13
@@ -14,7 +13,6 @@
   id: ActionCreateThrowingStar
   name: Create throwing star
   description: Channels suit power into creating a throwing star that deals extra stamina damage.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 0.5
@@ -29,7 +27,6 @@
   id: ActionRecallKatana
   name: Recall katana
   description: Teleports the Energy Katana linked to this suit to its wearer, cost based on distance.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -44,7 +41,6 @@
   id: ActionNinjaEmp
   name: EM Burst
   description: Disable any nearby technology with an electro-magnetic pulse.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -58,7 +54,6 @@
   id: ActionTogglePhaseCloak
   name: Phase cloak
   description: Toggles your suit's phase cloak. Beware that if you are hit, all abilities are disabled for 5 seconds, including your cloak!
-  noSpawn: true
   components:
   - type: InstantAction
     # have to plan (un)cloaking ahead of time
@@ -71,7 +66,6 @@
   id: ActionEnergyKatanaDash
   name: Katana dash
   description: Teleport to anywhere you can see, if your Energy Katana is in your hand.
-  noSpawn: true
   components:
   - type: WorldTargetAction
     icon:
diff --git a/Resources/Prototypes/Actions/polymorph.yml b/Resources/Prototypes/Actions/polymorph.yml
index 445dc8d9f54f..81feba4eaccc 100644
--- a/Resources/Prototypes/Actions/polymorph.yml
+++ b/Resources/Prototypes/Actions/polymorph.yml
@@ -2,14 +2,12 @@
   id: ActionRevertPolymorph
   name: Revert
   description: Revert back into your original form.
-  noSpawn: true
   components:
   - type: InstantAction
     event: !type:RevertPolymorphActionEvent
 
 - type: entity
   id: ActionPolymorph
-  noSpawn: true
   components:
   - type: InstantAction
     event: !type:PolymorphActionEvent
@@ -19,7 +17,6 @@
   id: ActionPolymorphWizardSpider
   name: Spider Polymorph
   description: Polymorphs you into a Spider.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 60
@@ -34,7 +31,6 @@
   id: ActionPolymorphWizardRod
   name: Rod Form
   description: CLANG!
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 60
diff --git a/Resources/Prototypes/Actions/revenant.yml b/Resources/Prototypes/Actions/revenant.yml
index da7b4ba56f21..dca491a99b53 100644
--- a/Resources/Prototypes/Actions/revenant.yml
+++ b/Resources/Prototypes/Actions/revenant.yml
@@ -2,7 +2,6 @@
   id: ActionRevenantShop
   name: Shop
   description: Opens the ability shop.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/shop.png
@@ -12,7 +11,6 @@
   id: ActionRevenantDefile
   name: Defile
   description: Costs 30 Essence.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/defile.png
@@ -23,7 +21,6 @@
   id: ActionRevenantOverloadLights
   name: Overload Lights
   description: Costs 40 Essence.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/overloadlight.png
@@ -34,7 +31,6 @@
 #  id: ActionRevenantBlight
 #  name: Blight
 #  description: Costs 50 Essence.
-#  noSpawn: true
 #  components:
 #  - type: InstantAction
 #    icon: Interface/Actions/blight.png
@@ -45,7 +41,6 @@
   id: ActionRevenantMalfunction
   name: Malfunction
   description: Costs 60 Essence.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/malfunction.png
diff --git a/Resources/Prototypes/Actions/speech.yml b/Resources/Prototypes/Actions/speech.yml
index 39db04b1b31f..c71ec74880c5 100644
--- a/Resources/Prototypes/Actions/speech.yml
+++ b/Resources/Prototypes/Actions/speech.yml
@@ -2,7 +2,6 @@
   id: ActionConfigureMeleeSpeech
   name: Set Battlecry
   description: Set a custom battlecry for when you attack!
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigItem
diff --git a/Resources/Prototypes/Actions/spider.yml b/Resources/Prototypes/Actions/spider.yml
index 14b9fb6ccbbb..fe37085ecabc 100644
--- a/Resources/Prototypes/Actions/spider.yml
+++ b/Resources/Prototypes/Actions/spider.yml
@@ -2,7 +2,6 @@
   id: ActionSpiderWeb
   name: Spider Web
   description: Spawns a web that slows your prey down.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/web.png
@@ -13,7 +12,6 @@
   id: ActionSericulture
   name: Weave silk
   description: Weave a bit of silk for use in arts and crafts.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/web.png
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index fb156a732e6d..4b3d75bf920e 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -13,7 +13,6 @@
   id: ActionScream
   name: Scream
   description: AAAAAAAAAAAAAAAAAAAAAAAAA
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
@@ -25,7 +24,6 @@
   id: ActionTurnUndead
   name: Turn Undead
   description: Succumb to your infection and become a zombie.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -37,7 +35,6 @@
   id: ActionToggleLight
   name: Toggle Light
   description: Turn the light on and off.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
@@ -48,7 +45,6 @@
   id: ActionOpenStorageImplant
   name: Open Storage Implant
   description: Opens the storage implant embedded under your skin
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigAction
@@ -63,7 +59,6 @@
   id: ActionActivateMicroBomb
   name: Activate Microbomb
   description: Activates your internal microbomb, completely destroying you and your equipment
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -80,7 +75,6 @@
   id: ActionActivateDeathAcidifier
   name: Activate Death-Acidifier
   description: Activates your death-acidifier, completely melting you and your equipment
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -96,7 +90,6 @@
   id: ActionActivateFreedomImplant
   name: Break Free
   description: Activating your freedom implant will free you from any hand restraints
-  noSpawn: true
   components:
   - type: InstantAction
     charges: 3
@@ -112,7 +105,6 @@
   id: ActionOpenUplinkImplant
   name: Open Uplink
   description: Opens the syndicate uplink embedded under your skin
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigAction
@@ -126,7 +118,6 @@
   id: ActionActivateEmpImplant
   name: Activate EMP
   description: Triggers a small EMP pulse around you
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -143,7 +134,6 @@
   id: ActionActivateScramImplant
   name: SCRAM!
   description: Randomly teleports you within a large distance.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -160,7 +150,6 @@
   id: ActionActivateDnaScramblerImplant
   name: Scramble DNA
   description:  Randomly changes your name and appearance.
-  noSpawn: true
   components:
   - type: InstantAction
     charges: 1
@@ -175,7 +164,6 @@
   id: ActionMorphGeras
   name: Morph into Geras
   description:  Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigAction
@@ -190,7 +178,6 @@
   id: ActionToggleSuitPiece
   name: Toggle Suit Piece
   description: Remember to equip the important pieces of your suit before going into action.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigItem
@@ -201,7 +188,6 @@
   id: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -216,7 +202,6 @@
   parent: ActionCombatModeToggle
   name: "[color=red]Combat Mode[/color]"
   description: Enter combat mode
-  noSpawn: true
   components:
   - type: InstantAction
     enabled: false
@@ -227,7 +212,6 @@
   id: ActionChangeVoiceMask
   name: Set name
   description: Change the name others hear to something else.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
@@ -237,7 +221,6 @@
   id: ActionVendingThrow
   name: Dispense Item
   description: Randomly dispense an item from your stock.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 30
@@ -247,7 +230,6 @@
   id: ActionArtifactActivate
   name: Activate Artifact
   description: Immediately activates your current artifact node.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -260,7 +242,6 @@
   id: ActionToggleBlock
   name: Block
   description: Raise or lower your shield.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-icon }
@@ -271,7 +252,6 @@
   id: ActionClearNetworkLinkOverlays
   name: Clear network link overlays
   description: Clear network link overlays.
-  noSpawn: true
   components:
   - type: InstantAction
     clientExclusive: true
@@ -285,7 +265,6 @@
   id: ActionAnimalLayEgg
   name: Lay egg
   description: Uses hunger to lay an egg.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
@@ -296,7 +275,6 @@
   id: ActionSleep
   name: Sleep
   description: Go to sleep.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -308,7 +286,6 @@
   id: ActionWake
   name: Wake up
   description: Stop sleeping.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
@@ -320,7 +297,6 @@
   id: ActionActivateHonkImplant
   name: Honk
   description: Activates your honking implant, which will produce the signature sound of the clown.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
@@ -331,7 +307,6 @@
   id: ActionFireStarter
   name: Ignite
   description: Ignites enemies in a radius around you.
-  noSpawn: true
   components:
   - type: InstantAction
     priority: -1
@@ -343,7 +318,6 @@
   id: ActionToggleEyes
   name: Open/Close eyes
   description: Close your eyes to protect your peepers, or open your eyes to enjoy the pretty lights.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/eyeopen.png
@@ -357,7 +331,6 @@
   id: ActionToggleWagging
   name: action-name-toggle-wagging
   description: action-description-toggle-wagging
-  noSpawn: true
   components:
     - type: InstantAction
       icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
index 3531a26a6c5b..00dcd8263f44 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -21,7 +21,6 @@
   id: ActionToggleMask
   name: Toggle Mask
   description: Handy, but prevents insertion of pie into your pie hole.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Mask/gas.rsi, state: icon }
@@ -49,4 +48,4 @@
           Quantity: 10
   - type: Tag
     tags:
-      - ClothMade
\ No newline at end of file
+      - ClothMade
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 51325c0bbbd0..8dfc709bc4f1 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -70,7 +70,6 @@
 - type: entity
   id: ActionStethoscope
   name: Listen with stethoscope
-  noSpawn: true
   components:
   - type: EntityTargetAction
     icon:
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index 485d530ea5a7..e80ed74305c6 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -132,7 +132,6 @@
   id: ActionBaseToggleMagboots
   name: Toggle Magboots
   description: Toggles the magboots on and off.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
@@ -141,7 +140,6 @@
 - type: entity
   id: ActionToggleMagboots
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots.rsi, state: icon }
@@ -150,7 +148,6 @@
 - type: entity
   id: ActionToggleMagbootsAdvanced
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots-advanced.rsi, state: icon }
@@ -159,7 +156,6 @@
 - type: entity
   id: ActionToggleMagbootsSci
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots-science.rsi, state: icon }
@@ -168,7 +164,6 @@
 - type: entity
   id: ActionToggleMagbootsSyndie
   parent: ActionBaseToggleMagboots
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi, state: icon }
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index d5a695c7c0ba..cbea9d319d91 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -128,7 +128,6 @@
   id: ActionToggleSpeedBoots
   name: Toggle Speed Boots
   description: Toggles the speed boots on and off.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: NoItem
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index aa12eac1c2dc..38debe2a9a79 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -301,7 +301,6 @@
   id: ActionRatKingRaiseArmy
   name: Raise Army
   description: Spend some hunger to summon an allied rat to help defend you.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 4
@@ -314,7 +313,6 @@
   id: ActionRatKingDomain
   name: Rat King's Domain
   description: Spend some hunger to release a cloud of ammonia into the air.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 6
@@ -327,7 +325,6 @@
   id: ActionRatKingOrderStay
   name: Stay
   description: Command your army to stand in place.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -346,7 +343,6 @@
   id: ActionRatKingOrderFollow
   name: Follow
   description: Command your army to follow you around.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -365,7 +361,6 @@
   id: ActionRatKingOrderCheeseEm
   name: Cheese 'Em
   description: Command your army to attack whoever you point at.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
@@ -384,7 +379,6 @@
   id: ActionRatKingOrderLoose
   name: Loose
   description: Command your army to act at their own will.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 1
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 0fa85fc84f21..4a83593bc342 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -97,7 +97,6 @@
   id: ActionAGhostShowSolar
   name: Solar Control Interface
   description: View a solar control interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -110,7 +109,6 @@
   id: ActionAGhostShowCommunications
   name: Communications Interface
   description: View a communications interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -123,7 +121,6 @@
   id: ActionAGhostShowRadar
   name: Mass Scanner Interface
   description: View a mass scanner interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -136,7 +133,6 @@
   id: ActionAGhostShowCargo
   name: Cargo Ordering Interface
   description: View a cargo ordering interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -149,7 +145,6 @@
   id: ActionAGhostShowCrewMonitoring
   name: Crew Monitoring Interface
   description: View a crew monitoring interface.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -162,7 +157,6 @@
   id: ActionAGhostShowStationRecords
   name: Station Records Interface
   description: View a station records Interface
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 258488af9b46..869fb880841c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -203,7 +203,6 @@
   id: ActionSpawnRift
   name: Summon Carp Rift
   description: Summons a carp rift that will periodically spawns carps.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
@@ -217,7 +216,6 @@
   id: ActionDevour
   name: "[color=red]Devour[/color]"
   description: Attempt to break a structure with your jaws or swallow a creature.
-  noSpawn: true
   components:
   - type: EntityTargetAction
     icon: { sprite : Interface/Actions/devour.rsi, state: icon }
@@ -226,7 +224,6 @@
     priority: 1
 
 - type: entity
-  noSpawn: true
   id: ActionDragonsBreath
   name: "[color=orange]Dragon's Breath[/color]"
   description: Spew out flames at anyone foolish enough to attack you!
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 80ee2c55b88a..9ccfdf4e507c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -259,7 +259,6 @@
   id: ActionToggleGuardian
   name: Toggle Guardian
   description: Either manifests the guardian or recalls it back into your body
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/manifest.png
diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
index 114c3fa74798..85be42cc0255 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -53,7 +53,6 @@
   id: ActionGhostBoo
   name: Boo!
   description: Scare your crew members because of boredom!
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/Actions/scream.png
@@ -65,7 +64,6 @@
   id: ActionToggleLighting
   name: Toggle All Lighting
   description: Toggle all light rendering to better observe dark areas.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/VerbIcons/light.svg.192dpi.png
@@ -77,7 +75,6 @@
   id: ActionToggleFov
   name: Toggle FoV
   description: Toggles field-of-view in order to see what players see.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: Interface/VerbIcons/vv.svg.192dpi.png
@@ -89,7 +86,6 @@
   id: ActionToggleGhosts
   name: Toggle Ghosts
   description: Toggle the visibility of other ghosts.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Mobs/Ghosts/ghost_human.rsi, state: icon }
@@ -101,7 +97,6 @@
   id: ActionToggleGhostHearing
   name: Toggle Ghost Hearing
   description: Toggle between hearing all messages and hearing only radio & nearby messages.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
index e02128102102..20e138f81a0c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
@@ -49,7 +49,6 @@
 
 # actions
 - type: entity
-  noSpawn: true
   id: ActionDisguiseNoRot
   name: Toggle Rotation
   description: Use this to prevent your disguise from rotating, making it easier to hide in some scenarios.
@@ -59,7 +58,6 @@
     event: !type:DisguiseToggleNoRotEvent
 
 - type: entity
-  noSpawn: true
   id: ActionDisguiseAnchor
   name: Toggle Anchored
   description: For many objects you will want to be anchored to not be completely obvious.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 1b9c5303c6b2..02bbce2843b4 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -136,7 +136,6 @@
   id: ActionPAIPlayMidi
   name: Play MIDI
   description: Open your portable MIDI interface to soothe your owner.
-  noSpawn: true
   components:
   - type: InstantAction
     checkCanInteract: false
@@ -149,7 +148,6 @@
   id: ActionPAIOpenMap
   name: Open Map
   description: Open your map interface and guide your owner.
-  noSpawn: true
   components:
     - type: InstantAction
       checkCanInteract: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index f6b2b0a70c6e..58f7e0155082 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -80,7 +80,6 @@
   id: ActionBibleSummon
   name: Summon familiar
   description: Summon a familiar that will aid you and gain humanlike intelligence once inhabited by a soul.
-  noSpawn: true
   components:
   - type: InstantAction
     icon: { sprite: Clothing/Head/Hats/witch.rsi, state: icon }
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 07206711d966..74e91a768cdd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -32,7 +32,6 @@
   id: ActionBorgSwapModule
   name: Swap Module
   description: Select this module, enabling you to use the tools it provides.
-  noSpawn: true
   components:
   - type: InstantAction
     itemIconStyle: BigItem
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index 04f8b9f9f6d1..6fee48daf147 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -62,7 +62,6 @@
   id: ActionToggleJetpack
   name: Toggle jetpack
   description: Toggles the jetpack, giving you movement outside the station.
-  noSpawn: true
   components:
   - type: InstantAction
     icon:
diff --git a/Resources/Prototypes/Magic/event_spells.yml b/Resources/Prototypes/Magic/event_spells.yml
index e59e1b2db881..01006b4ffe09 100644
--- a/Resources/Prototypes/Magic/event_spells.yml
+++ b/Resources/Prototypes/Magic/event_spells.yml
@@ -2,7 +2,6 @@
   id: ActionSummonGhosts
   name: Summon Ghosts
   description: Makes all current ghosts permanently invisible
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 120
diff --git a/Resources/Prototypes/Magic/forcewall_spells.yml b/Resources/Prototypes/Magic/forcewall_spells.yml
index d3d8fef76086..f1865cf72291 100644
--- a/Resources/Prototypes/Magic/forcewall_spells.yml
+++ b/Resources/Prototypes/Magic/forcewall_spells.yml
@@ -2,7 +2,6 @@
   id: ActionForceWall
   name: Forcewall
   description: Creates a magical barrier.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
diff --git a/Resources/Prototypes/Magic/knock_spell.yml b/Resources/Prototypes/Magic/knock_spell.yml
index e2c3dcfd4c7e..5ba456d3be99 100644
--- a/Resources/Prototypes/Magic/knock_spell.yml
+++ b/Resources/Prototypes/Magic/knock_spell.yml
@@ -2,7 +2,6 @@
   id: ActionKnock
   name: Knock
   description: This spell opens nearby doors.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
diff --git a/Resources/Prototypes/Magic/projectile_spells.yml b/Resources/Prototypes/Magic/projectile_spells.yml
index b8db7557bba6..71bbc096c555 100644
--- a/Resources/Prototypes/Magic/projectile_spells.yml
+++ b/Resources/Prototypes/Magic/projectile_spells.yml
@@ -2,7 +2,6 @@
   id: ActionFireball
   name: Fireball
   description: Fires an explosive fireball towards the clicked location.
-  noSpawn: true
   components:
   - type: Magic
   - type: WorldTargetAction
@@ -29,7 +28,6 @@
   parent: ActionFireball
   name: Fireball II
   description: Fires a fireball, but faster!
-  noSpawn: true
   components:
   - type: WorldTargetAction
     useDelay: 10
@@ -52,7 +50,6 @@
   parent: ActionFireball
   name: Fireball III
   description: The fastest fireball in the west!
-  noSpawn: true
   components:
     - type: WorldTargetAction
       useDelay: 8
diff --git a/Resources/Prototypes/Magic/rune_spells.yml b/Resources/Prototypes/Magic/rune_spells.yml
index 42022f578503..7ba357e7c134 100644
--- a/Resources/Prototypes/Magic/rune_spells.yml
+++ b/Resources/Prototypes/Magic/rune_spells.yml
@@ -2,7 +2,6 @@
   id: ActionFlashRune
   name: Flash Rune
   description: Summons a rune that flashes if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
@@ -17,7 +16,6 @@
   id: ActionExplosionRune
   name: Explosion Rune
   description: Summons a rune that explodes if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 20
@@ -32,7 +30,6 @@
   id: ActionIgniteRune
   name: Ignite Rune
   description: Summons a rune that ignites if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 15
@@ -47,7 +44,6 @@
   id: ActionStunRune
   name: Stun Rune
   description: Summons a rune that stuns if used.
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 10
diff --git a/Resources/Prototypes/Magic/smite_spells.yml b/Resources/Prototypes/Magic/smite_spells.yml
index e629e5650588..10f5bdd53893 100644
--- a/Resources/Prototypes/Magic/smite_spells.yml
+++ b/Resources/Prototypes/Magic/smite_spells.yml
@@ -2,7 +2,6 @@
   id: ActionSmite
   name: Smite
   description: Instantly gibs a target.
-  noSpawn: true
   components:
   - type: EntityTargetAction
     useDelay: 60
diff --git a/Resources/Prototypes/Magic/spawn_spells.yml b/Resources/Prototypes/Magic/spawn_spells.yml
index 3f8148b83cba..76674d5bfa88 100644
--- a/Resources/Prototypes/Magic/spawn_spells.yml
+++ b/Resources/Prototypes/Magic/spawn_spells.yml
@@ -2,7 +2,6 @@
   id: ActionSpawnMagicarpSpell
   name: Summon Magicarp
   description: This spell summons three Magi-Carp to your aid! May or may not turn on user.
-  noSpawn: true
   components:
   - type: WorldTargetAction
     useDelay: 10
diff --git a/Resources/Prototypes/Magic/staves.yml b/Resources/Prototypes/Magic/staves.yml
index ef94a3910fd7..ccabb516fd4c 100644
--- a/Resources/Prototypes/Magic/staves.yml
+++ b/Resources/Prototypes/Magic/staves.yml
@@ -34,7 +34,6 @@
 
 - type: entity
   id: ActionRgbLight
-  noSpawn: true
   components:
   - type: EntityTargetAction
     whitelist: { components: [ PointLight ] }
diff --git a/Resources/Prototypes/Magic/teleport_spells.yml b/Resources/Prototypes/Magic/teleport_spells.yml
index cc89cf8ee0d8..6f1ed9a6e43a 100644
--- a/Resources/Prototypes/Magic/teleport_spells.yml
+++ b/Resources/Prototypes/Magic/teleport_spells.yml
@@ -2,7 +2,6 @@
   id: ActionBlink
   name: Blink
   description: Teleport to the clicked location.
-  noSpawn: true
   components:
   - type: WorldTargetAction
     useDelay: 10
diff --git a/Resources/Prototypes/Magic/utility_spells.yml b/Resources/Prototypes/Magic/utility_spells.yml
index dccdda378981..90bcdc7487bd 100644
--- a/Resources/Prototypes/Magic/utility_spells.yml
+++ b/Resources/Prototypes/Magic/utility_spells.yml
@@ -2,7 +2,6 @@
   id: ActionChargeSpell
   name: Charge
   description: Adds a charge back to your wand
-  noSpawn: true
   components:
   - type: InstantAction
     useDelay: 30
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 1eac292eee3a..27a164210bc3 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -33,7 +33,6 @@
   id: ActionMimeInvisibleWall
   name: Create Invisible Wall
   description: Create an invisible wall in front of you, if placeable there.
-  noSpawn: true
   components:
   - type: InstantAction
     priority: -1

From 77a3d6c6f12e10031f6a6e5723705c515389279b Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 3 Jun 2024 02:59:22 +1200
Subject: [PATCH 224/568] Update engine to v224.0.1 (#28520)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index ff4548f108a5..f64821875655 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit ff4548f108a5b11e1a81cb7c01f7462400e4af2b
+Subproject commit f64821875655dfec4e2c951d5c22c0db873fe86e

From 9a23a6c695400d2b583b1a77e503cd366fb28cdc Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sun, 2 Jun 2024 12:52:40 -0400
Subject: [PATCH 225/568] Fix mid round antags not starting (#28523)

---
 Content.Server/StationEvents/Events/StationEventSystem.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index 38390cedb1a9..35dc646bce67 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -98,7 +98,11 @@ public override void Update(float frameTime)
             if (!GameTicker.IsGameRuleAdded(uid, ruleData))
                 continue;
 
-            if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
+            if (!GameTicker.IsGameRuleActive(uid, ruleData) && !HasComp<DelayedStartRuleComponent>(uid))
+            {
+                GameTicker.StartGameRule(uid, ruleData);
+            }
+            else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
             {
                 GameTicker.EndGameRule(uid, ruleData);
             }

From 6b40b5269e1c8ee9c7475ec753b3f9baf2931cea Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 2 Jun 2024 16:53:47 +0000
Subject: [PATCH 226/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a6e7cbbc7112..0bfd57a3b93f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fix store refunds.
-    type: Fix
-  id: 6165
-  time: '2024-03-16T14:06:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26173
 - author: LordCarve
   changes:
   - message: Decayed anomalies no longer show as having gone supercritical in logs.
@@ -3853,3 +3846,10 @@
   id: 6664
   time: '2024-06-02T04:17:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27369
+- author: AJCM-git
+  changes:
+  - message: Midround antags work again
+    type: Fix
+  id: 6665
+  time: '2024-06-02T16:52:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28523

From 66835ac84e01890aaffaa823b9d08cb25758f66f Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sun, 2 Jun 2024 19:30:27 +0200
Subject: [PATCH 227/568] Beacons no longer glitch off on grid split (#28518)

---
 Content.Server/Pinpointer/NavMapSystem.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index dba964753f87..424b6427de4b 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -237,6 +237,16 @@ private void RefreshGrid(EntityUid uid, NavMapComponent component, MapGridCompon
         component.Chunks.Clear();
         component.Beacons.Clear();
 
+        // Refresh beacons
+        var query = EntityQueryEnumerator<NavMapBeaconComponent, TransformComponent>();
+        while (query.MoveNext(out var qUid, out var qNavComp, out var qTransComp))
+        {
+            if (qTransComp.ParentUid != uid)
+                continue;
+
+            UpdateNavMapBeaconData(qUid, qNavComp);
+        }
+
         // Loop over all tiles
         var tileRefs = _mapSystem.GetAllTiles(uid, mapGrid);
 

From 054118757b619c5b0307e10c16797d166c639dc7 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 2 Jun 2024 17:31:33 +0000
Subject: [PATCH 228/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0bfd57a3b93f..ec5569327f65 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: LordCarve
-  changes:
-  - message: Decayed anomalies no longer show as having gone supercritical in logs.
-    type: Fix
-  id: 6166
-  time: '2024-03-16T17:31:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26180
 - author: Velcroboy
   changes:
   - message: Tweaked gas canisters to pass through cargo flaps.
@@ -3853,3 +3846,10 @@
   id: 6665
   time: '2024-06-02T16:52:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28523
+- author: Errant-4
+  changes:
+  - message: Map labels no longer suddenly disappear for the rest of the round.
+    type: Fix
+  id: 6666
+  time: '2024-06-02T17:30:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28518

From c5918648668e50cd3cce7a651f978d3bc2bdafee Mon Sep 17 00:00:00 2001
From: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Date: Sun, 2 Jun 2024 15:13:57 -0400
Subject: [PATCH 229/568] Drawl capitalization coldfix (part 2: rise of
 accidentally commiting to master) (#26639)

fixed finally yay
---
 .../EntitySystems/SouthernAccentSystem.cs      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
index b9260eb84415..c1f8a0be30be 100644
--- a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -5,9 +5,12 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class SouthernAccentSystem : EntitySystem
 {
-    private static readonly Regex RegexIng = new(@"ing\b");
-    private static readonly Regex RegexAnd = new(@"\band\b");
-    private static readonly Regex RegexDve = new("d've");
+    private static readonly Regex RegexLowerIng = new(@"ing\b");
+    private static readonly Regex RegexUpperIng = new(@"ING\b");
+    private static readonly Regex RegexLowerAnd = new(@"\band\b");
+    private static readonly Regex RegexUpperAnd = new(@"\bAND\b");
+    private static readonly Regex RegexLowerDve = new(@"d've\b");
+    private static readonly Regex RegexUpperDve = new(@"D'VE\b");
 
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
 
@@ -24,9 +27,12 @@ private void OnAccent(EntityUid uid, SouthernAccentComponent component, AccentGe
         message = _replacement.ApplyReplacements(message, "southern");
 
         //They shoulda started runnin' an' hidin' from me!
-        message = RegexIng.Replace(message, "in'");
-        message = RegexAnd.Replace(message, "an'");
-        message = RegexDve.Replace(message, "da");
+        message = RegexLowerIng.Replace(message, "in'");
+        message = RegexUpperIng.Replace(message, "IN'");
+        message = RegexLowerAnd.Replace(message, "an'");
+        message = RegexUpperAnd.Replace(message, "AN'");
+        message = RegexLowerDve.Replace(message, "da");
+        message = RegexUpperDve.Replace(message, "DA");
         args.Message = message;
     }
 };

From 4eadbbc39d2df69aace020583f1f5c57d0826c85 Mon Sep 17 00:00:00 2001
From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Date: Sun, 2 Jun 2024 21:40:02 +0200
Subject: [PATCH 230/568] fix typos in bonfire descriptions (#28515)

* fix typo

* a
---
 Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index cc69a6304d11..29efdaea5d36 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -2,7 +2,7 @@
   id: Bonfire
   parent: BaseStructure
   name: bonfire
-  description: What can be better then late evening under the sky with guitar and friends.
+  description: What can be better than a late evening under the sky with guitar and friends?
   components:
   - type: Sprite
     noRot: true

From 81821e87af5e14c6399482c0cc0f34aa73b86a02 Mon Sep 17 00:00:00 2001
From: stellar-novas <stellar_novas@riseup.net>
Date: Sun, 2 Jun 2024 15:49:31 -0400
Subject: [PATCH 231/568] Update to nixpkgs 24.05 (#28529)

---
 flake.lock | 14 +++++++-------
 flake.nix  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6ab38fa41bd8..7baaa468ea56 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708210246,
-        "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
+        "lastModified": 1717352157,
+        "narHash": "sha256-hbBzucWOhwxt3QzeAyUojtD6/aHH81JssDfhFfmqOy0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
+        "rev": "44f538ab12e2726af450877a5529f4fd88ddb0fb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e2e119eb9971..095e6b017c7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Development environment for Space Station 14";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   outputs = { self, nixpkgs, flake-utils }:

From 504208c6656bb7e56681c23e3e46092c3205c940 Mon Sep 17 00:00:00 2001
From: Voomra <dimon550@gmail.com>
Date: Mon, 3 Jun 2024 02:51:19 +0300
Subject: [PATCH 232/568] fix: localize PraySystem UI (#28535)

tweak: localize PraySystem UI
---
 Content.Server/Prayer/PrayerSystem.cs      | 2 +-
 Resources/Locale/en-US/prayers/prayers.ftl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs
index c8ef368dadfd..3b1ec3fa0838 100644
--- a/Content.Server/Prayer/PrayerSystem.cs
+++ b/Content.Server/Prayer/PrayerSystem.cs
@@ -54,7 +54,7 @@ private void AddPrayVerb(EntityUid uid, PrayableComponent comp, GetVerbsEvent<Ac
                     return;
                 }
 
-                _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString(comp.Verb), "Message", (string message) =>
+                _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString(comp.Verb), Loc.GetString("prayer-popup-notify-pray-ui-message"), (string message) =>
                 {
                     Pray(actor.PlayerSession, comp, message);
                 });
diff --git a/Resources/Locale/en-US/prayers/prayers.ftl b/Resources/Locale/en-US/prayers/prayers.ftl
index 07713bc8216c..532ba4954f09 100644
--- a/Resources/Locale/en-US/prayers/prayers.ftl
+++ b/Resources/Locale/en-US/prayers/prayers.ftl
@@ -13,3 +13,4 @@ prayer-popup-notify-centcom-sent = You left a voicemail message for Central Comm
 prayer-popup-notify-syndicate-sent = You left a voicemail message for Syndicate High Command...
 prayer-popup-notify-pray-sent = Your message has been sent to the gods...
 prayer-popup-notify-pray-locked = You don't feel worthy enough...
+prayer-popup-notify-pray-ui-message = Message

From 947ed7bb22655e2499f27e521766e094663b13dc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 2 Jun 2024 23:52:25 +0000
Subject: [PATCH 233/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ec5569327f65..53f9f65ab332 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Velcroboy
-  changes:
-  - message: Tweaked gas canisters to pass through cargo flaps.
-    type: Tweak
-  id: 6167
-  time: '2024-03-17T00:55:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26193
 - author: metalgearsloth
   changes:
   - message: Fix ID cards sometimes not loading properly.
@@ -3853,3 +3846,10 @@
   id: 6666
   time: '2024-06-02T17:30:27.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28518
+- author: Voomra
+  changes:
+  - message: localize Pray UI
+    type: Fix
+  id: 6667
+  time: '2024-06-02T23:51:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28535

From 307a0428c7fa324a69ec93fc0faf2a3679cd83de Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 3 Jun 2024 03:05:18 +0200
Subject: [PATCH 234/568] Shut up a child throwing a tantrum (#28538)

---
 Resources/Credits/GitHub.txt       | 2 +-
 Tools/contribs_shared.ps1          | 2 ++
 Tools/dump_github_contributors.ps1 | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index b3627580b1b8..f240c9524751 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Tools/contribs_shared.ps1 b/Tools/contribs_shared.ps1
index ba97c50a9a38..a3638b41b8d0 100644
--- a/Tools/contribs_shared.ps1
+++ b/Tools/contribs_shared.ps1
@@ -12,3 +12,5 @@ $ignore = @{
     "ZDDM" = $true
     "TYoung86" = $true
 }
+
+$add = @("RamZ")
diff --git a/Tools/dump_github_contributors.ps1 b/Tools/dump_github_contributors.ps1
index 51d8612b28ad..10e74bcf0b52 100755
--- a/Tools/dump_github_contributors.ps1
+++ b/Tools/dump_github_contributors.ps1
@@ -29,7 +29,7 @@ function load_contribs([string] $repo)
 $engineJson = load_contribs("space-wizards/RobustToolbox")
 $contentJson = load_contribs("space-wizards/space-station-14")
 
-($engineJson).login + ($contentJson).login `
+($engineJson).login + ($contentJson).login + ($add) `
     | select -unique `
     | Where-Object { -not $ignore[$_] }`
     | ForEach-Object { if($replacements[$_] -eq $null){ $_ } else { $replacements[$_] }} `

From 9dbdacda9533304004382ebf5f8c63a32e50916e Mon Sep 17 00:00:00 2001
From: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Date: Sun, 2 Jun 2024 22:18:49 -0400
Subject: [PATCH 235/568] Rename admin cloak to weh cloak (#28540)

---
 Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index 35a793791cc7..a329c4034b6e 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -8,7 +8,7 @@
     sprite: Clothing/Neck/Cloaks/centcomcloakformal.rsi
   - type: StealTarget
     stealGroup: HeadCloak # leaving this here because I suppose it might be interesting?
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakCap
@@ -118,7 +118,7 @@
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakAdmin
-  name: admin cloak
+  name: weh cloak
   description: Weh!
   components:
   - type: Sprite

From 7ecff3e6996c4141e70611f4fb7585d1fcb983e5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 02:19:55 +0000
Subject: [PATCH 236/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 53f9f65ab332..b60296408149 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fix ID cards sometimes not loading properly.
-    type: Fix
-  id: 6168
-  time: '2024-03-17T01:10:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26195
 - author: 21Melkuu
   changes:
   - message: Add new explosion-proof backpack in aplink.
@@ -3853,3 +3846,10 @@
   id: 6667
   time: '2024-06-02T23:51:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28535
+- author: Whisper
+  changes:
+  - message: Renamed the player-obtainable "admin cloak" to "weh cloak".
+    type: Tweak
+  id: 6668
+  time: '2024-06-03T02:18:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28540

From 509e3aedf7b91c1e1d11e5a885608bc92909f552 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sun, 2 Jun 2024 23:28:38 -0400
Subject: [PATCH 237/568] RespawnRuleSystem tweaks. (#28528)

---
 .../Components/RespawnDeadRuleComponent.cs    |   5 +
 .../Components/RespawnTrackerComponent.cs     |  12 +-
 .../GameTicking/Rules/DeathMatchRuleSystem.cs |   4 +-
 .../GameTicking/Rules/RespawnRuleSystem.cs    | 115 +++++++++---------
 Resources/Prototypes/GameRules/roundstart.yml |  11 ++
 5 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs
index fafe811dd922..f6e4a3b1290a 100644
--- a/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/RespawnDeadRuleComponent.cs
@@ -6,4 +6,9 @@
 [RegisterComponent, Access(typeof(RespawnRuleSystem))]
 public sealed partial class RespawnDeadRuleComponent : Component
 {
+    /// <summary>
+    /// Whether or not we want to add everyone who dies to the respawn tracker
+    /// </summary>
+    [DataField]
+    public bool AlwaysRespawnDead;
 }
diff --git a/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs b/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs
index 3d338c2d1336..b9c8fe109624 100644
--- a/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/RespawnTrackerComponent.cs
@@ -13,18 +13,24 @@ public sealed partial class RespawnTrackerComponent : Component
     /// A list of the people that should be respawned.
     /// Used to make sure that we don't respawn aghosts or observers.
     /// </summary>
-    [DataField("players")]
+    [DataField]
     public HashSet<NetUserId> Players = new();
 
     /// <summary>
     /// The delay between dying and respawning.
     /// </summary>
-    [DataField("respawnDelay")]
+    [DataField]
     public TimeSpan RespawnDelay = TimeSpan.Zero;
 
     /// <summary>
     /// A dictionary of player netuserids and when they will respawn.
     /// </summary>
-    [DataField("respawnQueue")]
+    [DataField]
     public Dictionary<NetUserId, TimeSpan> RespawnQueue = new();
+
+    /// <summary>
+    /// Whether or not to delete the original body when respawning
+    /// </summary>
+    [DataField]
+    public bool DeleteBody = true;
 }
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index ad7c63ff58df..9e3203d170bc 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -56,7 +56,7 @@ private void OnBeforeSpawn(PlayerBeforeSpawnEvent ev)
             _mind.TransferTo(newMind, mob);
             SetOutfitCommand.SetOutfit(mob, dm.Gear, EntityManager);
             EnsureComp<KillTrackerComponent>(mob);
-            _respawn.AddToTracker(ev.Player.UserId, uid, tracker);
+            _respawn.AddToTracker(ev.Player.UserId, (uid, tracker));
 
             _point.EnsurePlayer(ev.Player.UserId, uid, point);
 
@@ -73,7 +73,7 @@ private void OnSpawnComplete(PlayerSpawnCompleteEvent ev)
         {
             if (!GameTicker.IsGameRuleActive(uid, rule))
                 continue;
-            _respawn.AddToTracker(ev.Mob, uid, tracker);
+            _respawn.AddToTracker((ev.Mob, null), (uid, tracker));
         }
     }
 
diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
index 5215da96aa8d..3f8d31f622ff 100644
--- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Chat.Managers;
+using Content.Server.Database.Migrations.Postgres;
 using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
@@ -34,38 +35,6 @@ public override void Initialize()
         SubscribeLocalEvent<MobStateChangedEvent>(OnMobStateChanged);
     }
 
-    private void OnSuicide(SuicideEvent ev)
-    {
-        if (!TryComp<ActorComponent>(ev.Victim, out var actor))
-           return;
-
-        var query = EntityQueryEnumerator<RespawnTrackerComponent>();
-        while (query.MoveNext(out _, out var respawn))
-        {
-            if (respawn.Players.Remove(actor.PlayerSession.UserId))
-                QueueDel(ev.Victim);
-        }
-    }
-
-    private void OnMobStateChanged(MobStateChangedEvent args)
-    {
-        if (args.NewMobState == MobState.Alive)
-            return;
-
-        if (!TryComp<ActorComponent>(args.Target, out var actor))
-            return;
-
-        var query = EntityQueryEnumerator<RespawnDeadRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out _, out var rule))
-        {
-            if (!GameTicker.IsGameRuleActive(uid, rule))
-                continue;
-
-            if (RespawnPlayer(args.Target, uid, actor: actor))
-                break;
-        }
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -75,8 +44,7 @@ public override void Update(float frameTime)
 
         foreach (var tracker in EntityQuery<RespawnTrackerComponent>())
         {
-            var queue = new Dictionary<NetUserId, TimeSpan>(tracker.RespawnQueue);
-            foreach (var (player, time) in queue)
+            foreach (var (player, time) in tracker.RespawnQueue)
             {
                 if (_timing.CurTime < time)
                     continue;
@@ -92,53 +60,84 @@ public override void Update(float frameTime)
         }
     }
 
-    /// <summary>
-    /// Adds a given player to the respawn tracker, ensuring that they are respawned if they die.
-    /// </summary>
-    public void AddToTracker(EntityUid player, EntityUid tracker, RespawnTrackerComponent? component = null, ActorComponent? actor = null)
+    private void OnSuicide(SuicideEvent ev)
     {
-        if (!Resolve(tracker, ref component) || !Resolve(player, ref actor, false))
-            return;
+        if (!TryComp<ActorComponent>(ev.Victim, out var actor))
+           return;
 
-        AddToTracker(actor.PlayerSession.UserId, tracker, component);
+        var query = EntityQueryEnumerator<RespawnTrackerComponent>();
+        while (query.MoveNext(out _, out var respawn))
+        {
+            if (respawn.Players.Remove(actor.PlayerSession.UserId))
+                QueueDel(ev.Victim);
+        }
     }
 
-    /// <summary>
-    /// Adds a given player to the respawn tracker, ensuring that they are respawned if they die.
-    /// </summary>
-    public void AddToTracker(NetUserId id, EntityUid tracker, RespawnTrackerComponent? component = null)
+    private void OnMobStateChanged(MobStateChangedEvent args)
     {
-        if (!Resolve(tracker, ref component))
+        if (args.NewMobState != MobState.Dead)
             return;
 
-        component.Players.Add(id);
+        if (!TryComp<ActorComponent>(args.Target, out var actor))
+            return;
+
+        var query = EntityQueryEnumerator<RespawnDeadRuleComponent, RespawnTrackerComponent, GameRuleComponent>();
+        while (query.MoveNext(out var uid, out var respawnRule, out  var tracker, out var rule))
+        {
+            if (!GameTicker.IsGameRuleActive(uid, rule))
+                continue;
+
+            if (respawnRule.AlwaysRespawnDead)
+                AddToTracker(actor.PlayerSession.UserId, (uid, tracker));
+            if (RespawnPlayer((args.Target, actor), (uid, tracker)))
+                break;
+        }
     }
 
     /// <summary>
     /// Attempts to directly respawn a player, skipping the lobby screen.
     /// </summary>
-    public bool RespawnPlayer(EntityUid player, EntityUid respawnTracker, RespawnTrackerComponent? component = null, ActorComponent? actor = null)
+    public bool RespawnPlayer(Entity<ActorComponent> player, Entity<RespawnTrackerComponent> respawnTracker)
     {
-        if (!Resolve(respawnTracker, ref component) || !Resolve(player, ref actor, false))
+        if (!respawnTracker.Comp.Players.Contains(player.Comp.PlayerSession.UserId) || respawnTracker.Comp.RespawnQueue.ContainsKey(player.Comp.PlayerSession.UserId))
             return false;
 
-        if (!component.Players.Contains(actor.PlayerSession.UserId) || component.RespawnQueue.ContainsKey(actor.PlayerSession.UserId))
-            return false;
-
-        if (component.RespawnDelay == TimeSpan.Zero)
+        if (respawnTracker.Comp.RespawnDelay == TimeSpan.Zero)
         {
             if (_station.GetStations().FirstOrNull() is not { } station)
                 return false;
 
-            QueueDel(player);
-            GameTicker.MakeJoinGame(actor.PlayerSession, station, silent: true);
+            if (respawnTracker.Comp.DeleteBody)
+                QueueDel(player);
+            GameTicker.MakeJoinGame(player.Comp.PlayerSession, station, silent: true);
             return false;
         }
 
-        var msg = Loc.GetString("rule-respawn-in-seconds", ("second", component.RespawnDelay.TotalSeconds));
+        var msg = Loc.GetString("rule-respawn-in-seconds", ("second", respawnTracker.Comp.RespawnDelay.TotalSeconds));
         var wrappedMsg = Loc.GetString("chat-manager-server-wrap-message", ("message", msg));
-        _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMsg, respawnTracker, false, actor.PlayerSession.Channel, Color.LimeGreen);
-        component.RespawnQueue[actor.PlayerSession.UserId] = _timing.CurTime + component.RespawnDelay;
+        _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMsg, respawnTracker, false, player.Comp.PlayerSession.Channel, Color.LimeGreen);
+
+        respawnTracker.Comp.RespawnQueue[player.Comp.PlayerSession.UserId] = _timing.CurTime + respawnTracker.Comp.RespawnDelay;
+
         return true;
     }
+
+    /// <summary>
+    /// Adds a given player to the respawn tracker, ensuring that they are respawned if they die.
+    /// </summary>
+    public void AddToTracker(Entity<ActorComponent?> player, Entity<RespawnTrackerComponent?> respawnTracker)
+    {
+        if (!Resolve(respawnTracker, ref respawnTracker.Comp) || !Resolve(player, ref player.Comp, false))
+            return;
+
+        AddToTracker(player.Comp.PlayerSession.UserId, (respawnTracker, respawnTracker.Comp));
+    }
+
+    /// <summary>
+    /// Adds a given player to the respawn tracker, ensuring that they are respawned if they die.
+    /// </summary>
+    public void AddToTracker(NetUserId id, Entity<RespawnTrackerComponent> tracker)
+    {
+        tracker.Comp.Players.Add(id);
+    }
 }
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 93350163f68f..cf2c5b2f475a 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -5,6 +5,17 @@
   components:
   - type: GameRule
 
+- type: entity
+  noSpawn: true
+  parent: BaseGameRule
+  id: RespawnDeadRule
+  components:
+  - type: RespawnDeadRule
+    alwaysRespawnDead: true
+  - type: RespawnTracker
+    respawnDelay: 10
+    deleteBody: false
+
 - type: entity
   noSpawn: true
   parent: BaseGameRule

From 31eb3ed62ce607205aaac59416c53f7f2c40da97 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 238/568] Welding tweaks (#27959)

---
 .../Configurable/ConfigurationSystem.cs       |  6 +-
 .../DamageOnToolInteractComponent.cs          | 27 ++++---
 .../Systems/DamageOnToolInteractSystem.cs     |  5 +-
 .../Mech/Systems/MechAssemblySystem.cs        |  4 +-
 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      |  4 +-
 .../Tools/Components/ToolComponent.cs         | 71 ++++++++-----------
 .../Components/ToolRefinableComponent.cs      | 11 +--
 .../Tools/Systems/SharedToolSystem.Welder.cs  | 22 +++---
 .../Tools/Systems/SharedToolSystem.cs         |  3 +-
 .../Tools/Systems/ToolRefinableSystem.cs      | 20 +++---
 .../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 ++--
 .../Objects/Specific/Medical/surgery.yml      |  8 +--
 .../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, 137 insertions(+), 139 deletions(-)
 rename Content.Server/Construction/Components/WelderRefinableComponent.cs => Content.Shared/Tools/Components/ToolRefinableComponent.cs (74%)
 rename Content.Server/Construction/RefiningSystem.cs => Content.Shared/Tools/Systems/ToolRefinableSystem.cs (59%)

diff --git a/Content.Server/Configurable/ConfigurationSystem.cs b/Content.Server/Configurable/ConfigurationSystem.cs
index 5f5f1ef7d166..bf89c3f7ed13 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/Damage/Components/DamageOnToolInteractComponent.cs b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
index e54090cdbbfb..547c29a202d2 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 42676c1891cd..5980455e49c1 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 c1fff819b4c9..4b408343b7a3 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;
 
@@ -15,6 +16,7 @@ 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()
@@ -30,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 53c6c62cdb81..68b973f58877 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 6e0e0c503a9e..7882522d30ba 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 e8897781f5e7..5970e1631961 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 aa2a16aa1b2e..019e09bbbbc0 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 e9ef053f629f..efb5dfd02482 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -79,7 +79,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 746147eb5b4d..ea07b5f8a5ce 100644
--- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
+++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
@@ -6,10 +6,8 @@
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Radio.Components;
-using Content.Shared.Tools;
 using Content.Shared.Tools.Components;
 using Content.Shared.Wires;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
@@ -106,7 +104,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 92857ab9054d..a7210c6fa07b 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 74%
rename from Content.Server/Construction/Components/WelderRefinableComponent.cs
rename to Content.Shared/Tools/Components/ToolRefinableComponent.cs
index 2fe88f2670c1..5a311cdda8e3 100644
--- a/Content.Server/Construction/Components/WelderRefinableComponent.cs
+++ b/Content.Shared/Tools/Components/ToolRefinableComponent.cs
@@ -1,15 +1,16 @@
 using Content.Shared.Storage;
-using Content.Shared.Tools;
+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, Access(typeof(RefiningSystem))]
-public sealed partial class WelderRefinableComponent : Component
+[RegisterComponent, NetworkedComponent, Access(typeof(ToolRefinablSystem))]
+public sealed partial class ToolRefinableComponent : Component
 {
     /// <summary>
     /// The items created when the item is refined.
@@ -27,7 +28,7 @@ public sealed partial class WelderRefinableComponent : Component
     /// The amount of fuel it takes to refine a given item.
     /// </summary>
     [DataField]
-    public float RefineFuel;
+    public float RefineFuel = 3f;
 
     /// <summary>
     /// The tool type needed in order to refine this item.
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
index e790b59cd121..60eafce47429 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 9edae9b78fd0..72e984fd82a1 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -217,7 +217,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;
@@ -296,4 +296,3 @@ public LatticeCuttingCompleteEvent(NetCoordinates coordinates)
 public sealed partial class CableCuttingFinishedEvent : SimpleDoAfterEvent;
 
 #endregion
-
diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
similarity index 59%
rename from Content.Server/Construction/RefiningSystem.cs
rename to Content.Shared/Tools/Systems/ToolRefinableSystem.cs
index ce7eb49ef1d7..e8ac4d492d77 100644
--- a/Content.Server/Construction/RefiningSystem.cs
+++ b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs
@@ -1,25 +1,26 @@
-using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
-using Content.Shared.Tools.Systems;
+using Content.Shared.Tools.Components;
+using Robust.Shared.Network;
 using Robust.Shared.Random;
 
-namespace Content.Server.Construction;
+namespace Content.Shared.Tools.Systems;
 
-public sealed class RefiningSystem : EntitySystem
+public sealed class ToolRefinablSystem : EntitySystem
 {
+    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<WelderRefinableComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<WelderRefinableComponent, WelderRefineDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<ToolRefinableComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<ToolRefinableComponent, WelderRefineDoAfterEvent>(OnDoAfter);
     }
 
-    private void OnInteractUsing(EntityUid uid, WelderRefinableComponent component, InteractUsingEvent args)
+    private void OnInteractUsing(EntityUid uid, ToolRefinableComponent component, InteractUsingEvent args)
     {
         if (args.Handled)
             return;
@@ -34,11 +35,14 @@ private void OnInteractUsing(EntityUid uid, WelderRefinableComponent component,
             fuel: component.RefineFuel);
     }
 
-    private void OnDoAfter(EntityUid uid, WelderRefinableComponent component, WelderRefineDoAfterEvent args)
+    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)
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index b5f69e6f56b6..51647f698524 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2255,7 +2255,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 a3d4eafacbbc..8c262d23da65 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 35ad43586bf4..7287119019e8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -80,7 +80,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 5d092673edfa..f5cb260e03bd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -56,7 +56,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 561140a46a44..fa6937dac341 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -85,7 +85,7 @@
   components:
   - type: Sprite
     color: "#bbeeff"
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
   - type: DamageUserOnTrigger
@@ -120,7 +120,7 @@
     damage:
       types:
         Slash: 4.5
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: PartRodMetal1
@@ -156,7 +156,7 @@
     damage:
       types:
         Slash: 5.5
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetPlasma1
@@ -195,7 +195,7 @@
       types:
         Slash: 4.5
         Radiation: 2
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: SheetUranium1
@@ -230,7 +230,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 32222d0036cd..9d3ef6c42427 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -26,6 +26,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 112ce99710d3..71629919ae4e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -46,7 +46,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 bccf10bee535..3f7da1efab35 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
 
@@ -273,7 +273,7 @@
   - type: Construction
     graph: CyanLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalCyan
@@ -293,7 +293,7 @@
   - type: Construction
     graph: BlueLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalBlue
@@ -313,7 +313,7 @@
   - type: Construction
     graph: PinkLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalPink
@@ -333,7 +333,7 @@
   - type: Construction
     graph: OrangeLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalOrange
@@ -353,7 +353,7 @@
   - type: Construction
     graph: RedLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalRed
@@ -373,7 +373,7 @@
   - type: Construction
     graph: GreenLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalGreen
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index aa0cf4618721..c4f7798154e3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -178,7 +178,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 1.0
+    speedModifier: 1.0
 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
 
 - type: entity
@@ -200,7 +200,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 0.5
+    speedModifier: 0.5
 
 - type: entity
   name: circular saw
@@ -222,7 +222,7 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 1.5
+    speedModifier: 1.5
 
 - type: entity
   name: advanced circular saw
@@ -245,4 +245,4 @@
   - type: Tool
     qualities:
       - Sawing
-    speed: 2.0
+    speedModifier: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index 87959ebef3db..c9b37b8b1aed 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 7bdd32f45795..53423e84a4fe 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -51,7 +51,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 8e2b7597970d..c80e53870e58 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
@@ -69,7 +69,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 452a905329e2..7930482960ff 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -304,7 +304,7 @@
   - type: Tool
     qualities:
       - Screwing
-    speed: 1.5
+    speedModifier: 1.5
     useSound: /Audio/Items/drill_use.ogg
   - type: MultipleTool
     statusShowBehavior: true
@@ -479,7 +479,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 9bf3f2e2cb9d..9db30edb52ed 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -139,7 +139,7 @@
           Quantity: 250
         maxVol: 250
   - type: Tool
-    speed: 1.3
+    speedModifier: 1.3
 
 - type: entity
   name: experimental welding tool
@@ -190,7 +190,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 5347096bf10e..818c4bd67685 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -26,7 +26,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 934298b62076..df19550cdbde 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 72ea308af087..3570264a57ac 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 84df09af33d7..a89670805799 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 91875e91e13e77af5c9ca3b0c8a65a0fa232d5cd Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sun, 2 Jun 2024 23:30:00 -0400
Subject: [PATCH 239/568] Strip Items From Things Before Biomassing Them
 (#28544)

---
 .../Medical/BiomassReclaimer/BiomassReclaimerSystem.cs   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index f8d5139a46a8..a6285294c94c 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Humanoid;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
 using Content.Shared.Jittering;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
@@ -36,6 +37,7 @@ namespace Content.Server.Medical.BiomassReclaimer
     public sealed class BiomassReclaimerSystem : EntitySystem
     {
         [Dependency] private readonly IConfigurationManager _configManager = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
         [Dependency] private readonly SharedJitteringSystem _jitteringSystem = default!;
         [Dependency] private readonly SharedAudioSystem _sharedAudioSystem = default!;
@@ -49,6 +51,7 @@ public sealed class BiomassReclaimerSystem : EntitySystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly MaterialStorageSystem _material = default!;
         [Dependency] private readonly SharedMindSystem _minds = default!;
+        [Dependency] private readonly InventorySystem _inventory = default!;
 
         [ValidatePrototypeId<MaterialPrototype>]
         public const string BiomassPrototype = "Biomass";
@@ -221,6 +224,12 @@ private void StartProcessing(EntityUid toProcess, Entity<BiomassReclaimerCompone
 
             component.ProcessingTimer = physics.FixturesMass * component.ProcessingTimePerUnitMass;
 
+            var inventory = _inventory.GetHandOrInventoryEntities(toProcess);
+            foreach (var item in inventory)
+            {
+                _transform.DropNextTo(item, ent.Owner);
+            }
+
             QueueDel(toProcess);
         }
 

From 0a8167f055929533129a8c2b2aa518937db1d968 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 03:29:59 +0000
Subject: [PATCH 240/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b60296408149..3086e6a71c07 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: 21Melkuu
-  changes:
-  - message: Add new explosion-proof backpack in aplink.
-    type: Add
-  id: 6169
-  time: '2024-03-17T02:21:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26187
 - author: Ilya246
   changes:
   - message: Syndicate decoy bombs may now be purchased from the uplink.
@@ -3853,3 +3846,10 @@
   id: 6668
   time: '2024-06-03T02:18:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28540
+- author: Vermidia
+  changes:
+  - message: Glass shards are no longer weldable with an unlit welder.
+    type: Fix
+  id: 6669
+  time: '2024-06-03T03:28:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27959

From 42217079b76084ef2d45d3b32b96027ae36c5355 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 03:31:08 +0000
Subject: [PATCH 241/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3086e6a71c07..941b93313644 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: Ilya246
-  changes:
-  - message: Syndicate decoy bombs may now be purchased from the uplink.
-    type: Add
-  - message: Syndicate bomb description no longer lies about their minimum detonation
-      time.
-    type: Fix
-  id: 6170
-  time: '2024-03-17T02:31:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26034
 - author: wafehling
   changes:
   - message: Added 18 new bounties to cargo bounty system.
@@ -3853,3 +3843,11 @@
   id: 6669
   time: '2024-06-03T03:28:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27959
+- author: AJCM-git
+  changes:
+  - message: Biomass reclaimers no longer act as a void to any unfortunate belongings
+      a corpse may be wearing
+    type: Tweak
+  id: 6670
+  time: '2024-06-03T03:30:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28544

From be35a5d36991237525a490116af5363e06ab5216 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sun, 2 Jun 2024 23:33:30 -0400
Subject: [PATCH 242/568] Header of Gas tank UI screen now fetched from Entity
 name and local (#28545)

---
 .../GasTank/GasTankBoundUserInterface.cs      |   3 +-
 .../Systems/Atmos/GasTank/GasTankWindow.cs    | 307 +++++++++---------
 .../Locale/en-US/atmos/gas-tank-component.ftl |   1 -
 3 files changed, 151 insertions(+), 160 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
index ee8cb28d2ccc..4702f8f36594 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Atmos.Components;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.UserInterface.Systems.Atmos.GasTank
 {
@@ -30,7 +29,7 @@ public void ToggleInternals()
         protected override void Open()
         {
             base.Open();
-            _window = new GasTankWindow(this);
+            _window = new GasTankWindow(this, EntMan.GetComponent<MetaDataComponent>(Owner).EntityName);
             _window.OnClose += Close;
             _window.OpenCentered();
         }
diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index 7797a096de30..c23850a65034 100644
--- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -10,201 +10,194 @@
 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;
+    private readonly RichTextLabel _lblPressure;
+    private readonly FloatSpinBox _spbPressure;
+    private readonly RichTextLabel _lblInternals;
+    private readonly Button _btnInternals;
 
+    public GasTankWindow(GasTankBoundUserInterface owner, string uidName)
+    {
+        Control contentContainer;
+        BoxContainer topContainer;
+        TextureButton btnClose;
+        var resourceCache = IoCManager.Resolve<IResourceCache>();
+        var rootContainer = new LayoutContainer { Name = "GasTankRoot" };
+        AddChild(rootContainer);
 
-        private readonly IResourceCache _resourceCache = default!;
-        private readonly RichTextLabel _lblPressure;
-        private readonly FloatSpinBox _spbPressure;
-        private readonly RichTextLabel _lblInternals;
-        private readonly Button _btnInternals;
+        MouseFilter = MouseFilterMode.Stop;
 
-        public GasTankWindow(GasTankBoundUserInterface owner)
+        var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
+        var back = new StyleBoxTexture
         {
-            TextureButton btnClose;
-            _resourceCache = IoCManager.Resolve<IResourceCache>();
-            _owner = owner;
-            var rootContainer = new LayoutContainer {Name = "GasTankRoot"};
-            AddChild(rootContainer);
+            Texture = panelTex,
+            Modulate = Color.FromHex("#25252A"),
+        };
 
-            MouseFilter = MouseFilterMode.Stop;
+        back.SetPatchMargin(StyleBox.Margin.All, 10);
 
-            var panelTex = _resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
-            var back = new StyleBoxTexture
-            {
-                Texture = panelTex,
-                Modulate = Color.FromHex("#25252A"),
-            };
-
-            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 = _resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
+        var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13);
 
-            var topRow = new BoxContainer
+        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 =
+                (new Label
                 {
-                    (_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
-                    })
-                }
-            };
-
-            var middle = new PanelContainer
-            {
-                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#202025")},
-                Children =
+                    Text = uidName,
+                    FontOverride = font,
+                    FontColorOverride = StyleNano.NanoGold,
+                    VerticalAlignment = VAlignment.Center,
+                    HorizontalExpand = true,
+                    HorizontalAlignment = HAlignment.Left,
+                    Margin = new Thickness(0, 0, 20, 0),
+                }),
+                (btnClose = new TextureButton
                 {
-                    (_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
+                    StyleClasses = {DefaultWindow.StyleClassWindowCloseButton},
+                    VerticalAlignment = VAlignment.Center
+                })
+            }
+        };
+
+        var middle = new PanelContainer
+        {
+            PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#202025") },
+            Children =
             {
-                MinSize = new Vector2(0, 2),
-                PanelOverride = new StyleBoxFlat {BackgroundColor = Color.FromHex("#525252ff")}
-            });
+                (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") }
+        });
 
-            _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)
-            });
-
-            _contentContainer.AddChild(new Label
-            {
-                Text = Loc.GetString("gas-tank-window-output-pressure-label"),
-                Align = Label.AlignMode.Center
+                Orientation = LayoutOrientation.Horizontal,
+                Margin = new Thickness(0, 7, 0, 0),
+                Children = { _lblInternals, _btnInternals }
             });
-            _spbPressure = new FloatSpinBox
-            {
-                IsValid = f => f >= 0 || f <= 3000,
-                Margin = new Thickness(25, 0, 25, 7)
-            };
-            _contentContainer.AddChild(_spbPressure);
-
-            // Handlers
-            _spbPressure.OnValueChanged += args =>
-            {
-                _owner.SetOutputPressure(args.Value);
-            };
 
-            _btnInternals.OnPressed += args =>
-            {
-                _owner.ToggleInternals();
-            };
+        // Separator
+        contentContainer.AddChild(new Control
+        {
+            MinSize = new Vector2(0, 10)
+        });
 
-            btnClose.OnPressed += _ => Close();
-        }
+        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);
 
-        public void UpdateState(GasTankBoundUserInterfaceState state)
+        // Handlers
+        _spbPressure.OnValueChanged += args =>
         {
-            _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;
-            }
-        }
+            owner.SetOutputPressure(args.Value);
+        };
 
-        protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
+        _btnInternals.OnPressed += args =>
         {
-            return DragMode.Move;
-        }
+            owner.ToggleInternals();
+        };
 
-        protected override bool HasPoint(Vector2 point)
+        btnClose.OnPressed += _ => Close();
+    }
+
+    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)
         {
-            return false;
+            _spbPressure.Value = state.OutputPressure.Value;
         }
     }
+
+    protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
+    {
+        return DragMode.Move;
+    }
+
+    protected override bool HasPoint(Vector2 point)
+    {
+        return false;
+    }
 }
diff --git a/Resources/Locale/en-US/atmos/gas-tank-component.ftl b/Resources/Locale/en-US/atmos/gas-tank-component.ftl
index ae10d5630c12..1f2d8f1e9f8d 100644
--- a/Resources/Locale/en-US/atmos/gas-tank-component.ftl
+++ b/Resources/Locale/en-US/atmos/gas-tank-component.ftl
@@ -14,7 +14,6 @@ comp-gas-tank-examine-closed-valve = Gas release valve is [color=green]closed[/c
 control-verb-open-control-panel-text = Open Control Panel
 
 ## UI
-gas-tank-window-label = Gas Tank
 gas-tank-window-internals-toggle-button = Toggle
 gas-tank-window-output-pressure-label = Output Pressure
 gas-tank-window-tank-pressure-text = Pressure: {$tankPressure} kPA

From 39481fb2b018921bca058f49433422db848cd7ef Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 03:34:36 +0000
Subject: [PATCH 243/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 941b93313644..f30481fee770 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: wafehling
-  changes:
-  - message: Added 18 new bounties to cargo bounty system.
-    type: Add
-  id: 6171
-  time: '2024-03-17T17:06:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26160
 - author: Ko4erga
   changes:
   - message: Added craftable high and small wooden fences, bench. New stairs.
@@ -3851,3 +3844,10 @@
   id: 6670
   time: '2024-06-03T03:30:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28544
+- author: Laneron
+  changes:
+  - message: Jetpack UI window now has correctly displayed header
+    type: Fix
+  id: 6671
+  time: '2024-06-03T03:33:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28545

From 0d864d324cd0ca06e06484b38eadd8ea5c06ef5b Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 3 Jun 2024 01:12:13 -0400
Subject: [PATCH 244/568] Add support for HeldPrefix to
 SolutionContainerVisualsSystem (#28532)

---
 .../Visualizers/SolutionContainerVisualsSystem.cs          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index f1e8e8d7aa44..17b88fb5a8f5 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Hands;
+using Content.Shared.Item;
 using Content.Shared.Rounding;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
@@ -150,6 +151,9 @@ private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent c
         if (!TryComp(uid, out AppearanceComponent? appearance))
             return;
 
+        if (!TryComp<ItemComponent>(uid, out var item))
+            return;
+
         if (!AppearanceSystem.TryGetData<float>(uid, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
             return;
 
@@ -159,7 +163,8 @@ private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent c
         {
             var layer = new PrototypeLayerData();
 
-            var key = "inhand-" + args.Location.ToString().ToLowerInvariant() + component.InHandsFillBaseName + closestFillSprite;
+            var heldPrefix = item.HeldPrefix == null ? "inhand-" : $"{item.HeldPrefix}-inhand-";
+            var key = heldPrefix + args.Location.ToString().ToLowerInvariant() + component.InHandsFillBaseName + closestFillSprite;
 
             layer.State = key;
 

From d36ff569ab65692dffdc8a0ac8c7d8b8655bff46 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 3 Jun 2024 17:21:46 +1200
Subject: [PATCH 245/568] Add PrototypeUploadTest (#28522)

---
 .../PrototypeTests/PrototypeUploadTest.cs     | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 Content.IntegrationTests/Tests/PrototypeTests/PrototypeUploadTest.cs

diff --git a/Content.IntegrationTests/Tests/PrototypeTests/PrototypeUploadTest.cs b/Content.IntegrationTests/Tests/PrototypeTests/PrototypeUploadTest.cs
new file mode 100644
index 000000000000..c641cd9bd1ca
--- /dev/null
+++ b/Content.IntegrationTests/Tests/PrototypeTests/PrototypeUploadTest.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Tag;
+using Robust.Client.Upload.Commands;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Upload;
+
+namespace Content.IntegrationTests.Tests.PrototypeTests;
+
+public sealed class PrototypeUploadTest
+{
+    public const string IdA = "UploadTestPrototype";
+    public const string IdB = $"{IdA}NoParent";
+    public const string IdC = $"{IdA}Abstract";
+    public const string IdD = $"{IdA}UploadedParent";
+
+    private const string File = $@"
+- type: entity
+  parent: BaseStructure # BaseItem can cause AllItemsHaveSpritesTest to fail
+  id: {IdA}
+
+- type: entity
+  id: {IdB}
+
+- type: entity
+  id: {IdC}
+  abstract: true
+  components:
+  - type: Tag
+
+- type: entity
+  id: {IdD}
+  parent: {IdC}
+";
+
+    [Test]
+    [TestOf(typeof(LoadPrototypeCommand))]
+    public async Task TestFileUpload()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings {Connected = true});
+        var sCompFact = pair.Server.ResolveDependency<IComponentFactory>();
+        var cCompFact = pair.Client.ResolveDependency<IComponentFactory>();
+
+        Assert.That(!pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdA, out _));
+        Assert.That(!pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdB, out _));
+        Assert.That(!pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdC, out _));
+        Assert.That(!pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdD, out _));
+
+        Assert.That(!pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdA, out _));
+        Assert.That(!pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdB, out _));
+        Assert.That(!pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdC, out _));
+        Assert.That(!pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdD, out _));
+
+        var protoLoad = pair.Client.ResolveDependency<IGamePrototypeLoadManager>();
+        await pair.Client.WaitPost(() => protoLoad.SendGamePrototype(File));
+        await pair.RunTicksSync(10);
+
+        Assert.That(pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdA, out var sProtoA));
+        Assert.That(pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdB, out var sProtoB));
+        Assert.That(!pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdC, out _));
+        Assert.That(pair.Server.ProtoMan.TryIndex<EntityPrototype>(IdD, out var sProtoD));
+
+        Assert.That(pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdA, out var cProtoA));
+        Assert.That(pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdB, out var cProtoB));
+        Assert.That(!pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdC, out _));
+        Assert.That(pair.Client.ProtoMan.TryIndex<EntityPrototype>(IdD, out var cProtoD));
+
+        // Arbitrarily choosing TagComponent to check that inheritance works for uploaded prototypes.
+
+        await pair.Server.WaitPost(() =>
+        {
+            Assert.That(sProtoA!.TryGetComponent<TagComponent>(out _, sCompFact), Is.True);
+            Assert.That(sProtoB!.TryGetComponent<TagComponent>(out _, sCompFact), Is.False);
+            Assert.That(sProtoD!.TryGetComponent<TagComponent>(out _, sCompFact), Is.True);
+        });
+
+        await pair.Client.WaitPost(() =>
+        {
+            Assert.That(cProtoA!.TryGetComponent<TagComponent>(out _, cCompFact), Is.True);
+            Assert.That(cProtoB!.TryGetComponent<TagComponent>(out _, cCompFact), Is.False);
+            Assert.That(cProtoD!.TryGetComponent<TagComponent>(out _, cCompFact), Is.True);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}

From 36396e3f864b85783f831dde21f9f94b121b2da5 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Mon, 3 Jun 2024 06:54:32 -0500
Subject: [PATCH 246/568] Changes SyndiCat spawner to a radio (#28492)

---
 Resources/Locale/en-US/store/uplink-catalog.ftl |  4 ++--
 Resources/Prototypes/Catalog/uplink_catalog.yml |  2 +-
 .../reinforcement_teleporter.yml                | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 3ae2d65c16c3..1b9fa8aff93b 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -370,8 +370,8 @@ uplink-syndicate-sponge-box-desc = A box containing 6 syndicate sponges disguise
 uplink-slipocalypse-clustersoap-name = Slipocalypse Clustersoap
 uplink-slipocalypse-clustersoap-desc = Scatters arounds small pieces of syndicate-brand soap after being thrown, these pieces of soap evaporate after 60 seconds.
 
-uplink-mobcat-microbomb-name = SyndiCat
-uplink-mobcat-microbomb-desc = A hand cat equipped with a microbomb implant. Explodes when seriously injured. Can bite painfully
+uplink-mobcat-microbomb-name = SyndiCat Teleporter
+uplink-mobcat-microbomb-desc = Call in a handy cat equipped with a microbomb implant. Explodes when seriously injured. Can bite painfully.
 
 uplink-chameleon-projector-name = Chameleon Projector
 uplink-chameleon-projector-desc = Disappear in plain sight by creating a hologram of an item around you. Do not use this to play the game "Object Search".
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index c8d6eb4f618f..efec2417d0b5 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -999,7 +999,7 @@
   name: uplink-mobcat-microbomb-name
   description: uplink-mobcat-microbomb-desc
   icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
-  productEntity: MobCatSyndy
+  productEntity: ReinforcementRadioSyndicateSyndiCat
   cost:
     Telecrystal: 6
   categories:
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 c62783fcee98..2085422c9b55 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: ReinforcementRadioSyndicate
+  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-SyndiCat-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

From ba5af33ee42b82d7c653e7724ddf67b0a8c3cf1a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 11:55:38 +0000
Subject: [PATCH 247/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f30481fee770..7235a60a0dfd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Ko4erga
-  changes:
-  - message: Added craftable high and small wooden fences, bench. New stairs.
-    type: Add
-  id: 6172
-  time: '2024-03-17T21:18:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26182
 - author: potato1234_x
   changes:
   - message: Changed the puddle sprites so the smoothing is less jagged
@@ -3851,3 +3844,10 @@
   id: 6671
   time: '2024-06-03T03:33:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28545
+- author: Vermidia
+  changes:
+  - message: SyndiCats now spawn from a radio like other reinforcements.
+    type: Tweak
+  id: 6672
+  time: '2024-06-03T11:54:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28492

From eb026c9b5b582420ba8e97f1bdee02dc5193c736 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Mon, 3 Jun 2024 07:05:14 -0500
Subject: [PATCH 248/568] Gives Medibots Random Lines(not a good title)
 (#28543)

---
 Resources/Locale/en-US/advertisements/other/medibot.ftl  | 9 +++++++++
 .../Catalog/VendingMachines/advertisements.yml           | 6 ++++++
 Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml      | 2 ++
 3 files changed, 17 insertions(+)
 create mode 100644 Resources/Locale/en-US/advertisements/other/medibot.ftl

diff --git a/Resources/Locale/en-US/advertisements/other/medibot.ftl b/Resources/Locale/en-US/advertisements/other/medibot.ftl
new file mode 100644
index 000000000000..9e919ce49f37
--- /dev/null
+++ b/Resources/Locale/en-US/advertisements/other/medibot.ftl
@@ -0,0 +1,9 @@
+advertisement-medibot-1 = What kind of medbay is this? Everyone's dropping like dead flies.
+advertisement-medibot-2 = I knew it, I should've been a plastic surgeon.
+advertisement-medibot-3 = There's always a catch, and I'm the best there is.
+advertisement-medibot-4 = An apple a day keeps me away.
+advertisement-medibot-5 = I'm different!
+advertisement-medibot-6 = Fuck you.
+advertisement-medibot-7 = Why are we still here? Just to suffer?
+advertisement-medibot-8 = I...I've never lost a patient before. Not today, I mean.
+advertisement-medibot-9 = Lexorin in.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
index 6dbb60af6a97..c0052dba07c5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -255,3 +255,9 @@
   values:
     prefix: advertisement-virodrobe-
     count: 3
+
+- type: localizedDataset
+  id: MedibotAds
+  values:
+    prefix: advertisement-medibot-
+    count: 9
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index b2fefb67ae95..12788e457f25 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -287,6 +287,8 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Advertise
+    pack: MedibotAds
 
 - type: entity
   parent: MobSiliconBase

From 64ff99231ad36ccdad2dfd1f1a07370643c7c3b9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 12:06:20 +0000
Subject: [PATCH 249/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7235a60a0dfd..784f6f0de02a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: potato1234_x
-  changes:
-  - message: Changed the puddle sprites so the smoothing is less jagged
-    type: Tweak
-  id: 6173
-  time: '2024-03-17T23:15:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26171
 - author: FungiFellow
   changes:
   - message: Changed Monkey Reinf Price to 6TC
@@ -3851,3 +3844,10 @@
   id: 6672
   time: '2024-06-03T11:54:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28492
+- author: Cojoke-dot
+  changes:
+  - message: Medibots will now occasionally talk
+    type: Tweak
+  id: 6673
+  time: '2024-06-03T12:05:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28543

From a0b49116be679f2bd13c009a70f6aa4ef58b8839 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Mon, 3 Jun 2024 07:10:24 -0500
Subject: [PATCH 250/568] Adds Chat Triggers to the Gasp Emote (#28466)

---
 Resources/Prototypes/Voice/speech_emotes.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index e57183697641..e47d6382a1db 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -1,4 +1,4 @@
-# vocal emotes
+# vocal emotes
 - type: emote
   id: Scream
   name: chat-emote-name-scream
@@ -345,6 +345,16 @@
     components:
     - Respirator
   chatMessages: ["chat-emote-msg-gasp"]
+  chatTriggers:
+   - gasp
+   - gasp.
+   - gasp!
+   - gasps
+   - gasps.
+   - gasps!
+   - gasped
+   - gasped.
+   - gasped!
 
 - type: emote
   id: DefaultDeathgasp

From f8f55dea1ee00e4e32d3852116d4c45e38694703 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 12:11:31 +0000
Subject: [PATCH 251/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 784f6f0de02a..91acfe32966e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: FungiFellow
-  changes:
-  - message: Changed Monkey Reinf Price to 6TC
-    type: Tweak
-  id: 6174
-  time: '2024-03-18T01:25:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26214
 - author: Golinth
   changes:
   - message: Criminal record icons now show up below job icons
@@ -3851,3 +3844,10 @@
   id: 6673
   time: '2024-06-03T12:05:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28543
+- author: Cojoke-dot
+  changes:
+  - message: The player can now use the gasping emote
+    type: Tweak
+  id: 6674
+  time: '2024-06-03T12:10:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28466

From 50f8de08a4ce5f7647ea4cd15ddca4ac2790b55e Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:34:50 +0000
Subject: [PATCH 252/568] prevent nukie kidnapping (#28387)

---
 Content.Server/Antag/AntagSelectionSystem.cs | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 47da1b6475f3..710bb8f3d765 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -182,20 +182,20 @@ protected override void Started(EntityUid uid, AntagSelectionComponent component
             .Where(x => GameTicker.PlayerGameStatuses[x.UserId] == PlayerGameStatus.JoinedGame)
             .ToList();
 
-        ChooseAntags((uid, component), players);
+        ChooseAntags((uid, component), players, midround: true);
     }
 
     /// <summary>
     /// Chooses antagonists from the given selection of players
     /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool)
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, bool midround = false)
     {
         if (ent.Comp.SelectionsComplete)
             return;
 
         foreach (var def in ent.Comp.Definitions)
         {
-            ChooseAntags(ent, pool, def);
+            ChooseAntags(ent, pool, def, midround: midround);
         }
 
         ent.Comp.SelectionsComplete = true;
@@ -204,17 +204,28 @@ public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSessi
     /// <summary>
     /// Chooses antagonists from the given selection of players for the given antag definition.
     /// </summary>
-    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, AntagSelectionDefinition def)
+    /// <param name="midround">Disable picking players for pre-spawn antags in the middle of a round</param>
+    public void ChooseAntags(Entity<AntagSelectionComponent> ent, IList<ICommonSession> pool, AntagSelectionDefinition def, bool midround = false)
     {
         var playerPool = GetPlayerPool(ent, pool, def);
         var count = GetTargetAntagCount(ent, GetTotalPlayerCount(pool), def);
 
         // if there is both a spawner and players getting picked, let it fall back to a spawner.
         var noSpawner = def.SpawnerPrototype == null;
+        var picking = def.PickPlayer;
+        if (midround && ent.Comp.SelectionTime == AntagSelectionTime.PrePlayerSpawn)
+        {
+            // prevent antag selection from happening if the round is on-going, requiring a spawner if used midround.
+            // this is so rules like nukies, if added by an admin midround, dont make random living people nukies
+            Log.Info($"Antags for rule {ent:?} get picked pre-spawn so only spawners will be made.");
+            DebugTools.Assert(def.SpawnerPrototype != null, $"Rule {ent:?} had no spawner for pre-spawn rule added mid-round!");
+            picking = false;
+        }
+
         for (var i = 0; i < count; i++)
         {
             var session = (ICommonSession?) null;
-            if (def.PickPlayer)
+            if (picking)
             {
                 if (!playerPool.TryPickAndTake(RobustRandom, out session) && noSpawner)
                 {

From 977bd5ad6dd1a6fe7a32721f296129cd3bb6bbce Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:39:25 +0000
Subject: [PATCH 253/568] make GameRule use entity category (#28294)

---
 .../Components/GameRuleComponent.cs           |  3 +-
 Resources/Locale/en-US/entity-categories.ftl  |  1 +
 Resources/Prototypes/Entities/categories.yml  |  5 +++
 .../Prototypes/GameRules/cargo_gifts.yml      | 10 ------
 Resources/Prototypes/GameRules/events.yml     | 33 -------------------
 Resources/Prototypes/GameRules/midround.yml   |  1 -
 Resources/Prototypes/GameRules/roundstart.yml | 15 ---------
 Resources/Prototypes/GameRules/variation.yml  |  8 -----
 8 files changed, 8 insertions(+), 68 deletions(-)

diff --git a/Content.Server/GameTicking/Components/GameRuleComponent.cs b/Content.Server/GameTicking/Components/GameRuleComponent.cs
index 1e6c3f0ab1df..635452b3f3c3 100644
--- a/Content.Server/GameTicking/Components/GameRuleComponent.cs
+++ b/Content.Server/GameTicking/Components/GameRuleComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Destructible.Thresholds;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.GameTicking.Components;
@@ -7,7 +8,7 @@ namespace Content.Server.GameTicking.Components;
 /// Component attached to all gamerule entities.
 /// Used to both track the entity as well as store basic data
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, EntityCategory("GameRules")]
 public sealed partial class GameRuleComponent : Component
 {
     /// <summary>
diff --git a/Resources/Locale/en-US/entity-categories.ftl b/Resources/Locale/en-US/entity-categories.ftl
index 190fe5713ac4..457397845dad 100644
--- a/Resources/Locale/en-US/entity-categories.ftl
+++ b/Resources/Locale/en-US/entity-categories.ftl
@@ -1 +1,2 @@
 entity-category-name-actions = Actions
+entity-category-name-game-rules = Game Rules
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
index 2fb56818f944..0535a8a4c27a 100644
--- a/Resources/Prototypes/Entities/categories.yml
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -2,3 +2,8 @@
   id: Actions
   name: entity-category-name-actions
   hideSpawnMenu: true
+
+- type: entityCategory
+  id: GameRules
+  name: entity-category-name-game-rules
+  hideSpawnMenu: true
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index c5a525129707..ffc2ed404b70 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -17,7 +17,6 @@
 - type: entity
   id: GiftsPizzaPartySmall
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -35,7 +34,6 @@
 - type: entity
   id: GiftsPizzaPartyLarge
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 2
@@ -53,7 +51,6 @@
 - type: entity
   id: GiftsEngineering
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -74,7 +71,6 @@
 - type: entity
   id: GiftsVendingRestock
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
@@ -95,7 +91,6 @@
 - type: entity
   id: GiftsJanitor
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6
@@ -113,7 +108,6 @@
 - type: entity
   id: GiftsMedical
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 8
@@ -133,7 +127,6 @@
 - type: entity
   id: GiftsSpacingSupplies
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
@@ -153,7 +146,6 @@
 - type: entity
   id: GiftsFireProtection
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
@@ -171,7 +163,6 @@
 - type: entity
   id: GiftsSecurityGuns
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 3
@@ -190,7 +181,6 @@
 - type: entity
   id: GiftsSecurityRiot
   parent: CargoGiftsBase
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 4
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 9f6e6a812574..f421cf68183c 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -2,7 +2,6 @@
   id: BaseStationEvent
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
     - type: GameRule
       delay:
@@ -13,7 +12,6 @@
   id: BaseStationEventShortDelay
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
     - type: GameRule
       delay:
@@ -24,7 +22,6 @@
   id: BaseStationEventLongDelay
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
     - type: GameRule
       delay:
@@ -34,7 +31,6 @@
 - type: entity
   id: AnomalySpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncementColor: "#18abf5"
@@ -47,7 +43,6 @@
 - type: entity
   id: BluespaceArtifact
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: GameRule
     delay:
@@ -64,7 +59,6 @@
 - type: entity
   id: BluespaceLocker
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 2
@@ -76,7 +70,6 @@
 - type: entity
   id: BreakerFlip
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 7
@@ -87,7 +80,6 @@
 - type: entity
   id: BureaucraticError
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
@@ -99,7 +91,6 @@
 - type: entity
   id: ClericalError
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-clerical-error-announcement
@@ -111,7 +102,6 @@
 - type: entity
   parent: BaseGameRule
   id: ClosetSkeleton
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -123,7 +113,6 @@
 - type: entity
   parent: BaseGameRule
   id: DragonSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6.5
@@ -153,7 +142,6 @@
 - type: entity
   parent: BaseGameRule
   id: NinjaSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6
@@ -166,7 +154,6 @@
 - type: entity
   parent: BaseGameRule
   id: RevenantSpawn
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 7.5
@@ -180,7 +167,6 @@
 #- type: entity
 #  id: FalseAlarm
 #  parent: BaseGameRule
-#  noSpawn: true
 #  components:
 #  - type: StationEvent
 #    weight: 15
@@ -190,7 +176,6 @@
 - type: entity
   id: GasLeak
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-gas-leak-start-announcement
@@ -203,7 +188,6 @@
 - type: entity
   id: KudzuGrowth
   parent: BaseStationEventLongDelay
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 15
@@ -215,7 +199,6 @@
 - type: entity
   id: MeteorSwarm
   parent: BaseStationEventLongDelay
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 30
@@ -233,7 +216,6 @@
 - type: entity
   id: MouseMigration
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -259,7 +241,6 @@
 - type: entity
   id: CockroachMigration
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -277,7 +258,6 @@
 - type: entity
   id: PowerGridCheck
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 5
@@ -294,7 +274,6 @@
 - type: entity
   id: RandomSentience
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 6
@@ -307,7 +286,6 @@
 - type: entity
   parent: BaseGameRule
   id: SolarFlare
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 8
@@ -336,7 +314,6 @@
 - type: entity
   id: VentClog
   parent: BaseStationEventLongDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-clog-start-announcement
@@ -351,7 +328,6 @@
 - type: entity
   id: SlimesSpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -373,7 +349,6 @@
 - type: entity
   id: SpiderSpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -391,7 +366,6 @@
 - type: entity
   id: SpiderClownSpawn
   parent: BaseStationEventShortDelay
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-vent-creatures-start-announcement
@@ -409,7 +383,6 @@
 - type: entity
   id: ZombieOutbreak
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 50
@@ -441,7 +414,6 @@
         prototype: InitialInfected
 
 - type: entity
-  noSpawn: true
   parent: BaseNukeopsRule
   id: LoneOpsSpawn
   components:
@@ -475,7 +447,6 @@
         prototype: Nukeops
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorRule
   id: SleeperAgentsRule
   components:
@@ -501,7 +472,6 @@
 - type: entity
   id: MassHallucinations
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     weight: 7
@@ -518,7 +488,6 @@
 - type: entity
   id: ImmovableRodSpawn
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
     startAnnouncement: station-event-immovable-rod-start-announcement
@@ -556,7 +525,6 @@
       orGroup: rodProto
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: IonStorm
   components:
@@ -569,7 +537,6 @@
 - type: entity
   id: MimicVendorRule
   parent: BaseGameRule
-  noSpawn: true
   components:
     - type: StationEvent
       earliestStart: 0
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index fe5af117e68b..c190b0333ad6 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -18,7 +18,6 @@
     threats: NinjaThreats
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: Thief
   components:
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index cf2c5b2f475a..3493749457d5 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -1,12 +1,10 @@
 - type: entity
   id: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
   - type: GameRule
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: RespawnDeadRule
   components:
@@ -17,7 +15,6 @@
     deleteBody: false
 
 - type: entity
-  noSpawn: true
   parent: BaseGameRule
   id: SubGamemodesRule
   components:
@@ -29,7 +26,6 @@
 - type: entity
   id: DeathMatch31
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: DeathMatchRule
     rewardSpawns:
@@ -59,7 +55,6 @@
 - type: entity
   id: InactivityTimeRestart
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: InactivityRule
     inactivityMaxTime: 600
@@ -68,7 +63,6 @@
 - type: entity
   id: MaxTimeRestart
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: MaxTimeRestartRule
     roundMaxTime: 300
@@ -88,7 +82,6 @@
   - type: AntagLoadProfileRule
 
 - type: entity
-  noSpawn: true
   parent: BaseNukeopsRule
   id: Nukeops
   components:
@@ -166,7 +159,6 @@
     agentName: traitor-round-end-agent-name
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorRule
   id: Traitor
   components:
@@ -188,7 +180,6 @@
 - type: entity
   id: Revolutionary
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 15
@@ -213,21 +204,18 @@
 - type: entity
   id: Sandbox
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: SandboxRule
 
 - type: entity
   id: Secret
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: SecretRule
 
 - type: entity
   id: Zombie
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 20
@@ -260,14 +248,12 @@
 - type: entity
   id: BasicStationEventScheduler
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: BasicStationEventScheduler
 
 - type: entity
   id: RampingStationEventScheduler
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: RampingStationEventScheduler
 
@@ -275,7 +261,6 @@
 - type: entity
   id: BasicRoundstartVariation
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: RoundstartStationVariationRule
     rules:
diff --git a/Resources/Prototypes/GameRules/variation.yml b/Resources/Prototypes/GameRules/variation.yml
index 2884d5f9d6fa..093a832d72f8 100644
--- a/Resources/Prototypes/GameRules/variation.yml
+++ b/Resources/Prototypes/GameRules/variation.yml
@@ -4,7 +4,6 @@
   id: BaseVariationPass
   parent: BaseGameRule
   abstract: true
-  noSpawn: true
   components:
   - type: StationVariationPassRule
 
@@ -13,14 +12,12 @@
 - type: entity
   id: BasicPoweredLightVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PoweredLightVariationPass
 
 - type: entity
   id: SolidWallRustingVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: WallReplaceVariationPass
   - type: EntityReplaceVariationPass
@@ -32,7 +29,6 @@
 - type: entity
   id: ReinforcedWallRustingVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: ReinforcedWallReplaceVariationPass
   - type: EntityReplaceVariationPass
@@ -44,7 +40,6 @@
 - type: entity
   id: BasicTrashVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: EntitySpawnVariationPass
     tilesPerEntityAverage: 35
@@ -105,7 +100,6 @@
 - type: entity
   id: BasicPuddleMessVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PuddleMessVariationPass
     randomPuddleSolutionFill: RandomFillTrashPuddle
@@ -113,7 +107,6 @@
 - type: entity
   id: BloodbathPuddleMessVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: PuddleMessVariationPass
     tilesPerSpillAverage: 150
@@ -123,7 +116,6 @@
 - type: entity
   id: CutWireVariationPass
   parent: BaseVariationPass
-  noSpawn: true
   components:
   - type: CutWireVariationPass
     wireCutChance: 0.01

From e784f2cf3c638d9df1834751924916548389a1ab Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Mon, 3 Jun 2024 08:04:07 -0500
Subject: [PATCH 254/568] Make projectiles not hit crates unless clicked on
 (#28072)

---
 .../RequireProjectileTargetComponent.cs       | 14 +++++
 .../Systems/RequireProjectileTargetSystem.cs  | 51 +++++++++++++++++++
 .../Systems/MobStateSystem.Subscribers.cs     | 17 -------
 Resources/Prototypes/Entities/Mobs/base.yml   |  4 +-
 .../Storage/Crates/base_structurecrates.yml   |  1 +
 5 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
 create mode 100644 Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs

diff --git a/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
new file mode 100644
index 000000000000..5bd8292daae7
--- /dev/null
+++ b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+/// Prevent the object from getting hit by projetiles unless you target the object.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(RequireProjectileTargetSystem))]
+public sealed partial class RequireProjectileTargetComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public bool Active = true;
+}
diff --git a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
new file mode 100644
index 000000000000..79b374a60f35
--- /dev/null
+++ b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.Projectiles;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Standing;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Damage.Components;
+
+public sealed class RequireProjectileTargetSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<RequireProjectileTargetComponent, PreventCollideEvent>(PreventCollide);
+        SubscribeLocalEvent<RequireProjectileTargetComponent, StoodEvent>(StandingBulletHit);
+        SubscribeLocalEvent<RequireProjectileTargetComponent, DownedEvent>(LayingBulletPass);
+    }
+
+    private void PreventCollide(Entity<RequireProjectileTargetComponent> ent, ref PreventCollideEvent args)
+    {
+        if (args.Cancelled)
+          return;
+
+        if (!ent.Comp.Active)
+            return;
+
+        var other = args.OtherEntity;
+        if (HasComp<ProjectileComponent>(other) &&
+            CompOrNull<TargetedProjectileComponent>(other)?.Target != ent)
+        {
+            args.Cancelled = true;
+        }
+    }
+
+    private void SetActive(Entity<RequireProjectileTargetComponent> ent, bool value)
+    {
+        if (ent.Comp.Active == value)
+            return;
+
+        ent.Comp.Active = value;
+        Dirty(ent);
+    }
+
+    private void StandingBulletHit(Entity<RequireProjectileTargetComponent> ent, ref StoodEvent args)
+    {
+        SetActive(ent, false);
+    }
+
+    private void LayingBulletPass(Entity<RequireProjectileTargetComponent> ent, ref DownedEvent args)
+    {
+        SetActive(ent, true);
+    }
+}
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index ee747554e14b..08b351e61e85 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -46,7 +46,6 @@ private void SubscribeEvents()
         SubscribeLocalEvent<MobStateComponent, TryingToSleepEvent>(OnSleepAttempt);
         SubscribeLocalEvent<MobStateComponent, CombatModeShouldHandInteractEvent>(OnCombatModeShouldHandInteract);
         SubscribeLocalEvent<MobStateComponent, AttemptPacifiedAttackEvent>(OnAttemptPacifiedAttack);
-        SubscribeLocalEvent<MobStateComponent, PreventCollideEvent>(OnPreventCollide);
     }
 
     private void OnStateExitSubscribers(EntityUid target, MobStateComponent component, MobState state)
@@ -179,21 +178,5 @@ private void OnAttemptPacifiedAttack(Entity<MobStateComponent> ent, ref AttemptP
         args.Cancelled = true;
     }
 
-    private void OnPreventCollide(Entity<MobStateComponent> ent, ref PreventCollideEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (IsAlive(ent, ent))
-            return;
-
-        var other = args.OtherEntity;
-        if (HasComp<ProjectileComponent>(other) &&
-            CompOrNull<TargetedProjectileComponent>(other)?.Target != ent.Owner)
-        {
-            args.Cancelled = true;
-        }
-    }
-
     #endregion
 }
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 0a2b68d0a1da..fae47113107d 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -1,4 +1,4 @@
-# The progenitor. This should only container the most basic components possible.
+# The progenitor. This should only container the most basic components possible.
 # Only put things on here if every mob *must* have it. This includes ghosts.
 - type: entity
   save: false
@@ -43,6 +43,8 @@
   - type: MovementSpeedModifier
   - type: Polymorphable
   - type: StatusIcon
+  - type: RequireProjectileTarget
+    active: False
 
 # Used for mobs that have health and can take damage.
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 2d84541231eb..01c226cb0fd0 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -89,6 +89,7 @@
     node: crategenericsteel
     containers:
       - entity_storage
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: CrateGeneric

From 33d963a149a0b0ad0a7dc29a0c3ef808c98f8bd2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 13:05:14 +0000
Subject: [PATCH 255/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 91acfe32966e..0587709ee3db 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Golinth
-  changes:
-  - message: Criminal record icons now show up below job icons
-    type: Tweak
-  id: 6175
-  time: '2024-03-18T01:37:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26203
 - author: PJB3005
   changes:
   - message: Fixed pressure damage calculations to what they were always supposed
@@ -3851,3 +3844,13 @@
   id: 6674
   time: '2024-06-03T12:10:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28466
+- author: Cojoke-dot
+  changes:
+  - message: Bullets no longer hit crates unless directly clicked on while shooting.
+    type: Tweak
+  - message: Bullets now pass over mobs that are lying down unless directly clicked
+      on while shooting.
+    type: Tweak
+  id: 6675
+  time: '2024-06-03T13:04:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28072

From 8d78b7442af48ff87607efbcdfb4692a00678daa Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Mon, 3 Jun 2024 13:23:52 +0000
Subject: [PATCH 256/568] make objectives use entityCategory (#28269)

---
 .../Components/ObjectiveComponent.cs          | 10 +++--
 Resources/Locale/en-US/entity-categories.ftl  |  1 +
 Resources/Prototypes/Entities/categories.yml  |  5 +++
 .../Prototypes/Objectives/base_objectives.yml |  6 +--
 Resources/Prototypes/Objectives/dragon.yml    |  2 -
 Resources/Prototypes/Objectives/ninja.yml     |  6 ---
 Resources/Prototypes/Objectives/thief.yml     | 41 -------------------
 Resources/Prototypes/Objectives/traitor.yml   | 19 ---------
 8 files changed, 15 insertions(+), 75 deletions(-)

diff --git a/Content.Shared/Objectives/Components/ObjectiveComponent.cs b/Content.Shared/Objectives/Components/ObjectiveComponent.cs
index 95fbc6856116..36d3fa0bded7 100644
--- a/Content.Shared/Objectives/Components/ObjectiveComponent.cs
+++ b/Content.Shared/Objectives/Components/ObjectiveComponent.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Objectives;
 using Content.Shared.Objectives.Systems;
 using Robust.Shared.Utility;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Objectives.Components;
 
@@ -9,32 +10,33 @@ namespace Content.Shared.Objectives.Components;
 /// Required component for an objective entity prototype.
 /// </summary>
 [RegisterComponent, Access(typeof(SharedObjectivesSystem))]
+[EntityCategory("Objectives")]
 public sealed partial class ObjectiveComponent : Component
 {
     /// <summary>
     /// Difficulty rating used to avoid assigning too many difficult objectives.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
     public float Difficulty;
 
     /// <summary>
     /// Organisation that issued this objective, used for grouping and as a header above common objectives.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
     public string Issuer = string.Empty;
 
     /// <summary>
     /// Unique objectives can only have 1 per prototype id.
     /// Set this to false if you want multiple objectives of the same prototype.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public bool Unique = true;
 
     /// <summary>
     /// Icon of this objective to display in the character menu.
     /// Can be specified by an <see cref="ObjectiveGetInfoEvent"/> handler but is usually done in the prototype.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SpriteSpecifier? Icon;
 }
 
diff --git a/Resources/Locale/en-US/entity-categories.ftl b/Resources/Locale/en-US/entity-categories.ftl
index 457397845dad..6067830b7aaa 100644
--- a/Resources/Locale/en-US/entity-categories.ftl
+++ b/Resources/Locale/en-US/entity-categories.ftl
@@ -1,2 +1,3 @@
 entity-category-name-actions = Actions
 entity-category-name-game-rules = Game Rules
+entity-category-name-objectives = Objectives
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/categories.yml b/Resources/Prototypes/Entities/categories.yml
index 0535a8a4c27a..bc4dd104def7 100644
--- a/Resources/Prototypes/Entities/categories.yml
+++ b/Resources/Prototypes/Entities/categories.yml
@@ -7,3 +7,8 @@
   id: GameRules
   name: entity-category-name-game-rules
   hideSpawnMenu: true
+
+- type: entityCategory
+  id: Objectives
+  name: entity-category-name-objectives
+  hideSpawnMenu: true
\ No newline at end of file
diff --git a/Resources/Prototypes/Objectives/base_objectives.yml b/Resources/Prototypes/Objectives/base_objectives.yml
index 2ab5149213a6..1fbd23dfce22 100644
--- a/Resources/Prototypes/Objectives/base_objectives.yml
+++ b/Resources/Prototypes/Objectives/base_objectives.yml
@@ -1,6 +1,6 @@
 # OBJECTIVE STYLE
-# in comments anything that says final prototype means the objective that isnt abstract
-# the final prototype must be noSpawn to avoid showing in f5
+# in comments anything that says final prototype means the objective that isnt abstract.
+# you dont need noSpawn because Objectives category is automatically added, which has hideSpawnmenu
 # components are listed in this order:
 # 1. Objective
 # 2. requirement components
@@ -8,7 +8,7 @@
 # 4. the condition component
 
 # all objectives should inherit this at some point
-# then have its difficulty etc fields set in the final objective prototypes
+# then have its icon etc fields set in the final objective prototypes
 - type: entity
   abstract: true
   id: BaseObjective
diff --git a/Resources/Prototypes/Objectives/dragon.yml b/Resources/Prototypes/Objectives/dragon.yml
index 2cf7eb292f79..10ca942cb39a 100644
--- a/Resources/Prototypes/Objectives/dragon.yml
+++ b/Resources/Prototypes/Objectives/dragon.yml
@@ -13,7 +13,6 @@
       - DragonRole
 
 - type: entity
-  noSpawn: true
   parent: BaseDragonObjective
   id: CarpRiftsObjective
   components:
@@ -30,7 +29,6 @@
   - type: CarpRiftsCondition
 
 - type: entity
-  noSpawn: true
   parent: [BaseDragonObjective, BaseSurviveObjective]
   id: DragonSurviveObjective
   name: Survive
diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index bc17992e90df..3c2fbcaca889 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -13,7 +13,6 @@
       - NinjaRole
 
 - type: entity
-  noSpawn: true
   parent: BaseNinjaObjective
   id: DoorjackObjective
   components:
@@ -29,7 +28,6 @@
   - type: DoorjackCondition
 
 - type: entity
-  noSpawn: true
   parent: BaseNinjaObjective
   id: StealResearchObjective
   description: Your gloves can be used to hack a research server and steal its precious data. If science has been slacking you'll have to get to work.
@@ -45,7 +43,6 @@
   - type: StealResearchCondition
 
 - type: entity
-  noSpawn: true
   parent: [BaseNinjaObjective, BaseCodeObjective]
   id: SpiderChargeObjective
   description: This bomb can be detonated in a specific location. Note that the bomb will not work anywhere else!
@@ -56,7 +53,6 @@
       state: icon
 
 - type: entity
-  noSpawn: true
   parent: [BaseNinjaObjective, BaseSurviveObjective]
   id: NinjaSurviveObjective
   name: Survive
@@ -68,7 +64,6 @@
       state: icon
 
 - type: entity
-  noSpawn: true
   parent: [BaseNinjaObjective, BaseCodeObjective]
   id: TerrorObjective
   name: Call in a threat
@@ -80,7 +75,6 @@
       state: red_phone
 
 - type: entity
-  noSpawn: true
   parent: [BaseNinjaObjective, BaseCodeObjective]
   id: MassArrestObjective
   name: Set everyone to wanted
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 18154850973b..8b5307e9a093 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -55,7 +55,6 @@
 # Collections
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: FigurineStealCollectionObjective
   components:
@@ -67,7 +66,6 @@
     difficulty: 0.25
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: HeadCloakStealCollectionObjective
   components:
@@ -79,7 +77,6 @@
     difficulty: 1.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: HeadBedsheetStealCollectionObjective
   components:
@@ -91,7 +88,6 @@
     difficulty: 1.0
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: StampStealCollectionObjective
   components:
@@ -103,7 +99,6 @@
     difficulty: 1.0
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: DoorRemoteStealCollectionObjective
   components:
@@ -115,7 +110,6 @@
     difficulty: 1.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: TechnologyDiskStealCollectionObjective
   components:
@@ -130,7 +124,6 @@
     difficulty: 0.8
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: IDCardsStealCollectionObjective
   components:
@@ -145,7 +138,6 @@
 
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealCollectionObjective
   id: LAMPStealCollectionObjective
   components:
@@ -163,7 +155,6 @@
 # steal item
 
 - type: entity                                      #Security subgroup
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ForensicScannerStealObjective
   components:
@@ -175,7 +166,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: FlippoEngravedLighterStealObjective
   components:
@@ -187,7 +177,6 @@
     difficulty: 0.8
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ClothingHeadHatWardenStealObjective
   components:
@@ -197,7 +186,6 @@
     difficulty: 1.2
 
 - type: entity                                      #Medical subgroup
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ClothingOuterHardsuitVoidParamedStealObjective
   components:
@@ -209,7 +197,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: MedicalTechFabCircuitboardStealObjective
   components:
@@ -221,7 +208,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ClothingHeadsetAltMedicalStealObjective
   components:
@@ -233,7 +219,6 @@
     difficulty: 1
 
 - type: entity                                      #Engineering subgroup
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: FireAxeStealObjective
   components:
@@ -245,7 +230,6 @@
     difficulty: 0.8
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: AmePartFlatpackStealObjective
   components:
@@ -257,7 +241,6 @@
     difficulty: 1
 
 - type: entity                                      #Cargo subgroup
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ExpeditionsCircuitboardStealObjective
   components:
@@ -269,7 +252,6 @@
     difficulty: 0.7
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: CargoShuttleCircuitboardStealObjective
   components:
@@ -281,7 +263,6 @@
     difficulty: 0.7
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: SalvageShuttleCircuitboardStealObjective
   components:
@@ -293,7 +274,6 @@
     difficulty: 0.7
 
 - type: entity                                      #Service subgroup
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ClothingEyesHudBeerStealObjective
   components:
@@ -305,7 +285,6 @@
     difficulty: 0.3
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: BibleStealObjective
   components:
@@ -317,7 +296,6 @@
     difficulty: 0.4
 
 - type: entity                                      #Other subgroup
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ClothingNeckGoldmedalStealObjective
   components:
@@ -329,7 +307,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealObjective
   id: ClothingNeckClownmedalStealObjective
   components:
@@ -343,7 +320,6 @@
 # Structures
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: NuclearBombStealObjective
   components:
@@ -355,7 +331,6 @@
     difficulty: 2.5 #Good luck
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: FaxMachineCaptainStealObjective
   components:
@@ -367,7 +342,6 @@
     difficulty: 2
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: ChemDispenserStealObjective
   components:
@@ -379,7 +353,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: XenoArtifactStealObjective
   components:
@@ -391,7 +364,6 @@
     difficulty: 0.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: FreezerHeaterStealObjective
   components:
@@ -403,7 +375,6 @@
     difficulty: 0.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: TegStealObjective
   components:
@@ -415,7 +386,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: BoozeDispenserStealObjective
   components:
@@ -427,7 +397,6 @@
     difficulty: 0.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: AltarNanotrasenStealObjective
   components:
@@ -439,7 +408,6 @@
     difficulty: 0.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealStructureObjective
   id: PlantRDStealObjective
   components:
@@ -453,7 +421,6 @@
 # Animal
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: IanStealObjective
   components:
@@ -465,7 +432,6 @@
     difficulty: 2.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: BingusStealObjective
   components:
@@ -475,7 +441,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: McGriffStealObjective
   components:
@@ -487,7 +452,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: WalterStealObjective
   components:
@@ -499,7 +463,6 @@
     difficulty: 1
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: MortyStealObjective
   components:
@@ -509,7 +472,6 @@
     difficulty: 0.5
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: RenaultStealObjective
   components:
@@ -521,7 +483,6 @@
     difficulty: 2
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: ShivaStealObjective
   components:
@@ -533,7 +494,6 @@
     difficulty: 2
 
 - type: entity
-  noSpawn: true
   parent: BaseThiefStealAnimalObjective
   id: TropicoStealObjective
   components:
@@ -547,7 +507,6 @@
 # Escape
 
 - type: entity
-  noSpawn: true
   parent: [BaseThiefObjective, BaseLivingObjective]
   id: EscapeThiefShuttleObjective
   name: Escape to centcom alive and unrestrained.
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 14397535d4d2..ad5f56a443ea 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -36,7 +36,6 @@
 # state
 
 - type: entity
-  noSpawn: true
   parent: [BaseTraitorObjective, BaseLivingObjective]
   id: EscapeShuttleObjective
   name: Escape to centcom alive and unrestrained.
@@ -50,7 +49,6 @@
   - type: EscapeShuttleCondition
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorObjective
   id: DieObjective
   name: Die a glorious death
@@ -69,7 +67,6 @@
   - type: DieCondition
 
 #- type: entity
-#  noSpawn: true
 #  parent: [BaseTraitorObjective, BaseLivingObjective]
 #  id: HijackShuttleObjective
 #  name: Hijack emergency shuttle
@@ -85,7 +82,6 @@
 # kill
 
 - type: entity
-  noSpawn: true
   parent: [BaseTraitorObjective, BaseKillObjective]
   id: KillRandomPersonObjective
   description: Do it however you like, just make sure they don't make it to centcom.
@@ -98,7 +94,6 @@
   - type: PickRandomPerson
 
 - type: entity
-  noSpawn: true
   parent: [BaseTraitorObjective, BaseKillObjective]
   id: KillRandomHeadObjective
   description: We need this head gone and you probably know why. Good luck, agent.
@@ -119,7 +114,6 @@
 # social
 
 - type: entity
-  noSpawn: true
   parent: [BaseTraitorSocialObjective, BaseKeepAliveObjective]
   id: RandomTraitorAliveObjective
   description: Identify yourself at your own risk. We just need them alive.
@@ -131,7 +125,6 @@
   - type: RandomTraitorAlive
 
 - type: entity
-  noSpawn: true
   parent: [BaseTraitorSocialObjective, BaseHelpProgressObjective]
   id: RandomTraitorProgressObjective
   description: Identify yourself at your own risk. We just need them to succeed.
@@ -157,7 +150,6 @@
     owner: job-name-cmo
 
 - type: entity
-  noSpawn: true
   parent: BaseCMOStealObjective
   id: CMOHyposprayStealObjective
   components:
@@ -165,7 +157,6 @@
     stealGroup: Hypospray
 
 - type: entity
-  noSpawn: true
   parent: BaseCMOStealObjective
   id: CMOCrewMonitorStealObjective
   components:
@@ -185,7 +176,6 @@
     owner: job-name-rd
 
 - type: entity
-  noSpawn: true
   parent: BaseRDStealObjective
   id: RDHardsuitStealObjective
   components:
@@ -196,7 +186,6 @@
     difficulty: 3
 
 - type: entity
-  noSpawn: true
   parent: BaseRDStealObjective
   id: HandTeleporterStealObjective
   components:
@@ -206,7 +195,6 @@
 ## hos
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorStealObjective
   id: SecretDocumentsStealObjective
   components:
@@ -222,7 +210,6 @@
 ## ce
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorStealObjective
   id: MagbootsStealObjective
   components:
@@ -235,7 +222,6 @@
 ## qm
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorStealObjective
   id: ClipboardStealObjective
   components:
@@ -248,7 +234,6 @@
 ## hop
 
 - type: entity
-  noSpawn: true
   parent: BaseTraitorStealObjective
   id: CorgiMeatStealObjective
   components:
@@ -274,7 +259,6 @@
     job: Captain
 
 - type: entity
-  noSpawn: true
   parent: BaseCaptainObjective
   id: CaptainIDStealObjective
   components:
@@ -282,7 +266,6 @@
     stealGroup: CaptainIDCard
 
 - type: entity
-  noSpawn: true
   parent: BaseCaptainObjective
   id: CaptainJetpackStealObjective
   components:
@@ -290,7 +273,6 @@
     stealGroup: JetpackCaptainFilled
 
 - type: entity
-  noSpawn: true
   parent: BaseCaptainObjective
   id: CaptainGunStealObjective
   components:
@@ -299,7 +281,6 @@
     owner: job-name-captain
 
 - type: entity
-  noSpawn: true
   parent: BaseCaptainObjective
   id: NukeDiskStealObjective
   components:

From def04cdaf52ee4e39fe269d3a92d94d02e1e3dc0 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Mon, 3 Jun 2024 06:30:47 -0700
Subject: [PATCH 257/568] Add more info to GettingAttackedAttemptEvent (#28548)

---
 Content.Shared/ActionBlocker/ActionBlockerSystem.cs         | 6 +-----
 .../Interaction/Events/GettingAttackedAttemptEvent.cs       | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index d2883b5ef5be..f1c77fda43b2 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -1,13 +1,9 @@
-using Content.Shared.Bed.Sleep;
 using Content.Shared.Body.Events;
-using Content.Shared.DragDrop;
 using Content.Shared.Emoting;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Speech;
@@ -194,7 +190,7 @@ public bool CanAttack(EntityUid uid, EntityUid? target = null, Entity<MeleeWeapo
             if (target == null)
                 return true;
 
-            var tev = new GettingAttackedAttemptEvent();
+            var tev = new GettingAttackedAttemptEvent(uid, weapon, disarm);
             RaiseLocalEvent(target.Value, ref tev);
             return !tev.Cancelled;
         }
diff --git a/Content.Shared/Interaction/Events/GettingAttackedAttemptEvent.cs b/Content.Shared/Interaction/Events/GettingAttackedAttemptEvent.cs
index ed7379fd72e5..d37c810e3faf 100644
--- a/Content.Shared/Interaction/Events/GettingAttackedAttemptEvent.cs
+++ b/Content.Shared/Interaction/Events/GettingAttackedAttemptEvent.cs
@@ -4,4 +4,4 @@ namespace Content.Shared.Interaction.Events;
 /// Raised directed on the target entity when being attacked.
 /// </summary>
 [ByRefEvent]
-public record struct GettingAttackedAttemptEvent(bool Cancelled);
+public record struct GettingAttackedAttemptEvent(EntityUid Attacker, EntityUid? Weapon, bool Disarm, bool Cancelled = false);

From 0b4388d5d423669f7a3d431ea4f983f3ef50a06d Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 4 Jun 2024 01:36:07 +1200
Subject: [PATCH 258/568] Try fix KeyNotFoundException in KillTrackingSystem
 (#28553)

---
 .../KillTracking/KillTrackingSystem.cs           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Content.Server/KillTracking/KillTrackingSystem.cs b/Content.Server/KillTracking/KillTrackingSystem.cs
index 63627fd1b971..ba27ea5d9e5a 100644
--- a/Content.Server/KillTracking/KillTrackingSystem.cs
+++ b/Content.Server/KillTracking/KillTrackingSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.KillTracking;
@@ -14,7 +15,8 @@ public sealed class KillTrackingSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<KillTrackerComponent, DamageChangedEvent>(OnDamageChanged);
+        // Add damage to LifetimeDamage before MobStateChangedEvent gets raised
+        SubscribeLocalEvent<KillTrackerComponent, DamageChangedEvent>(OnDamageChanged, before: [ typeof(MobThresholdSystem) ]);
         SubscribeLocalEvent<KillTrackerComponent, MobStateChangedEvent>(OnMobStateChanged);
     }
 
@@ -50,7 +52,7 @@ private void OnMobStateChanged(EntityUid uid, KillTrackerComponent component, Mo
         var largestSource = GetLargestSource(component.LifetimeDamage);
         largestSource ??= killImpulse;
 
-        KillSource? killSource;
+        KillSource killSource;
         KillSource? assistSource = null;
 
         if (killImpulse is KillEnvironmentSource)
@@ -69,13 +71,13 @@ private void OnMobStateChanged(EntityUid uid, KillTrackerComponent component, Mo
             killSource = killImpulse;
 
             // no assist is given to environmental kills
-            if (largestSource is not KillEnvironmentSource)
+            if (largestSource is not KillEnvironmentSource
+                && component.LifetimeDamage.TryGetValue(largestSource, out var largestDamage))
             {
-                // you have to do at least 50% of largest source's damage to get the assist.
-                if (component.LifetimeDamage[largestSource] >= component.LifetimeDamage[killSource] / 2)
-                {
+                var killDamage = component.LifetimeDamage.GetValueOrDefault(killSource);
+                // you have to do at least twice as much damage as the killing source to get the assist.
+                if (largestDamage >= killDamage / 2)
                     assistSource = largestSource;
-                }
             }
         }
 

From 87ffbab4614ff616447d7a89d161a699d5750013 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:37:30 +0200
Subject: [PATCH 259/568] Remove locale related changelog (#28547)

---
 Resources/Changelog/Changelog.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0587709ee3db..cab645fa8d43 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3787,25 +3787,18 @@
   id: 6666
   time: '2024-06-02T17:30:27.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28518
-- author: Voomra
-  changes:
-  - message: localize Pray UI
-    type: Fix
-  id: 6667
-  time: '2024-06-02T23:51:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28535
 - author: Whisper
   changes:
   - message: Renamed the player-obtainable "admin cloak" to "weh cloak".
     type: Tweak
-  id: 6668
+  id: 6667
   time: '2024-06-03T02:18:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28540
 - author: Vermidia
   changes:
   - message: Glass shards are no longer weldable with an unlit welder.
     type: Fix
-  id: 6669
+  id: 6668
   time: '2024-06-03T03:28:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27959
 - author: AJCM-git
@@ -3813,35 +3806,35 @@
   - message: Biomass reclaimers no longer act as a void to any unfortunate belongings
       a corpse may be wearing
     type: Tweak
-  id: 6670
+  id: 6669
   time: '2024-06-03T03:30:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28544
 - author: Laneron
   changes:
   - message: Jetpack UI window now has correctly displayed header
     type: Fix
-  id: 6671
+  id: 6670
   time: '2024-06-03T03:33:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28545
 - author: Vermidia
   changes:
   - message: SyndiCats now spawn from a radio like other reinforcements.
     type: Tweak
-  id: 6672
+  id: 6671
   time: '2024-06-03T11:54:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28492
 - author: Cojoke-dot
   changes:
   - message: Medibots will now occasionally talk
     type: Tweak
-  id: 6673
+  id: 6672
   time: '2024-06-03T12:05:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28543
 - author: Cojoke-dot
   changes:
   - message: The player can now use the gasping emote
     type: Tweak
-  id: 6674
+  id: 6673
   time: '2024-06-03T12:10:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28466
 - author: Cojoke-dot
@@ -3851,6 +3844,6 @@
   - message: Bullets now pass over mobs that are lying down unless directly clicked
       on while shooting.
     type: Tweak
-  id: 6675
+  id: 6674
   time: '2024-06-03T13:04:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28072

From 8c105810109a076c30518f0b122b58fcac354bd7 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 260/568] Cleans up StatusIconSystem and fixing some bugs
 (#28270)

---
 .../UI/AgentIDCardBoundUserInterface.cs       |  4 +-
 .../Access/UI/AgentIDCardWindow.xaml.cs       |  8 +--
 Content.Client/Antag/AntagStatusIconSystem.cs | 55 -------------------
 .../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 +-
 Content.Client/Zombies/ZombieSystem.cs        | 48 +++++++---------
 .../Access/Components/AgentIDCardComponent.cs |  6 +-
 .../Access/Systems/AgentIDCardSystem.cs       |  8 +--
 .../Access/Systems/IdCardConsoleSystem.cs     |  2 +-
 .../Access/Systems/PresetIdCardSystem.cs      |  4 +-
 .../Revolutionary/RevolutionarySystem.cs      |  5 ++
 .../Station/Systems/StationSpawningSystem.cs  |  4 +-
 .../Access/SharedAgentIDCardSystem.cs         | 10 ++--
 .../Antag/IAntagStatusIconComponent.cs        | 12 ----
 .../Antag/ShowAntagIconsComponent.cs          |  9 +++
 .../Overlays/ShowHealthBarsComponent.cs       |  5 ++
 .../Components/HeadRevolutionaryComponent.cs  |  5 +-
 .../Components/RevolutionaryComponent.cs      |  5 +-
 .../Components/ShowRevIconsComponent.cs       | 11 ----
 .../SharedRevolutionarySystem.cs              | 22 +++-----
 Content.Shared/Roles/JobPrototype.cs          |  4 +-
 .../SSDIndicator/SSDIndicatorComponent.cs     |  5 +-
 .../Components/StatusIconComponent.cs         | 14 +----
 .../StatusIcon/StatusIconPrototype.cs         | 42 +++++++++++---
 .../Zombies/InitialInfectedComponent.cs       |  8 +--
 .../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
 .../{ => StatusIcon}/StatusEffects/ssd.yml    |  0
 Resources/Prototypes/StatusIcon/antag.yml     | 17 ++++++
 .../{StatusEffects => StatusIcon}/job.yml     |  0
 .../security.yml                              |  0
 49 files changed, 223 insertions(+), 258 deletions(-)
 delete mode 100644 Content.Client/Antag/AntagStatusIconSystem.cs
 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/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 c3fac8cb92a5..761f52988a9d 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 Content.Shared.StatusIcon;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Access.UI
 {
@@ -40,7 +42,7 @@ private void OnJobChanged(string newJob)
             SendMessage(new AgentIDCardJobChangedMessage(newJob));
         }
 
-        public void OnJobIconChanged(string newJobIconId)
+        public void OnJobIconChanged(ProtoId<StatusIconPrototype> newJobIconId)
         {
             SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
         }
diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
index 9a38c0c48530..6d0b2a184f49 100644
--- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
+++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
@@ -38,7 +38,7 @@ public AgentIDCardWindow(AgentIDCardBoundUserInterface bui)
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
-        public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
+        public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
         {
             IconGrid.DisposeAllChildren();
 
@@ -46,10 +46,8 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
             var i = 0;
             foreach (var jobIconId in icons)
             {
-                if (!_prototypeManager.TryIndex<StatusIconPrototype>(jobIconId, out var jobIcon))
-                {
+                if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
                     continue;
-                }
 
                 String styleBase = StyleBase.ButtonOpenBoth;
                 var modulo = i % JobIconColumnCount;
@@ -77,7 +75,7 @@ public void SetAllowedIcons(HashSet<string> icons, string currentJobIconId)
                 };
 
                 jobIconButton.AddChild(jobIconTexture);
-                jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIcon.ID);
+                jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId);
                 IconGrid.AddChild(jobIconButton);
 
                 if (jobIconId.Equals(currentJobIconId))
diff --git a/Content.Client/Antag/AntagStatusIconSystem.cs b/Content.Client/Antag/AntagStatusIconSystem.cs
deleted file mode 100644
index 804ae21ad4a4..000000000000
--- a/Content.Client/Antag/AntagStatusIconSystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Shared.Antag;
-using Content.Shared.Revolutionary.Components;
-using Content.Shared.StatusIcon;
-using Content.Shared.StatusIcon.Components;
-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);
-    }
-
-    /// <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);
-
-    }
-}
diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs
index bd3e21718f0a..ef918313a0d1 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 ba9351d6746b..252aa9aafad4 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -244,7 +244,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 eb182c83ee11..53c332c1857f 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -806,7 +806,7 @@ public void RefreshJobs()
                         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 758bb562f92a..55978d98f7e2 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -1,14 +1,17 @@
 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;
+using Robust.Shared.Prototypes;
 using static Robust.Shared.Maths.Color;
 
 namespace Content.Client.Overlays;
@@ -19,19 +22,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<StatusIconPrototype> 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>();
     }
 
@@ -44,6 +55,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,
@@ -52,31 +64,23 @@ 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;
-            }
 
             // we are all progressing towards death every day
             if (CalcProgress(uid, mobStateComponent, damageableComponent, mobThresholdsComponent) is not { } deathProgress)
diff --git a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
index 8f23cd510cb3..c353b1727295 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 170f552cf3ff..1eb712a8988f 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 a546cf4d8281..d8af91482b3e 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 b1c0f3a1a0c9..6b0d575a8102 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 e24b99f3e87d..a6d4f70af6b4 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 8bf39b875f66..cdb9c54fdfa4 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 660ef198e147..782178a29dbe 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<StatusIconPrototype>(component.SyndStatusIcon, out var iconPrototype))
             ev.StatusIcons.Add(iconPrototype);
     }
 }
-
diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs
index b08aa4340b21..44be1f7a67f5 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 682c73f93e78..8e7e687fa8fc 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 587450a2f66b..e7311953170b 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 f1473bda7a2a..4b3daae22fd8 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 980fd9f2a929..63f57767695e 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 b60ffc2a4089..0b94e41f6bc6 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.Client/Zombies/ZombieSystem.cs b/Content.Client/Zombies/ZombieSystem.cs
index 49b5d6aec184..d250e418504f 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.Server/Access/Components/AgentIDCardComponent.cs b/Content.Server/Access/Components/AgentIDCardComponent.cs
index 4b92b43ea992..7a97c5f5653f 100644
--- a/Content.Server/Access/Components/AgentIDCardComponent.cs
+++ b/Content.Server/Access/Components/AgentIDCardComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.StatusIcon;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Access.Components
 {
@@ -9,7 +9,7 @@ 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();
+        [DataField]
+        public HashSet<ProtoId<StatusIconPrototype>> Icons;
     }
 }
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index d5e9dc357ddf..f0ce3acbdb88 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<StatusIconPrototype>(args.JobIconId, out var jobIcon))
-            {
+            if (!_prototypeManager.TryIndex(args.JobIconId, out var jobIcon))
                 return;
-            }
 
             _cardSystem.TryChangeJobIcon(uid, jobIcon, idCard);
 
@@ -109,7 +105,7 @@ private bool TryFindJobProtoFromIcon(StatusIconPrototype jobIcon, [NotNullWhen(t
         {
             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/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index 4e63c93a837d..e02664f2bbdf 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 3e775b9c35da..426e523243c3 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -82,9 +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/Revolutionary/RevolutionarySystem.cs b/Content.Server/Revolutionary/RevolutionarySystem.cs
new file mode 100644
index 000000000000..597c4896b90a
--- /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 f175565a5a0e..557a1f95662e 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -257,10 +257,8 @@ public void SetPdaAndIdCardData(EntityUid entity, string characterName, JobProto
         _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.Shared/Access/SharedAgentIDCardSystem.cs b/Content.Shared/Access/SharedAgentIDCardSystem.cs
index d027a3937f5a..91aa626fe398 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
@@ -23,12 +25,12 @@ public enum AgentIDCardUiKey : byte
     [Serializable, NetSerializable]
     public sealed class AgentIDCardBoundUserInterfaceState : BoundUserInterfaceState
     {
-        public readonly HashSet<string> Icons;
+        public readonly HashSet<ProtoId<StatusIconPrototype>> 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, HashSet<ProtoId<StatusIconPrototype>> icons)
         {
             Icons = icons;
             CurrentName = currentName;
@@ -62,9 +64,9 @@ public AgentIDCardJobChangedMessage(string job)
     [Serializable, NetSerializable]
     public sealed class AgentIDCardJobIconChangedMessage : BoundUserInterfaceMessage
     {
-        public string JobIconId { get; }
+        public ProtoId<StatusIconPrototype> JobIconId { get; }
 
-        public AgentIDCardJobIconChangedMessage(string jobIconId)
+        public AgentIDCardJobIconChangedMessage(ProtoId<StatusIconPrototype> jobIconId)
         {
             JobIconId = jobIconId;
         }
diff --git a/Content.Shared/Antag/IAntagStatusIconComponent.cs b/Content.Shared/Antag/IAntagStatusIconComponent.cs
deleted file mode 100644
index 981937c91630..000000000000
--- 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 000000000000..c451b69c3e0c
--- /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/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index 48e3162269a6..1297d5683854 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;
@@ -15,4 +17,7 @@ public sealed partial class ShowHealthBarsComponent : Component
     /// </summary>
     [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageContainerPrototype>))]
     public List<string> DamageContainers = new();
+
+    [DataField]
+    public ProtoId<StatusIconPrototype> HealthStatusIcon = "HealthIconFine";
 }
diff --git a/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/HeadRevolutionaryComponent.cs
index d2c8374fefee..ef2bad65e0de 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.
@@ -24,7 +24,4 @@ public sealed partial class HeadRevolutionaryComponent : Component, IAntagStatus
     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 73f533cf6906..1f6b45ddea19 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
@@ -25,7 +25,4 @@ public sealed partial class RevolutionaryComponent : Component, IAntagStatusIcon
     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 11e20db3f89b..000000000000
--- 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 ddaf73fcc9f9..bbf91193cc31 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/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 2959b564972a..0b3bfb44384c 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -97,8 +97,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<StatusIconPrototype> 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 66310505a1a4..ee67e3296f68 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;
@@ -16,6 +17,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<StatusIconPrototype> Icon = "SSDIcon";
 }
diff --git a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs
index 385f9760c659..c56be7c96a52 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 2bd13b9361d3..29a1b60114f2 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,26 +17,45 @@ 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;
 
-    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>
@@ -52,6 +73,11 @@ public int CompareTo(StatusIconData? other)
     /// </summary>
     [DataField]
     public bool IsShaded = false;
+
+    public int CompareTo(StatusIconData? other)
+    {
+        return Priority.CompareTo(other?.Priority ?? int.MaxValue);
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs
index 3200dd7f5ee7..3149de63bddf 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;
@@ -6,11 +5,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 bool IconVisibleToGhost { get; set; } = true;
+    public ProtoId<StatusIconPrototype> StatusIcon = "InitialInfectedFaction";
 }
diff --git a/Content.Shared/Zombies/ShowZombieIconsComponent.cs b/Content.Shared/Zombies/ShowZombieIconsComponent.cs
deleted file mode 100644
index a2bc85c07461..000000000000
--- 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 3673a2c51d58..2cd0cdb96d77 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
@@ -97,9 +97,6 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     [DataField("zombieStatusIcon")]
     public ProtoId<StatusIconPrototype> 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 4a83593bc342..8b0f60ca58aa 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -84,8 +84,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/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/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml
index 0dbdfce4f97c..0da545b8a203 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -1,6 +1,11 @@
 - type: statusIcon
   id: ZombieFaction
   priority: 11
+  showTo:
+    components:
+    - ShowAntagIcons
+    - Zombie
+    - InitialInfected
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
@@ -8,6 +13,10 @@
 - type: statusIcon
   id: InitialInfectedFaction
   priority: 11
+  showTo:
+    components:
+    - ShowAntagIcons
+    - InitialInfected
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: InitialInfected
@@ -15,6 +24,10 @@
 - type: statusIcon
   id: RevolutionaryFaction
   priority: 11
+  showTo:
+    components:
+      - ShowAntagIcons
+      - Revolutionary
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Revolutionary
@@ -22,6 +35,10 @@
 - type: statusIcon
   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 1e04b3c9f492e82bf28da9e9e97bcad65bb01c67 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 16:13:28 +0000
Subject: [PATCH 261/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index cab645fa8d43..f2d31318272d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3847,3 +3847,11 @@
   id: 6674
   time: '2024-06-03T13:04:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28072
+- author: AJCM-git
+  changes:
+  - message: Ninja stealth mode, stealth boxes and everything with stealth won't show
+      up in equipment HUDs like the medical or security HUD anymore.
+    type: Fix
+  id: 6675
+  time: '2024-06-03T16:12:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28270

From 619d82ed426c50a72d71ca195d901c11b09adea9 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:22:26 -0400
Subject: [PATCH 262/568] Small code cleanup to health bar (#28554)

---
 Content.Client/Commands/ShowHealthBarsCommand.cs   | 2 +-
 Content.Client/Overlays/EntityHealthBarOverlay.cs  | 2 +-
 Content.Shared/Overlays/ShowHealthBarsComponent.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs
index ef918313a0d1..0811f9666378 100644
--- a/Content.Client/Commands/ShowHealthBarsCommand.cs
+++ b/Content.Client/Commands/ShowHealthBarsCommand.cs
@@ -35,7 +35,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             var showHealthBarsComponent = new ShowHealthBarsComponent
             {
                 DamageContainers = args.ToList(),
-                HealthStatusIcon = "",
+                HealthStatusIcon = null,
                 NetSyncEnabled = false
             };
 
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 55978d98f7e2..4f928437395a 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -33,7 +33,7 @@ public sealed class EntityHealthBarOverlay : Overlay
 
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
-    public ProtoId<StatusIconPrototype> StatusIcon;
+    public ProtoId<StatusIconPrototype>? StatusIcon;
 
     public EntityHealthBarOverlay(IEntityManager entManager, IPrototypeManager prototype)
     {
diff --git a/Content.Shared/Overlays/ShowHealthBarsComponent.cs b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
index 1297d5683854..4229e27af604 100644
--- a/Content.Shared/Overlays/ShowHealthBarsComponent.cs
+++ b/Content.Shared/Overlays/ShowHealthBarsComponent.cs
@@ -19,5 +19,5 @@ public sealed partial class ShowHealthBarsComponent : Component
     public List<string> DamageContainers = new();
 
     [DataField]
-    public ProtoId<StatusIconPrototype> HealthStatusIcon = "HealthIconFine";
+    public ProtoId<StatusIconPrototype>? HealthStatusIcon = "HealthIconFine";
 }

From b5e8a696225a3c790939b67a832067caa1354c67 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 3 Jun 2024 12:24:32 -0400
Subject: [PATCH 263/568] Add a test for sliceable cargo bounty exploits
 (#28357)

---
 Content.IntegrationTests/Tests/CargoTest.cs   | 79 +++++++++++++++++++
 .../Cargo/Systems/CargoSystem.Bounty.cs       | 17 +++-
 .../Prototypes/Catalog/Bounties/bounties.yml  |  6 ++
 3 files changed, 101 insertions(+), 1 deletion(-)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 09f179cf4f5a..8e1d536054f2 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 = @"
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 0fcfd160bb39..554b349b9ba6 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 bedfe442872e..08bb2a142250 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 ee8224bce22c5d5ca76faaa43b2fc8441f356610 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 3 Jun 2024 12:59:59 -0400
Subject: [PATCH 264/568] Tip 51 does not exist (#28555)

---
 Resources/Locale/en-US/tips.ftl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Locale/en-US/tips.ftl b/Resources/Locale/en-US/tips.ftl
index 52912d1ba407..90a061645267 100644
--- a/Resources/Locale/en-US/tips.ftl
+++ b/Resources/Locale/en-US/tips.ftl
@@ -48,6 +48,7 @@ tips-dataset-47 = As a Salvage Specialist, you can use your proto-kinetic accele
 tips-dataset-48 = As a Salvage Specialist, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology.
 tips-dataset-49 = As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!
 tips-dataset-50 = As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator.
+tips-dataset-51 = Tip #51 does not exist and has never existed. Ignore any rumors to the contrary.
 tips-dataset-52 = As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials.
 tips-dataset-53 = As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner.
 tips-dataset-54 = As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to.

From a4d16017589e82822c9880b146b8d3dab9621093 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:47:06 +0300
Subject: [PATCH 265/568] Accent trait limit (#28046)

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  99 +++++++++++++----
 .../UI/Roles/TraitPreferenceSelector.xaml     |   2 +-
 .../UI/Roles/TraitPreferenceSelector.xaml.cs  |   9 +-
 Content.Server/Traits/TraitSystem.cs          |  30 ++---
 .../Preferences/HumanoidCharacterProfile.cs   |  32 +++++-
 .../Traits/TraitCategoryPrototype.cs          |  26 +++++
 Content.Shared/Traits/TraitPrototype.cs       | 104 ++++++++++--------
 .../ui/humanoid-profile-editor.ftl            |  11 +-
 Resources/Locale/en-US/traits/traits.ftl      |  18 ++-
 Resources/Prototypes/Traits/categories.yml    |   8 ++
 Resources/Prototypes/Traits/disabilities.yml  |  42 ++++---
 .../Prototypes/Traits/inconveniences.yml      |  18 ---
 Resources/Prototypes/Traits/neutral.yml       |  33 ------
 Resources/Prototypes/Traits/speech.yml        |  88 +++++++++++++++
 14 files changed, 357 insertions(+), 163 deletions(-)
 create mode 100644 Content.Shared/Traits/TraitCategoryPrototype.cs
 create mode 100644 Resources/Prototypes/Traits/categories.yml
 delete mode 100644 Resources/Prototypes/Traits/inconveniences.yml
 delete mode 100644 Resources/Prototypes/Traits/neutral.yml
 create mode 100644 Resources/Prototypes/Traits/speech.yml

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 53c332c1857f..ac43fa11a853 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -7,6 +7,7 @@
 using Content.Client.Lobby.UI.Roles;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
@@ -466,38 +467,96 @@ public void RefreshTraits()
             var traits = _prototypeManager.EnumeratePrototypes<TraitPrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
             TabContainer.SetTabTitle(3, Loc.GetString("humanoid-profile-editor-traits-tab"));
 
-            if (traits.Count > 0)
+            if (traits.Count < 1)
             {
-                foreach (var trait in traits)
+                TraitsList.AddChild(new Label
                 {
-                    var selector = new TraitPreferenceSelector(trait);
+                    Text = Loc.GetString("humanoid-profile-editor-no-traits"),
+                    FontColorOverride = Color.Gray,
+                });
+                return;
+            }
 
-                    if (Profile?.TraitPreferences.Contains(trait.ID) == true)
-                    {
-                        selector.Preference = true;
-                    }
-                    else
+            //Setup model
+            Dictionary<string, List<string>> model = new();
+            List<string> defaultTraits = new();
+            model.Add("default", defaultTraits);
+
+            foreach (var trait in traits)
+            {
+                if (trait.Category == null)
+                {
+                    defaultTraits.Add(trait.ID);
+                    continue;
+                }
+
+                if (!model.ContainsKey(trait.Category))
+                {
+                    model.Add(trait.Category, new());
+                }
+                model[trait.Category].Add(trait.ID);
+            }
+
+            //Create UI view from model
+            foreach (var (categoryId, traitId) in model)
+            {
+                TraitCategoryPrototype? category = null;
+                if (categoryId != "default")
+                {
+                    category = _prototypeManager.Index<TraitCategoryPrototype>(categoryId);
+                    // Label
+                    TraitsList.AddChild(new Label
                     {
-                        selector.Preference = false;
-                    }
+                        Text = Loc.GetString(category.Name),
+                        Margin = new Thickness(0, 10, 0, 0),
+                        StyleClasses = { StyleBase.StyleClassLabelHeading },
+                    });
+                }
+
+                List<TraitPreferenceSelector?> selectors = new();
+                var selectionCount = 0;
+
+                foreach (var traitProto in traitId)
+                {
+                    var trait = _prototypeManager.Index<TraitPrototype>(traitProto);
+                    var selector = new TraitPreferenceSelector(trait);
+
+                    selector.Preference = Profile?.TraitPreferences.Contains(trait.ID) == true;
+                    if (selector.Preference)
+                        selectionCount += trait.Cost;
 
                     selector.PreferenceChanged += preference =>
                     {
-                        Profile = Profile?.WithTraitPreference(trait.ID, preference);
+                        Profile = Profile?.WithTraitPreference(trait.ID, categoryId, preference);
                         SetDirty();
+                        RefreshTraits(); // If too many traits are selected, they will be reset to the real value.
                     };
+                    selectors.Add(selector);
+                }
 
-                    TraitsList.AddChild(selector);
+                // Selection counter
+                if (category is { MaxTraitPoints: >= 0 })
+                {
+                    TraitsList.AddChild(new Label
+                    {
+                        Text = Loc.GetString("humanoid-profile-editor-trait-count-hint", ("current", selectionCount) ,("max", category.MaxTraitPoints)),
+                        FontColorOverride = Color.Gray
+                    });
                 }
-            }
-            else
-            {
-                TraitsList.AddChild(new Label
+
+                foreach (var selector in selectors)
                 {
-                    // TODO: Localise
-                    Text = "No traits available :(",
-                    FontColorOverride = Color.Gray,
-                });
+                    if (selector == null)
+                        continue;
+
+                    if (category is { MaxTraitPoints: >= 0 } &&
+                        selector.Cost + selectionCount > category.MaxTraitPoints)
+                    {
+                        selector.Checkbox.Label.FontColorOverride = Color.Red;
+                    }
+
+                    TraitsList.AddChild(selector);
+                }
             }
         }
 
diff --git a/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml b/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml
index 18dabe309041..266b4b8eeee4 100644
--- a/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml
+++ b/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml
@@ -2,6 +2,6 @@
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
         <BoxContainer Name="Container"
                       Orientation="Horizontal">
-            <CheckBox Name="Checkbox"/>
+            <CheckBox Name="Checkbox" Access="Public"/>
         </BoxContainer>
 </Control>
diff --git a/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml.cs b/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml.cs
index 498a5ca4e504..a52a3fa2dbc3 100644
--- a/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml.cs
+++ b/Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml.cs
@@ -9,6 +9,8 @@ namespace Content.Client.Lobby.UI.Roles;
 [GenerateTypedNameReferences]
 public sealed partial class TraitPreferenceSelector : Control
 {
+    public int Cost;
+
     public bool Preference
     {
         get => Checkbox.Pressed;
@@ -20,7 +22,12 @@ public bool Preference
     public TraitPreferenceSelector(TraitPrototype trait)
     {
         RobustXamlLoader.Load(this);
-        Checkbox.Text = Loc.GetString(trait.Name);
+
+        var text = trait.Cost != 0 ? $"[{trait.Cost}] " : "";
+        text += Loc.GetString(trait.Name);
+
+        Cost = trait.Cost;
+        Checkbox.Text = text;
         Checkbox.OnToggled += OnCheckBoxToggled;
 
         if (trait.Description is { } desc)
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 22ee0e4861f4..f7531f7e2ce7 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -38,27 +38,21 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 continue;
 
             // Add all components required by the prototype
-            foreach (var entry in traitPrototype.Components.Values)
-            {
-                if (HasComp(args.Mob, entry.Component.GetType()))
-                    continue;
-
-                var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
-                comp.Owner = args.Mob;
-                EntityManager.AddComponent(args.Mob, comp);
-            }
+            EntityManager.AddComponents(args.Mob, traitPrototype.Components, false);
 
             // Add item required by the trait
-            if (traitPrototype.TraitGear != null)
-            {
-                if (!TryComp(args.Mob, out HandsComponent? handsComponent))
-                    continue;
+            if (traitPrototype.TraitGear == null)
+                continue;
 
-                var coords = Transform(args.Mob).Coordinates;
-                var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
-                _sharedHandsSystem.TryPickup(args.Mob, inhandEntity, checkActionBlocker: false,
-                    handsComp: handsComponent);
-            }
+            if (!TryComp(args.Mob, out HandsComponent? handsComponent))
+                continue;
+
+            var coords = Transform(args.Mob).Coordinates;
+            var inhandEntity = EntityManager.SpawnEntity(traitPrototype.TraitGear, coords);
+            _sharedHandsSystem.TryPickup(args.Mob,
+                inhandEntity,
+                checkActionBlocker: false,
+                handsComp: handsComponent);
         }
     }
 }
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index f47a3ac3dbe7..bd55bbb40a8f 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -346,13 +346,43 @@ public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
             };
         }
 
-        public HumanoidCharacterProfile WithTraitPreference(string traitId, bool pref)
+        public HumanoidCharacterProfile WithTraitPreference(string traitId, string? categoryId, bool pref)
         {
+            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+            var traitProto = prototypeManager.Index<TraitPrototype>(traitId);
+
+            TraitCategoryPrototype? categoryProto = null;
+            if (categoryId != null && categoryId != "default")
+                categoryProto = prototypeManager.Index<TraitCategoryPrototype>(categoryId);
+
             var list = new HashSet<string>(_traitPreferences);
 
             if (pref)
             {
                 list.Add(traitId);
+
+                if (categoryProto == null || categoryProto.MaxTraitPoints < 0)
+                {
+                    return new(this)
+                    {
+                        _traitPreferences = list,
+                    };
+                }
+
+                var count = 0;
+                foreach (var trait in list)
+                {
+                    var traitProtoTemp = prototypeManager.Index<TraitPrototype>(trait);
+                    count += traitProtoTemp.Cost;
+                }
+
+                if (count > categoryProto.MaxTraitPoints && traitProto.Cost != 0)
+                {
+                    return new(this)
+                    {
+                        _traitPreferences = _traitPreferences,
+                    };
+                }
             }
             else
             {
diff --git a/Content.Shared/Traits/TraitCategoryPrototype.cs b/Content.Shared/Traits/TraitCategoryPrototype.cs
new file mode 100644
index 000000000000..1da624173a3d
--- /dev/null
+++ b/Content.Shared/Traits/TraitCategoryPrototype.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Traits;
+
+/// <summary>
+/// Traits category with general settings. Allows you to limit the number of taken traits in one category
+/// </summary>
+[Prototype]
+public sealed partial class TraitCategoryPrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    ///     Name of the trait category displayed in the UI
+    /// </summary>
+    [DataField]
+    public LocId Name { get; private set; } = string.Empty;
+
+    /// <summary>
+    ///     The maximum number of traits that can be taken in this category. If -1, you can take as many traits as you like.
+    /// </summary>
+    [DataField]
+    public int MaxTraitPoints = -1;
+}
diff --git a/Content.Shared/Traits/TraitPrototype.cs b/Content.Shared/Traits/TraitPrototype.cs
index 34feb8da22c3..c79d3cbf308e 100644
--- a/Content.Shared/Traits/TraitPrototype.cs
+++ b/Content.Shared/Traits/TraitPrototype.cs
@@ -1,55 +1,63 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-// don't worry about it
+namespace Content.Shared.Traits;
 
-namespace Content.Shared.Traits
+/// <summary>
+/// Describes a trait.
+/// </summary>
+[Prototype]
+public sealed partial class TraitPrototype : IPrototype
 {
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The name of this trait.
+    /// </summary>
+    [DataField]
+    public LocId Name { get; private set; } = string.Empty;
+
+    /// <summary>
+    /// The description of this trait.
+    /// </summary>
+    [DataField]
+    public LocId? Description { get; private set; }
+
+    /// <summary>
+    /// Don't apply this trait to entities this whitelist IS NOT valid for.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
     /// <summary>
-    ///     Describes a trait.
-    /// </summary>
-    [Prototype("trait")]
-    public sealed partial class TraitPrototype : IPrototype
-    {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        /// <summary>
-        ///     The name of this trait.
-        /// </summary>
-        [DataField("name")]
-        public string Name { get; private set; } = "";
-
-        /// <summary>
-        ///     The description of this trait.
-        /// </summary>
-        [DataField("description")]
-        public string? Description { get; private set; }
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS NOT valid for.
-        /// </summary>
-        [DataField("whitelist")]
-        public EntityWhitelist? Whitelist;
-
-        /// <summary>
-        ///     Don't apply this trait to entities this whitelist IS valid for. (hence, a blacklist)
-        /// </summary>
-        [DataField("blacklist")]
-        public EntityWhitelist? Blacklist;
-
-        /// <summary>
-        ///     The components that get added to the player, when they pick this trait.
-        /// </summary>
-        [DataField("components")]
-        public ComponentRegistry Components { get; private set; } = default!;
-
-        /// <summary>
-        ///     Gear that is given to the player, when they pick this trait.
-        /// </summary>
-        [DataField("traitGear", required: false, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? TraitGear;
-    }
+    /// Don't apply this trait to entities this whitelist IS valid for. (hence, a blacklist)
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// The components that get added to the player, when they pick this trait.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry Components { get; private set; } = default!;
+
+    /// <summary>
+    /// Gear that is given to the player, when they pick this trait.
+    /// </summary>
+    [DataField]
+    public EntProtoId? TraitGear;
+
+    /// <summary>
+    /// Trait Price. If negative number, points will be added.
+    /// </summary>
+    [DataField]
+    public int Cost = 0;
+
+    /// <summary>
+    /// Adds a trait to a category, allowing you to limit the selection of some traits to the settings of that category.
+    /// </summary>
+    [DataField]
+    public ProtoId<TraitCategoryPrototype>? Category;
 }
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index c7a24d540585..bfdbeb2f140b 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -42,7 +42,7 @@ humanoid-profile-editor-department-jobs-label = {$departmentName} jobs
 humanoid-profile-editor-antags-tab = Antags
 humanoid-profile-editor-antag-preference-yes-button = Yes
 humanoid-profile-editor-antag-preference-no-button = No
-humanoid-profile-editor-traits-tab = Traits
+
 humanoid-profile-editor-job-priority-high-button = High
 humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
@@ -50,3 +50,12 @@ humanoid-profile-editor-job-priority-never-button = Never
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
 humanoid-profile-editor-markings-tab = Markings
 humanoid-profile-editor-flavortext-tab = Description
+
+# Traits
+humanoid-profile-editor-traits-tab = Traits
+humanoid-profile-editor-no-traits = No traits available
+
+humanoid-profile-editor-trait-count-hint = Points available: [{$current}/{$max}]
+
+trait-category-disabilities = Disabilities
+trait-category-speech = Speech traits
\ No newline at end of file
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index cbf65308f3ea..e3aed1c8b246 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -12,7 +12,7 @@ trait-pacifist-desc = You cannot attack or hurt any living beings.
 
 permanent-blindness-trait-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} eyes are glassy and unfocused. It doesn't seem like {SUBJECT($target)} can see you well, if at all.[/color]
 
-trait-lightweight-name = Lightweight Drunk
+trait-lightweight-name = Lightweight drunk
 trait-lightweight-desc = Alcohol has a stronger effect on you
 
 trait-muted-name = Muted
@@ -24,23 +24,29 @@ trait-paracusia-desc = You hear sounds that aren't really there
 trait-unrevivable-name = Unrevivable
 trait-unrevivable-desc = You are unable to be revived by defibrillators.
 
-trait-pirate-accent-name = Pirate Accent
+trait-pirate-accent-name = Pirate accent
 trait-pirate-accent-desc = You can't stop speaking like a pirate!
 
 trait-accentless-name = Accentless
 trait-accentless-desc = You don't have the accent that your species would usually have
 
-trait-frontal-lisp-name = Frontal Lisp
+trait-frontal-lisp-name = Frontal lisp
 trait-frontal-lisp-desc = You thpeak with a lithp
 
-trait-socialanxiety-name = Social Anxiety
+trait-socialanxiety-name = Social anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.
 
-trait-southern-name = Southern Drawl
+trait-southern-name = Southern drawl
 trait-southern-desc = You have a different way of speakin'.
 
 trait-snoring-name = Snoring
 trait-snoring-desc = You will snore while sleeping.
 
 trait-liar-name = Pathological liar
-trait-liar-desc = You can hardly bring yourself to tell the truth. Sometimes you lie anyway.
\ No newline at end of file
+trait-liar-desc = You can hardly bring yourself to tell the truth. Sometimes you lie anyway.
+
+trait-cowboy-name = Cowboy accent
+trait-cowboy-desc = You speak with a distinct cowboy accent!
+
+trait-italian-name = Italian accent
+trait-italian-desc = Mamma mia! You seem to have lived in space italy!
\ No newline at end of file
diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml
new file mode 100644
index 000000000000..a3621648a433
--- /dev/null
+++ b/Resources/Prototypes/Traits/categories.yml
@@ -0,0 +1,8 @@
+- type: traitCategory
+  id: Disabilities
+  name: trait-category-disabilities
+
+- type: traitCategory
+  id: SpeechTraits
+  name: trait-category-speech
+  maxTraitPoints: 2
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index be1e981549c6..6e0026e44ebd 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -3,6 +3,7 @@
   name: trait-blindness-name
   description: trait-blindness-desc
   traitGear: WhiteCane
+  category: Disabilities
   whitelist:
     components:
       - Blindable
@@ -14,6 +15,7 @@
   name: trait-poor-vision-name
   description: trait-poor-vision-desc
   traitGear: ClothingEyesGlasses
+  category: Disabilities
   whitelist:
     components:
       - Blindable
@@ -25,6 +27,7 @@
   id: Narcolepsy
   name: trait-narcolepsy-name
   description: trait-narcolepsy-desc
+  category: Disabilities
   components:
     - type: Narcolepsy
       timeBetweenIncidents: 300, 600
@@ -34,25 +37,15 @@
   id: Pacifist
   name: trait-pacifist-name
   description: trait-pacifist-desc
+  category: Disabilities
   components:
     - type: Pacified
 
-- type: trait
-  id: Paracusia
-  name: trait-paracusia-name
-  description: trait-paracusia-desc
-  components:
-    - type: Paracusia
-      minTimeBetweenIncidents: 0.1
-      maxTimeBetweenIncidents: 300
-      maxSoundDistance: 7
-      sounds:
-        collection: Paracusia
-
 - type: trait
   id: Unrevivable
   name: trait-unrevivable-name
   description: trait-unrevivable-desc
+  category: Disabilities
   components:
     - type: Unrevivable
 
@@ -60,6 +53,7 @@
   id: Muted
   name: trait-muted-name
   description: trait-muted-desc
+  category: Disabilities
   blacklist:
     components:
       - BorgChassis
@@ -67,15 +61,31 @@
     - type: Muted
 
 - type: trait
-  id: FrontalLisp
-  name: trait-frontal-lisp-name
-  description: trait-frontal-lisp-desc
+  id: LightweightDrunk
+  name: trait-lightweight-name
+  description: trait-lightweight-desc
+  category: Disabilities
   components:
-    - type: FrontalLisp
+    - type: LightweightDrunk
+      boozeStrengthMultiplier: 2
+
+- type: trait
+  id: Paracusia
+  name: trait-paracusia-name
+  description: trait-paracusia-desc
+  category: Disabilities
+  components:
+    - type: Paracusia
+      minTimeBetweenIncidents: 0.1
+      maxTimeBetweenIncidents: 300
+      maxSoundDistance: 7
+      sounds:
+        collection: Paracusia
 
 - type: trait
   id: Snoring
   name: trait-snoring-name
   description: trait-snoring-desc
+  category: Disabilities
   components:
     - type: Snoring
diff --git a/Resources/Prototypes/Traits/inconveniences.yml b/Resources/Prototypes/Traits/inconveniences.yml
deleted file mode 100644
index 657781d1b595..000000000000
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: trait
-  id: LightweightDrunk
-  name: trait-lightweight-name
-  description: trait-lightweight-desc
-  components:
-    - type: LightweightDrunk
-      boozeStrengthMultiplier: 2
-
-- type: trait
-  id: SocialAnxiety
-  name: trait-socialanxiety-name
-  description: trait-socialanxiety-desc
-  components:
-    - type: StutteringAccent
-      matchRandomProb: 0.1
-      fourRandomProb: 0
-      threeRandomProb: 0
-      cutRandomProb: 0
diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml
deleted file mode 100644
index 78d2bba04961..000000000000
--- a/Resources/Prototypes/Traits/neutral.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- type: trait
-  id: PirateAccent
-  name: trait-pirate-accent-name
-  description: trait-pirate-accent-desc
-  components:
-    - type: PirateAccent
-
-- type: trait
-  id: Accentless
-  name: trait-accentless-name
-  description: trait-accentless-desc
-  components:
-  - type: Accentless
-    removes:
-    - type: LizardAccent
-    - type: MothAccent
-    - type: ReplacementAccent
-      accent: dwarf
-
-- type: trait
-  id: Southern
-  name: trait-southern-name
-  description: trait-southern-desc
-  components:
-    - type: SouthernAccent
-
-- type: trait
-  id: Liar
-  name: trait-liar-name
-  description: trait-liar-desc
-  components:
-    - type: ReplacementAccent
-      accent: liar
diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml
new file mode 100644
index 000000000000..9448e160b5f7
--- /dev/null
+++ b/Resources/Prototypes/Traits/speech.yml
@@ -0,0 +1,88 @@
+# Free
+
+- type: trait
+  id: Accentless
+  name: trait-accentless-name
+  description: trait-accentless-desc
+  category: SpeechTraits
+  components:
+  - type: Accentless
+    removes:
+    - type: LizardAccent
+    - type: MothAccent
+    - type: ReplacementAccent
+      accent: dwarf
+
+# 1 Cost
+
+- type: trait
+  id: SouthernAccent
+  name: trait-southern-name
+  description: trait-southern-desc
+  category: SpeechTraits
+  cost: 1
+  components:
+    - type: SouthernAccent
+
+- type: trait
+  id: PirateAccent
+  name: trait-pirate-accent-name
+  description: trait-pirate-accent-desc
+  category: SpeechTraits
+  cost: 1
+  components:
+    - type: PirateAccent
+
+- type: trait
+  id: CowboyAccent
+  name: trait-cowboy-name
+  description: trait-cowboy-desc
+  category: SpeechTraits
+  cost: 1
+  components:
+    - type: ReplacementAccent
+      accent: cowboy
+
+- type: trait
+  id: ItalianAccent
+  name: trait-italian-name
+  description: trait-italian-desc
+  category: SpeechTraits
+  cost: 1
+  components:
+    - type: ReplacementAccent
+      accent: italian
+
+- type: trait
+  id: Liar
+  name: trait-liar-name
+  description: trait-liar-desc
+  category: SpeechTraits
+  cost: 1
+  components:
+    - type: ReplacementAccent
+      accent: liar
+
+# 2 Cost
+
+- type: trait
+  id: SocialAnxiety
+  name: trait-socialanxiety-name
+  description: trait-socialanxiety-desc
+  category: SpeechTraits
+  cost: 2
+  components:
+    - type: StutteringAccent
+      matchRandomProb: 0.1
+      fourRandomProb: 0
+      threeRandomProb: 0
+      cutRandomProb: 0
+
+- type: trait
+  id: FrontalLisp
+  name: trait-frontal-lisp-name
+  description: trait-frontal-lisp-desc
+  category: SpeechTraits
+  cost: 2
+  components:
+    - type: FrontalLisp

From 3e2eb6cc7a6f82b5aedc853ad74ceeb1e8ce8838 Mon Sep 17 00:00:00 2001
From: RenQ <164364533+ImRenQ@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:48:01 +0300
Subject: [PATCH 266/568] "Death gasp" for a moth (#28409)

---
 Resources/Audio/Effects/Gasp/attributions.yml   |   6 ++++++
 Resources/Audio/Effects/Gasp/moth_DeathGasp.ogg | Bin 0 -> 18078 bytes
 .../Prototypes/SoundCollections/deathgasp.yml   |   5 +++++
 .../Prototypes/Voice/speech_emote_sounds.yml    |   2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Audio/Effects/Gasp/moth_DeathGasp.ogg

diff --git a/Resources/Audio/Effects/Gasp/attributions.yml b/Resources/Audio/Effects/Gasp/attributions.yml
index fe8f817c5a35..8d84b770f3ab 100644
--- a/Resources/Audio/Effects/Gasp/attributions.yml
+++ b/Resources/Audio/Effects/Gasp/attributions.yml
@@ -24,3 +24,9 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f7a49c4068f1277e6857baf0892d355f1c055974"
   source: "https://github.com/tgstation/tgstation/tree/f7a49c4068f1277e6857baf0892d355f1c055974/sound/voice/human"
+
+- files:
+  - moth_DeathGasp.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/948ad3dd5b22803a01cd74c27f37e509dc61395b"
+  source: "https://github.com/tgstation/tgstation/blob/948ad3dd5b22803a01cd74c27f37e509dc61395b/sound/voice/moth/moth_death.ogg"
diff --git a/Resources/Audio/Effects/Gasp/moth_DeathGasp.ogg b/Resources/Audio/Effects/Gasp/moth_DeathGasp.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..df23cfa472ac1043b1fc1eacde71a493402f9133
GIT binary patch
literal 18078
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

literal 0
HcmV?d00001

diff --git a/Resources/Prototypes/SoundCollections/deathgasp.yml b/Resources/Prototypes/SoundCollections/deathgasp.yml
index 28c33c1fb458..77d198ca702d 100644
--- a/Resources/Prototypes/SoundCollections/deathgasp.yml
+++ b/Resources/Prototypes/SoundCollections/deathgasp.yml
@@ -21,3 +21,8 @@
   files:
   - /Audio/Effects/Gasp/deathgasp_1.ogg
   - /Audio/Effects/Gasp/deathgasp_2.ogg
+
+- type: soundCollection
+  id: MothDeathGasp
+  files:
+  - /Audio/Effects/Gasp/moth_DeathGasp.ogg
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 3358d5be6786..0bc922985a65 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -354,7 +354,7 @@
     Gasp:
       collection: MaleGasp
     DefaultDeathgasp:
-      collection: DeathGasp
+      collection: MothDeathGasp
 
 - type: emoteSounds
   id: UnisexSilicon

From 713c6d966bedb2ea1085cf1dbb7306edbf840ece Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Mon, 3 Jun 2024 20:48:44 +0200
Subject: [PATCH 267/568] Make borgs shown in logprobe (#27788)

---
 Content.Shared/Access/Systems/AccessReaderSystem.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 3670e24bd32a..efdbff3bb88a 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -6,7 +6,9 @@
 using Content.Shared.Emag.Systems;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Inventory;
+using Content.Shared.NameIdentifier;
 using Content.Shared.PDA;
+using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.StationRecords;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -393,6 +395,9 @@ private void LogAccess(Entity<AccessReaderComponent> ent, EntityUid accessor)
             ent.Comp.AccessLog.Dequeue();
 
         string? name = null;
+        if (TryComp<NameIdentifierComponent>(accessor, out var nameIdentifier))
+            name = nameIdentifier.FullIdentifier;
+
         // 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)

From b1c123efae5fdcc1ba8d968c32ef85321afb939c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 3 Jun 2024 18:49:52 +0000
Subject: [PATCH 268/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 51 ++++++++++++++-----------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f2d31318272d..0ae775e19368 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,32 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: Fixed pressure damage calculations to what they were always supposed
-      to be. This means pressure damage now starts happening at more extreme values
-      (20 kPa for low pressure damage instead of 50 kPa) and high pressure damage
-      is scaled different. It also fixed the HUD alerts so that the "warning" alerts
-      show up before you actually start taking damage.
-    type: Fix
-  - message: Air alarms now start complaining about low pressure much earlier, when
-      the pressure drops so much that you can't breathe oxygen tank.
-    type: Tweak
-  id: 6176
-  time: '2024-03-18T05:16:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26217
-- author: HappyRoach
-  changes:
-  - message: The correct magazines now appear in the WT550 safe.
-    type: Fix
-  id: 6177
-  time: '2024-03-18T06:10:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26208
-- author: vanx
-  changes:
-  - message: You can now wear most guns in the suit slot, and see them on yourself!
-    type: Tweak
-  id: 6178
-  time: '2024-03-18T06:16:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26152
 - author: Dutch-VanDerLinde
   changes:
   - message: Romerol now properly works on the dead.
@@ -3855,3 +3827,26 @@
   id: 6675
   time: '2024-06-03T16:12:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28270
+- author: TheShuEd
+  changes:
+  - message: Added italian and cowboy accents
+    type: Add
+  - message: Now you can't choose all the accents at once.
+    type: Fix
+  id: 6676
+  time: '2024-06-03T18:47:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28046
+- author: RenQ
+  changes:
+  - message: The moths now have their own "death grasp"
+    type: Add
+  id: 6677
+  time: '2024-06-03T18:48:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28409
+- author: lzk228
+  changes:
+  - message: Borgs ID now will be shown in LogProbe instead of Unknown.
+    type: Tweak
+  id: 6678
+  time: '2024-06-03T18:48:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27788

From af7f70bade908658416be91c5571cab1160e18ec Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 3 Jun 2024 15:40:46 -0400
Subject: [PATCH 269/568] Add integration test for LocalizedDatasets (#28485)

---
 .../LocalizedDatasetPrototypeTest.cs          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 Content.IntegrationTests/Tests/Localization/LocalizedDatasetPrototypeTest.cs

diff --git a/Content.IntegrationTests/Tests/Localization/LocalizedDatasetPrototypeTest.cs b/Content.IntegrationTests/Tests/Localization/LocalizedDatasetPrototypeTest.cs
new file mode 100644
index 000000000000..b30c0a370e0b
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Localization/LocalizedDatasetPrototypeTest.cs
@@ -0,0 +1,35 @@
+using System.Linq;
+using Content.Shared.Dataset;
+using Robust.Shared.Localization;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Localization;
+
+[TestFixture]
+public sealed class LocalizedDatasetPrototypeTest
+{
+    [Test]
+    public async Task ValidProtoIdsTest()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+
+        var server = pair.Server;
+        var protoMan = server.ResolveDependency<IPrototypeManager>();
+        var localizationMan = server.ResolveDependency<ILocalizationManager>();
+
+        var protos = protoMan.EnumeratePrototypes<LocalizedDatasetPrototype>().OrderBy(p => p.ID);
+
+        // Check each prototype
+        foreach (var proto in protos)
+        {
+            // Check each value in the prototype
+            foreach (var locId in proto.Values)
+            {
+                // Make sure the localization manager has a string for the LocId
+                Assert.That(localizationMan.HasString(locId), $"LocalizedDataset {proto.ID} with prefix \"{proto.Values.Prefix}\" specifies {proto.Values.Count} entries, but no localized string was found matching {locId}!");
+            }
+        }
+
+        await pair.CleanReturnAsync();
+    }
+}

From 98ab251f9212699a816aaaf31792ffcda768e8c9 Mon Sep 17 00:00:00 2001
From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:55:43 -0500
Subject: [PATCH 270/568] Remove duplicate entities (#28561)

---
 .../Entities/Structures/Doors/Airlocks/access.yml        | 9 ---------
 Resources/migration.yml                                  | 3 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index d798d0c3be72..e92da80c4b2e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -73,15 +73,6 @@
     containers:
       board: [ DoorElectronicsHydroponics ]
 
-- type: entity
-  parent: AirlockCommandLocked
-  id: AirlockServiceCaptainLocked
-  suffix: Captain, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCaptain ]
-
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalLocked
diff --git a/Resources/migration.yml b/Resources/migration.yml
index cf1a0f7a6023..65e914aed688 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -345,3 +345,6 @@ CrateJanitorExplosive: ClosetJanitorBombFilled
 
 # 2024-05-27
 DoorRemoteFirefight: null
+
+# 2024-06-03
+AirlockServiceCaptainLocked: AirlockCaptainLocked

From 5e51a1d73c3a90438969b8100a32e43e44a5a5fb Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 4 Jun 2024 09:05:51 +1200
Subject: [PATCH 271/568] Add StorageInteractionTest (#28541)

---
 .../Tests/Chemistry/DispenserTest.cs          |   2 +-
 .../Interaction/ComputerContruction.cs        |  10 +-
 .../Interaction/GrilleWindowConstruction.cs   |  13 +-
 .../Interaction/MachineConstruction.cs        |   7 +-
 .../Construction/Interaction/PanelScrewing.cs |  12 +-
 .../Interaction/PlaceableDeconstruction.cs    |   4 +-
 .../Interaction/WallConstruction.cs           |   9 +-
 .../Interaction/WindowConstruction.cs         |   8 +-
 .../Construction/Interaction/WindowRepair.cs  |   2 +-
 .../Tests/DoAfter/DoAfterCancellationTests.cs |  39 +-
 .../EncryptionKeys/RemoveEncryptionKeys.cs    |  16 +-
 .../InteractionTest.EntitySpecifier.cs        |   6 +-
 .../Interaction/InteractionTest.Helpers.cs    | 353 +++++++++++++-----
 .../Tests/Interaction/InteractionTest.cs      |  29 +-
 .../Tests/Payload/ModularGrenadeTests.cs      |  14 +-
 .../Tests/Storage/StorageInteractionTest.cs   |  75 ++++
 .../Tests/Tiles/TileConstructionTests.cs      |  16 +-
 .../Tests/Weldable/WeldableTests.cs           |   2 +-
 18 files changed, 427 insertions(+), 190 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs

diff --git a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
index a5449308be4a..52b7e555a9d3 100644
--- a/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
+++ b/Content.IntegrationTests/Tests/Chemistry/DispenserTest.cs
@@ -18,7 +18,7 @@ public async Task InsertEjectBuiTest()
         ToggleNeedPower();
 
         // Insert beaker
-        await Interact("Beaker");
+        await InteractUsing("Beaker");
         Assert.That(Hands.ActiveHandEntity, Is.Null);
 
         // Open BUI
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
index 5412469ac5d6..8af5edaf3165 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
@@ -16,10 +16,8 @@ public async Task ConstructComputer()
         await StartConstruction(Computer);
 
         // Initial interaction (ghost turns into real entity)
-        await Interact(Steel, 5);
-        ClientAssertPrototype(ComputerFrame, ClientTarget);
-        Target = CTestSystem.Ghosts[ClientTarget!.Value.GetHashCode()];
-        ClientTarget = null;
+        await InteractUsing(Steel, 5);
+        ClientAssertPrototype(ComputerFrame, Target);
 
         // Perform construction steps
         await Interact(
@@ -41,7 +39,7 @@ public async Task DeconstructComputer()
         await StartDeconstruction(ComputerId);
 
         // Initial interaction turns id computer into generic computer
-        await Interact(Screw);
+        await InteractUsing(Screw);
         AssertPrototype(ComputerFrame);
 
         // Perform deconstruction steps
@@ -71,7 +69,7 @@ public async Task ChangeComputer()
         await SpawnTarget(ComputerId);
 
         // Initial interaction turns id computer into generic computer
-        await Interact(Screw);
+        await InteractUsing(Screw);
         AssertPrototype(ComputerFrame);
 
         // Perform partial deconstruction steps
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/GrilleWindowConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/GrilleWindowConstruction.cs
index 0de39d27577f..ef6a7b09ae34 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/GrilleWindowConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/GrilleWindowConstruction.cs
@@ -17,17 +17,14 @@ public async Task WindowOnGrille()
     {
         // Construct Grille
         await StartConstruction(Grille);
-        await Interact(Rod, 10);
-        ClientAssertPrototype(Grille, ClientTarget);
-
-        Target = CTestSystem.Ghosts[ClientTarget!.Value.GetHashCode()];
+        await InteractUsing(Rod, 10);
+        ClientAssertPrototype(Grille, Target);
         var grille = Target;
 
         // Construct Window
         await StartConstruction(Window);
-        await Interact(Glass, 10);
-        ClientAssertPrototype(Window, ClientTarget);
-        Target = CTestSystem.Ghosts[ClientTarget!.Value.GetHashCode()];
+        await InteractUsing(Glass, 10);
+        ClientAssertPrototype(Window, Target);
 
         // Deconstruct Window
         await Interact(Screw, Wrench);
@@ -35,7 +32,7 @@ public async Task WindowOnGrille()
 
         // Deconstruct Grille
         Target = grille;
-        await Interact(Cut);
+        await InteractUsing(Cut);
         AssertDeleted();
     }
 
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
index f52f820a4ce9..06874f39edba 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
@@ -14,9 +14,8 @@ public sealed class MachineConstruction : InteractionTest
     public async Task ConstructProtolathe()
     {
         await StartConstruction(MachineFrame);
-        await Interact(Steel, 5);
-        ClientAssertPrototype(Unfinished, ClientTarget);
-        Target = CTestSystem.Ghosts[ClientTarget!.Value.GetHashCode()];
+        await InteractUsing(Steel, 5);
+        ClientAssertPrototype(Unfinished, Target);
         await Interact(Wrench, Cable);
         AssertPrototype(MachineFrame);
         await Interact(ProtolatheBoard, Bin1, Bin1, Manipulator1, Manipulator1, Beaker, Beaker, Screw);
@@ -51,7 +50,7 @@ public async Task ChangeMachine()
         AssertPrototype(MachineFrame);
 
         // Change it into an autolathe
-        await Interact("AutolatheMachineCircuitboard");
+        await InteractUsing("AutolatheMachineCircuitboard");
         AssertPrototype(MachineFrame);
         await Interact(Bin1, Bin1, Bin1, Manipulator1, Glass, Screw);
         AssertPrototype("Autolathe");
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/PanelScrewing.cs b/Content.IntegrationTests/Tests/Construction/Interaction/PanelScrewing.cs
index b6d960e28821..636d58bf96fb 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/PanelScrewing.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/PanelScrewing.cs
@@ -19,21 +19,21 @@ public async Task WiresPanelScrewing(string prototype)
 
         // Open & close panel
         Assert.That(comp.Open, Is.False);
-        await Interact(Screw);
+        await InteractUsing(Screw);
         Assert.That(comp.Open, Is.True);
-        await Interact(Screw);
+        await InteractUsing(Screw);
         Assert.That(comp.Open, Is.False);
 
         // Interrupted DoAfters
-        await Interact(Screw, awaitDoAfters: false);
+        await InteractUsing(Screw, awaitDoAfters: false);
         await CancelDoAfters();
         Assert.That(comp.Open, Is.False);
-        await Interact(Screw);
+        await InteractUsing(Screw);
         Assert.That(comp.Open, Is.True);
-        await Interact(Screw, awaitDoAfters: false);
+        await InteractUsing(Screw, awaitDoAfters: false);
         await CancelDoAfters();
         Assert.That(comp.Open, Is.True);
-        await Interact(Screw);
+        await InteractUsing(Screw);
         Assert.That(comp.Open, Is.False);
     }
 }
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/PlaceableDeconstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/PlaceableDeconstruction.cs
index bc0cb9bcef38..783c14c06825 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/PlaceableDeconstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/PlaceableDeconstruction.cs
@@ -13,9 +13,9 @@ public async Task DeconstructTable()
     {
         await StartDeconstruction("Table");
         Assert.That(Comp<PlaceableSurfaceComponent>().IsPlaceable);
-        await Interact(Wrench);
+        await InteractUsing(Wrench);
         AssertPrototype("TableFrame");
-        await Interact(Wrench);
+        await InteractUsing(Wrench);
         AssertDeleted();
         await AssertEntityLookup((Steel, 1), (Rod, 2));
     }
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs
index 67a2f8025dc0..292bf0c55abe 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WallConstruction.cs
@@ -12,11 +12,10 @@ public sealed class WallConstruction : InteractionTest
     public async Task ConstructWall()
     {
         await StartConstruction(Wall);
-        await Interact(Steel, 2);
+        await InteractUsing(Steel, 2);
         Assert.That(Hands.ActiveHandEntity, Is.Null);
-        ClientAssertPrototype(Girder, ClientTarget);
-        Target = CTestSystem.Ghosts[ClientTarget!.Value.GetHashCode()];
-        await Interact(Steel, 2);
+        ClientAssertPrototype(Girder, Target);
+        await InteractUsing(Steel, 2);
         Assert.That(Hands.ActiveHandEntity, Is.Null);
         AssertPrototype(WallSolid);
     }
@@ -25,7 +24,7 @@ public async Task ConstructWall()
     public async Task DeconstructWall()
     {
         await StartDeconstruction(WallSolid);
-        await Interact(Weld);
+        await InteractUsing(Weld);
         AssertPrototype(Girder);
         await Interact(Wrench, Screw);
         AssertDeleted();
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowConstruction.cs
index 46bb892ed99a..2ece6b3e397d 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowConstruction.cs
@@ -11,8 +11,8 @@ public sealed class WindowConstruction : InteractionTest
     public async Task ConstructWindow()
     {
         await StartConstruction(Window);
-        await Interact(Glass, 5);
-        ClientAssertPrototype(Window, ClientTarget);
+        await InteractUsing(Glass, 5);
+        ClientAssertPrototype(Window, Target);
     }
 
     [Test]
@@ -28,8 +28,8 @@ public async Task DeconstructWindow()
     public async Task ConstructReinforcedWindow()
     {
         await StartConstruction(RWindow);
-        await Interact(RGlass, 5);
-        ClientAssertPrototype(RWindow, ClientTarget);
+        await InteractUsing(RGlass, 5);
+        ClientAssertPrototype(RWindow, Target);
     }
 
     [Test]
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
index abd4bc265b30..6eea519af3b5 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs
@@ -24,7 +24,7 @@ public async Task RepairReinforcedWindow()
         Assert.That(comp.Damage.GetTotal(), Is.GreaterThan(FixedPoint2.Zero));
 
         // Repair the entity
-        await Interact(Weld);
+        await InteractUsing(Weld);
         Assert.That(comp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero));
 
         // Validate that we can still deconstruct the entity (i.e., that welding deconstruction is not blocked).
diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
index 0ebd17d8879b..1aaf4a5184ce 100644
--- a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
+++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
@@ -16,31 +16,31 @@ public sealed class DoAfterCancellationTests : InteractionTest
     public async Task CancelWallDeconstruct()
     {
         await StartDeconstruction(WallConstruction.WallSolid);
-        await Interact(Weld, awaitDoAfters: false);
+        await InteractUsing(Weld, awaitDoAfters: false);
 
         // Failed do-after has no effect
         await CancelDoAfters();
         AssertPrototype(WallConstruction.WallSolid);
 
         // Second attempt works fine
-        await Interact(Weld);
+        await InteractUsing(Weld);
         AssertPrototype(WallConstruction.Girder);
 
         // Repeat for wrenching interaction
         AssertAnchored();
-        await Interact(Wrench, awaitDoAfters: false);
+        await InteractUsing(Wrench, awaitDoAfters: false);
         await CancelDoAfters();
         AssertAnchored();
         AssertPrototype(WallConstruction.Girder);
-        await Interact(Wrench);
+        await InteractUsing(Wrench);
         AssertAnchored(false);
 
         // Repeat for screwdriver interaction.
         AssertExists();
-        await Interact(Screw, awaitDoAfters: false);
+        await InteractUsing(Screw, awaitDoAfters: false);
         await CancelDoAfters();
         AssertExists();
-        await Interact(Screw);
+        await InteractUsing(Screw);
         AssertDeleted();
     }
 
@@ -48,17 +48,16 @@ public async Task CancelWallDeconstruct()
     public async Task CancelWallConstruct()
     {
         await StartConstruction(WallConstruction.Wall);
-        await Interact(Steel, 5, awaitDoAfters: false);
+        await InteractUsing(Steel, 5, awaitDoAfters: false);
         await CancelDoAfters();
 
-        await Interact(Steel, 5);
-        ClientAssertPrototype(WallConstruction.Girder, ClientTarget);
-        Target = CTestSystem.Ghosts[ClientTarget!.Value.GetHashCode()];
-        await Interact(Steel, 5, awaitDoAfters: false);
+        await InteractUsing(Steel, 5);
+        ClientAssertPrototype(WallConstruction.Girder, Target);
+        await InteractUsing(Steel, 5, awaitDoAfters: false);
         await CancelDoAfters();
         AssertPrototype(WallConstruction.Girder);
 
-        await Interact(Steel, 5);
+        await InteractUsing(Steel, 5);
         AssertPrototype(WallConstruction.WallSolid);
     }
 
@@ -66,11 +65,11 @@ public async Task CancelWallConstruct()
     public async Task CancelTilePry()
     {
         await SetTile(Floor);
-        await Interact(Pry, awaitDoAfters: false);
+        await InteractUsing(Pry, awaitDoAfters: false);
         await CancelDoAfters();
         await AssertTile(Floor);
 
-        await Interact(Pry);
+        await InteractUsing(Pry);
         await AssertTile(Plating);
     }
 
@@ -78,7 +77,7 @@ public async Task CancelTilePry()
     public async Task CancelRepeatedTilePry()
     {
         await SetTile(Floor);
-        await Interact(Pry, awaitDoAfters: false);
+        await InteractUsing(Pry, awaitDoAfters: false);
         await RunTicks(1);
         Assert.That(ActiveDoAfters.Count(), Is.EqualTo(1));
         await AssertTile(Floor);
@@ -89,7 +88,7 @@ public async Task CancelRepeatedTilePry()
         await AssertTile(Floor);
 
         // Third do after will work fine
-        await Interact(Pry);
+        await InteractUsing(Pry);
         Assert.That(ActiveDoAfters.Count(), Is.EqualTo(0));
         await AssertTile(Plating);
     }
@@ -102,7 +101,7 @@ public async Task CancelRepeatedWeld()
 
         Assert.That(comp.IsWelded, Is.False);
 
-        await Interact(Weld, awaitDoAfters: false);
+        await InteractUsing(Weld, awaitDoAfters: false);
         await RunTicks(1);
         Assert.Multiple(() =>
         {
@@ -120,7 +119,7 @@ public async Task CancelRepeatedWeld()
         });
 
         // Third do after will work fine
-        await Interact(Weld);
+        await InteractUsing(Weld);
         Assert.Multiple(() =>
         {
             Assert.That(ActiveDoAfters.Count(), Is.EqualTo(0));
@@ -128,7 +127,7 @@ public async Task CancelRepeatedWeld()
         });
 
         // Repeat test for un-welding
-        await Interact(Weld, awaitDoAfters: false);
+        await InteractUsing(Weld, awaitDoAfters: false);
         await RunTicks(1);
         Assert.Multiple(() =>
         {
@@ -141,7 +140,7 @@ public async Task CancelRepeatedWeld()
             Assert.That(ActiveDoAfters.Count(), Is.EqualTo(0));
             Assert.That(comp.IsWelded, Is.True);
         });
-        await Interact(Weld);
+        await InteractUsing(Weld);
         Assert.Multiple(() =>
         {
             Assert.That(ActiveDoAfters.Count(), Is.EqualTo(0));
diff --git a/Content.IntegrationTests/Tests/EncryptionKeys/RemoveEncryptionKeys.cs b/Content.IntegrationTests/Tests/EncryptionKeys/RemoveEncryptionKeys.cs
index 9e3dbd8863ef..f5e8c22242ea 100644
--- a/Content.IntegrationTests/Tests/EncryptionKeys/RemoveEncryptionKeys.cs
+++ b/Content.IntegrationTests/Tests/EncryptionKeys/RemoveEncryptionKeys.cs
@@ -22,7 +22,7 @@ public async Task HeadsetKeys()
         });
 
         // Remove the key
-        await Interact(Screw);
+        await InteractUsing(Screw);
         Assert.Multiple(() =>
         {
             Assert.That(comp.KeyContainer.ContainedEntities, Has.Count.EqualTo(0));
@@ -34,7 +34,7 @@ public async Task HeadsetKeys()
         await AssertEntityLookup(("EncryptionKeyCommon", 1));
 
         // Re-insert a key.
-        await Interact("EncryptionKeyCentCom");
+        await InteractUsing("EncryptionKeyCentCom");
         Assert.Multiple(() =>
         {
             Assert.That(comp.KeyContainer.ContainedEntities, Has.Count.EqualTo(1));
@@ -59,7 +59,7 @@ public async Task CommsServerKeys()
         });
 
         // cannot remove keys without opening panel
-        await Interact(Pry);
+        await InteractUsing(Pry);
         Assert.Multiple(() =>
         {
             Assert.That(comp.KeyContainer.ContainedEntities, Has.Count.GreaterThan(0));
@@ -68,7 +68,7 @@ public async Task CommsServerKeys()
         });
 
         // Open panel
-        await Interact(Screw);
+        await InteractUsing(Screw);
         Assert.Multiple(() =>
         {
             Assert.That(panel.Open, Is.True);
@@ -79,7 +79,7 @@ public async Task CommsServerKeys()
         });
 
         // Now remove the keys
-        await Interact(Pry);
+        await InteractUsing(Pry);
         Assert.Multiple(() =>
         {
             Assert.That(comp.KeyContainer.ContainedEntities, Has.Count.EqualTo(0));
@@ -87,7 +87,7 @@ public async Task CommsServerKeys()
         });
 
         // Reinsert a key
-        await Interact("EncryptionKeyCentCom");
+        await InteractUsing("EncryptionKeyCentCom");
         Assert.Multiple(() =>
         {
             Assert.That(comp.KeyContainer.ContainedEntities, Has.Count.EqualTo(1));
@@ -97,7 +97,7 @@ public async Task CommsServerKeys()
         });
 
         // Remove it again
-        await Interact(Pry);
+        await InteractUsing(Pry);
         Assert.Multiple(() =>
         {
             Assert.That(comp.KeyContainer.ContainedEntities, Has.Count.EqualTo(0));
@@ -106,7 +106,7 @@ public async Task CommsServerKeys()
 
         // Prying again will start deconstructing the machine.
         AssertPrototype("TelecomServerFilled");
-        await Interact(Pry);
+        await InteractUsing(Pry);
         AssertPrototype("MachineFrame");
     }
 }
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
index 37dca721373b..053152dbe1be 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
@@ -33,7 +33,7 @@ protected sealed class EntitySpecifier
         public int Quantity;
 
         /// <summary>
-        /// If true, a check has been performed to see if the prototype ia an entity prototype with a stack component,
+        /// If true, a check has been performed to see if the prototype is an entity prototype with a stack component,
         /// in which case the specifier was converted into a stack-specifier
         /// </summary>
         public bool Converted;
@@ -100,7 +100,7 @@ await Server.WaitPost(() =>
 
         if (!ProtoMan.TryIndex<EntityPrototype>(spec.Prototype, out var entProto))
         {
-            Assert.Fail($"Unkown prototype: {spec.Prototype}");
+            Assert.Fail($"Unknown prototype: {spec.Prototype}");
             return default;
         }
 
@@ -120,7 +120,7 @@ await Server.WaitPost(() =>
 
     /// <summary>
     /// Convert an entity-uid to a matching entity specifier. Useful when doing entity lookups & checking that the
-    /// right quantity of entities/materials werre produced. Returns null if passed an entity with a null prototype.
+    /// right quantity of entities/materials were produced. Returns null if passed an entity with a null prototype.
     /// </summary>
     protected EntitySpecifier? ToEntitySpecifier(EntityUid uid)
     {
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index 19ca83a9715d..f4826cb2495c 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -14,6 +14,7 @@
 using Content.Shared.Gravity;
 using Content.Shared.Item;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
@@ -44,8 +45,9 @@ await Client.WaitPost(() =>
                 return;
 
             var comp = CEntMan.GetComponent<ConstructionGhostComponent>(clientTarget!.Value);
-            ClientTarget = clientTarget;
-            ConstructionGhostId = comp.Owner.Id;
+            Target = CEntMan.GetNetEntity(clientTarget.Value);
+            Assert.That(Target.Value.IsClientSide());
+            ConstructionGhostId = clientTarget.Value.GetHashCode();
         });
 
         await RunTicks(1);
@@ -129,21 +131,20 @@ await Server.WaitPost(() =>
     /// <summary>
     /// Place an entity prototype into the players hand. Deletes any currently held entity.
     /// </summary>
-    /// <remarks>
-    /// Automatically enables welders.
-    /// </remarks>
-    protected async Task<NetEntity> PlaceInHands(string id, int quantity = 1, bool enableWelder = true)
+    /// <param name="id">The entity or stack prototype to spawn and place into the users hand</param>
+    /// <param name="quantity">The number of entities to spawn. If the prototype is a stack, this sets the stack count.</param>
+    /// <param name="enableToggleable">Whether or not to automatically enable any toggleable items</param>
+    protected async Task<NetEntity> PlaceInHands(string id, int quantity = 1, bool enableToggleable = true)
     {
-        return await PlaceInHands((id, quantity), enableWelder);
+        return await PlaceInHands((id, quantity), enableToggleable);
     }
 
     /// <summary>
     /// Place an entity prototype into the players hand. Deletes any currently held entity.
     /// </summary>
-    /// <remarks>
-    /// Automatically enables welders.
-    /// </remarks>
-    protected async Task<NetEntity> PlaceInHands(EntitySpecifier entity, bool enableWelder = true)
+    /// <param name="entity">The entity type & quantity to spawn and place into the users hand</param>
+    /// <param name="enableToggleable">Whether or not to automatically enable any toggleable items</param>
+    protected async Task<NetEntity> PlaceInHands(EntitySpecifier entity, bool enableToggleable = true)
     {
         if (Hands.ActiveHand == null)
         {
@@ -165,7 +166,7 @@ await Server.WaitPost(() =>
             Assert.That(HandSys.TryPickup(playerEnt, item, Hands.ActiveHand, false, false, Hands));
 
             // turn on welders
-            if (enableWelder && SEntMan.TryGetComponent(item, out itemToggle) && !itemToggle.Activated)
+            if (enableToggleable && SEntMan.TryGetComponent(item, out itemToggle) && !itemToggle.Activated)
             {
                 Assert.That(ItemToggleSys.TryActivate(item, playerEnt, itemToggle: itemToggle));
             }
@@ -173,7 +174,7 @@ await Server.WaitPost(() =>
 
         await RunTicks(1);
         Assert.That(Hands.ActiveHandEntity, Is.EqualTo(item));
-        if (enableWelder && itemToggle != null)
+        if (enableToggleable && itemToggle != null)
             Assert.That(itemToggle.Activated);
 
         return SEntMan.GetNetEntity(item);
@@ -254,21 +255,20 @@ await Server.WaitPost(() =>
     /// <summary>
     /// Place an entity prototype into the players hand and interact with the given entity (or target position)
     /// </summary>
-    /// <remarks>
-    /// Empty strings imply empty hands.
-    /// </remarks>
-    protected async Task Interact(string id, int quantity = 1, bool shouldSucceed = true, bool awaitDoAfters = true)
+    /// <param name="id">The entity or stack prototype to spawn and place into the users hand</param>
+    /// <param name="quantity">The number of entities to spawn. If the prototype is a stack, this sets the stack count.</param>
+    /// <param name="awaitDoAfters">Whether or not to wait for any do-afters to complete</param>
+    protected async Task InteractUsing(string id, int quantity = 1, bool awaitDoAfters = true)
     {
-        await Interact((id, quantity), shouldSucceed, awaitDoAfters);
+        await InteractUsing((id, quantity), awaitDoAfters);
     }
 
     /// <summary>
-    /// Place an entity prototype into the players hand and interact with the given entity (or target position)
+    /// Place an entity prototype into the players hand and interact with the given entity (or target position).
     /// </summary>
-    /// <remarks>
-    /// Empty strings imply empty hands.
-    /// </remarks>
-    protected async Task Interact(EntitySpecifier entity, bool shouldSucceed = true, bool awaitDoAfters = true)
+    /// <param name="entity">The entity type & quantity to spawn and place into the users hand</param>
+    /// <param name="awaitDoAfters">Whether or not to wait for any do-afters to complete</param>
+    protected async Task InteractUsing(EntitySpecifier entity, bool awaitDoAfters = true)
     {
         // For every interaction, we will also examine the entity, just in case this breaks something, somehow.
         // (e.g., servers attempt to assemble construction examine hints).
@@ -278,38 +278,80 @@ protected async Task Interact(EntitySpecifier entity, bool shouldSucceed = true,
         }
 
         await PlaceInHands(entity);
-        await Interact(shouldSucceed, awaitDoAfters);
+        await Interact(awaitDoAfters);
     }
 
     /// <summary>
     /// Interact with an entity using the currently held entity.
     /// </summary>
-    protected async Task Interact(bool shouldSucceed = true, bool awaitDoAfters = true)
+    /// <param name="awaitDoAfters">Whether or not to wait for any do-afters to complete</param>
+    protected async Task Interact(bool awaitDoAfters = true)
     {
-        var clientTarget = ClientTarget;
-
-        if ((clientTarget?.IsValid() != true || CEntMan.Deleted(clientTarget)) && (Target == null || Target.Value.IsValid()))
+        if (Target == null || !Target.Value.IsClientSide())
         {
-            await Server.WaitPost(() => InteractSys.UserInteraction(SEntMan.GetEntity(Player), SEntMan.GetCoordinates(TargetCoords), SEntMan.GetEntity(Target)));
-            await RunTicks(1);
+            await Interact(Target, TargetCoords, awaitDoAfters);
+            return;
         }
-        else
-        {
-            // The entity is client-side, so attempt to start construction
-            var clientEnt = ClientTarget ?? CEntMan.GetEntity(Target);
 
-            await Client.WaitPost(() => CConSys.TryStartConstruction(clientEnt!.Value));
-            await RunTicks(5);
-        }
+        // The target is a client-side entity, so we will just attempt to start construction under the assumption that
+        // it is a construction ghost.
+
+        await Client.WaitPost(() => CConSys.TryStartConstruction(CTarget!.Value));
+        await RunTicks(5);
+
+        if (awaitDoAfters)
+            await AwaitDoAfters();
+
+        await CheckTargetChange();
+    }
+
+    /// <inheritdoc cref="Interact(EntityUid?,EntityCoordinates,bool)"/>
+    protected async Task Interact(NetEntity? target, NetCoordinates coordinates, bool awaitDoAfters = true)
+    {
+        Assert.That(SEntMan.TryGetEntity(target, out var sTarget) || target == null);
+        var coords = SEntMan.GetCoordinates(coordinates);
+        Assert.That(coords.IsValid(SEntMan));
+        await Interact(sTarget, coords, awaitDoAfters);
+    }
+
+    /// <summary>
+    /// Interact with an entity using the currently held entity.
+    /// </summary>
+    protected async Task Interact(EntityUid? target, EntityCoordinates coordinates, bool awaitDoAfters = true)
+    {
+        Assert.That(SEntMan.TryGetEntity(Player, out var player));
+
+        await Server.WaitPost(() => InteractSys.UserInteraction(player!.Value, coordinates, target));
+        await RunTicks(1);
+
+        if (awaitDoAfters)
+            await AwaitDoAfters();
+
+        await CheckTargetChange();
+    }
+
+    /// <summary>
+    /// Activate an entity.
+    /// </summary>
+    protected async Task Activate(NetEntity? target = null, bool awaitDoAfters = true)
+    {
+        target ??= Target;
+        Assert.That(target, Is.Not.Null);
+        Assert.That(SEntMan.TryGetEntity(target!.Value, out var sTarget));
+        Assert.That(SEntMan.TryGetEntity(Player, out var player));
+
+        await Server.WaitPost(() => InteractSys.InteractionActivate(player!.Value, sTarget!.Value));
+        await RunTicks(1);
 
         if (awaitDoAfters)
-            await AwaitDoAfters(shouldSucceed);
+            await AwaitDoAfters();
 
-        await CheckTargetChange(shouldSucceed && awaitDoAfters);
+        await CheckTargetChange();
     }
 
     /// <summary>
-    /// Variant of <see cref="InteractUsing"/> that performs several interactions using different entities.
+    /// Variant of <see cref="InteractUsing(string,int,bool)"/> that performs several interactions using different entities.
+    /// Useful for quickly finishing multiple construction steps.
     /// </summary>
     /// <remarks>
     /// Empty strings imply empty hands.
@@ -318,7 +360,7 @@ protected async Task Interact(params EntitySpecifier[] specifiers)
     {
         foreach (var spec in specifiers)
         {
-            await Interact(spec);
+            await InteractUsing(spec);
         }
     }
 
@@ -338,7 +380,7 @@ protected async Task<bool> ThrowItem(NetCoordinates? target = null, float minDis
     /// <summary>
     /// Wait for any currently active DoAfters to finish.
     /// </summary>
-    protected async Task AwaitDoAfters(bool shouldSucceed = true, int maxExpected = 1)
+    protected async Task AwaitDoAfters(int maxExpected = 1)
     {
         if (!ActiveDoAfters.Any())
             return;
@@ -353,13 +395,12 @@ protected async Task AwaitDoAfters(bool shouldSucceed = true, int maxExpected =
             await RunTicks(10);
         }
 
-        if (!shouldSucceed)
-            return;
-
         foreach (var doAfter in doAfters)
         {
             Assert.That(!doAfter.Cancelled);
         }
+
+        await RunTicks(5);
     }
 
     /// <summary>
@@ -398,39 +439,28 @@ await Server.WaitPost(() =>
     /// Check if the test's target entity has changed. E.g., construction interactions will swap out entities while
     /// a structure is being built.
     /// </summary>
-    protected async Task CheckTargetChange(bool shouldSucceed)
+    protected async Task CheckTargetChange()
     {
         if (Target == null)
             return;
 
-        var target = Target.Value;
+        var originalTarget = Target.Value;
         await RunTicks(5);
 
-        if (ClientTarget != null && CEntMan.IsClientSide(ClientTarget.Value))
+        if (Target.Value.IsClientSide() && CTestSystem.Ghosts.TryGetValue(ConstructionGhostId, out var newWeh))
         {
-            Assert.That(CEntMan.Deleted(ClientTarget.Value), Is.EqualTo(shouldSucceed),
-                $"Construction ghost was {(shouldSucceed ? "not deleted" : "deleted")}.");
-
-            if (shouldSucceed)
-            {
-                Assert.That(CTestSystem.Ghosts.TryGetValue(ConstructionGhostId, out var newWeh),
-                    $"Failed to get construction entity from ghost Id");
-
-                await Client.WaitPost(() => CLogger.Debug($"Construction ghost {ConstructionGhostId} became entity {newWeh}"));
-                Target = newWeh;
-            }
+            CLogger.Debug($"Construction ghost {ConstructionGhostId} became entity {newWeh}");
+            Target = newWeh;
         }
 
         if (STestSystem.EntChanges.TryGetValue(Target.Value, out var newServerWeh))
         {
-            await Server.WaitPost(
-                () => SLogger.Debug($"Construction entity {Target.Value} changed to {newServerWeh}"));
-
+            SLogger.Debug($"Construction entity {Target.Value} changed to {newServerWeh}");
             Target = newServerWeh;
         }
 
-        if (Target != target)
-            await CheckTargetChange(shouldSucceed);
+        if (Target != originalTarget)
+            await CheckTargetChange();
     }
 
     #region Asserts
@@ -444,16 +474,10 @@ protected void ClientAssertPrototype(string? prototype, NetEntity? target = null
             return;
         }
 
-        var meta = SEntMan.GetComponent<MetaDataComponent>(SEntMan.GetEntity(target.Value));
+        var meta = CEntMan.GetComponent<MetaDataComponent>(CEntMan.GetEntity(target.Value));
         Assert.That(meta.EntityPrototype?.ID, Is.EqualTo(prototype));
     }
 
-    protected void ClientAssertPrototype(string? prototype, EntityUid? target)
-    {
-        var netEnt = CTestSystem.Ghosts[target.GetHashCode()];
-        AssertPrototype(prototype, netEnt);
-    }
-
     protected void AssertPrototype(string? prototype, NetEntity? target = null)
     {
         target ??= Target;
@@ -699,6 +723,8 @@ protected async Task<EntityUid> FindEntity(
     protected IEnumerable<Shared.DoAfter.DoAfter> ActiveDoAfters
         => DoAfters.DoAfters.Values.Where(x => !x.Cancelled && !x.Completed);
 
+    #region Component
+
     /// <summary>
     /// Convenience method to get components on the target. Returns SERVER-SIDE components.
     /// </summary>
@@ -708,9 +734,23 @@ protected T Comp<T>(NetEntity? target = null) where T : IComponent
         if (target == null)
             Assert.Fail("No target specified");
 
-        return SEntMan.GetComponent<T>(SEntMan.GetEntity(target!.Value));
+        return SEntMan.GetComponent<T>(ToServer(target!.Value));
+    }
+
+    /// <inheritdoc cref="Comp{T}"/>
+    protected bool TryComp<T>(NetEntity? target, [NotNullWhen(true)] out T? comp) where T : IComponent
+    {
+        return SEntMan.TryGetComponent(ToServer(target), out comp);
+    }
+
+    /// <inheritdoc cref="Comp{T}"/>
+    protected bool TryComp<T>([NotNullWhen(true)] out T? comp) where T : IComponent
+    {
+        return SEntMan.TryGetComponent(STarget, out comp);
     }
 
+    #endregion
+
     /// <summary>
     /// Set the tile at the target position to some prototype.
     /// </summary>
@@ -833,23 +873,70 @@ protected bool TryGetBui(Enum key, [NotNullWhen(true)] out BoundUserInterface? b
         return true;
     }
 
+    protected bool IsUiOpen(Enum key)
+    {
+        if (!TryComp(Player, out UserInterfaceUserComponent? user))
+            return false;
+
+        foreach (var keys in user.OpenInterfaces.Values)
+        {
+            if (keys.Contains(key))
+                return true;
+        }
+
+        return false;
+    }
+
     #endregion
 
     #region UI
 
     /// <summary>
-    ///     Presses and releases a button on some client-side window. Will fail if the button cannot be found.
+    /// Attempts to find, and then presses and releases a control on some client-side window.
+    /// Will fail if the control cannot be found.
+    /// </summary>
+    protected async Task ClickControl<TWindow, TControl>(string name, BoundKeyFunction? function = null)
+        where TWindow : BaseWindow
+        where TControl : Control
+    {
+        var window = GetWindow<TWindow>();
+        var control = GetControlFromField<TControl>(name, window);
+        await ClickControl(control, function);
+    }
+
+    /// <summary>
+    /// Attempts to find, and then presses and releases a control on some client-side widget.
+    /// Will fail if the control cannot be found.
     /// </summary>
-    protected async Task ClickControl<TWindow>(string name) where TWindow : BaseWindow
+    protected async Task ClickWidgetControl<TWidget, TControl>(string name, BoundKeyFunction? function = null)
+        where TWidget : UIWidget, new()
+        where TControl : Control
+    {
+        var widget = GetWidget<TWidget>();
+        var control = GetControlFromField<TControl>(name, widget);
+        await ClickControl(control, function);
+    }
+
+    /// <inheritdoc cref="ClickControl{TWindow,TControl}"/>
+    protected async Task ClickControl<TWindow>(string name, BoundKeyFunction? function = null)
+        where TWindow : BaseWindow
     {
-        await ClickControl(GetControl<TWindow, Control>(name));
+        await ClickControl<TWindow, Control>(name, function);
+    }
+
+    /// <inheritdoc cref="ClickWidgetControl{TWidget,TControl}"/>
+    protected async Task ClickWidgetControl<TWidget>(string name, BoundKeyFunction? function = null)
+        where TWidget : UIWidget, new()
+    {
+        await ClickWidgetControl<TWidget, Control>(name, function);
     }
 
     /// <summary>
-    ///     Simulates a click and release at the center of some UI Constrol.
+    ///     Simulates a click and release at the center of some UI control.
     /// </summary>
-    protected async Task ClickControl(Control control)
+    protected async Task ClickControl(Control control, BoundKeyFunction? function = null)
     {
+        function ??= EngineKeyFunctions.UIClick;
         var screenCoords = new ScreenCoordinates(
             control.GlobalPixelPosition + control.PixelSize / 2,
             control.Window?.Id ?? default);
@@ -858,7 +945,7 @@ protected async Task ClickControl(Control control)
         var relativePixelPos = screenCoords.Position - control.GlobalPixelPosition;
 
         var args = new GUIBoundKeyEventArgs(
-            EngineKeyFunctions.UIClick,
+            function.Value,
             BoundKeyState.Down,
             screenCoords,
             default,
@@ -869,7 +956,7 @@ protected async Task ClickControl(Control control)
         await RunTicks(1);
 
         args = new GUIBoundKeyEventArgs(
-            EngineKeyFunctions.UIClick,
+            function.Value,
             BoundKeyState.Up,
             screenCoords,
             default,
@@ -881,31 +968,26 @@ protected async Task ClickControl(Control control)
     }
 
     /// <summary>
-    ///     Attempts to find a control on some client-side window. Will fail if the control cannot be found.
+    /// Attempt to retrieve a control by looking for a field on some other control.
     /// </summary>
-    protected TControl GetControl<TWindow, TControl>(string name)
-        where TWindow : BaseWindow
+    /// <remarks>
+    /// Will fail if the control cannot be found.
+    /// </remarks>
+    protected TControl GetControlFromField<TControl>(string name, Control parent)
         where TControl : Control
-    {
-        var control = GetControl<TWindow>(name);
-        Assert.That(control.GetType().IsAssignableTo(typeof(TControl)));
-        return (TControl) control;
-    }
-
-    protected Control GetControl<TWindow>(string name) where TWindow : BaseWindow
     {
         const BindingFlags flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-        var field = typeof(TWindow).GetField(name, flags);
-        var prop = typeof(TWindow).GetProperty(name, flags);
+        var parentType = parent.GetType();
+        var field = parentType.GetField(name, flags);
+        var prop = parentType.GetProperty(name, flags);
 
         if (field == null && prop == null)
         {
-            Assert.Fail($"Window {typeof(TWindow).Name} does not have a field or property named {name}");
+            Assert.Fail($"Window {parentType.Name} does not have a field or property named {name}");
             return default!;
         }
 
-        var window = GetWindow<TWindow>();
-        var fieldOrProp = field?.GetValue(window) ?? prop?.GetValue(window);
+        var fieldOrProp = field?.GetValue(parent) ?? prop?.GetValue(parent);
 
         if (fieldOrProp is not Control control)
         {
@@ -913,7 +995,59 @@ protected Control GetControl<TWindow>(string name) where TWindow : BaseWindow
             return default!;
         }
 
-        return control;
+        Assert.That(control.GetType().IsAssignableTo(typeof(TControl)));
+        return (TControl) control;
+    }
+
+    /// <summary>
+    /// Attempt to retrieve a control that matches some predicate by iterating through a control's children.
+    /// </summary>
+    /// <remarks>
+    /// Will fail if the control cannot be found.
+    /// </remarks>
+    protected TControl GetControlFromChildren<TControl>(Func<TControl, bool> predicate, Control parent, bool recursive = true)
+        where TControl : Control
+    {
+        if (TryGetControlFromChildren(predicate, parent, out var control, recursive))
+            return control;
+
+        Assert.Fail($"Failed to find a {nameof(TControl)} that satisfies the predicate in {parent.Name}");
+        return default!;
+    }
+
+    /// <summary>
+    /// Attempt to retrieve a control of a given type by iterating through a control's children.
+    /// </summary>
+    protected TControl GetControlFromChildren<TControl>(Control parent, bool recursive = false)
+        where TControl : Control
+    {
+        return GetControlFromChildren<TControl>(static _ => true, parent, recursive);
+    }
+
+    /// <summary>
+    /// Attempt to retrieve a control that matches some predicate by iterating through a control's children.
+    /// </summary>
+    protected bool TryGetControlFromChildren<TControl>(
+        Func<TControl, bool> predicate,
+        Control parent,
+        [NotNullWhen(true)] out TControl? control,
+        bool recursive = true)
+        where TControl : Control
+    {
+        foreach (var ctrl in parent.Children)
+        {
+            if (ctrl is TControl cast && predicate(cast))
+            {
+                control = cast;
+                return true;
+            }
+
+            if (recursive && TryGetControlFromChildren(predicate, ctrl, out control))
+                return true;
+        }
+
+        control = null;
+        return false;
     }
 
     /// <summary>
@@ -944,7 +1078,6 @@ protected bool TryFindWindow<TWindow>([NotNullWhen(true)] out TWindow? window) w
         return window != null;
     }
 
-
     /// <summary>
     /// Attempts to find a currently open client-side window.
     /// </summary>
@@ -962,6 +1095,34 @@ protected bool TryFindWindow(Type type, [NotNullWhen(true)] out BaseWindow? wind
         return window != null;
     }
 
+
+    /// <summary>
+    /// Attempts to find client-side UI widget.
+    /// </summary>
+    protected UIWidget GetWidget<TWidget>()
+        where TWidget : UIWidget, new()
+    {
+        if (TryFindWidget(out TWidget? widget))
+            return widget;
+
+        Assert.Fail($"Could not find a {typeof(TWidget).Name} widget");
+        return default!;
+    }
+
+    /// <summary>
+    /// Attempts to find client-side UI widget.
+    /// </summary>
+    private bool TryFindWidget<TWidget>([NotNullWhen(true)] out TWidget? uiWidget)
+        where TWidget : UIWidget, new()
+    {
+        uiWidget = null;
+        var screen = UiMan.ActiveScreen;
+        if (screen == null)
+            return false;
+
+        return screen.TryGetWidget(out uiWidget);
+    }
+
     #endregion
 
     #region Power
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index e5f794feaa04..089addfaefd0 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -1,8 +1,10 @@
 #nullable enable
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
 using Content.Client.Construction;
 using Content.Client.Examine;
+using Content.Client.Gameplay;
 using Content.IntegrationTests.Pair;
 using Content.Server.Body.Systems;
 using Content.Server.Hands.Systems;
@@ -24,6 +26,7 @@
 using Robust.Shared.Timing;
 using Robust.UnitTesting;
 using Content.Shared.Item.ItemToggle;
+using Robust.Client.State;
 
 namespace Content.IntegrationTests.Tests.Interaction;
 
@@ -64,15 +67,12 @@ public abstract partial class InteractionTest
     /// The player entity that performs all these interactions. Defaults to an admin-observer with 1 hand.
     /// </summary>
     protected NetEntity Player;
-
-    protected EntityUid SPlayer => ToServer(Player);
-    protected EntityUid CPlayer => ToClient(Player);
+    protected EntityUid SPlayer;
+    protected EntityUid CPlayer;
 
     protected ICommonSession ClientSession = default!;
     protected ICommonSession ServerSession = default!;
 
-    public EntityUid? ClientTarget;
-
     /// <summary>
     /// The current target entity. This is the default entity for various helper functions.
     /// </summary>
@@ -108,6 +108,7 @@ public abstract partial class InteractionTest
     protected InteractionTestSystem STestSystem = default!;
     protected SharedTransformSystem Transform = default!;
     protected ISawmill SLogger = default!;
+    protected SharedUserInterfaceSystem SUiSys = default!;
 
     // CLIENT dependencies
     protected IEntityManager CEntMan = default!;
@@ -119,6 +120,7 @@ public abstract partial class InteractionTest
     protected ExamineSystem ExamineSys = default!;
     protected InteractionTestSystem CTestSystem = default!;
     protected ISawmill CLogger = default!;
+    protected SharedUserInterfaceSystem CUiSys = default!;
 
     // player components
     protected HandsComponent Hands = default!;
@@ -168,6 +170,7 @@ public virtual async Task Setup()
         STestSystem = SEntMan.System<InteractionTestSystem>();
         Stack = SEntMan.System<StackSystem>();
         SLogger = Server.ResolveDependency<ILogManager>().RootSawmill;
+        SUiSys = Client.System<SharedUserInterfaceSystem>();
 
         // client dependencies
         CEntMan = Client.ResolveDependency<IEntityManager>();
@@ -179,6 +182,7 @@ public virtual async Task Setup()
         CConSys = CEntMan.System<ConstructionSystem>();
         ExamineSys = CEntMan.System<ExamineSystem>();
         CLogger = Client.ResolveDependency<ILogManager>().RootSawmill;
+        CUiSys = Client.System<SharedUserInterfaceSystem>();
 
         // Setup map.
         await Pair.CreateTestMap();
@@ -204,15 +208,16 @@ await Server.WaitPost(() =>
 
             old = cPlayerMan.LocalEntity;
             Player = SEntMan.GetNetEntity(SEntMan.SpawnEntity(PlayerPrototype, SEntMan.GetCoordinates(PlayerCoords)));
-            var serverPlayerEnt = SEntMan.GetEntity(Player);
-            Server.PlayerMan.SetAttachedEntity(ServerSession, serverPlayerEnt);
-            Hands = SEntMan.GetComponent<HandsComponent>(serverPlayerEnt);
-            DoAfters = SEntMan.GetComponent<DoAfterComponent>(serverPlayerEnt);
+            SPlayer = SEntMan.GetEntity(Player);
+            Server.PlayerMan.SetAttachedEntity(ServerSession, SPlayer);
+            Hands = SEntMan.GetComponent<HandsComponent>(SPlayer);
+            DoAfters = SEntMan.GetComponent<DoAfterComponent>(SPlayer);
         });
 
         // Check player got attached.
         await RunTicks(5);
-        Assert.That(CEntMan.GetNetEntity(cPlayerMan.LocalEntity), Is.EqualTo(Player));
+        CPlayer = ToClient(Player);
+        Assert.That(cPlayerMan.LocalEntity, Is.EqualTo(CPlayer));
 
         // Delete old player entity.
         await Server.WaitPost(() =>
@@ -235,6 +240,10 @@ await Server.WaitPost(() =>
             }
         });
 
+        // Change UI state to in-game.
+        var state = Client.ResolveDependency<IStateManager>();
+        await Client.WaitPost(() => state.RequestStateChange<GameplayState>());
+
         // Final player asserts/checks.
         await Pair.ReallyBeIdle(5);
         Assert.Multiple(() =>
diff --git a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
index 70179fdec1aa..4db79373d389 100644
--- a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
+++ b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
@@ -22,32 +22,32 @@ public async Task AssembleAndDetonateGrenade()
         Target = SEntMan.GetNetEntity(await FindEntity("ModularGrenade"));
 
         await Drop();
-        await Interact(Cable);
+        await InteractUsing(Cable);
 
         // Insert & remove trigger
         AssertComp<OnUseTimerTriggerComponent>(false);
-        await Interact(Trigger);
+        await InteractUsing(Trigger);
         AssertComp<OnUseTimerTriggerComponent>();
         await FindEntity(Trigger, LookupFlags.Uncontained, shouldSucceed: false);
-        await Interact(Pry);
+        await InteractUsing(Pry);
         AssertComp<OnUseTimerTriggerComponent>(false);
 
         // Trigger was dropped to floor, not deleted.
         await FindEntity(Trigger, LookupFlags.Uncontained);
 
         // Re-insert
-        await Interact(Trigger);
+        await InteractUsing(Trigger);
         AssertComp<OnUseTimerTriggerComponent>();
 
         // Insert & remove payload.
-        await Interact(Payload);
+        await InteractUsing(Payload);
         await FindEntity(Payload, LookupFlags.Uncontained, shouldSucceed: false);
-        await Interact(Pry);
+        await InteractUsing(Pry);
         var ent = await FindEntity(Payload, LookupFlags.Uncontained);
         await Delete(ent);
 
         // successfully insert a second time
-        await Interact(Payload);
+        await InteractUsing(Payload);
         ent = await FindEntity(Payload);
         var sys = SEntMan.System<SharedContainerSystem>();
         Assert.That(sys.IsEntityInContainer(ent));
diff --git a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
new file mode 100644
index 000000000000..34402dd5e627
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
@@ -0,0 +1,75 @@
+using Content.Client.UserInterface.Systems.Hotbar.Widgets;
+using Content.Client.UserInterface.Systems.Storage.Controls;
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.Input;
+using Content.Shared.PDA;
+using Content.Shared.Storage;
+using Robust.Client.UserInterface;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Storage;
+
+public sealed class StorageInteractionTest : InteractionTest
+{
+    /// <summary>
+    /// Check that players can interact with items in storage if the storage UI is open
+    /// </summary>
+    [Test]
+    public async Task UiInteractTest()
+    {
+        var sys = Server.System<SharedContainerSystem>();
+
+        await SpawnTarget("ClothingBackpack");
+        var backpack = ToServer(Target);
+
+        // Initially no BUI is open.
+        Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.False);
+        Assert.That(IsUiOpen(PdaUiKey.Key), Is.False);
+
+        // Activating the backpack opens the UI
+        await Activate();
+        Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
+        Assert.That(IsUiOpen(PdaUiKey.Key), Is.False);
+
+        // Pick up a PDA
+        var pda = await PlaceInHands("PassengerPDA");
+        var sPda = ToServer(pda);
+        Assert.That(sys.IsEntityInContainer(sPda), Is.True);
+        Assert.That(sys.TryGetContainingContainer((sPda, null), out var container));
+        Assert.That(container!.Owner, Is.EqualTo(SPlayer));
+
+        // Insert the PDA into the backpack
+        await Interact();
+        Assert.That(sys.TryGetContainingContainer((sPda, null), out container));
+        Assert.That(container!.Owner, Is.EqualTo(backpack));
+
+        // Use "e" / ActivateInWorld to open the PDA UI while it is still in the backpack.
+        var ctrl = GetStorageControl(pda);
+        await ClickControl(ctrl, ContentKeyFunctions.ActivateItemInWorld);
+        await RunTicks(10);
+        Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
+        Assert.That(IsUiOpen(PdaUiKey.Key), Is.True);
+
+        // Click on the pda to pick it up and remove it from the backpack.
+        await ClickControl(ctrl, ContentKeyFunctions.MoveStoredItem);
+        await RunTicks(10);
+        Assert.That(sys.TryGetContainingContainer((sPda, null), out container));
+        Assert.That(container!.Owner, Is.EqualTo(SPlayer));
+
+        // UIs should still be open
+        Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
+        Assert.That(IsUiOpen(PdaUiKey.Key), Is.True);
+    }
+
+    /// <summary>
+    /// Retrieve the control that corresponds to the given entity in the currently open storage UI.
+    /// </summary>
+    private ItemGridPiece GetStorageControl(NetEntity target)
+    {
+        var uid = ToClient(target);
+        var hotbar = GetWidget<HotbarGui>();
+        var storageContainer  = GetControlFromField<Control>(nameof(HotbarGui.StorageContainer), hotbar);
+        return GetControlFromChildren<ItemGridPiece>(c => c.Entity == uid, storageContainer);
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
index 083e817d6975..6ea8b6882ad3 100644
--- a/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
+++ b/Content.IntegrationTests/Tests/Tiles/TileConstructionTests.cs
@@ -15,10 +15,10 @@ public async Task PlaceThenCutLattice()
         await AssertTile(Plating, PlayerCoords);
         AssertGridCount(1);
         await SetTile(null);
-        await Interact(Rod);
+        await InteractUsing(Rod);
         await AssertTile(Lattice);
         Assert.That(Hands.ActiveHandEntity, Is.Null);
-        await Interact(Cut);
+        await InteractUsing(Cut);
         await AssertTile(null);
         await AssertEntityLookup((Rod, 1));
         AssertGridCount(1);
@@ -43,14 +43,14 @@ public async Task CutThenPlaceLatticeNewGrid()
         // Place Lattice
         var oldPos = TargetCoords;
         TargetCoords = SEntMan.GetNetCoordinates(new EntityCoordinates(MapData.MapUid, 1, 0));
-        await Interact(Rod);
+        await InteractUsing(Rod);
         TargetCoords = oldPos;
         await AssertTile(Lattice);
         AssertGridCount(1);
 
         // Cut lattice
         Assert.That(Hands.ActiveHandEntity, Is.Null);
-        await Interact(Cut);
+        await InteractUsing(Cut);
         await AssertTile(null);
         AssertGridCount(0);
 
@@ -76,25 +76,25 @@ public async Task FloorConstructDeconstruct()
         // Space -> Lattice
         var oldPos = TargetCoords;
         TargetCoords = SEntMan.GetNetCoordinates(new EntityCoordinates(MapData.MapUid, 1, 0));
-        await Interact(Rod);
+        await InteractUsing(Rod);
         TargetCoords = oldPos;
         await AssertTile(Lattice);
         AssertGridCount(1);
 
         // Lattice -> Plating
-        await Interact(Steel);
+        await InteractUsing(Steel);
         Assert.That(Hands.ActiveHandEntity, Is.Null);
         await AssertTile(Plating);
         AssertGridCount(1);
 
         // Plating -> Tile
-        await Interact(FloorItem);
+        await InteractUsing(FloorItem);
         Assert.That(Hands.ActiveHandEntity, Is.Null);
         await AssertTile(Floor);
         AssertGridCount(1);
 
         // Tile -> Plating
-        await Interact(Pry);
+        await InteractUsing(Pry);
         await AssertTile(Plating);
         AssertGridCount(1);
 
diff --git a/Content.IntegrationTests/Tests/Weldable/WeldableTests.cs b/Content.IntegrationTests/Tests/Weldable/WeldableTests.cs
index 6227f3dee1b9..e7eadeda0a47 100644
--- a/Content.IntegrationTests/Tests/Weldable/WeldableTests.cs
+++ b/Content.IntegrationTests/Tests/Weldable/WeldableTests.cs
@@ -18,7 +18,7 @@ public async Task WeldLocker()
 
         Assert.That(comp.IsWelded, Is.False);
 
-        await Interact(Weld);
+        await InteractUsing(Weld);
         Assert.That(comp.IsWelded, Is.True);
         AssertPrototype(Locker); // Prototype did not change.
     }

From 2bd4f859661f0cbe9d7c357e9038f2671460c443 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:07:41 -0500
Subject: [PATCH 272/568] Fix Weh Juice and Other emote chems not working
 (#28562)

---
 Content.Server/Chat/Systems/ChatSystem.Emote.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 23e1517d7548..5897aac61a16 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -81,7 +81,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 &&

From c5ff647ca6257862cfd391926470694f909759f4 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 273/568] Replace obsolete EntityWhitelist IsValid usages part
 2 (#28506)

---
 Content.Client/Outline/TargetOutlineSystem.cs     |  3 ++-
 Content.Server/Chat/Systems/ChatSystem.Emote.cs   |  1 +
 .../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           |  4 +++-
 .../EntitySystems/AnimalHusbandrySystem.cs        |  6 ++++--
 .../Nutrition/EntitySystems/FoodSystem.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              |  8 ++++----
 .../Equipment/Systems/ArtifactCrusherSystem.cs    |  4 +++-
 .../Effects/Systems/DamageNearbyArtifactSystem.cs |  6 ++++--
 Content.Shared/Actions/SharedActionsSystem.cs     |  4 +++-
 .../Buckle/SharedBuckleSystem.Buckle.cs           |  7 +++++--
 .../Conditions/EntityWhitelistCondition.cs        |  3 ++-
 Content.Shared/Inventory/InventorySystem.Equip.cs | 11 ++++-------
 .../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          |  6 ++++--
 .../Ranged/Systems/SharedGunSystem.Ballistic.cs   |  3 ++-
 .../Ranged/Systems/SharedGunSystem.Clothing.cs    |  2 +-
 42 files changed, 141 insertions(+), 91 deletions(-)

diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 2a6867f51f55..df57578b1f51 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 5897aac61a16..20a4f1874650 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -81,6 +81,7 @@ public void TryEmoteWithChat(
         bool ignoreActionBlocker = false
         )
     {
+
         if (_whitelistSystem.IsWhitelistFail(emote.Whitelist, source) || _whitelistSystem.IsBlacklistPass(emote.Blacklist, source))
             return;
 
diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs
index 29f9275bdf47..6b106b1fc0a3 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,
                 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 04d3722c66cb..5161ac358ac9 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.Map;
 using Robust.Shared.Player;
@@ -30,6 +31,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.
@@ -337,7 +339,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;
@@ -422,7 +424,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 3a80d82fd92b..c60cf2513e0e 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.GridPreloader;
 using Content.Server.Spawners.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 fd94c74ac8c1..372de4bbb45d 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 9e56d0a49377..ee542572d7e0 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 f51c0444e69d..f9fe5e464135 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 68b973f58877..b738d28b4674 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 970ca78e2cc0..1768606ad20f 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -9,6 +9,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -24,6 +25,7 @@ public sealed class StunProviderSystem : SharedStunProviderSystem
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -42,7 +44,7 @@ private void OnBeforeInteractHand(EntityUid uid, StunProviderComponent comp, Bef
         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 || _whitelistSystem.IsWhitelistFail(comp.Whitelist, target))
             return;
 
         if (_timing.CurTime < comp.NextStun)
diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index cd0541340564..e224c7c47927 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.Popups;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
@@ -9,6 +9,7 @@
 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;
@@ -33,6 +34,7 @@ public sealed class AnimalHusbandrySystem : EntitySystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     private readonly HashSet<EntityUid> _failedAttempts = new();
     private readonly HashSet<EntityUid> _birthQueue = new();
@@ -174,7 +176,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/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 2c7632aadca5..1862b4e19f14 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -32,6 +32,7 @@
 using Robust.Shared.Utility;
 using System.Linq;
 using Robust.Server.GameObjects;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
@@ -57,6 +58,7 @@ public sealed class FoodSystem : EntitySystem
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StomachSystem _stomach = default!;
     [Dependency] private readonly UtensilSystem _utensil = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const float MaxFeedDistance = 1.0f;
 
@@ -408,7 +410,7 @@ 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 (_whitelistSystem.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;
diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs
index 56b245ce8479..8fe7e7e20315 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 97aee218f063..8421987bae9f 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 b4240d409ad8..b29f46e09e9d 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 effe1b72f718..21a7f4d03959 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 415e8d924671..43fcb32d1f07 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 859703a72a70..ff4a9a19cdd2 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 20ec5cecce8a..ced4dfa9c0b4 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 1adab9930d91..4deb5238a53c 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 f7531f7e2ce7..f41512b6ac2d 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Traits;
+using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
 
@@ -12,6 +13,7 @@ public sealed class TraitSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ISerializationManager _serializationManager = default!;
     [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -31,10 +33,8 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
                 return;
             }
 
-            if (traitPrototype.Whitelist != null && !traitPrototype.Whitelist.IsValid(args.Mob))
-                continue;
-
-            if (traitPrototype.Blacklist != null && traitPrototype.Blacklist.IsValid(args.Mob))
+            if (_whitelistSystem.IsWhitelistFail(traitPrototype.Whitelist, args.Mob) ||
+                _whitelistSystem.IsBlacklistPass(traitPrototype.Blacklist, args.Mob))
                 continue;
 
             // Add all components required by the prototype
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 6606f284327e..f65ba46f7a5d 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Content.Shared.Xenoarchaeology.Equipment;
 using Robust.Shared.Collections;
 using Robust.Shared.Random;
@@ -25,6 +26,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()
@@ -92,7 +94,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 a2023a18d482..f231120ad5b5 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/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index bf86d2c1e492..0e302f1e0288 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -9,6 +9,7 @@
 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;
@@ -29,6 +30,7 @@ public abstract class SharedActionsSystem : EntitySystem
     [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()
     {
@@ -477,7 +479,7 @@ private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTa
         if (!target.IsValid() || Deleted(target))
             return false;
 
-        if (action.Whitelist != null && !action.Whitelist.IsValid(target, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(action.Whitelist, target))
             return false;
 
         if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, target))
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 00040211e36c..e7bfb53f08c7 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Utility;
@@ -24,6 +25,8 @@ namespace Content.Shared.Buckle;
 
 public abstract partial class SharedBuckleSystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+
     private void InitializeBuckle()
     {
         SubscribeLocalEvent<BuckleComponent, ComponentStartup>(OnBuckleComponentStartup);
@@ -224,8 +227,8 @@ private bool CanBuckle(
         }
 
         // Does it pass the Whitelist
-        if (strapComp.Whitelist != null &&
-            !strapComp.Whitelist.IsValid(buckleUid, EntityManager) || strapComp.Blacklist?.IsValid(buckleUid, EntityManager) == true)
+        if (_whitelistSystem.IsWhitelistFail(strapComp.Whitelist, buckleUid) ||
+            _whitelistSystem.IsBlacklistPass(strapComp.Blacklist, buckleUid))
         {
             if (_netManager.IsServer)
                 _popup.PopupEntity(Loc.GetString("buckle-component-cannot-fit-message"), userUid, buckleUid, PopupType.Medium);
diff --git a/Content.Shared/Construction/Conditions/EntityWhitelistCondition.cs b/Content.Shared/Construction/Conditions/EntityWhitelistCondition.cs
index 22d86b54fb73..b7b3c56ba4c0 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 7fd156213b45..7acfafee4a63 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Strip.Components;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
@@ -30,6 +31,7 @@ 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!;
 
     [ValidatePrototypeId<ItemSizePrototype>]
     private const string PocketableItemSize = "Small";
@@ -267,13 +269,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 7dbeee3e770a..0763bb101cae 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 fb1702bb94e0..9a7da17d4863 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -9,6 +9,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.Containers;
@@ -29,6 +30,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
     [Dependency] protected readonly SharedAmbientSoundSystem AmbientSound = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] protected readonly SharedContainerSystem Container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const string ActiveReclaimerContainerId = "active-material-reclaimer-container";
 
@@ -91,10 +93,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, out _) && !Container.TryRemoveFromContainer(item))
diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index 73b7c0847fc1..2ec48085c47d 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 400a675cd253..6e1b3a29aec5 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 df9cf8ac8252..6838e7982cb0 100644
--- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
+++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs
@@ -17,6 +17,7 @@ public sealed class EmagProviderSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
     [Dependency] private readonly TagSystem _tags = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -35,7 +36,7 @@ private void OnBeforeInteractHand(EntityUid uid, EmagProviderComponent comp, Bef
             return;
 
         // only allowed to emag entities on the whitelist
-        if (comp.Whitelist != null && !comp.Whitelist.IsValid(target, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(comp.Whitelist, target))
             return;
 
         // only allowed to emag non-immune entities
diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs
index 9be6a4acd5a6..d1ea88b82a0c 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 6b8a58abb712..58d67c268e3a 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 0dcdc44c9f21..efc18abaa065 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 d81ad754d1ef..14703f3177ea 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()
     {
@@ -67,7 +69,7 @@ private bool Update(EntityUid uid, StepTriggerComponent component, TransformComp
                 if (ent == uid)
                     continue;
 
-                if (component.Blacklist.IsValid(ent.Value, EntityManager) == true)
+                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 1cc95337ea4a..8c2cb4c4fcbf 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 a5e151f4ea62..2557f8100c66 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 bc73baa61adf..58c249fec54f 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 1bb11f337f65..b1006b2a7423 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;
 
 namespace Content.Shared.UserInterface;
@@ -19,6 +20,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()
     {
@@ -96,7 +98,7 @@ private bool ShouldAddVerb<T>(EntityUid uid, ActivatableUIComponent component, G
         if (!args.CanAccess)
             return false;
 
-        if (!component.RequiredItems?.IsValid(args.Using ?? default, EntityManager) ?? false)
+        if (_whitelistSystem.IsWhitelistFail(component.RequiredItems, args.Using ?? default))
             return false;
 
         if (component.RequireHands)
@@ -156,7 +158,7 @@ private void OnInteractUsing(EntityUid uid, ActivatableUIComponent component, In
         if (component.RequiredItems == null)
             return;
 
-        if (!component.RequiredItems.IsValid(args.Used, EntityManager))
+        if (_whitelistSystem.IsWhitelistFail(component.RequiredItems, args.Used))
             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 1f9e6cee76aa..9123661c8e96 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 77ee419ac3bc..d4aa024f4c84 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 b51f04a765a68d5d5b86f83f49eb14c812ea0ac0 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:42:50 -0700
Subject: [PATCH 274/568] Gets rid of obsolete EntityWhitelist.IsValid()
 function (#28565)

Gets rid of obsolete IsValid function

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Shared/Whitelist/EntityWhitelist.cs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Content.Shared/Whitelist/EntityWhitelist.cs b/Content.Shared/Whitelist/EntityWhitelist.cs
index 895759be9582..3e4e2fecb2e5 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 2ae5c953de0ee6bb5cafa1c983106c9c4596c8d6 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 275/568] 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          | 45 ++++++++++++++-----
 .../Chemistry/ReagentEffects/Emote.cs         |  7 ++-
 Resources/Prototypes/Reagents/fun.yml         |  1 +
 Resources/Prototypes/Reagents/toxins.yml      |  1 +
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
index 20a4f1874650..e4e5c39eeb67 100644
--- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -49,18 +49,20 @@ private void CacheEmotes()
     /// <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="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>
@@ -72,22 +74,18 @@ public void TryEmoteWithChat(
     /// <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="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
@@ -156,15 +154,40 @@ 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();
         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/Chemistry/ReagentEffects/Emote.cs b/Content.Server/Chemistry/ReagentEffects/Emote.cs
index a4d49e4ad1cf..db6de6cc75be 100644
--- a/Content.Server/Chemistry/ReagentEffects/Emote.cs
+++ b/Content.Server/Chemistry/ReagentEffects/Emote.cs
@@ -8,7 +8,7 @@
 namespace Content.Server.Chemistry.ReagentEffects;
 
 /// <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 : ReagentEffect
@@ -19,6 +19,9 @@ public sealed partial class Emote : ReagentEffect
     [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;
@@ -30,7 +33,7 @@ public override void Effect(ReagentEffectArgs args)
 
         var chatSys = args.EntityManager.System<ChatSystem>();
         if (ShowInChat)
-            chatSys.TryEmoteWithChat(args.SolutionEntity, EmoteId, ChatTransmitRange.GhostRangeLimit);
+            chatSys.TryEmoteWithChat(args.SolutionEntity, EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: Force);
         else
             chatSys.TryEmoteWithoutChat(args.SolutionEntity, EmoteId);
 
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index befa8d829688..1df2636c8ceb 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 f5b196acf6b6..9665de7b099e 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -560,6 +560,7 @@
       - !type:Emote
         emote: Honk
         showInChat: true
+        force: true
         probability: 0.2
       - !type:HealthChange
         conditions:

From 7d22897d02706507be7f918bfafa493fccc702e3 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Mon, 3 Jun 2024 19:52:15 -0400
Subject: [PATCH 276/568] Job starting gear is now defined in the starting gear
 rather than backpack prototypes (#27605)

*
---
 .../Tests/Roles/StartingGearStorageTests.cs   |  72 +++
 .../Station/Systems/StationSpawningSystem.cs  |  15 +-
 Content.Shared/Roles/StartingGearPrototype.cs |  68 ++-
 .../Station/SharedStationSpawningSystem.cs    |  20 +-
 .../en-US/preferences/loadout-groups.ftl      |  11 +-
 .../Fills/Backpacks/StarterGear/backpack.yml  | 422 ------------------
 .../Fills/Backpacks/StarterGear/duffelbag.yml | 275 ------------
 .../Fills/Backpacks/StarterGear/satchel.yml   | 300 -------------
 .../Catalog/Fills/Backpacks/duffelbag.yml     |  49 --
 .../Entities/Clothing/Back/backpacks.yml      |  10 +
 .../Prototypes/Entities/Mobs/NPCs/human.yml   |   2 +-
 .../Loadouts/Jobs/Cargo/cargo_technician.yml  |   6 +-
 .../Loadouts/Jobs/Cargo/quartermaster.yml     |  28 --
 .../Jobs/Cargo/salvage_specialist.yml         |   6 +-
 .../Loadouts/Jobs/Civilian/botanist.yml       |   6 +-
 .../Loadouts/Jobs/Civilian/chaplain.yml       |  28 --
 .../Loadouts/Jobs/Civilian/clown.yml          |   6 +-
 .../Loadouts/Jobs/Civilian/lawyer.yml         |  30 +-
 .../Loadouts/Jobs/Civilian/mime.yml           |   6 +-
 .../Loadouts/Jobs/Civilian/musician.yml       |  28 --
 .../Loadouts/Jobs/Civilian/passenger.yml      |   6 +-
 .../Loadouts/Jobs/Command/captain.yml         |   6 +-
 .../Jobs/Command/head_of_personnel.yml        |  29 +-
 .../Engineering/atmospheric_technician.yml    |   6 +-
 .../Jobs/Engineering/chief_engineer.yml       |  28 --
 .../Jobs/Engineering/station_engineer.yml     |   6 +-
 .../Loadouts/Jobs/Medical/chemist.yml         |   6 +-
 .../Jobs/Medical/chief_medical_officer.yml    |  28 --
 .../Loadouts/Jobs/Medical/medical_doctor.yml  |   6 +-
 .../Loadouts/Jobs/Medical/paramedic.yml       |  28 --
 .../Jobs/Science/research_director.yml        |  28 --
 .../Loadouts/Jobs/Science/scientist.yml       |   6 +-
 .../Loadouts/Jobs/Security/detective.yml      |  28 --
 .../Jobs/Security/security_officer.yml        |   6 +-
 .../Prototypes/Loadouts/loadout_groups.yml    |  82 +---
 .../Prototypes/Loadouts/role_loadouts.yml     |  18 +-
 Resources/Prototypes/Roles/Antags/Thief.yml   |   7 +
 Resources/Prototypes/Roles/Antags/ninja.yml   |  30 ++
 Resources/Prototypes/Roles/Antags/nukeops.yml |  63 +++
 Resources/Prototypes/Roles/Antags/pirate.yml  |  16 +-
 .../Prototypes/Roles/Antags/revolutionary.yml |   7 +
 Resources/Prototypes/Roles/Antags/traitor.yml |  33 ++
 .../Roles/Jobs/Cargo/cargo_technician.yml     |   5 +-
 .../Roles/Jobs/Cargo/quartermaster.yml        |   6 +-
 .../Roles/Jobs/Cargo/salvage_specialist.yml   |   5 +-
 .../Roles/Jobs/Civilian/assistant.yml         |   3 +
 .../Roles/Jobs/Civilian/bartender.yml         |   3 +
 .../Roles/Jobs/Civilian/botanist.yml          |   3 +
 .../Roles/Jobs/Civilian/chaplain.yml          |   5 +
 .../Prototypes/Roles/Jobs/Civilian/chef.yml   |   3 +
 .../Prototypes/Roles/Jobs/Civilian/clown.yml  |   7 +-
 .../Roles/Jobs/Civilian/janitor.yml           |   3 +
 .../Prototypes/Roles/Jobs/Civilian/lawyer.yml |   4 +
 .../Roles/Jobs/Civilian/librarian.yml         |   4 +
 .../Prototypes/Roles/Jobs/Civilian/mime.yml   |   4 +
 .../Roles/Jobs/Civilian/musician.yml          |   7 +-
 .../Roles/Jobs/Civilian/service_worker.yml    |   3 +
 .../Prototypes/Roles/Jobs/Command/captain.yml |   5 +
 .../Roles/Jobs/Command/head_of_personnel.yml  |   4 +
 .../Engineering/atmospheric_technician.yml    |   3 +
 .../Roles/Jobs/Engineering/chief_engineer.yml |   4 +
 .../Jobs/Engineering/station_engineer.yml     |   3 +
 .../Jobs/Engineering/technical_assistant.yml  |   5 +-
 .../Roles/Jobs/Fun/cult_startinggear.yml      |  10 +-
 .../Roles/Jobs/Fun/emergencyresponseteam.yml  | 174 +++++++-
 .../Roles/Jobs/Fun/misc_startinggear.yml      | 219 +++------
 .../Roles/Jobs/Fun/wizard_startinggear.yml    |  22 +-
 .../Prototypes/Roles/Jobs/Medical/chemist.yml |   5 +-
 .../Jobs/Medical/chief_medical_officer.yml    |   4 +
 .../Roles/Jobs/Medical/medical_doctor.yml     |   3 +
 .../Roles/Jobs/Medical/medical_intern.yml     |   5 +-
 .../Roles/Jobs/Medical/paramedic.yml          |   4 +
 .../Roles/Jobs/Science/research_assistant.yml |   3 +
 .../Roles/Jobs/Science/research_director.yml  |   6 +-
 .../Roles/Jobs/Science/scientist.yml          |   4 +-
 .../Roles/Jobs/Security/detective.yml         |   6 +
 .../Roles/Jobs/Security/head_of_security.yml  |   5 +
 .../Roles/Jobs/Security/security_cadet.yml    |   7 +-
 .../Roles/Jobs/Security/security_officer.yml  |   5 +
 .../Prototypes/Roles/Jobs/Security/warden.yml |   5 +
 .../Prototypes/Roles/Jobs/Wildcards/boxer.yml |   3 +
 .../Roles/Jobs/Wildcards/psychologist.yml     |   3 +
 .../Roles/Jobs/Wildcards/reporter.yml         |   3 +
 .../Roles/Jobs/Wildcards/zookeeper.yml        |   3 +
 Resources/migration.yml                       |   6 +-
 85 files changed, 728 insertions(+), 1727 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
 delete mode 100644 Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
 delete mode 100644 Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
 delete mode 100644 Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

diff --git a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
new file mode 100644
index 000000000000..0f15a02eaa29
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs
@@ -0,0 +1,72 @@
+using System.Linq;
+using Content.Shared.Roles;
+using Content.Server.Storage.EntitySystems;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Collections;
+
+namespace Content.IntegrationTests.Tests.Roles;
+
+[TestFixture]
+public sealed class StartingGearPrototypeStorageTest
+{
+    /// <summary>
+    /// Checks that a storage fill on a StartingGearPrototype will properly fill
+    /// </summary>
+    [Test]
+    public async Task TestStartingGearStorage()
+    {
+        var settings = new PoolSettings { Connected = true, Dirty = true };
+        await using var pair = await PoolManager.GetServerClient(settings);
+        var server = pair.Server;
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var storageSystem = server.System<StorageSystem>();
+
+        var protos = server.ProtoMan
+            .EnumeratePrototypes<StartingGearPrototype>()
+            .Where(p => !p.Abstract)
+            .ToList()
+            .OrderBy(p => p.ID);
+
+        var testMap = await pair.CreateTestMap();
+        var coords = testMap.GridCoords;
+
+        await server.WaitAssertion(() =>
+        {
+            foreach (var gearProto in protos)
+            {
+                var backpackProto = gearProto.GetGear("back");
+                if (backpackProto == string.Empty)
+                    continue;
+
+                var bag = server.EntMan.SpawnEntity(backpackProto, coords);
+                var ents = new ValueList<EntityUid>();
+
+                foreach (var (slot, entProtos) in gearProto.Storage)
+                {
+                    if (entProtos.Count == 0)
+                        continue;
+
+                    foreach (var ent in entProtos)
+                    {
+                        ents.Add(server.EntMan.SpawnEntity(ent, coords));
+                    }
+
+                    foreach (var ent in ents)
+                    {
+                        if (!storageSystem.CanInsert(bag, ent, out _))
+                            Assert.Fail($"StartingGearPrototype {gearProto.ID} could not successfully put items into storage {bag.Id}");
+
+                        server.EntMan.DeleteEntity(ent);
+                    }
+                }
+
+                server.EntMan.DeleteEntity(bag);
+            }
+
+            mapManager.DeleteMap(testMap.MapId);
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 557a1f95662e..b91082ff2616 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -179,13 +179,6 @@ public EntityUid SpawnPlayerMob(
             profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId);
         }
 
-        if (prototype?.StartingGear != null)
-        {
-            var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
-            EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
-        }
-
-        // Run loadouts after so stuff like storage loadouts can get
         var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID);
 
         if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto))
@@ -203,6 +196,12 @@ public EntityUid SpawnPlayerMob(
             EquipRoleLoadout(entity.Value, loadout, roleProto);
         }
 
+        if (prototype?.StartingGear != null)
+        {
+            var startingGear = _prototypeManager.Index<StartingGearPrototype>(prototype.StartingGear);
+            EquipStartingGear(entity.Value, startingGear, raiseEvent: false);
+        }
+
         var gearEquippedEv = new StartingGearEquippedEvent(entity.Value);
         RaiseLocalEvent(entity.Value, ref gearEquippedEv);
 
@@ -309,4 +308,4 @@ public PlayerSpawningEvent(JobComponent? job, HumanoidCharacterProfile? humanoid
         HumanoidCharacterProfile = humanoidCharacterProfile;
         Station = station;
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index fc9ecec7afe0..d96d014f88d3 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -1,30 +1,50 @@
-using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
-namespace Content.Shared.Roles
+namespace Content.Shared.Roles;
+
+[Prototype]
+public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype
 {
-    [Prototype("startingGear")]
-    public sealed partial class StartingGearPrototype : IPrototype
+    /// <inheritdoc/>
+    [ViewVariables]
+    [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; }
+
+    /// <summary>
+    /// The slot and entity prototype ID of the equipment that is to be spawned and equipped onto the entity.
+    /// </summary>
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, EntProtoId> Equipment = new();
+
+    /// <summary>
+    /// The inhand items that are equipped when this starting gear is equipped onto an entity.
+    /// </summary>
+    [DataField]
+    [AlwaysPushInheritance]
+    public List<EntProtoId> Inhand = new(0);
+
+    /// <summary>
+    /// Inserts entities into the specified slot's storage (if it does have storage).
+    /// </summary>
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<string, List<EntProtoId>> Storage = new();
+
+    /// <summary>
+    /// Gets the entity prototype ID of a slot in this starting gear.
+    /// </summary>
+    public string GetGear(string slot)
     {
-        [DataField]
-        public Dictionary<string, EntProtoId> Equipment = new();
-
-        [DataField]
-        public List<EntProtoId> Inhand = new(0);
-
-        /// <summary>
-        /// Inserts entities into the specified slot's storage (if it does have storage).
-        /// </summary>
-        [DataField]
-        public Dictionary<string, List<EntProtoId>> Storage = new();
-
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = string.Empty;
-
-        public string GetGear(string slot)
-        {
-            return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
-        }
+        return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
     }
 }
diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs
index f352c9db63e9..ca53998115bc 100644
--- a/Content.Shared/Station/SharedStationSpawningSystem.cs
+++ b/Content.Shared/Station/SharedStationSpawningSystem.cs
@@ -15,9 +15,9 @@ public abstract class SharedStationSpawningSystem : EntitySystem
 {
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly InventorySystem InventorySystem = default!;
-    [Dependency] private   readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private   readonly SharedStorageSystem _storage = default!;
-    [Dependency] private   readonly SharedTransformSystem _xformSystem = default!;
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedStorageSystem _storage = default!;
+    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
     private EntityQuery<HandsComponent> _handsQuery;
     private EntityQuery<InventoryComponent> _inventoryQuery;
@@ -91,7 +91,7 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
                 if (!string.IsNullOrEmpty(equipmentStr))
                 {
                     var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, xform.Coordinates);
-                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force:true);
+                    InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true);
                 }
             }
         }
@@ -122,15 +122,15 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
                 if (entProtos.Count == 0)
                     continue;
 
-                foreach (var ent in entProtos)
-                {
-                    ents.Add(Spawn(ent, coords));
-                }
-
                 if (inventoryComp != null &&
                     InventorySystem.TryGetSlotEntity(entity, slot, out var slotEnt, inventoryComponent: inventoryComp) &&
                     _storageQuery.TryComp(slotEnt, out var storage))
                 {
+                    foreach (var ent in entProtos)
+                    {
+                        ents.Add(Spawn(ent, coords));
+                    }
+
                     foreach (var ent in ents)
                     {
                         _storage.Insert(slotEnt.Value, ent, out _, storageComp: storage, playSound: false);
@@ -145,4 +145,4 @@ public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingG
             RaiseLocalEvent(entity, ref ev);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index 68a47cba19fc..28863268dfc6 100644
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -1,6 +1,7 @@
 # Miscellaneous
 loadout-group-trinkets = Trinkets
 loadout-group-glasses = Glasses
+loadout-group-backpack = Backpack
 
 # Command
 loadout-group-captain-head = Captain head
@@ -19,7 +20,6 @@ loadout-group-hop-outerclothing = Head of Personnel outer clothing
 loadout-group-passenger-jumpsuit = Passenger jumpsuit
 loadout-group-passenger-mask = Passenger mask
 loadout-group-passenger-gloves = Passenger gloves
-loadout-group-passenger-backpack = Passenger backpack
 loadout-group-passenger-outerclothing = Passenger outer clothing
 loadout-group-passenger-shoes = Passenger shoes
 
@@ -36,12 +36,10 @@ loadout-group-librarian-jumpsuit = Librarian jumpsuit
 
 loadout-group-lawyer-jumpsuit = Lawyer jumpsuit
 loadout-group-lawyer-neck = Lawyer neck
-loadout-group-lawyer-backpack = Lawyer backpack
 
 loadout-group-chaplain-head = Chaplain head
 loadout-group-chaplain-mask = Chaplain mask
 loadout-group-chaplain-jumpsuit = Chaplain jumpsuit
-loadout-group-chaplain-backpack = Chaplain backpack
 loadout-group-chaplain-outerclothing = Chaplain outer clothing
 loadout-group-chaplain-neck = Chaplain neck
 
@@ -67,13 +65,11 @@ loadout-group-mime-jumpsuit = Mime jumpsuit
 loadout-group-mime-backpack = Mime backpack
 loadout-group-mime-outerclothing = Mime outer clothing
 
-loadout-group-musician-backpack = Musician backpack
 loadout-group-musician-outerclothing = Musician outer clothing
 
 # Cargo
 loadout-group-quartermaster-head = Quartermaster head
 loadout-group-quartermaster-jumpsuit = Quartermaster jumpsuit
-loadout-group-quartermaster-backpack = Quartermaster backpack
 loadout-group-quartermaster-neck = Quartermaster neck
 loadout-group-quartermaster-outerclothing = Quartermaster outer clothing
 loadout-group-quartermaster-shoes = Quartermaster shoes
@@ -91,7 +87,6 @@ loadout-group-salvage-specialist-shoes = Salvage Specialist shoes
 # Engineering
 loadout-group-chief-engineer-head = Chief Engineer head
 loadout-group-chief-engineer-jumpsuit = Chief Engineer jumpsuit
-loadout-group-chief-engineer-backpack = Chief Engineer backpack
 loadout-group-chief-engineer-outerclothing = Chief Engineer outer clothing
 loadout-group-chief-engineer-neck = Chief Engineer neck
 loadout-group-chief-engineer-shoes = Chief Engineer shoes
@@ -114,7 +109,6 @@ loadout-group-atmospheric-technician-shoes = Atmospheric Technician shoes
 loadout-group-research-director-head = Research Director head
 loadout-group-research-director-neck = Research Director neck
 loadout-group-research-director-jumpsuit = Research Director jumpsuit
-loadout-group-research-director-backpack = Research Director backpack
 loadout-group-research-director-outerclothing = Research Director outer clothing
 loadout-group-research-director-shoes = Research Director shoes
 
@@ -150,7 +144,6 @@ loadout-group-security-id = Security ID
 loadout-group-detective-head = Detective head
 loadout-group-detective-neck = Detective neck
 loadout-group-detective-jumpsuit = Detective jumpsuit
-loadout-group-detective-backpack = Detective backpack
 loadout-group-detective-outerclothing = Detective outer clothing
 
 loadout-group-security-cadet-jumpsuit = Security cadet jumpsuit
@@ -162,7 +155,6 @@ loadout-group-medical-mask = Medical mask
 loadout-group-chief-medical-officer-head = Chief Medical Officer head
 loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit
 loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing
-loadout-group-chief-medical-officer-backpack = Chief Medical Officer backpack
 loadout-group-chief-medical-officer-shoes = Chief Medical Officer shoes
 loadout-group-chief-medical-officer-neck = Chief Medical Officer neck
 
@@ -183,7 +175,6 @@ loadout-group-paramedic-head = Paramedic head
 loadout-group-paramedic-jumpsuit = Paramedic jumpsuit
 loadout-group-paramedic-outerclothing = Paramedic outer clothing
 loadout-group-paramedic-shoes = Paramedic shoes
-loadout-group-paramedic-backpack = Paramedic backpack
 
 # Wildcards
 loadout-group-reporter-jumpsuit = Reporter jumpsuit
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
deleted file mode 100644
index 71c679a2aa52..000000000000
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ /dev/null
@@ -1,422 +0,0 @@
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackFilled
-  noSpawn: true
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackClown
-  id: ClothingBackpackClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-      - id: CrayonRainbow
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCaptain
-  id: ClothingBackpackCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackIan
-  id: ClothingBackpackHOPIanFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMedical
-  id: ClothingBackpackCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSecurity
-  id: ClothingBackpackHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackEngineering
-  id: ClothingBackpackEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackAtmospherics
-  id: ClothingBackpackAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackScience
-  id: ClothingBackpackScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHydroponics
-  id: ClothingBackpackHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackMime
-  id: ClothingBackpackMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackChemistry
-  id: ClothingBackpackChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpack
-  id: ClothingBackpackDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-      - id: BoxForensicPad
-
-# ERT
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazineMagnum
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackERTSecurityFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
-        - id: BoxZiptie
-        - id: CrowbarRed
-        - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTMedical
-  id: ClothingBackpackERTMedicalFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalMedical
-        - id: Hypospray
-        - id: MedkitAdvancedFilled
-        - id: CrowbarRed
-        - id: OmnizineChemistryBottle
-        - id: EpinephrineChemistryBottle
-        - id: EpinephrineChemistryBottle
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTEngineer
-  id: ClothingBackpackERTEngineerFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: trayScanner
-        - id: RCD
-        - id: RCDAmmo
-          amount: 2
-        - id: CableMVStack
-        - id: CableHVStack
-        - id: CableApcStack
-        - id: SheetPlasteel
-        - id: SheetSteel
-        - id: SheetGlass
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: LightReplacer
-        - id: BoxLightMixed
-        - id: BoxLightMixed
-        - id: Soap
-        - id: CrowbarRed
-        - id: AdvMopItem
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTChaplain
-  id: ClothingBackpackERTChaplainFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: BoxCandle
-        - id: BoxBodyBag
-        - id: DrinkWaterMelonJuiceJug
-        - id: Lantern
-        - id: Lantern
-        - id: Bible
-        - id: CrowbarRed
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: FoodBakedBunHotX
-        - id: Lighter
-
-# Death Squad
-
-- type: entity
-  noSpawn: false
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackDeathSquadFilled
-  name: death squad backpack
-  description: Holds the kit of CentComm's most feared agents.
-  components:
-    - type: Storage
-      grid:
-      - 0,0,7,6
-    - type: StorageFill
-      contents:
-        - id: BoxSurvivalEngineering
-        - id: WeaponPulseRifle
-        - id: WeaponPulsePistol
-        - id: WeaponRevolverMateba
-        - id: SpeedLoaderMagnumAP
-        - id: SpeedLoaderMagnumAP
-        - id: BoxFlashbang
-        - id: ToolDebug # spanish army knife
-        - id: WelderExperimental
-        - id: Hypospray
-        - id: DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
-        - id: FreedomImplanter
-
-# Cargo
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackCargo
-  id: ClothingBackpackCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSalvage
-  id: ClothingBackpackSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-# Pirate
-
-- type: entity
-  parent: ClothingBackpackSatchelLeather
-  id: ClothingBackpackPirateFilled
-  suffix: Filled, Pirate
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: Cutlass
-        - id: WeaponRevolverPirate
-        - id: ClothingEyesEyepatch
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
deleted file mode 100644
index 477b8b2f185f..000000000000
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ /dev/null
@@ -1,275 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelClown
-  id: ClothingBackpackDuffelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelBrigmedic
-  id: ClothingBackpackDuffelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCaptain
-  id: ClothingBackpackDuffelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMedical
-  id: ClothingBackpackDuffelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSecurity
-  id: ClothingBackpackDuffelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
-  id: ClothingBackpackDuffelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelAtmospherics
-  id: ClothingBackpackDuffelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelScience
-  id: ClothingBackpackDuffelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelHydroponics
-  id: ClothingBackpackDuffelHydroponicsFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelMime
-  id: ClothingBackpackDuffelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelChemistry
-  id: ClothingBackpackDuffelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-  
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: Lighter
-      - id: CigPackBlack
-      - id: BoxForensicPad
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelCargo
-  id: ClothingBackpackDuffelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackDuffelSalvage
-  id: ClothingBackpackDuffelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
deleted file mode 100644
index fe411688298f..000000000000
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ /dev/null
@@ -1,300 +0,0 @@
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelTools
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Crowbar
-      - id: Wrench
-      - id: Screwdriver
-      - id: Wirecutter
-      - id: Welder
-      - id: Multitool
-
-- type: entity
-  parent: ClothingBackpackSatchelClown
-  id: ClothingBackpackSatchelClownFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxHug
-      - id: RubberStampClown
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelSecurityFilledDetective
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: ForensicPad
-      - id: ForensicScanner
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelBrigmedic
-  id: ClothingBackpackSatchelBrigmedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Flash
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelMedicalFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelParamedicFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: EmergencyRollerBedSpawnFolded
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCaptain
-  id: ClothingBackpackSatchelCaptainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- name: StationCharter
-      #- name: TelescopicBaton
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelChiefEngineerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelResearchDirectorFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelHOPFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMedical
-  id: ClothingBackpackSatchelCMOFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelQuartermasterFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Flash
-      #- id: TelescopicBaton
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSecurity
-  id: ClothingBackpackSatchelHOSFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSecurity
-      - id: Flash
-      - id: MagazinePistol
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
-  id: ClothingBackpackSatchelEngineeringFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelAtmospherics
-  id: ClothingBackpackSatchelAtmosphericsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalEngineering
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelScience
-  id: ClothingBackpackSatchelScienceFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHydroponics
-  id: ClothingBackpackSatchelHydroponicsFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelChemistry
-  id: ClothingBackpackSatchelChemistryFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalMedical
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelChaplainFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: Bible
-      - id: RubberStampChaplain
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLawyerFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampLawyer
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelMusicianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: AcousticGuitarInstrument
-        - id: SaxophoneInstrument
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelLibrarianFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: BookRandom
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelDetectiveFilled
-  components:
-    - type: StorageFill
-      contents:
-      - id: BoxSurvival
-      - id: BoxForensicPad
-      - id: Lighter
-      - id: CigPackBlack
-      - id: HandLabeler
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelCargo
-  id: ClothingBackpackSatchelCargoFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelSalvage
-  id: ClothingBackpackSatchelSalvageFilled
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelMime
-  id: ClothingBackpackSatchelMimeFilled
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvival
-      - id: RubberStampMime
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchelHolding
-  id: ClothingBackpackSatchelHoldingAdmin
-  components:
-  - type: StorageFill
-    contents:
-    - id: GasAnalyzer
-    - id: trayScanner
-    - id: AccessConfiguratorUniversal
-  - type: Unremoveable
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 4e4b6d938268..ae57ea634213 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -13,23 +13,6 @@
       - id: Retractor
       - id: Scalpel
 
-- type: entity
-  id: ClothingBackpackDuffelCBURNFilled
-  parent: ClothingBackpackDuffelCBURN
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-    - id: BoxSurvivalEngineering
-    - id: WeaponShotgunDoubleBarreled
-    - id: BoxShotgunIncendiary
-      amount: 2
-    - id: GrenadeFlashBang
-      amount: 2
-    - id: PillAmbuzolPlus
-    - id: PillAmbuzol
-      amount: 4
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateFilledMedical
@@ -320,38 +303,6 @@
       - id: PillAmbuzol
         amount: 3
 
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateOperative
-  name: operative duffelbag
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: DeathAcidifierImplanter
-
-
-- type: entity
-  parent: ClothingBackpackDuffelSyndicateMedicalBundle
-  id: ClothingBackpackDuffelSyndicateOperativeMedic
-  name: operative medic duffelbag
-  description: A large duffel bag for holding extra medical supplies.
-  components:
-  - type: StorageFill
-    contents:
-      - id: SyndiHypo
-      - id: BoxSurvivalSyndicate
-      - id: SawAdvanced
-      - id: Cautery
-      - id: CombatKnife
-      - id: WeaponPistolViper
-      - id: PinpointerSyndicateNuclear
-      - id: HandheldHealthAnalyzer
-      - id: CombatMedipen
-      - id: DeathAcidifierImplanter
-
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle
   id: ClothingBackpackDuffelSyndicateMedicalBundleFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 5d9fc64e128d..ceaa7442959c 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -257,6 +257,16 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
+- type: entity
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquad
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    - type: Storage
+      grid:
+      - 0,0,7,6
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index 2133694342e8..ec2ed5070d39 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -7,7 +7,7 @@
   - type: InputMover
   - type: MobMover
   - type: Loadout
-    prototypes: [PassengerGear]
+    prototypes: [LimitedPassengerGear]
   - type: NpcFactionMember
     factions:
     - NanoTrasen
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
index f2922d8cfd5f..ecc353445818 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
@@ -35,7 +35,7 @@
 - type: startingGear
   id: CargoTechnicianBackpack
   equipment:
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackCargo
 
 - type: loadout
   id: CargoTechnicianSatchel
@@ -44,7 +44,7 @@
 - type: startingGear
   id: CargoTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelCargoFilled
+    back: ClothingBackpackSatchelCargo
 
 - type: loadout
   id: CargoTechnicianDuffel
@@ -53,7 +53,7 @@
 - type: startingGear
   id: CargoTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelCargoFilled
+    back: ClothingBackpackDuffelCargo
 
 # OuterClothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
index d738306c6500..f02da1231615 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -82,34 +82,6 @@
   equipment:
     neck: ClothingNeckMantleQM
 
-# Back
-- type: loadout
-  id: QuartermasterBackpack
-  equipment: QuartermasterBackpack
-
-- type: startingGear
-  id: QuartermasterBackpack
-  equipment:
-    back: ClothingBackpackQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterSatchel
-  equipment: QuartermasterSatchel
-
-- type: startingGear
-  id: QuartermasterSatchel
-  equipment:
-    back: ClothingBackpackSatchelQuartermasterFilled
-
-- type: loadout
-  id: QuartermasterDuffel
-  equipment: QuartermasterDuffel
-
-- type: startingGear
-  id: QuartermasterDuffel
-  equipment:
-    back: ClothingBackpackDuffelQuartermasterFilled
-
 # OuterClothing
 - type: loadout
   id: QuartermasterWintercoat
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
index 2b42fab50ae3..abf787d5100d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
@@ -6,7 +6,7 @@
 - type: startingGear
   id: SalvageSpecialistBackpack
   equipment:
-    back: ClothingBackpackSalvageFilled
+    back: ClothingBackpackSalvage
 
 - type: loadout
   id: SalvageSpecialistSatchel
@@ -15,7 +15,7 @@
 - type: startingGear
   id: SalvageSpecialistSatchel
   equipment:
-    back: ClothingBackpackSatchelSalvageFilled
+    back: ClothingBackpackSatchelSalvage
 
 - type: loadout
   id: SalvageSpecialistDuffel
@@ -24,7 +24,7 @@
 - type: startingGear
   id: SalvageSpecialistDuffel
   equipment:
-    back: ClothingBackpackDuffelSalvageFilled
+    back: ClothingBackpackDuffelSalvage
 
 # OuterClothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
index 5ab2cecd1534..7dba761a18b6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
@@ -53,7 +53,7 @@
 - type: startingGear
   id: BotanistBackpack
   equipment:
-    back: ClothingBackpackHydroponicsFilled
+    back: ClothingBackpackHydroponics
 
 - type: loadout
   id: BotanistSatchel
@@ -62,7 +62,7 @@
 - type: startingGear
   id: BotanistSatchel
   equipment:
-    back: ClothingBackpackSatchelHydroponicsFilled
+    back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
   id: BotanistDuffel
@@ -71,7 +71,7 @@
 - type: startingGear
   id: BotanistDuffel
   equipment:
-    back: ClothingBackpackDuffelHydroponicsFilled
+    back: ClothingBackpackDuffelHydroponics
 
 # Outer clothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
index 623e18a01d04..160f06d5cf26 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
@@ -91,34 +91,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitMonasticRobeLight
 
-# Back
-- type: loadout
-  id: ChaplainBackpack
-  equipment: ChaplainBackpack
-
-- type: startingGear
-  id: ChaplainBackpack
-  equipment:
-    back: ClothingBackpackChaplainFilled
-
-- type: loadout
-  id: ChaplainSatchel
-  equipment: ChaplainSatchel
-
-- type: startingGear
-  id: ChaplainSatchel
-  equipment:
-    back: ClothingBackpackSatchelChaplainFilled
-
-- type: loadout
-  id: ChaplainDuffel
-  equipment: ChaplainDuffel
-
-- type: startingGear
-  id: ChaplainDuffel
-  equipment:
-    back: ClothingBackpackDuffelChaplainFilled
-
 # Neck
 - type: loadout
   id: ChaplainNeck
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
index 8b315d50c193..d3a3ce2e6c0a 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
@@ -35,7 +35,7 @@
 - type: startingGear
   id: ClownBackpack
   equipment:
-    back: ClothingBackpackClownFilled
+    back: ClothingBackpackClown
 
 - type: loadout
   id: ClownSatchel
@@ -44,7 +44,7 @@
 - type: startingGear
   id: ClownSatchel
   equipment:
-    back: ClothingBackpackSatchelClownFilled
+    back: ClothingBackpackSatchelClown
 
 - type: loadout
   id: ClownDuffel
@@ -53,7 +53,7 @@
 - type: startingGear
   id: ClownDuffel
   equipment:
-    back: ClothingBackpackDuffelClownFilled
+    back: ClothingBackpackDuffelClown
 
 # Shoes
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
index 5edd3ecf76de..00be12443078 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
@@ -97,32 +97,4 @@
 - type: startingGear
   id: LawyerNeck
   equipment:
-    neck: ClothingNeckLawyerbadge
-
-# Backpack
-- type: loadout
-  id: LawyerBackpack
-  equipment: LawyerBackpack
-
-- type: startingGear
-  id: LawyerBackpack
-  equipment:
-    back: ClothingBackpackLawyerFilled
-
-- type: loadout
-  id: LawyerSatchel
-  equipment: LawyerSatchel
-
-- type: startingGear
-  id: LawyerSatchel
-  equipment:
-    back: ClothingBackpackSatchelLawyerFilled
-
-- type: loadout
-  id: LawyerDuffel
-  equipment: LawyerDuffel
-
-- type: startingGear
-  id: LawyerDuffel
-  equipment:
-    back: ClothingBackpackDuffelLawyerFilled
+    neck: ClothingNeckLawyerbadge
\ No newline at end of file
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
index 95647052b872..e60b2807ff45 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
@@ -81,7 +81,7 @@
 - type: startingGear
   id: MimeBackpack
   equipment:
-    back: ClothingBackpackMimeFilled
+    back: ClothingBackpackMime
 
 - type: loadout
   id: MimeSatchel
@@ -90,7 +90,7 @@
 - type: startingGear
   id: MimeSatchel
   equipment:
-    back: ClothingBackpackSatchelMimeFilled
+    back: ClothingBackpackSatchelMime
 
 - type: loadout
   id: MimeDuffel
@@ -99,7 +99,7 @@
 - type: startingGear
   id: MimeDuffel
   equipment:
-    back: ClothingBackpackDuffelMimeFilled
+    back: ClothingBackpackDuffelMime
 
 # Outerclothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
index 579481c0eef9..c26da03628ea 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
@@ -1,31 +1,3 @@
-# Back
-- type: loadout
-  id: MusicianBackpack
-  equipment: MusicianBackpack
-
-- type: startingGear
-  id: MusicianBackpack
-  equipment:
-    back: ClothingBackpackMusicianFilled
-
-- type: loadout
-  id: MusicianSatchel
-  equipment: MusicianSatchel
-
-- type: startingGear
-  id: MusicianSatchel
-  equipment:
-    back: ClothingBackpackSatchelMusicianFilled
-
-- type: loadout
-  id: MusicianDuffel
-  equipment: MusicianDuffel
-
-- type: startingGear
-  id: MusicianDuffel
-  equipment:
-    back: ClothingBackpackDuffelMusicianFilled
-
 # Outerclothing
 - type: loadout
   id: MusicianWintercoat
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
index 5c09b1299f32..84685e1702a8 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -75,7 +75,7 @@
 - type: startingGear
   id: CommonBackpack
   equipment:
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
 
 - type: loadout
   id: CommonSatchel
@@ -84,7 +84,7 @@
 - type: startingGear
   id: CommonSatchel
   equipment:
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
   id: CommonDuffel
@@ -93,7 +93,7 @@
 - type: startingGear
   id: CommonDuffel
   equipment:
-    back: ClothingBackpackDuffelFilled
+    back: ClothingBackpackDuffel
 
 # Gloves
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
index 6ec2d7f78902..50786d615434 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -90,7 +90,7 @@
 - type: startingGear
   id: CaptainBackpack
   equipment:
-    back: ClothingBackpackCaptainFilled
+    back: ClothingBackpackCaptain
 
 - type: loadout
   id: CaptainSatchel
@@ -99,7 +99,7 @@
 - type: startingGear
   id: CaptainSatchel
   equipment:
-    back: ClothingBackpackSatchelCaptainFilled
+    back: ClothingBackpackSatchelCaptain
 
 - type: loadout
   id: CaptainDuffel
@@ -108,7 +108,7 @@
 - type: startingGear
   id: CaptainDuffel
   equipment:
-    back: ClothingBackpackDuffelCaptainFilled
+    back: ClothingBackpackDuffelCaptain
 
 # Outer clothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
index 0abba16f1246..1e4e5d527ffa 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -57,33 +57,6 @@
     neck: ClothingNeckMantleHOP
 
 # Back
-- type: loadout
-  id: HoPBackpack
-  equipment: HoPBackpack
-
-- type: startingGear
-  id: HoPBackpack
-  equipment:
-    back: ClothingBackpackHOPFilled
-
-- type: loadout
-  id: HoPSatchel
-  equipment: HoPSatchel
-
-- type: startingGear
-  id: HoPSatchel
-  equipment:
-    back: ClothingBackpackSatchelHOPFilled
-
-- type: loadout
-  id: HoPDuffel
-  equipment: HoPDuffel
-
-- type: startingGear
-  id: HoPDuffel
-  equipment:
-    back: ClothingBackpackDuffelHOPFilled
-
 - type: loadout
   id: HoPBackpackIan
   equipment: HoPBackpackIan
@@ -94,7 +67,7 @@
 - type: startingGear
   id: HoPBackpackIan
   equipment:
-    back: ClothingBackpackHOPIanFilled
+    back: ClothingBackpackIan
 
 # Outerclothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
index fc9bbbf28234..5f1e753b9f73 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
@@ -34,7 +34,7 @@
 - type: startingGear
   id: AtmosphericTechnicianBackpack
   equipment:
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackAtmospherics
 
 - type: loadout
   id: AtmosphericTechnicianSatchel
@@ -43,7 +43,7 @@
 - type: startingGear
   id: AtmosphericTechnicianSatchel
   equipment:
-    back: ClothingBackpackSatchelAtmosphericsFilled
+    back: ClothingBackpackSatchelAtmospherics
 
 - type: loadout
   id: AtmosphericTechnicianDuffel
@@ -52,7 +52,7 @@
 - type: startingGear
   id: AtmosphericTechnicianDuffel
   equipment:
-    back: ClothingBackpackDuffelAtmosphericsFilled
+    back: ClothingBackpackDuffelAtmospherics
 
 # OuterClothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
index 23732050669b..5bfbb8c20118 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -68,34 +68,6 @@
   equipment:
     neck: ClothingNeckMantleCE
 
-# Back
-- type: loadout
-  id: ChiefEngineerBackpack
-  equipment: ChiefEngineerBackpack
-
-- type: startingGear
-  id: ChiefEngineerBackpack
-  equipment:
-    back: ClothingBackpackChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerSatchel
-  equipment: ChiefEngineerSatchel
-
-- type: startingGear
-  id: ChiefEngineerSatchel
-  equipment:
-    back: ClothingBackpackSatchelChiefEngineerFilled
-
-- type: loadout
-  id: ChiefEngineerDuffel
-  equipment: ChiefEngineerDuffel
-
-- type: startingGear
-  id: ChiefEngineerDuffel
-  equipment:
-    back: ClothingBackpackDuffelChiefEngineerFilled
-
 # OuterClothing
 - type: loadout
   id: ChiefEngineerWintercoat
diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
index 7104598b3ae6..7f9e20e2aa4f 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -118,7 +118,7 @@
 - type: startingGear
   id: StationEngineerBackpack
   equipment:
-    back: ClothingBackpackEngineeringFilled
+    back: ClothingBackpackEngineering
 
 - type: loadout
   id: StationEngineerSatchel
@@ -127,7 +127,7 @@
 - type: startingGear
   id: StationEngineerSatchel
   equipment:
-    back: ClothingBackpackSatchelEngineeringFilled
+    back: ClothingBackpackSatchelEngineering
 
 - type: loadout
   id: StationEngineerDuffel
@@ -136,7 +136,7 @@
 - type: startingGear
   id: StationEngineerDuffel
   equipment:
-    back: ClothingBackpackDuffelEngineeringFilled
+    back: ClothingBackpackDuffelEngineering
 
 # OuterClothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
index 9b05120b1aa3..289910c8c852 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
@@ -25,7 +25,7 @@
 - type: startingGear
   id: ChemistBackpack
   equipment:
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
 
 - type: loadout
   id: ChemistSatchel
@@ -34,7 +34,7 @@
 - type: startingGear
   id: ChemistSatchel
   equipment:
-    back: ClothingBackpackSatchelChemistryFilled
+    back: ClothingBackpackSatchelChemistry
 
 - type: loadout
   id: ChemistDuffel
@@ -43,7 +43,7 @@
 - type: startingGear
   id: ChemistDuffel
   equipment:
-    back: ClothingBackpackDuffelChemistryFilled
+    back: ClothingBackpackDuffelChemistry
 
 # Outer clothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
index 8cf8148518a5..f7436a4281a6 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -73,34 +73,6 @@
   equipment:
     neck: ClothingNeckMantleCMO
 
-# Back
-- type: loadout
-  id: ChiefMedicalOfficerBackpack
-  equipment: ChiefMedicalOfficerBackpack
-
-- type: startingGear
-  id: ChiefMedicalOfficerBackpack
-  equipment:
-    back: ClothingBackpackCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerSatchel
-  equipment: ChiefMedicalOfficerSatchel
-
-- type: startingGear
-  id: ChiefMedicalOfficerSatchel
-  equipment:
-    back: ClothingBackpackSatchelCMOFilled
-
-- type: loadout
-  id: ChiefMedicalOfficerDuffel
-  equipment: ChiefMedicalOfficerDuffel
-
-- type: startingGear
-  id: ChiefMedicalOfficerDuffel
-  equipment:
-    back: ClothingBackpackDuffelCMOFilled
-
 # Outer clothing
 - type: loadout
   id: ChiefMedicalOfficerLabCoat
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
index ebad9b9f8477..a64d60ba1f68 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -178,7 +178,7 @@
 - type: startingGear
   id: MedicalDoctorBackpack
   equipment:
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackMedical
 
 - type: loadout
   id: MedicalDoctorSatchel
@@ -187,7 +187,7 @@
 - type: startingGear
   id: MedicalDoctorSatchel
   equipment:
-    back: ClothingBackpackSatchelMedicalFilled
+    back: ClothingBackpackSatchelMedical
 
 - type: loadout
   id: MedicalDoctorDuffel
@@ -196,7 +196,7 @@
 - type: startingGear
   id: MedicalDoctorDuffel
   equipment:
-    back: ClothingBackpackDuffelMedicalFilled
+    back: ClothingBackpackDuffelMedical
 
 # OuterClothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
index f393109eea42..7fd8d4a32f10 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
@@ -27,34 +27,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtParamedic
 
-# Back
-- type: loadout
-  id: ParamedicBackpack
-  equipment: ParamedicBackpack
-
-- type: startingGear
-  id: ParamedicBackpack
-  equipment:
-    back: ClothingBackpackParamedicFilled
-
-- type: loadout
-  id: ParamedicSatchel
-  equipment: ParamedicSatchel
-
-- type: startingGear
-  id: ParamedicSatchel
-  equipment:
-    back: ClothingBackpackSatchelParamedicFilled
-
-- type: loadout
-  id: ParamedicDuffel
-  equipment: ParamedicDuffel
-
-- type: startingGear
-  id: ParamedicDuffel
-  equipment:
-    back: ClothingBackpackDuffelParamedicFilled
-
 # Outer clothing
 - type: loadout
   id: ParamedicWindbreaker
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
index 4d81b801e806..748e5d217c2d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
@@ -43,34 +43,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtResearchDirector
 
-# Back
-- type: loadout
-  id: ResearchDirectorBackpack
-  equipment: ResearchDirectorBackpack
-
-- type: startingGear
-  id: ResearchDirectorBackpack
-  equipment:
-    back: ClothingBackpackResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorSatchel
-  equipment: ResearchDirectorSatchel
-
-- type: startingGear
-  id: ResearchDirectorSatchel
-  equipment:
-    back: ClothingBackpackSatchelResearchDirectorFilled
-
-- type: loadout
-  id: ResearchDirectorDuffel
-  equipment: ResearchDirectorDuffel
-
-- type: startingGear
-  id: ResearchDirectorDuffel
-  equipment:
-    back: ClothingBackpackDuffelResearchDirectorFilled
-
 # OuterClothing
 - type: loadout
   id: ResearchDirectorLabCoat
diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
index c03ae4cfbc4d..ee30a9cf4158 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -120,7 +120,7 @@
 - type: startingGear
   id: ScientistBackpack
   equipment:
-    back: ClothingBackpackScienceFilled
+    back: ClothingBackpackScience
 
 - type: loadout
   id: ScientistSatchel
@@ -129,7 +129,7 @@
 - type: startingGear
   id: ScientistSatchel
   equipment:
-    back: ClothingBackpackSatchelScienceFilled
+    back: ClothingBackpackSatchelScience
 
 - type: loadout
   id: ScientistDuffel
@@ -138,7 +138,7 @@
 - type: startingGear
   id: ScientistDuffel
   equipment:
-    back: ClothingBackpackDuffelScienceFilled
+    back: ClothingBackpackDuffelScience
 
 # OuterClothing
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
index c16d24e5b83a..888ed971e17d 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -64,34 +64,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
-# Back
-- type: loadout
-  id: DetectiveBackpack
-  equipment: DetectiveBackpack
-
-- type: startingGear
-  id: DetectiveBackpack
-  equipment:
-    back: ClothingBackpackSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveSatchel
-  equipment: DetectiveSatchel
-
-- type: startingGear
-  id: DetectiveSatchel
-  equipment:
-    back: ClothingBackpackSatchelSecurityFilledDetective
-
-- type: loadout
-  id: DetectiveDuffel
-  equipment: DetectiveDuffel
-
-- type: startingGear
-  id: DetectiveDuffel
-  equipment:
-    back: ClothingBackpackDuffelSecurityFilledDetective
-
 # OuterClothing
 - type: loadout
   id: DetectiveArmorVest
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index b2b9e1e0c12d..321cc46feb56 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -110,7 +110,7 @@
 - type: startingGear
   id: SecurityBackpack
   equipment:
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
 
 - type: loadout
   id: SecuritySatchel
@@ -119,7 +119,7 @@
 - type: startingGear
   id: SecuritySatchel
   equipment:
-    back: ClothingBackpackSatchelSecurityFilled
+    back: ClothingBackpackSatchelSecurity
 
 - type: loadout
   id: SecurityDuffel
@@ -128,7 +128,7 @@
 - type: startingGear
   id: SecurityDuffel
   equipment:
-    back: ClothingBackpackDuffelSecurityFilled
+    back: ClothingBackpackDuffelSecurity
 
 # Belt
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index d889514a33b9..7f8a9ff4e488 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -103,9 +103,9 @@
   id: HoPBackpack
   name: loadout-group-hop-backpack
   loadouts:
-  - HoPBackpack
-  - HoPSatchel
-  - HoPDuffel
+  - CommonBackpack
+  - CommonSatchel
+  - CommonDuffel
   - HoPBackpackIan
 
 - type: loadoutGroup
@@ -122,8 +122,8 @@
   loadouts:
   - GreyJumpsuit
   - GreyJumpskirt
-  - RainbowJumpsuit
   - AncientJumpsuit
+  - RainbowJumpsuit
 
 - type: loadoutGroup
   id: PassengerFace
@@ -141,7 +141,7 @@
 
 - type: loadoutGroup
   id: CommonBackpack
-  name: loadout-group-passenger-backpack
+  name: loadout-group-backpack
   loadouts:
   - CommonBackpack
   - CommonSatchel
@@ -247,14 +247,6 @@
   loadouts:
   - LawyerNeck
 
-- type: loadoutGroup
-  id: LawyerBackpack
-  name: loadout-group-lawyer-backpack
-  loadouts:
-  - LawyerBackpack
-  - LawyerSatchel
-  - LawyerDuffel
-
 - type: loadoutGroup
   id: ChaplainHead
   name: loadout-group-chaplain-head
@@ -282,14 +274,6 @@
   - ChaplainRobesLight
   - ChaplainRobesDark
 
-- type: loadoutGroup
-  id: ChaplainBackpack
-  name: loadout-group-chaplain-backpack
-  loadouts:
-  - ChaplainBackpack
-  - ChaplainSatchel
-  - ChaplainDuffel
-
 - type: loadoutGroup
   id: ChaplainOuterClothing
   name: loadout-group-chaplain-outerclothing
@@ -446,14 +430,6 @@
   loadouts:
   - MimeWintercoat
 
-- type: loadoutGroup
-  id: MusicianBackpack
-  name: loadout-group-musician-backpack
-  loadouts:
-  - MusicianBackpack
-  - MusicianSatchel
-  - MusicianDuffel
-
 - type: loadoutGroup
   id: MusicianOuterClothing
   name: loadout-group-musician-outerclothing
@@ -480,14 +456,6 @@
   - QuartermasterTurtleneckSkirt
   - QuartermasterFormalSuit
 
-- type: loadoutGroup
-  id: QuartermasterBackpack
-  name: loadout-group-quartermaster-backpack
-  loadouts:
-  - QuartermasterBackpack
-  - QuartermasterSatchel
-  - QuartermasterDuffel
-
 - type: loadoutGroup
   id: QuartermasterNeck
   name: loadout-group-quartermaster-neck
@@ -586,14 +554,6 @@
   - ChiefEngineerTurtleneck
   - ChiefEngineerTurtleneckSkirt
 
-- type: loadoutGroup
-  id: ChiefEngineerBackpack
-  name: loadout-group-chief-engineer-backpack
-  loadouts:
-  - ChiefEngineerBackpack
-  - ChiefEngineerSatchel
-  - ChiefEngineerDuffel
-
 - type: loadoutGroup
   id: ChiefEngineerNeck
   name: loadout-group-chief-engineer-neck
@@ -725,14 +685,6 @@
   - ResearchDirectorJumpsuit
   - ResearchDirectorJumpskirt
 
-- type: loadoutGroup
-  id: ResearchDirectorBackpack
-  name: loadout-group-research-director-backpack
-  loadouts:
-  - ResearchDirectorBackpack
-  - ResearchDirectorSatchel
-  - ResearchDirectorDuffel
-
 - type: loadoutGroup
   id: ResearchDirectorOuterClothing
   name: loadout-group-research-director-outerclothing
@@ -964,14 +916,6 @@
   - NoirJumpsuit
   - NoirJumpskirt
 
-- type: loadoutGroup
-  id: DetectiveBackpack
-  name: loadout-group-detective-backpack
-  loadouts:
-  - DetectiveBackpack
-  - DetectiveSatchel
-  - DetectiveDuffel
-
 - type: loadoutGroup
   id: DetectiveOuterClothing
   name: loadout-group-detective-outerclothing
@@ -1013,14 +957,6 @@
   - ChiefMedicalOfficerLabCoat
   - ChiefMedicalOfficerWintercoat
 
-- type: loadoutGroup
-  id: ChiefMedicalOfficerBackpack
-  name: loadout-group-chief-medical-officer-backpack
-  loadouts:
-  - ChiefMedicalOfficerBackpack
-  - ChiefMedicalOfficerSatchel
-  - ChiefMedicalOfficerDuffel
-
 - type: loadoutGroup
   id: ChiefMedicalOfficerNeck
   name: loadout-group-chief-medical-officer-neck
@@ -1160,14 +1096,6 @@
   - ParamedicWindbreaker
   - ParamedicWintercoat
 
-- type: loadoutGroup
-  id: ParamedicBackpack
-  name: loadout-group-paramedic-backpack
-  loadouts:
-  - ParamedicBackpack
-  - ParamedicSatchel
-  - ParamedicDuffel
-
 - type: loadoutGroup
   id: ParamedicShoes
   name: loadout-group-paramedic-shoes
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 5bc6fc4572b0..4ff2775dfc1d 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -75,7 +75,7 @@
   groups:
   - LawyerNeck
   - LawyerJumpsuit
-  - LawyerBackpack
+  - CommonBackpack
   - Glasses
   - Trinkets
 
@@ -86,7 +86,7 @@
   - ChaplainMask
   - ChaplainNeck
   - ChaplainJumpsuit
-  - ChaplainBackpack
+  - CommonBackpack
   - ChaplainOuterClothing
   - Glasses
   - Trinkets
@@ -137,7 +137,7 @@
 - type: roleLoadout
   id: JobMusician
   groups:
-  - MusicianBackpack
+  - CommonBackpack
   - MusicianOuterClothing
   - Glasses
   - Trinkets
@@ -149,7 +149,7 @@
   - QuartermasterHead
   - QuartermasterNeck
   - QuartermasterJumpsuit
-  - QuartermasterBackpack
+  - CargoTechnicianBackpack
   - QuartermasterOuterClothing
   - QuartermasterShoes
   - Glasses
@@ -181,7 +181,7 @@
   groups:
   - ChiefEngineerHead
   - ChiefEngineerJumpsuit
-  - ChiefEngineerBackpack
+  - StationEngineerBackpack
   - ChiefEngineerNeck
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
@@ -221,7 +221,7 @@
   - ResearchDirectorHead
   - ResearchDirectorNeck
   - ResearchDirectorJumpsuit
-  - ResearchDirectorBackpack
+  - ScientistBackpack
   - ResearchDirectorOuterClothing
   - ScientistGloves
   - ResearchDirectorShoes
@@ -292,7 +292,7 @@
   - DetectiveHead
   - DetectiveNeck
   - DetectiveJumpsuit
-  - DetectiveBackpack
+  - SecurityBackpack
   - DetectiveOuterClothing
   - SecurityShoes
   - Trinkets
@@ -312,7 +312,7 @@
   - MedicalMask
   - ChiefMedicalOfficerJumpsuit
   - MedicalGloves
-  - ChiefMedicalOfficerBackpack
+  - MedicalBackpack
   - ChiefMedicalOfficerOuterClothing
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
@@ -359,7 +359,7 @@
   - MedicalMask
   - ParamedicJumpsuit
   - MedicalGloves
-  - ParamedicBackpack
+  - MedicalBackpack
   - ParamedicOuterClothing
   - ParamedicShoes
   - Glasses
diff --git a/Resources/Prototypes/Roles/Antags/Thief.yml b/Resources/Prototypes/Roles/Antags/Thief.yml
index 131db8cf1da8..d85d366f6b55 100644
--- a/Resources/Prototypes/Roles/Antags/Thief.yml
+++ b/Resources/Prototypes/Roles/Antags/Thief.yml
@@ -4,3 +4,10 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-thief-objective
+
+- type: startingGear
+  id: ThiefGear
+  storage:
+    back:
+    - ToolboxThief
+    - ClothingHandsChameleonThief
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index a7492bd1b160..cb32dc2c102d 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -4,3 +4,33 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-space-ninja-objective
+
+#Ninja Gear
+- type: startingGear
+  id: SpaceNinjaGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitNinja
+    back: ClothingBackpackSatchel
+    mask: ClothingMaskNinja
+    head: ClothingHeadHelmetSpaceNinja
+    eyes: ClothingEyesVisorNinja
+    gloves: ClothingHandsGlovesSpaceNinja
+    outerClothing: ClothingOuterSuitSpaceNinja
+    shoes: ClothingShoesSpaceNinja
+    id: AgentIDCard
+    ears: ClothingHeadsetGrey
+    pocket1: SpiderCharge
+    pocket2: PinpointerStation
+    belt: EnergyKatana
+    suitstorage: OxygenTankFilled
+  inhand:
+    - JetpackBlackFilled
+  storage:
+    back: # belt holds katana so satchel has the tools for sabotaging things
+    - BoxSurvival
+    - Crowbar
+    - Wrench
+    - Screwdriver
+    - Wirecutter
+    - Welder
+    - Multitool
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 4075005e6859..e91d50f53cd9 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -34,3 +34,66 @@
     department: Security
     time: 18000 # 5h
   # should be changed to nukie playtime when thats tracked (wyci)
+
+#Nuclear Operative Gear
+- type: startingGear
+  id: SyndicateOperativeGearFull
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitOperative
+    back: ClothingBackpackDuffelSyndicate
+    mask: ClothingMaskGasSyndicate
+    eyes: ClothingEyesHudSyndicate
+    ears: ClothingHeadsetAltSyndicate
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitSyndie
+    shoes: ClothingShoesBootsCombatFilled
+    id: SyndiPDA
+    pocket1: DoubleEmergencyOxygenTankFilled
+    pocket2: BaseUplinkRadio40TC
+    belt: ClothingBeltMilitaryWebbing
+  storage:
+    back:
+    - BoxSurvivalSyndicate
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - DeathAcidifierImplanter
+
+#Nuclear Operative Commander Gear
+- type: startingGear
+  id: SyndicateCommanderGearFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    neck: SyndicateWhistle
+    outerClothing: ClothingOuterHardsuitSyndieCommander
+  inhand:
+    - NukeOpsDeclarationOfWar
+
+#Nuclear Operative Medic Gear
+- type: startingGear
+  id: SyndicateOperativeMedicFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    eyes: ClothingEyesHudSyndicateAgent
+    outerClothing: ClothingOuterHardsuitSyndieMedic
+    shoes: ClothingShoesBootsMagSyndie
+    id: SyndiAgentPDA
+    belt: ClothingBeltMilitaryWebbingMedFilled
+  storage:
+    back:
+    - SyndiHypo
+    - BoxSurvivalSyndicate
+    - SawAdvanced
+    - Cautery
+    - CombatKnife
+    - WeaponPistolViper
+    - PinpointerSyndicateNuclear
+    - HandheldHealthAnalyzer
+    - CombatMedipen
+    - DeathAcidifierImplanter
+
+#Lone Operative Gear
+- type: startingGear
+  id: SyndicateLoneOperativeGearFull
+  parent: SyndicateOperativeGearFull
+  equipment:
+    pocket2: BaseUplinkRadio60TC
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml
index 235ccfdab86f..849e9dc1f289 100644
--- a/Resources/Prototypes/Roles/Antags/pirate.yml
+++ b/Resources/Prototypes/Roles/Antags/pirate.yml
@@ -2,7 +2,7 @@
   id: PirateGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
+    back: ClothingBackpackSatchelLeather
     head: ClothingHeadBandBlack
     shoes: ClothingShoesBootsLaceup
     id: PiratePDA
@@ -11,25 +11,15 @@
 
 - type: startingGear
   id: PirateCaptainGear
+  parent: PirateGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirate
-    shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
-    belt: ClothingBeltUtility
-    pocket1: AppraisalTool
     pocket2: EnergyCutlass
     outerClothing: ClothingOuterCoatPirate
 
 - type: startingGear
   id: PirateFirstmateGear
+  parent: PirateGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirateTricord
-    shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
-    belt: ClothingBeltUtility
-    pocket1: AppraisalTool
     outerClothing: ClothingOuterCoatGentle
diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml
index c5e6cb814987..3bdc9d7977c7 100644
--- a/Resources/Prototypes/Roles/Antags/revolutionary.yml
+++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml
@@ -11,3 +11,10 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-rev-objective
+
+- type: startingGear
+  id: HeadRevGear
+  storage:
+    back:
+    - Flash
+    - ClothingEyesGlassesSunglasses
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index a4e1fe8d1097..f192733b7e1e 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -4,3 +4,36 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-syndicate-agent-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
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index 46c5273549d1..78ab1847a459 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -17,4 +17,7 @@
   equipment:
     id: CargoPDA
     ears: ClothingHeadsetCargo
-    pocket1: AppraisalTool
\ No newline at end of file
+    pocket1: AppraisalTool
+  storage:
+    back:
+    - BoxSurvival
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 36d904c56eaf..e39c327e903a 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -41,4 +41,8 @@
     id: QuartermasterPDA
     ears: ClothingHeadsetQM
     belt: BoxFolderClipboard
-    pocket1: AppraisalTool
\ No newline at end of file
+    pocket1: AppraisalTool
+  storage:
+    back:
+    - BoxSurvival
+    - Flash
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index 7b3fcd6b58dc..4dd20f51fb03 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -23,4 +23,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
     id: SalvagePDA
-    ears: ClothingHeadsetCargo
\ No newline at end of file
+    ears: ClothingHeadsetCargo
+  storage:
+    back:
+    - BoxSurvival
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
index b43f929d6948..06b66448cb8f 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -14,3 +14,6 @@
   equipment:
     id: PassengerPDA
     ears: ClothingHeadsetGrey
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
index a49e3cef7fac..6bceebc65ea6 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -24,3 +24,6 @@
     shoes: ClothingShoesColorBlack
     id: BartenderPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
index feed9e7e6bf6..e8cda189145a 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -21,3 +21,6 @@
     id: BotanistPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltPlantFilled
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index e3dc1cb23db4..0ae49f853c63 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -20,3 +20,8 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
+    - Bible
+    - RubberStampChaplain
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index 1dda98bb37d4..0d8d1911e56d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -25,3 +25,6 @@
     id: ChefPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltChefFilled
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index c70b4a99435d..627469f6c550 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -32,4 +32,9 @@
     pocket1: BikeHorn
     pocket2: ClownRecorder
     id: ClownPDA
-    ears: ClothingHeadsetService
\ No newline at end of file
+    ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxHug
+    - RubberStampClown
+    - CrayonRainbow
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index b768bd25be5a..9b006cbed16d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -32,3 +32,6 @@
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 1a321aff400a..3ec0eba51ca7 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -24,3 +24,7 @@
     # TODO add copy of space law
   inhand:
     - BriefcaseBrownFilled
+  storage:
+    back:
+    - BoxSurvival
+    - RubberStampLawyer
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
index 909d8da19daa..f5826b76bfb9 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -18,3 +18,7 @@
     ears: ClothingHeadsetService
     pocket1: d10Dice
     pocket2: HandLabeler # for making named bestsellers
+  storage:
+    back:
+    - BoxSurvival
+    - BookRandom
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 27a164210bc3..b7e932acb4fd 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -28,6 +28,10 @@
     pocket2: Paper
     id: MimePDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
+    - RubberStampMime
 
 - type: entity
   id: ActionMimeInvisibleWall
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index 1ba1e998f68b..4b508c907d78 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -21,4 +21,9 @@
     eyes: ClothingEyesGlassesSunglasses
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
-    ears: ClothingHeadsetService
\ No newline at end of file
+    ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
+    - AcousticGuitarInstrument
+    - SaxophoneInstrument
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
index db2382667371..efda20712fbd 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -21,3 +21,6 @@
     shoes: ClothingShoesColorBlack
     id: ServiceWorkerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index dd7445670aa1..1e93ff73cce3 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -40,3 +40,8 @@
     gloves: ClothingHandsGlovesCaptain
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
+  storage:
+    back:
+    - BoxSurvival
+    - Flash
+    # - StationCharter
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 5f119b643469..72a862f2648f 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -64,3 +64,7 @@
     gloves: ClothingHandsGlovesHop
     ears: ClothingHeadsetAltCommand
     belt: BoxFolderClipboard
+  storage:
+    back:
+    - BoxSurvival
+    - Flash
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index 01af70888d18..49a897863379 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -23,3 +23,6 @@
     id: AtmosPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+  storage:
+    back:
+    - BoxSurvivalEngineering
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index c55fbfbd4184..8cc934d634ae 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -44,3 +44,7 @@
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
     belt: ClothingBeltUtilityEngineering
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - Flash
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index d37847968108..1bff9257bba6 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -23,3 +23,6 @@
     eyes: ClothingEyesGlassesMeson
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+  storage:
+    back:
+    - BoxSurvivalEngineering
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index f3b21e644442..8bbaf2a3903a 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -26,4 +26,7 @@
     id: TechnicalAssistantPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
-    pocket2: BookEngineersHandbook
\ No newline at end of file
+    pocket2: BookEngineersHandbook
+  storage:
+    back:
+    - BoxSurvivalEngineering
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
index 8748367830b4..5542a7a69dde 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
@@ -3,21 +3,27 @@
   id: CultLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadHelmetCult
     neck: BedsheetCult
     outerClothing: ClothingOuterArmorCult
     shoes: ClothingShoesCult
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: CultistGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadHatHoodCulthood
     outerClothing: ClothingOuterRobesCult
     shoes: ClothingShoesColorRed
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index f37085e005b6..337b7e1de913 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -18,7 +18,7 @@
   id: ERTLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTLeader
     eyes: ClothingEyesGlassesSecurity
@@ -29,12 +29,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolN1984
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -46,12 +55,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolN1984
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVALecter
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
+    back: ClothingBackpackERTLeader
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -65,6 +83,15 @@
     pocket2: MagazineRifle
   inhand:
     - AirTankFilled
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazineMagnum
 
 # Chaplain
 - type: job
@@ -90,7 +117,7 @@
   id: ERTChaplainGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplainFilled
+    back: ClothingBackpackERTChaplain
     shoes: ClothingShoesLeather
     head: ClothingHeadHatFez
     eyes: ClothingEyesGlasses
@@ -102,12 +129,27 @@
     belt: ClothingBeltStorageWaistbag
     pocket1: Flare
     pocket2: DrinkWaterBottleFull
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - BoxCandle
+    - BoxBodyBag
+    - DrinkWaterMelonJuiceJug
+    - Lantern
+    - Lantern
+    - Bible
+    - CrowbarRed
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - Lighter
 
 - type: startingGear
   id: ERTChaplainGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplainFilled
+    back: ClothingBackpackERTChaplain
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlasses
@@ -120,6 +162,21 @@
     belt: ClothingBeltStorageWaistbag
     pocket1: Flare
     pocket2: DrinkWaterBottleFull
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - BoxCandle
+    - BoxBodyBag
+    - DrinkWaterMelonJuiceJug
+    - Lantern
+    - Lantern
+    - Bible
+    - CrowbarRed
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - Lighter
 
 # Engineer
 - type: job
@@ -141,7 +198,7 @@
   id: ERTEngineerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerFilled
+    back: ClothingBackpackERTEngineer
     shoes: ClothingShoesBootsWork
     head: ClothingHeadHelmetERTEngineer
     eyes: ClothingEyesGlassesMeson
@@ -152,12 +209,25 @@
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
     pocket2: GasAnalyzer
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - trayScanner
+    - RCD
+    - RCDAmmo
+    - RCDAmmo
+    - CableMVStack
+    - CableHVStack
+    - CableApcStack
+    - SheetPlasteel
+    - SheetSteel
+    - SheetGlass
 
 - type: startingGear
   id: ERTEngineerGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerFilled
+    back: ClothingBackpackERTEngineer
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesMeson
@@ -169,6 +239,19 @@
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
     pocket2: GasAnalyzer
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - trayScanner
+    - RCD
+    - RCDAmmo
+    - RCDAmmo
+    - CableMVStack
+    - CableHVStack
+    - CableApcStack
+    - SheetPlasteel
+    - SheetSteel
+    - SheetGlass
 
 # Security
 - type: job
@@ -190,7 +273,7 @@
   id: ERTSecurityGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTSecurity
     eyes: ClothingEyesGlassesSecurity
@@ -201,12 +284,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -218,12 +310,21 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
     pocket2: FlashlightSeclite
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVALecter
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
+    back: ClothingBackpackERTSecurity
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -237,6 +338,15 @@
     pocket2: MagazineRifle
   inhand:
     - AirTankFilled
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponDisabler
+    - MedicatedSuture
+    - RegenerativeMesh
+    - BoxZiptie
+    - CrowbarRed
+    - MagazinePistol
 
 # Medical
 - type: job
@@ -258,7 +368,7 @@
   id: ERTMedicalGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalFilled
+    back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTMedic
     eyes: ClothingEyesHudMedical
@@ -268,12 +378,21 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - Hypospray
+    - MedkitAdvancedFilled
+    - CrowbarRed
+    - OmnizineChemistryBottle
+    - EpinephrineChemistryBottle
+    - EpinephrineChemistryBottle
 
 - type: startingGear
   id: ERTMedicalGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalFilled
+    back: ClothingBackpackERTMedical
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
@@ -284,6 +403,15 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - Hypospray
+    - MedkitAdvancedFilled
+    - CrowbarRed
+    - OmnizineChemistryBottle
+    - EpinephrineChemistryBottle
+    - EpinephrineChemistryBottle
 
 # Janitor
 - type: job
@@ -305,7 +433,7 @@
   id: ERTJanitorGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorFilled
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHelmetERTJanitor
     gloves: ClothingHandsGlovesColorPurple
@@ -314,12 +442,21 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - LightReplacer
+    - BoxLightMixed
+    - BoxLightMixed
+    - Soap
+    - CrowbarRed
+    - AdvMopItem
 
 - type: startingGear
   id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorFilled
+    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     gloves: ClothingHandsGlovesColorPurple
@@ -329,3 +466,12 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - LightReplacer
+    - BoxLightMixed
+    - BoxLightMixed
+    - Soap
+    - CrowbarRed
+    - AdvMopItem
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index d4cfc3e29cf8..e12bee8c79e0 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -5,7 +5,7 @@
   id: SkeletonBiker
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     head: ClothingHeadBandSkull
     eyes: ClothingEyesGlassesSunglasses
     outerClothing: ClothingOuterCoatGentle
@@ -13,35 +13,16 @@
     shoes: ClothingShoesBootsJack
     id: PassengerPDA
     ears: ClothingHeadsetGrey
-
-#Space Ninja Outfit
-- type: startingGear
-  id: SpaceNinjaGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitNinja
-    # belt holds katana so satchel has the tools for sabotaging things
-    back: ClothingBackpackSatchelTools
-    mask: ClothingMaskNinja
-    head: ClothingHeadHelmetSpaceNinja
-    eyes: ClothingEyesVisorNinja
-    gloves: ClothingHandsGlovesSpaceNinja
-    outerClothing: ClothingOuterSuitSpaceNinja
-    shoes: ClothingShoesSpaceNinja
-    id: AgentIDCard
-    ears: ClothingHeadsetGrey
-    pocket1: SpiderCharge
-    pocket2: PinpointerStation
-    belt: EnergyKatana
-    suitstorage: OxygenTankFilled
-  inhand:
-    - JetpackBlackFilled
+  storage:
+    back:
+    - BoxSurvival
 
 #Deathsquad Outfit
 - type: startingGear
   id: DeathSquadGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDeathSquadFilled
+    back: ClothingBackpackDeathSquad
     mask: ClothingMaskGasDeathSquad
     eyes: ClothingEyesHudSecurity
     ears: ClothingHeadsetAltCentCom
@@ -53,23 +34,20 @@
     pocket1: EnergySword
     pocket2: EnergyShield
     belt: ClothingBeltMilitaryWebbingMedFilled
-
-# 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: ClothingBackpackDuffelSyndicateOperative
-    shoes: ClothingShoesBootsCombatFilled
-    gloves: ClothingHandsGlovesColorBlack
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponPulseRifle
+    - WeaponPulsePistol
+    - WeaponRevolverMateba
+    - SpeedLoaderMagnumAP
+    - SpeedLoaderMagnumAP
+    - BoxFlashbang
+    - ToolDebug # spanish army knife
+    - WelderExperimental
+    - Hypospray
+    - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
+    - FreedomImplanter
 
 # Syndicate Operative Outfit - Civilian
 - type: startingGear
@@ -82,122 +60,35 @@
     id: SyndiPDA
     ears: ClothingHeadsetAltSyndicate
 
-#Syndicate Operative Outfit - Basic
-- type: startingGear
-  id: SyndicateOperativeGearBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
-
-#Syndicate Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-
-#Nuclear Operative Commander Gear
-- type: startingGear
-  id: SyndicateCommanderGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    neck: SyndicateWhistle
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieCommander
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-  inhand:
-    - NukeOpsDeclarationOfWar
-
-#Nuclear Operative Medic Gear
-- type: startingGear
-  id: SyndicateOperativeMedicFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperativeMedic
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicateAgent
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieMedic
-    shoes: ClothingShoesBootsMagSyndie
-    id: SyndiAgentPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbingMedFilled
-
-#Syndicate Lone Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateLoneOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio60TC
-    belt: ClothingBeltMilitaryWebbing
-
-# Syndicate Footsoldier Gear
+# Syndicate Footsoldier Gear - No Headset
 - type: startingGear
-  id: SyndicateFootsoldierGear
+  id: SyndicateFootsoldierGearRuin
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     head: ClothingHeadHelmetSwatSyndicate
     mask: ClothingMaskGas
     outerClothing: ClothingOuterArmorBasic
-    ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
     shoes: ClothingShoesBootsCombat
     id: SyndiPDA
+  storage:
+    back:
+    - BoxSurvival
 
-# Syndicate Footsoldier Gear - No Headset
+# Syndicate Footsoldier Gear
 - type: startingGear
-  id: SyndicateFootsoldierGearRuin
+  id: SyndicateFootsoldierGear
+  parent: SyndicateFootsoldierGearRuin
   equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasic
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    id: SyndiPDA
+    ears: ClothingHeadsetAltSyndicate
 
 # Nanotrasen Paramilitary Unit Gear
 - type: startingGear
   id: NanotrasenParamilitaryGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitSec
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurity
     shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHelmetSwat
@@ -205,13 +96,18 @@
     outerClothing: ClothingOuterArmorBasicSlim
     ears: ClothingHeadsetSecurity
     gloves: ClothingHandsGlovesCombat
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
 
 #CBURN Unit Gear - Full Kit
 - type: startingGear
   id: CBURNGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBrown
-    back: ClothingBackpackDuffelCBURNFilled
+    back: ClothingBackpackDuffelCBURN
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetAltCentCom
@@ -223,6 +119,14 @@
     pocket2: WeaponLaserGun
     suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
+  storage:
+    back:
+    - BoxSurvivalEngineering
+    - WeaponShotgunDoubleBarreled
+    - BoxShotgunIncendiary
+    - GrenadeFlashBang
+    - PillAmbuzolPlus
+    - PillAmbuzol
 
 - type: startingGear
   id: BoxingKangarooGear
@@ -237,14 +141,6 @@
     jumpsuit: ClothingUniformJumpsuitJacketMonkey
     id: PunPunIDCard
 
-# Passenger but without the ID, bag, or headset
-
-- type: startingGear
-  id: LimitedPassengerGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitColorGrey
-    shoes: ClothingShoesColorBlack
-
 # DeathMatch Gear
 
 - type: startingGear
@@ -278,24 +174,13 @@
 - type: startingGear
   id: MobAghostGear
   equipment:
-    back: ClothingBackpackSatchelHoldingAdmin
+    back: ClothingBackpackSatchelHolding
     id: AdminPDA
-
-#Head Rev Gear
-- type: startingGear
-  id: HeadRevGear
   storage:
     back:
-    - Flash
-    - ClothingEyesGlassesSunglasses
-
-#Thief Gear
-- type: startingGear
-  id: ThiefGear
-  storage:
-    back:
-    - ToolboxThief
-    - ClothingHandsChameleonThief
+    - GasAnalyzer
+    - trayScanner
+    - AccessConfiguratorUniversal
 
 #Gladiator with spear
 - type: startingGear
@@ -325,10 +210,16 @@
     shoes: ClothingShoesClownBanana
     jumpsuit: ClothingUniformJumpsuitClownBanana
     mask: ClothingMaskClownBanana
-    ears: ClothingHeadsetService
     pocket1: BikeHorn
     pocket2: ClownRecorder
 
+# Passenger but without the ID, bag, or headset
+- type: startingGear
+  id: LimitedPassengerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorGrey
+    shoes: ClothingShoesColorBlack
+
 #Clown Troupe
 - type: startingGear
   id: ClownTroupe
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
index 596e42776b7c..d053d8da1cce 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
@@ -3,41 +3,33 @@
   id: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorDarkBlue
-    back: ClothingBackpackFilled
     head: ClothingHeadHatWizard
     outerClothing: ClothingOuterWizard
     shoes: ClothingShoesWizard
     id: PassengerPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: WizardRedGear
+  parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
-    back: ClothingBackpackFilled
     head: ClothingHeadHatRedwizard
     outerClothing: ClothingOuterWizardRed
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: WizardVioletGear
+  parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorPurple
-    back: ClothingBackpackFilled
     head: ClothingHeadHatVioletwizard
     outerClothing: ClothingOuterWizardViolet
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: WizardHardsuitGear
+  parent: WizardVioletGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitColorPurple
-    back: ClothingBackpackFilled
-    outerClothing: ClothingOuterHardsuitWizard
-    shoes: ClothingShoesWizard
-    id: PassengerPDA
-    ears: ClothingHeadsetService
+    outerClothing: ClothingOuterHardsuitWizard
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 0684d9d36ac6..fefd0110accd 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -22,4 +22,7 @@
     ears: ClothingHeadsetMedical
     belt: ChemBag
     pocket1: HandLabeler
-    eyes: ClothingEyesGlassesChemical
\ No newline at end of file
+    eyes: ClothingEyesGlassesChemical
+  storage:
+    back:
+    - BoxSurvivalMedical
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index e20edb32d45a..3f6bd5e4529d 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -44,3 +44,7 @@
     id: CMOPDA
     ears: ClothingHeadsetCMO
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - Flash
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 27efb3b8b268..be058518a68d 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -21,3 +21,6 @@
   equipment:
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalMedical
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index 199645d5c380..3fe26e6056b4 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -23,4 +23,7 @@
     id: MedicalInternPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-    pocket2: BookMedicalReferenceBook
\ No newline at end of file
+    pocket2: BookMedicalReferenceBook
+  storage:
+    back:
+    - BoxSurvivalMedical
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index fb9fd2822dc1..242fac8d0c02 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -24,3 +24,7 @@
     id: ParamedicPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalEMTFilled
+  storage:
+    back:
+    - BoxSurvivalMedical
+    - EmergencyRollerBedSpawnFolded
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index b50c61ebdb2b..aec2dd6fff3d 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -23,3 +23,6 @@
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
     pocket2: BookScientistsGuidebook
+  storage:
+    back:
+    - BoxSurvival
\ 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 adf53d9c7089..fd6e00a8e3f9 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -33,4 +33,8 @@
   id: ResearchDirectorGear
   equipment:
     id: RnDPDA
-    ears: ClothingHeadsetRD
\ No newline at end of file
+    ears: ClothingHeadsetRD
+  storage:
+    back:
+    - BoxSurvival
+    - Flash
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index 5188e47057ee..b2e63fead8a6 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -18,4 +18,6 @@
   id: ScientistGear
   equipment:
     ears: ClothingHeadsetScience
-
+  storage:
+    back:
+    - BoxSurvival
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index b17d0d41df85..47258fa00bf1 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -28,3 +28,9 @@
     id: DetectivePDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltHolsterFilled
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - ForensicPad
+    - ForensicScanner
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 8646ca8dddd1..aac7c7b35089 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -47,3 +47,8 @@
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
     pocket1: WeaponPistolMk58
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 17e09b232e98..b68336c95305 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -34,4 +34,9 @@
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
-    pocket2: BookSecurity
\ No newline at end of file
+    pocket2: BookSecurity
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index edf16448d7ca..c773396601dd 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -28,3 +28,8 @@
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 5c1dc985d1e8..7f157525767d 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -31,3 +31,8 @@
     id: WardenPDA
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistol
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
index 0f19323724a8..aceb7a10f6ac 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
@@ -17,3 +17,6 @@
     ears: ClothingHeadsetService
     shoes: ClothingShoesColorRed
     belt: ClothingBeltChampion
+  storage:
+    back:
+    - BoxSurvival
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
index d1d07c008c8b..17bed0ee7f6e 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -19,3 +19,6 @@
     shoes: ClothingShoesLeather
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
+  storage:
+    back:
+    - BoxSurvivalMedical
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
index d2d70d856a58..b379a0ec2350 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
@@ -16,3 +16,6 @@
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
index 27e7fa65ff6f..815ead412c78 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
@@ -18,3 +18,6 @@
     shoes: ClothingShoesColorWhite
     id: ZookeeperPDA
     ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvival
\ No newline at end of file
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 65e914aed688..5f73d4d2530b 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -251,11 +251,11 @@ AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked
 AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked
 
 # 2024-03-10
-ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
-ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
-ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
 FoodChili: FoodChiliPepper
 FoodChilly: FoodChillyPepper
+# ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
+# ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
+# ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
 
 # 2024-03-11
 ImprovisedExplosive: FireBomb

From 16b3fb1204d3921200822bf558c510c585ba33e3 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 4 Jun 2024 00:04:19 +0000
Subject: [PATCH 277/568] LoadMapRule grid storage rework (#28210)

*
---
 .../Tests/GameRules/NukeOpsTest.cs            | 10 +--
 .../Rules/Components/LoadMapRuleComponent.cs  | 26 +++---
 .../Rules/Components/RuleGridsComponent.cs    | 30 +++++++
 .../Rules/GameRuleSystem.Utility.cs           |  4 +
 .../GameTicking/Rules/LoadMapRuleSystem.cs    | 90 +++++++------------
 .../GameTicking/Rules/NukeopsRuleSystem.cs    | 12 +--
 .../GameTicking/Rules/RuleGridsSystem.cs      | 78 ++++++++++++++++
 .../GridPreloader/GridPreloaderSystem.cs      |  9 +-
 .../Events/StationEventSystem.cs              |  9 --
 Resources/Prototypes/GameRules/events.yml     |  1 +
 Resources/Prototypes/GameRules/midround.yml   |  1 -
 Resources/Prototypes/GameRules/roundstart.yml |  1 +
 .../Prototypes/GameRules/unknown_shuttles.yml | 49 +++-------
 13 files changed, 190 insertions(+), 130 deletions(-)
 create mode 100644 Content.Server/GameTicking/Rules/Components/RuleGridsComponent.cs
 create mode 100644 Content.Server/GameTicking/Rules/RuleGridsSystem.cs

diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index ea19a30005ee..2360ea0bf4f2 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -114,8 +114,8 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
 
         // The game rule exists, and all the stations/shuttles/maps are properly initialized
         var rule = entMan.AllComponents<NukeopsRuleComponent>().Single().Component;
-        var mapRule = entMan.AllComponents<LoadMapRuleComponent>().Single().Component;
-        foreach (var grid in mapRule.MapGrids)
+        var gridsRule = entMan.AllComponents<RuleGridsComponent>().Single().Component;
+        foreach (var grid in gridsRule.MapGrids)
         {
             Assert.That(entMan.EntityExists(grid));
             Assert.That(entMan.HasComponent<MapGridComponent>(grid));
@@ -129,7 +129,7 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(entMan.EntityExists(nukieShuttlEnt));
 
         EntityUid? nukieStationEnt = null;
-        foreach (var grid in mapRule.MapGrids)
+        foreach (var grid in gridsRule.MapGrids)
         {
             if (entMan.HasComponent<StationMemberComponent>(grid))
             {
@@ -144,8 +144,8 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(entMan.EntityExists(nukieStation.Station));
         Assert.That(nukieStation.Station, Is.Not.EqualTo(rule.TargetStation));
 
-        Assert.That(server.MapMan.MapExists(mapRule.Map));
-        var nukieMap = mapSys.GetMap(mapRule.Map!.Value);
+        Assert.That(server.MapMan.MapExists(gridsRule.Map));
+        var nukieMap = mapSys.GetMap(gridsRule.Map!.Value);
 
         var targetStation = entMan.GetComponent<StationDataComponent>(rule.TargetStation!.Value);
         var targetGrid = targetStation.Grids.First();
diff --git a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
index b7aef0c61dc2..1f0505c60fc0 100644
--- a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs
@@ -1,8 +1,6 @@
+using Content.Server.GameTicking.Rules;
 using Content.Server.Maps;
 using Content.Shared.GridPreloader.Prototypes;
-using Content.Shared.Storage;
-using Content.Shared.Whitelist;
-using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -10,25 +8,27 @@ namespace Content.Server.GameTicking.Rules.Components;
 
 /// <summary>
 /// This is used for a game rule that loads a map when activated.
+/// Works with <see cref="RuleGridsComponent"/>.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, Access(typeof(LoadMapRuleSystem))]
 public sealed partial class LoadMapRuleComponent : Component
 {
-    [DataField]
-    public MapId? Map;
-
+    /// <summary>
+    /// A <see cref="GameMapPrototype"/> to load on a new map.
+    /// </summary>
     [DataField]
     public ProtoId<GameMapPrototype>? GameMap;
 
+    /// <summary>
+    /// A map path to load on a new map.
+    /// </summary>
     [DataField]
     public ResPath? MapPath;
 
+    /// <summary>
+    /// A <see cref="PreloadedGridPrototype"/> to move to a new map.
+    /// If there are no instances left nothing is done.
+    /// </summary>
     [DataField]
     public ProtoId<PreloadedGridPrototype>? PreloadedGrid;
-
-    [DataField]
-    public List<EntityUid> MapGrids = new();
-
-    [DataField]
-    public EntityWhitelist? SpawnerWhitelist;
 }
diff --git a/Content.Server/GameTicking/Rules/Components/RuleGridsComponent.cs b/Content.Server/GameTicking/Rules/Components/RuleGridsComponent.cs
new file mode 100644
index 000000000000..eec6f8881568
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/Components/RuleGridsComponent.cs
@@ -0,0 +1,30 @@
+using Content.Server.GameTicking.Rules;
+using Content.Shared.Whitelist;
+using Robust.Shared.Map;
+
+/// <summary>
+/// Stores grids created by another gamerule component.
+/// With <c>AntagSelection</c>, spawners on these grids can be used for its antags.
+/// </summary>
+[RegisterComponent, Access(typeof(RuleGridsSystem))]
+public sealed partial class RuleGridsComponent : Component
+{
+    /// <summary>
+    /// The map that was loaded.
+    /// </summary>
+    [DataField]
+    public MapId? Map;
+
+    /// <summary>
+    /// The grid entities that have been loaded.
+    /// </summary>
+    [DataField]
+    public List<EntityUid> MapGrids = new();
+
+    /// <summary>
+    /// Whitelist for a spawner to be considered for an antag.
+    /// All spawners must have <c>SpawnPointComponent</c> regardless to be found.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? SpawnerWhitelist;
+}
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index cbd981e99e69..9ac7a6edbb90 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -126,4 +126,8 @@ protected bool TryFindRandomTileOnStation(Entity<StationDataComponent> station,
         return found;
     }
 
+    protected void ForceEndSelf(EntityUid uid, GameRuleComponent? component = null)
+    {
+        GameTicker.EndGameRule(uid, component);
+    }
 }
diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
index c60cf2513e0e..1c09d6e86e10 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -1,9 +1,6 @@
-using Content.Server.Antag;
 using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.GridPreloader;
-using Content.Server.Spawners.Components;
-using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
@@ -14,97 +11,70 @@ namespace Content.Server.GameTicking.Rules;
 public sealed class LoadMapRuleSystem : GameRuleSystem<LoadMapRuleComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly MapSystem _map = default!;
     [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
     [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()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<LoadMapRuleComponent, AntagSelectLocationEvent>(OnSelectLocation);
-        SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
-    }
-
-    private void OnGridSplit(ref GridSplitEvent args)
-    {
-        var rule = QueryActiveRules();
-        while (rule.MoveNext(out _, out var mapComp, out _))
-        {
-            if (!mapComp.MapGrids.Contains(args.Grid))
-                continue;
-
-            mapComp.MapGrids.AddRange(args.NewGrids);
-            break;
-        }
-    }
 
     protected override void Added(EntityUid uid, LoadMapRuleComponent comp, GameRuleComponent rule, GameRuleAddedEvent args)
     {
-        if (comp.Map != null)
+        if (comp.PreloadedGrid != null && !_gridPreloader.PreloadingEnabled)
+        {
+            // Preloading will never work if it's disabled, duh
+            Log.Debug($"Immediately ending {ToPrettyString(uid):rule} as preloading grids is disabled by cvar.");
+            ForceEndSelf(uid, rule);
             return;
+        }
 
         // grid preloading needs map to init after moving it
-        var mapUid = comp.PreloadedGrid != null ? _map.CreateMap(out var mapId, false) : _map.CreateMap(out mapId);
-        _metaData.SetEntityName(mapUid, $"LoadMapRule destination for rule {ToPrettyString(uid)}");
-        comp.Map = mapId;
+        var mapUid = _map.CreateMap(out var mapId, runMapInit: comp.PreloadedGrid == null);
+
+        Log.Info($"Created map {mapId} for {ToPrettyString(uid):rule}");
 
+        IReadOnlyList<EntityUid> grids;
         if (comp.GameMap != null)
         {
             var gameMap = _prototypeManager.Index(comp.GameMap.Value);
-            comp.MapGrids.AddRange(GameTicker.LoadGameMap(gameMap, comp.Map.Value, new MapLoadOptions()));
+            grids = GameTicker.LoadGameMap(gameMap, mapId, new MapLoadOptions());
         }
-        else if (comp.MapPath != null)
+        else if (comp.MapPath is {} path)
         {
-            if (!_mapLoader.TryLoad(comp.Map.Value,
-                    comp.MapPath.Value.ToString(),
-                    out var roots,
-                    new MapLoadOptions { LoadMap = true }))
+            var options = new MapLoadOptions { LoadMap = true };
+            if (!_mapLoader.TryLoad(mapId, path.ToString(), out var roots, options))
             {
-                _mapManager.DeleteMap(mapId);
+                Log.Error($"Failed to load map from {path}!");
+                Del(mapUid);
+                ForceEndSelf(uid, rule);
                 return;
             }
 
-            comp.MapGrids.AddRange(roots);
+            grids = roots;
         }
-        else if (comp.PreloadedGrid != null)
+        else if (comp.PreloadedGrid is {} preloaded)
         {
             // TODO: If there are no preloaded grids left, any rule announcements will still go off!
-            if (!_gridPreloader.TryGetPreloadedGrid(comp.PreloadedGrid.Value, out var loadedShuttle))
+            if (!_gridPreloader.TryGetPreloadedGrid(preloaded, out var loadedShuttle))
             {
-                _mapManager.DeleteMap(mapId);
+                Log.Error($"Failed to get a preloaded grid with {preloaded}!");
+                Del(mapUid);
+                ForceEndSelf(uid, rule);
                 return;
             }
 
             _transform.SetParent(loadedShuttle.Value, mapUid);
-            comp.MapGrids.Add(loadedShuttle.Value);
-            _map.InitializeMap(mapId);
+            grids = new List<EntityUid>() { loadedShuttle.Value };
+            _map.InitializeMap(mapUid);
         }
         else
         {
             Log.Error($"No valid map prototype or map path associated with the rule {ToPrettyString(uid)}");
+            Del(mapUid);
+            ForceEndSelf(uid, rule);
+            return;
         }
-    }
-
-    private void OnSelectLocation(Entity<LoadMapRuleComponent> ent, ref AntagSelectLocationEvent args)
-    {
-        var query = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
-        while (query.MoveNext(out var uid, out _, out var xform))
-        {
-            if (xform.MapID != ent.Comp.Map)
-                continue;
-
-            if (xform.GridUid == null || !ent.Comp.MapGrids.Contains(xform.GridUid.Value))
-                continue;
 
-            if (_whitelistSystem.IsWhitelistFail(ent.Comp.SpawnerWhitelist, uid))
-                continue;
-
-            args.Coordinates.Add(_transform.GetMapCoordinates(xform));
-        }
+        var ev = new RuleLoadedGridsEvent(mapId, grids);
+        RaiseLocalEvent(uid, ref ev);
     }
 }
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 1b62778d7585..6688bfd980c6 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -260,10 +260,10 @@ private void OnMapInit(Entity<NukeOpsShuttleComponent> ent, ref MapInitEvent arg
     {
         var map = Transform(ent).MapID;
 
-        var rules = EntityQueryEnumerator<NukeopsRuleComponent, LoadMapRuleComponent>();
-        while (rules.MoveNext(out var uid, out _, out var mapRule))
+        var rules = EntityQueryEnumerator<NukeopsRuleComponent, RuleGridsComponent>();
+        while (rules.MoveNext(out var uid, out _, out var grids))
         {
-            if (map != mapRule.Map)
+            if (map != grids.Map)
                 continue;
             ent.Comp.AssociatedRule = uid;
             break;
@@ -324,7 +324,7 @@ private void OnWarDeclared(ref WarDeclaredEvent ev)
             if (nukeops.WarDeclaredTime != null)
                 continue;
 
-            if (TryComp<LoadMapRuleComponent>(uid, out var mapComp) && Transform(ev.DeclaratorEntity).MapID != mapComp.Map)
+            if (TryComp<RuleGridsComponent>(uid, out var grids) && Transform(ev.DeclaratorEntity).MapID != grids.Map)
                 continue;
 
             var newStatus = GetWarCondition(nukeops, ev.Status);
@@ -445,7 +445,7 @@ private void CheckRoundShouldEnd(Entity<NukeopsRuleComponent> ent)
 
         // Check that there are spawns available and that they can access the shuttle.
         var spawnsAvailable = EntityQuery<NukeOperativeSpawnerComponent>(true).Any();
-        if (spawnsAvailable && CompOrNull<LoadMapRuleComponent>(ent)?.Map == shuttleMapId)
+        if (spawnsAvailable && CompOrNull<RuleGridsComponent>(ent)?.Map == shuttleMapId)
             return; // Ghost spawns can still access the shuttle. Continue the round.
 
         // The shuttle is inaccessible to both living nuke operatives and yet to spawn nuke operatives,
@@ -478,7 +478,7 @@ private void OnAfterAntagEntSelected(Entity<NukeopsRuleComponent> ent, ref After
     /// Is this method the shitty glue holding together the last of my sanity? yes.
     /// Do i have a better solution? not presently.
     /// </remarks>
-    private EntityUid? GetOutpost(Entity<LoadMapRuleComponent?> ent)
+    private EntityUid? GetOutpost(Entity<RuleGridsComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return null;
diff --git a/Content.Server/GameTicking/Rules/RuleGridsSystem.cs b/Content.Server/GameTicking/Rules/RuleGridsSystem.cs
new file mode 100644
index 000000000000..9eae9e3c95f7
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/RuleGridsSystem.cs
@@ -0,0 +1,78 @@
+using Content.Server.Antag;
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Spawners.Components;
+using Content.Shared.Whitelist;
+using Robust.Server.Physics;
+using Robust.Shared.Map;
+
+namespace Content.Server.GameTicking.Rules;
+
+/// <summary>
+/// Handles storing grids from <see cref="RuleLoadedGridsEvent"/> and antags spawning on their spawners.
+/// </summary>
+public sealed class RuleGridsSystem : GameRuleSystem<RuleGridsComponent>
+{
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+
+        SubscribeLocalEvent<RuleGridsComponent, RuleLoadedGridsEvent>(OnLoadedGrids);
+        SubscribeLocalEvent<RuleGridsComponent, AntagSelectLocationEvent>(OnSelectLocation);
+    }
+
+    private void OnGridSplit(ref GridSplitEvent args)
+    {
+        var rule = QueryActiveRules();
+        while (rule.MoveNext(out _, out var comp, out _))
+        {
+            if (!comp.MapGrids.Contains(args.Grid))
+                continue;
+
+            comp.MapGrids.AddRange(args.NewGrids);
+            break; // only 1 rule can own a grid, not multiple
+        }
+    }
+
+    private void OnLoadedGrids(Entity<RuleGridsComponent> ent, ref RuleLoadedGridsEvent args)
+    {
+        var (uid, comp) = ent;
+        if (comp.Map != null && args.Map != comp.Map)
+        {
+            Log.Warning($"{ToPrettyString(uid):rule} loaded grids on multiple maps {comp.Map} and {args.Map}, the second will be ignored.");
+            return;
+        }
+
+        comp.Map = args.Map;
+        comp.MapGrids.AddRange(args.Grids);
+    }
+
+    private void OnSelectLocation(Entity<RuleGridsComponent> ent, ref AntagSelectLocationEvent args)
+    {
+        var query = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var xform))
+        {
+            if (xform.MapID != ent.Comp.Map)
+                continue;
+
+            if (xform.GridUid is not {} grid || !ent.Comp.MapGrids.Contains(grid))
+                continue;
+
+            if (_whitelist.IsWhitelistFail(ent.Comp.SpawnerWhitelist, uid))
+                continue;
+
+            args.Coordinates.Add(_transform.GetMapCoordinates(xform));
+        }
+    }
+}
+
+/// <summary>
+/// Raised by another gamerule system to store loaded grids, and have other systems work with it.
+/// A single rule can only load grids for a single map, attempts to load more are ignored.
+/// </summary>
+[ByRefEvent]
+public record struct RuleLoadedGridsEvent(MapId Map, IReadOnlyList<EntityUid> Grids);
diff --git a/Content.Server/GridPreloader/GridPreloaderSystem.cs b/Content.Server/GridPreloader/GridPreloaderSystem.cs
index 569fe54141c8..e12ce41a31e8 100644
--- a/Content.Server/GridPreloader/GridPreloaderSystem.cs
+++ b/Content.Server/GridPreloader/GridPreloaderSystem.cs
@@ -24,12 +24,19 @@ public sealed class GridPreloaderSystem : SharedGridPreloaderSystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
+    /// <summary>
+    /// Whether the preloading CVar is set or not.
+    /// </summary>
+    public bool PreloadingEnabled;
+
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
         SubscribeLocalEvent<PostGameMapLoad>(OnPostGameMapLoad);
+
+        Subs.CVar(_cfg, CCVars.PreloadGrids, value => PreloadingEnabled = value, true);
     }
 
     private void OnRoundRestart(RoundRestartCleanupEvent ev)
@@ -52,7 +59,7 @@ private void EnsurePreloadedGridMap()
         if (GetPreloaderEntity() != null)
             return;
 
-        if (!_cfg.GetCVar(CCVars.PreloadGrids))
+        if (!PreloadingEnabled)
             return;
 
         var mapUid = _map.CreateMap(out var mapId, false);
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index 35dc646bce67..06dfdd5276be 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -108,13 +108,4 @@ public override void Update(float frameTime)
             }
         }
     }
-
-    #region Helper Functions
-
-    protected void ForceEndSelf(EntityUid uid, GameRuleComponent? component = null)
-    {
-        GameTicker.EndGameRule(uid, component);
-    }
-
-    #endregion
 }
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index f421cf68183c..d3b0971be081 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -422,6 +422,7 @@
     weight: 5.5
     minimumPlayers: 20
     duration: 1
+  - type: RuleGrids
   - type: LoadMapRule
     preloadedGrid: ShuttleStriker
   - type: NukeopsRule
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index c190b0333ad6..5a38c2221545 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -3,7 +3,6 @@
 - type: entity
   id: Ninja
   parent: BaseGameRule
-  noSpawn: true
   components:
   - type: GenericAntagRule
     agentName: ninja-round-end-agent-name
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 3493749457d5..88f80fd4f6a2 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -78,6 +78,7 @@
     - operationPrefix
     - operationSuffix
   - type: NukeopsRule
+  - type: RuleGrids
   - type: AntagSelection
   - type: AntagLoadProfileRule
 
diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml
index 359d7bffc042..1ce365cd816b 100644
--- a/Resources/Prototypes/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@@ -1,7 +1,7 @@
-- type: entity
-  id: UnknownShuttleCargoLost
+- type: entity
+  abstract: true
   parent: BaseGameRule
-  noSpawn: true
+  id: BaseUnknownShuttleRule
   components:
   - type: StationEvent
     startAnnouncement: station-event-unknown-shuttle-incoming
@@ -10,65 +10,44 @@
     weight: 5
     reoccurrenceDelay: 30
     duration: 1
+  - type: RuleGrids
+  - type: LoadMapRule
+
+- type: entity
+  parent: BaseUnknownShuttleRule
+  id: UnknownShuttleCargoLost
+  components:
   - type: LoadMapRule
     preloadedGrid: ShuttleCargoLost
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleTravelingCuisine
-  parent: BaseGameRule
-  noSpawn: true
   components:
-  - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
-    weight: 5
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: TravelingCuisine
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleDisasterEvacPod
-  parent: BaseGameRule
-  noSpawn: true
   components:
-  - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
-    weight: 5
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: DisasterEvacPod
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleHonki
-  parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
     weight: 2
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: Honki
 
 - type: entity
+  parent: BaseUnknownShuttleRule
   id: UnknownShuttleSyndieEvacPod
-  parent: BaseGameRule
-  noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: station-event-unknown-shuttle-incoming
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
     weight: 2
-    reoccurrenceDelay: 30
-    duration: 1
   - type: LoadMapRule
     preloadedGrid: SyndieEvacPod

From 9d2b4ed3b22e548f02aeee7caa855b65b37dda24 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Mon, 3 Jun 2024 20:23:43 -0400
Subject: [PATCH 278/568] Add an integration test for solution fill level
 sprites. (#28564)

---
 .../Tests/FillLevelSpriteTest.cs              | 71 +++++++++++++++++++
 .../Prototypes/Entities/Objects/Fun/darts.yml |  4 --
 .../Entities/Objects/Specific/chemistry.yml   |  4 ++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/FillLevelSpriteTest.cs

diff --git a/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
new file mode 100644
index 000000000000..37e777fa8cf8
--- /dev/null
+++ b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
@@ -0,0 +1,71 @@
+using System.Linq;
+using Content.Shared.Chemistry.Components;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests;
+
+/// <summary>
+/// Tests to see if any entity prototypes specify solution fill level sprites that don't exist.
+/// </summary>
+[TestFixture]
+public sealed class FillLevelSpriteTest
+{
+    private static readonly string[] HandStateNames = ["left", "right"];
+
+    [Test]
+    public async Task FillLevelSpritesExist()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var client = pair.Client;
+        var protoMan = client.ResolveDependency<IPrototypeManager>();
+        var componentFactory = client.ResolveDependency<IComponentFactory>();
+
+        await client.WaitAssertion(() =>
+        {
+            var protos = protoMan.EnumeratePrototypes<EntityPrototype>()
+                .Where(p => !p.Abstract)
+                .Where(p => !pair.IsTestPrototype(p))
+                .Where(p => p.TryGetComponent<SolutionContainerVisualsComponent>(out _, componentFactory))
+                .OrderBy(p => p.ID)
+                .ToList();
+
+            foreach (var proto in protos)
+            {
+                Assert.That(proto.TryGetComponent<SolutionContainerVisualsComponent>(out var visuals, componentFactory));
+                Assert.That(proto.TryGetComponent<SpriteComponent>(out var sprite, componentFactory));
+
+                var rsi = sprite.BaseRSI;
+
+                // Test base sprite fills
+                if (!string.IsNullOrEmpty(visuals.FillBaseName))
+                {
+                    for (var i = 1; i <= visuals.MaxFillLevels; i++)
+                    {
+                        var state = $"{visuals.FillBaseName}{i}";
+                        Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                            MaxFillLevels = {visuals.MaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                    }
+                }
+
+                // Test inhand sprite fills
+                if (!string.IsNullOrEmpty(visuals.InHandsFillBaseName))
+                {
+                    for (var i = 1; i <= visuals.InHandsMaxFillLevels; i++)
+                    {
+                        foreach (var handname in HandStateNames)
+                        {
+                            var state = $"inhand-{handname}{visuals.InHandsFillBaseName}{i}";
+                            Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                                InHandsMaxFillLevels = {visuals.InHandsMaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                        }
+
+                    }
+                }
+            }
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 36c841995e5c..c0b5eb33999d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -83,10 +83,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 1
-    fillBaseName: dart
 
 - type: entity
   parent: Dart
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ce0e0b629a3e..dd15a90baa23 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -233,6 +233,8 @@
     sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi
     layers:
       - state: beakernoreact
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
   - type: SolutionContainerManager
     solutions:
       beaker:
@@ -251,6 +253,8 @@
     sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
     layers:
       - state: beakerbluespace
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
   - type: SolutionContainerManager
     solutions:
       beaker:

From a3a1538d32c4e0c7d9aeab9790e0c522a211fc79 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:53:24 +0000
Subject: [PATCH 279/568] move gamerule components to shared (#28572)

* move MinMax to shared

* cleanup MinMax

* move other ticking components to shared just because

* remove unused prototype file

* update everything to use shared components

* test

* test 2

* test 3

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../DestructibleDestructionTest.cs            |  1 +
 .../Tests/GameRules/FailAndStartPresetTest.cs |  2 +-
 .../Tests/GameRules/RuleMaxTimeRestartTest.cs |  2 +-
 Content.Server/Administration/ServerApi.cs    |  2 +-
 Content.Server/Antag/AntagSelectionSystem.cs  |  2 +-
 .../Components/AntagSelectionComponent.cs     |  2 +-
 .../Antag/MobReplacementRuleSystem.cs         |  2 +-
 .../Behaviors/SpawnEntitiesBehavior.cs        |  6 ++---
 .../Destructible/Thresholds/MinMax.cs         | 26 -------------------
 .../GameTicking/GameTicker.GameRule.cs        |  2 +-
 .../GameTicking/Rules/DeathMatchRuleSystem.cs |  2 +-
 .../GameTicking/Rules/GameRulePrototype.cs    | 15 -----------
 .../Rules/GameRuleSystem.Utility.cs           |  2 +-
 .../GameTicking/Rules/GameRuleSystem.cs       |  2 +-
 .../Rules/InactivityTimeRestartRuleSystem.cs  |  2 +-
 .../Rules/KillCalloutRuleSystem.cs            |  2 +-
 .../GameTicking/Rules/LoadMapRuleSystem.cs    |  2 +-
 .../Rules/MaxTimeRestartRuleSystem.cs         |  2 +-
 .../GameTicking/Rules/NukeopsRuleSystem.cs    |  2 +-
 .../GameTicking/Rules/RespawnRuleSystem.cs    |  2 +-
 .../Rules/RevolutionaryRuleSystem.cs          |  2 +-
 .../RoundstartStationVariationRuleSystem.cs   |  2 +-
 .../GameTicking/Rules/SandboxRuleSystem.cs    |  2 +-
 .../GameTicking/Rules/SecretRuleSystem.cs     |  2 +-
 .../GameTicking/Rules/SubGamemodesSystem.cs   |  2 +-
 .../GameTicking/Rules/TraitorRuleSystem.cs    |  2 +-
 .../GameTicking/Rules/ZombieRuleSystem.cs     |  2 +-
 Content.Server/Objectives/ObjectivesSystem.cs |  2 +-
 .../PowerMonitoringConsoleSystem.cs           |  2 +-
 .../EntitySystems/ConditionalSpawnerSystem.cs |  2 +-
 .../BasicStationEventSchedulerSystem.cs       |  2 +-
 .../Events/AlertLevelInterceptionRule.cs      |  4 +--
 .../StationEvents/Events/AnomalySpawnRule.cs  |  2 +-
 .../Events/BluespaceArtifactRule.cs           |  2 +-
 .../Events/BluespaceLockerRule.cs             |  2 +-
 .../StationEvents/Events/BreakerFlipRule.cs   |  2 +-
 .../Events/BureaucraticErrorRule.cs           |  2 +-
 .../StationEvents/Events/CargoGiftsRule.cs    |  2 +-
 .../StationEvents/Events/ClericalErrorRule.cs |  2 +-
 .../StationEvents/Events/FalseAlarmRule.cs    |  2 +-
 .../StationEvents/Events/GasLeakRule.cs       |  2 +-
 .../StationEvents/Events/ImmovableRodRule.cs  |  2 +-
 .../StationEvents/Events/IonStormRule.cs      |  2 +-
 .../StationEvents/Events/KudzuGrowthRule.cs   |  2 +-
 .../Events/MassHallucinationsRule.cs          |  2 +-
 .../StationEvents/Events/MeteorSwarmRule.cs   |  2 +-
 .../StationEvents/Events/NinjaSpawnRule.cs    |  2 +-
 .../Events/PowerGridCheckRule.cs              |  2 +-
 .../Events/RandomEntityStorageSpawnRule.cs    |  2 +-
 .../Events/RandomSentienceRule.cs             |  2 +-
 .../StationEvents/Events/RandomSpawnRule.cs   |  2 +-
 .../StationEvents/Events/SolarFlareRule.cs    |  2 +-
 .../Events/StationEventSystem.cs              |  2 +-
 .../StationEvents/Events/VentClogRule.cs      |  2 +-
 .../StationEvents/Events/VentCrittersRule.cs  |  2 +-
 .../RampingStationEventSchedulerSystem.cs     |  2 +-
 .../Destructible/Thresholds/MinMax.cs         | 24 +++++++++++++++++
 .../Components/ActiveGameRuleComponent.cs     |  6 ++---
 .../Components/DelayedStartRuleComponent.cs   |  2 +-
 .../Components/EndedGameRuleComponent.cs      |  6 ++---
 .../Components/GameRuleComponent.cs           |  4 +--
 61 files changed, 88 insertions(+), 108 deletions(-)
 delete mode 100644 Content.Server/Destructible/Thresholds/MinMax.cs
 delete mode 100644 Content.Server/GameTicking/Rules/GameRulePrototype.cs
 create mode 100644 Content.Shared/Destructible/Thresholds/MinMax.cs
 rename {Content.Server => Content.Shared}/GameTicking/Components/ActiveGameRuleComponent.cs (67%)
 rename {Content.Server => Content.Shared}/GameTicking/Components/DelayedStartRuleComponent.cs (91%)
 rename {Content.Server => Content.Shared}/GameTicking/Components/EndedGameRuleComponent.cs (61%)
 rename {Content.Server => Content.Shared}/GameTicking/Components/GameRuleComponent.cs (94%)

diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index e14a8264678d..a50238d8f50d 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -3,6 +3,7 @@
 using Content.Server.Destructible.Thresholds.Behaviors;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
+using Content.Shared.Destructible.Thresholds;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes;
diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
index 1fed226beee5..09a27c1baea8 100644
--- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.GameRules;
diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
index 20a157e33e83..4708bd10c08a 100644
--- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
@@ -1,9 +1,9 @@
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Commands;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs
index 04fd38598fb2..d0f23db637b4 100644
--- a/Content.Server/Administration/ServerApi.cs
+++ b/Content.Server/Administration/ServerApi.cs
@@ -8,13 +8,13 @@
 using System.Threading.Tasks;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Maps;
 using Content.Server.RoundEnd;
 using Content.Shared.Administration.Managers;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Prototypes;
 using Robust.Server.ServerStatus;
 using Robust.Shared.Asynchronous;
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 710bb8f3d765..52ccb1bd708d 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Antag.Components;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
@@ -15,6 +14,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Antag;
 using Content.Shared.GameTicking;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Server/Antag/Components/AntagSelectionComponent.cs
index f70c27d12f28..1ab16e8aec87 100644
--- a/Content.Server/Antag/Components/AntagSelectionComponent.cs
+++ b/Content.Server/Antag/Components/AntagSelectionComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Administration.Systems;
-using Content.Server.Destructible.Thresholds;
 using Content.Shared.Antag;
+using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Roles;
 using Content.Shared.Storage;
 using Content.Shared.Whitelist;
diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs
index 18837b5a7c87..eeff765d8bb7 100644
--- a/Content.Server/Antag/MobReplacementRuleSystem.cs
+++ b/Content.Server/Antag/MobReplacementRuleSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Antag.Mimic;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.VendingMachines;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 057b6df9df21..4ec6fa9e908e 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,12 +1,12 @@
 using System.Numerics;
 using Content.Server.Forensics;
 using Content.Server.Stack;
+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;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
 {
@@ -17,8 +17,8 @@ public sealed partial class SpawnEntitiesBehavior : IThresholdBehavior
         /// <summary>
         ///     Entities spawned on reaching this threshold, from a min to a max.
         /// </summary>
-        [DataField("spawn", customTypeSerializer:typeof(PrototypeIdDictionarySerializer<MinMax, EntityPrototype>))]
-        public Dictionary<string, MinMax> Spawn { get; set; } = new();
+        [DataField]
+        public Dictionary<EntProtoId, MinMax> Spawn = new();
 
         [DataField("offset")]
         public float Offset { get; set; } = 0.5f;
diff --git a/Content.Server/Destructible/Thresholds/MinMax.cs b/Content.Server/Destructible/Thresholds/MinMax.cs
deleted file mode 100644
index c44864183abe..000000000000
--- a/Content.Server/Destructible/Thresholds/MinMax.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.Random;
-
-namespace Content.Server.Destructible.Thresholds
-{
-    [Serializable]
-    [DataDefinition]
-    public partial struct MinMax
-    {
-        [DataField("min")]
-        public int Min;
-
-        [DataField("max")]
-        public int Max;
-
-        public MinMax(int min, int max)
-        {
-            Min = min;
-            Max = max;
-        }
-
-        public int Next(IRobustRandom random)
-        {
-            return random.Next(Min, Max + 1);
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs
index a6d0a4baf0a9..2a33d01bd09e 100644
--- a/Content.Server/GameTicking/GameTicker.GameRule.cs
+++ b/Content.Server/GameTicking/GameTicker.GameRule.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Content.Server.Administration;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.Administration;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Prototypes;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
index 9e3203d170bc..557e44f09528 100644
--- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using Content.Server.Administration.Commands;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Server.Mind;
 using Content.Server.Points;
 using Content.Server.RoundEnd;
 using Content.Server.Station.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Points;
 using Content.Shared.Storage;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/GameTicking/Rules/GameRulePrototype.cs b/Content.Server/GameTicking/Rules/GameRulePrototype.cs
deleted file mode 100644
index 47f99184f73b..000000000000
--- a/Content.Server/GameTicking/Rules/GameRulePrototype.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-namespace Content.Server.GameTicking.Rules;
-
-/*
-[Prototype("gameRule")]
-public sealed partial class GameRulePrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField("config", required: true)]
-    public GameRuleConfiguration Configuration { get; private set; } = default!;
-}
-*/
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index 9ac7a6edbb90..5a5eb720cfb7 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Random.Helpers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
index 05374aa1396b..730748ce6b9e 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
diff --git a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
index 01fa387595cc..e56537c43811 100644
--- a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Timer = Robust.Shared.Timing.Timer;
diff --git a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
index 3da55e30c9e5..8f706fd2ad36 100644
--- a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Shared.Chat;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
index 1c09d6e86e10..3594242bcdee 100644
--- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.GridPreloader;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
diff --git a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
index cae99fee9fc3..db9df8a5b009 100644
--- a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Content.Server.Chat.Managers;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 6688bfd980c6..5c3459ef81b5 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -11,6 +11,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.NPC.Components;
@@ -24,7 +25,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Shared.Store.Components;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
index 3f8d31f622ff..38102f1a2e9b 100644
--- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
@@ -1,9 +1,9 @@
 using Content.Server.Chat.Managers;
 using Content.Server.Database.Migrations.Postgres;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Chat;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 58ced9629503..c5f88ab6cf1e 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -12,6 +12,7 @@
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Systems;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mind;
@@ -27,7 +28,6 @@
 using Content.Shared.Zombies;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Server.GameTicking.Components;
 using Content.Shared.Cuffs.Components;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
index f09ed3ebc3cd..570889155b32 100644
--- a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs
@@ -1,9 +1,9 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
index c60670a3ad7a..23e9ee5a7d21 100644
--- a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Sandbox;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
index d25262b797af..320f9d197aac 100644
--- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Logs;
-using Content.Server.GameTicking.Components;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Random;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
diff --git a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
index 4486ee40fbbd..4fe3827ce5ce 100644
--- a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
+++ b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 
 namespace Content.Server.GameTicking.Rules;
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 29de85a42e50..17442da85770 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.PDA.Ringer;
 using Content.Server.Roles;
 using Content.Server.Traitor.Uplink;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
 using Content.Shared.NPC.Systems;
 using Content.Shared.Objectives.Components;
@@ -15,7 +16,6 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
-using Content.Server.GameTicking.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 97e5fd3fc468..95d1f791ef29 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.Zombies;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
@@ -15,7 +16,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using System.Globalization;
-using Content.Server.GameTicking.Components;
 
 namespace Content.Server.GameTicking.Rules;
 
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index f8ecc22828e5..18077b413ad5 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Cuffs.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Objectives.Systems;
@@ -9,7 +10,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using System.Text;
 using Robust.Server.Player;
 
diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
index 42c84b7f43b6..35b17dc95849 100644
--- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.Power.NodeGroups;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Pinpointer;
 using Content.Shared.Power;
 using JetBrains.Annotations;
@@ -13,7 +14,6 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 using System.Linq;
-using Content.Server.GameTicking.Components;
 
 namespace Content.Server.Power.EntitySystems;
 
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 75f861879890..f57481b05b63 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -1,8 +1,8 @@
 using System.Numerics;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Spawners.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index 7e32f546bed1..501d9033b9c0 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 using Robust.Shared.Toolshed;
diff --git a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
index a78a542d3b31..916d7d16883f 100644
--- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
+++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.AlertLevel;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -20,4 +20,4 @@ protected override void Started(EntityUid uid, AlertLevelInterceptionRuleCompone
 
         _alertLevelSystem.SetLevel(chosenStation.Value, component.AlertLevel, true, true, true);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index cf66a7c052e4..06da91e25693 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,7 +1,7 @@
 using Content.Server.Anomaly;
-using Content.Server.GameTicking.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
index aaa0f0cffc32..fc4f180adbdd 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -1,5 +1,5 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/BluespaceLockerRule.cs b/Content.Server/StationEvents/Events/BluespaceLockerRule.cs
index eef9850e739d..b19485bc31ee 100644
--- a/Content.Server/StationEvents/Events/BluespaceLockerRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceLockerRule.cs
@@ -1,4 +1,3 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Resist;
 using Content.Server.Station.Components;
@@ -6,6 +5,7 @@
 using Content.Server.Storage.Components;
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.Access.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Coordinates;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index ef2825938974..0cfe87051d5e 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
index ccfb8aee58e2..b49049a10d43 100644
--- a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
+++ b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
@@ -1,9 +1,9 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index 4cddf4674b30..ff2d1ca63117 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -2,9 +2,9 @@
 using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/ClericalErrorRule.cs b/Content.Server/StationEvents/Events/ClericalErrorRule.cs
index 854ee685b33d..e52c2c05aafe 100644
--- a/Content.Server/StationEvents/Events/ClericalErrorRule.cs
+++ b/Content.Server/StationEvents/Events/ClericalErrorRule.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationRecords;
 using Content.Server.StationRecords.Systems;
 using Content.Shared.StationRecords;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
index 115b6d905eae..e1c642a85d7a 100644
--- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -1,6 +1,6 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index c17f17a8279d..9e1f70474c1b 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -1,7 +1,7 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
diff --git a/Content.Server/StationEvents/Events/ImmovableRodRule.cs b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
index aa193f2f4cbc..17a92e1b3de3 100644
--- a/Content.Server/StationEvents/Events/ImmovableRodRule.cs
+++ b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
@@ -1,9 +1,9 @@
 using System.Numerics;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.ImmovableRod;
 using Content.Server.StationEvents.Components;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs
index 8361cc6048a3..926ecc2db921 100644
--- a/Content.Server/StationEvents/Events/IonStormRule.cs
+++ b/Content.Server/StationEvents/Events/IonStormRule.cs
@@ -1,4 +1,3 @@
-using Content.Server.GameTicking.Components;
 using System.Linq;
 using Content.Server.Silicons.Laws;
 using Content.Server.Station.Components;
@@ -7,6 +6,7 @@
 using Content.Shared.Database;
 using Content.Shared.Dataset;
 using Content.Shared.FixedPoint;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Silicons.Laws;
diff --git a/Content.Server/StationEvents/Events/KudzuGrowthRule.cs b/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
index 5b56e03846f9..42c57ffcaae5 100644
--- a/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
+++ b/Content.Server/StationEvents/Events/KudzuGrowthRule.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
index d6f609bee1d1..bfb7699e9d6e 100644
--- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
+++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Traits.Assorted;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Traits.Assorted;
 
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
index 455011259dca..b97cde86a02e 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
diff --git a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
index d9d68a386cf5..9cbc193ce61f 100644
--- a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameTicking.Components;
 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;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
diff --git a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
index d547fc944619..e00369a321c9 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
@@ -1,10 +1,10 @@
 using System.Threading;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
diff --git a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
index 87d50fc8b2a4..a9f279381805 100644
--- a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.Storage.Components;
 using Content.Server.Storage.EntitySystems;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index 06bb470602ba..3869f227bd4d 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/RandomSpawnRule.cs b/Content.Server/StationEvents/Events/RandomSpawnRule.cs
index 77744d44e465..e904c24ba603 100644
--- a/Content.Server/StationEvents/Events/RandomSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSpawnRule.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/SolarFlareRule.cs b/Content.Server/StationEvents/Events/SolarFlareRule.cs
index 0370b4ee61d0..19f6e393d201 100644
--- a/Content.Server/StationEvents/Events/SolarFlareRule.cs
+++ b/Content.Server/StationEvents/Events/SolarFlareRule.cs
@@ -1,4 +1,3 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Radio;
 using Robust.Shared.Random;
@@ -8,6 +7,7 @@
 using Content.Shared.Radio.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index 06dfdd5276be..c4c51afd2a1f 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index 867f41dcccfa..043ea0375aaa 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -6,9 +6,9 @@
 using Robust.Shared.Random;
 using System.Linq;
 using Content.Server.Fluids.EntitySystems;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.StationEvents.Events;
 
diff --git a/Content.Server/StationEvents/Events/VentCrittersRule.cs b/Content.Server/StationEvents/Events/VentCrittersRule.cs
index c2605039bce2..fba9cfa6a60e 100644
--- a/Content.Server/StationEvents/Events/VentCrittersRule.cs
+++ b/Content.Server/StationEvents/Events/VentCrittersRule.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameTicking.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
index 6c1ad4f48911..f65105de0669 100644
--- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.StationEvents.Events;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.Random;
 
diff --git a/Content.Shared/Destructible/Thresholds/MinMax.cs b/Content.Shared/Destructible/Thresholds/MinMax.cs
new file mode 100644
index 000000000000..e086a0f61c30
--- /dev/null
+++ b/Content.Shared/Destructible/Thresholds/MinMax.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Random;
+
+namespace Content.Shared.Destructible.Thresholds;
+
+[DataDefinition, Serializable]
+public partial struct MinMax
+{
+    [DataField]
+    public int Min;
+
+    [DataField]
+    public int Max;
+
+    public MinMax(int min, int max)
+    {
+        Min = min;
+        Max = max;
+    }
+
+    public int Next(IRobustRandom random)
+    {
+        return random.Next(Min, Max + 1);
+    }
+}
diff --git a/Content.Server/GameTicking/Components/ActiveGameRuleComponent.cs b/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
similarity index 67%
rename from Content.Server/GameTicking/Components/ActiveGameRuleComponent.cs
rename to Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
index b9e6fa5d4b8b..51bdd1c0371d 100644
--- a/Content.Server/GameTicking/Components/ActiveGameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/ActiveGameRuleComponent.cs
@@ -1,10 +1,8 @@
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 ///     Added to game rules before <see cref="GameRuleStartedEvent"/> and removed before <see cref="GameRuleEndedEvent"/>.
 ///     Mutually exclusive with <seealso cref="EndedGameRuleComponent"/>.
 /// </summary>
 [RegisterComponent]
-public sealed partial class ActiveGameRuleComponent : Component
-{
-}
+public sealed partial class ActiveGameRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Components/DelayedStartRuleComponent.cs b/Content.Shared/GameTicking/Components/DelayedStartRuleComponent.cs
similarity index 91%
rename from Content.Server/GameTicking/Components/DelayedStartRuleComponent.cs
rename to Content.Shared/GameTicking/Components/DelayedStartRuleComponent.cs
index de4be83627de..9275da29b01c 100644
--- a/Content.Server/GameTicking/Components/DelayedStartRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/DelayedStartRuleComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 /// Generic component used to track a gamerule that's start has been delayed.
diff --git a/Content.Server/GameTicking/Components/EndedGameRuleComponent.cs b/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
similarity index 61%
rename from Content.Server/GameTicking/Components/EndedGameRuleComponent.cs
rename to Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
index 3234bfff3a0e..5e209ed78a2e 100644
--- a/Content.Server/GameTicking/Components/EndedGameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/EndedGameRuleComponent.cs
@@ -1,10 +1,8 @@
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 ///     Added to game rules before <see cref="GameRuleEndedEvent"/>.
 ///     Mutually exclusive with <seealso cref="ActiveGameRuleComponent"/>.
 /// </summary>
 [RegisterComponent]
-public sealed partial class EndedGameRuleComponent : Component
-{
-}
+public sealed partial class EndedGameRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Components/GameRuleComponent.cs b/Content.Shared/GameTicking/Components/GameRuleComponent.cs
similarity index 94%
rename from Content.Server/GameTicking/Components/GameRuleComponent.cs
rename to Content.Shared/GameTicking/Components/GameRuleComponent.cs
index 635452b3f3c3..4e93c2b00382 100644
--- a/Content.Server/GameTicking/Components/GameRuleComponent.cs
+++ b/Content.Shared/GameTicking/Components/GameRuleComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.Destructible.Thresholds;
+using Content.Shared.Destructible.Thresholds;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.GameTicking.Components;
+namespace Content.Shared.GameTicking.Components;
 
 /// <summary>
 /// Component attached to all gamerule entities.

From 87fe804831e15ccd757d5830c9413811ed2fb780 Mon Sep 17 00:00:00 2001
From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Date: Tue, 4 Jun 2024 07:57:17 -0400
Subject: [PATCH 280/568] tyvm, tysm (#28577)

* tyvm, tysm

* cya -> see you

* ya
---
 Resources/Locale/en-US/speech/speech-chatsan.ftl   | 9 +++++++++
 Resources/Prototypes/Accents/word_replacements.yml | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 25e6c6f1ea98..ef9450729522 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -120,3 +120,12 @@ chatsan-replacement-43 = i guess
 
 chatsan-word-44 = tbf
 chatsan-replacement-44 = to be fair
+
+chatsan-word-45 = tysm
+chatsan-replacement-45 = thank you so much
+
+chatsan-word-46 = tyvm
+chatsan-replacement-46 = thank you very much
+
+chatsan-word-47 = cya
+chatsan-replacement-47 = see ya
\ No newline at end of file
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 9a801d786de8..40cc94e4537f 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -425,6 +425,9 @@
     chatsan-word-42: chatsan-replacement-42
     chatsan-word-43: chatsan-replacement-43
     chatsan-word-44: chatsan-replacement-44
+    chatsan-word-45: chatsan-replacement-45
+    chatsan-word-46: chatsan-replacement-46
+    chatsan-word-47: chatsan-replacement-47
 
 - type: accent
   id: liar

From 58647e703683e848730589ab003a94400f6c1075 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Tue, 4 Jun 2024 15:11:48 +0200
Subject: [PATCH 281/568] Don't switch-unwield if mob has more than 2 hands
 (#28438)

---
 Content.Shared/Wieldable/WieldableSystem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index c09044f84b43..cb95c1d7e780 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Examine;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
@@ -94,7 +95,8 @@ private void OnGunWielded(EntityUid uid, GunWieldBonusComponent component, ref I
 
     private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, HandDeselectedEvent args)
     {
-        if (!component.Wielded)
+        if (!component.Wielded ||
+            _handsSystem.EnumerateHands(args.User).Count() > 2)
             return;
 
         TryUnwield(uid, component, args.User);

From d4fe7eda515a1374ec753e740f025aefcae18e5a Mon Sep 17 00:00:00 2001
From: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Date: Tue, 4 Jun 2024 14:23:09 +0100
Subject: [PATCH 282/568] SS14-26964 Clown Waddling Replicates, etc (#26983)

---
 .../Movement/Systems/WaddleAnimationSystem.cs | 156 ++++++++----------
 .../Movement/Systems/WaddleAnimationSystem.cs |   5 +
 .../Components/WaddleWhenWornComponent.cs     |  11 +-
 .../EntitySystems}/WaddleClothingSystem.cs    |  17 +-
 .../Components/WaddleAnimationComponent.cs    |  28 ++--
 .../Systems/SharedWaddleAnimationSystem.cs    | 106 ++++++++++++
 6 files changed, 207 insertions(+), 116 deletions(-)
 create mode 100644 Content.Server/Movement/Systems/WaddleAnimationSystem.cs
 rename {Content.Client/Clothing/Systems => Content.Shared/Clothing/EntitySystems}/WaddleClothingSystem.cs (59%)
 create mode 100644 Content.Shared/Movement/Systems/SharedWaddleAnimationSystem.cs

diff --git a/Content.Client/Movement/Systems/WaddleAnimationSystem.cs b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
index 9555c1f6b9e4..0ed2d04f694a 100644
--- a/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
+++ b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
@@ -2,94 +2,115 @@
 using Content.Client.Buckle;
 using Content.Client.Gravity;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Buckle.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Events;
-using Content.Shared.StatusEffect;
-using Content.Shared.Stunnable;
+using Content.Shared.Movement.Systems;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Movement.Systems;
 
-public sealed class WaddleAnimationSystem : EntitySystem
+public sealed class WaddleAnimationSystem : SharedWaddleAnimationSystem
 {
     [Dependency] private readonly AnimationPlayerSystem _animation = default!;
     [Dependency] private readonly GravitySystem _gravity = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly BuckleSystem _buckle = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<WaddleAnimationComponent, MoveInputEvent>(OnMovementInput);
-        SubscribeLocalEvent<WaddleAnimationComponent, StartedWaddlingEvent>(OnStartedWalking);
-        SubscribeLocalEvent<WaddleAnimationComponent, StoppedWaddlingEvent>(OnStoppedWalking);
+        base.Initialize();
+
+        SubscribeAllEvent<StartedWaddlingEvent>(OnStartWaddling);
         SubscribeLocalEvent<WaddleAnimationComponent, AnimationCompletedEvent>(OnAnimationCompleted);
-        SubscribeLocalEvent<WaddleAnimationComponent, StunnedEvent>(OnStunned);
-        SubscribeLocalEvent<WaddleAnimationComponent, KnockedDownEvent>(OnKnockedDown);
-        SubscribeLocalEvent<WaddleAnimationComponent, BuckleChangeEvent>(OnBuckleChange);
+        SubscribeAllEvent<StoppedWaddlingEvent>(OnStopWaddling);
     }
 
-    private void OnMovementInput(EntityUid entity, WaddleAnimationComponent component, MoveInputEvent args)
+    private void OnStartWaddling(StartedWaddlingEvent msg, EntitySessionEventArgs args)
     {
-        // Prediction mitigation. Prediction means that MoveInputEvents are spammed repeatedly, even though you'd assume
-        // they're once-only for the user actually doing something. As such do nothing if we're just repeating this FoR.
-        if (!_timing.IsFirstTimePredicted)
-        {
+        if (TryComp<WaddleAnimationComponent>(GetEntity(msg.Entity), out var comp))
+            StartWaddling((GetEntity(msg.Entity), comp));
+    }
+
+    private void OnStopWaddling(StoppedWaddlingEvent msg, EntitySessionEventArgs args)
+    {
+        if (TryComp<WaddleAnimationComponent>(GetEntity(msg.Entity), out var comp))
+            StopWaddling((GetEntity(msg.Entity), comp));
+    }
+
+    private void StartWaddling(Entity<WaddleAnimationComponent> entity)
+    {
+        if (_animation.HasRunningAnimation(entity.Owner, entity.Comp.KeyName))
             return;
-        }
 
-        if (!args.HasDirectionalMovement && component.IsCurrentlyWaddling)
-        {
-            var stopped = new StoppedWaddlingEvent(entity);
+        if (!TryComp<InputMoverComponent>(entity.Owner, out var mover))
+            return;
 
-            RaiseLocalEvent(entity, ref stopped);
+        if (_gravity.IsWeightless(entity.Owner))
+            return;
 
+        if (!_actionBlocker.CanMove(entity.Owner, mover))
             return;
-        }
 
-        // Only start waddling if we're not currently AND we're actually moving.
-        if (component.IsCurrentlyWaddling || !args.HasDirectionalMovement)
+        // Do nothing if buckled in
+        if (_buckle.IsBuckled(entity.Owner))
             return;
 
-        var started = new StartedWaddlingEvent(entity);
+        // Do nothing if crit or dead (for obvious reasons)
+        if (_mobState.IsIncapacitated(entity.Owner))
+            return;
 
-        RaiseLocalEvent(entity, ref started);
+        PlayWaddleAnimationUsing(
+            (entity.Owner, entity.Comp),
+            CalculateAnimationLength(entity.Comp, mover),
+            CalculateTumbleIntensity(entity.Comp)
+        );
     }
 
-    private void OnStartedWalking(EntityUid uid, WaddleAnimationComponent component, StartedWaddlingEvent args)
+    private static float CalculateTumbleIntensity(WaddleAnimationComponent component)
     {
-        if (_animation.HasRunningAnimation(uid, component.KeyName))
-            return;
+        return component.LastStep ? 360 - component.TumbleIntensity : component.TumbleIntensity;
+    }
+
+    private static float CalculateAnimationLength(WaddleAnimationComponent component, InputMoverComponent mover)
+    {
+        return mover.Sprinting ? component.AnimationLength * component.RunAnimationLengthMultiplier : component.AnimationLength;
+    }
 
-        if (!TryComp<InputMoverComponent>(uid, out var mover))
+    private void OnAnimationCompleted(Entity<WaddleAnimationComponent> entity, ref AnimationCompletedEvent args)
+    {
+        if (args.Key != entity.Comp.KeyName)
             return;
 
-        if (_gravity.IsWeightless(uid))
+        if (!TryComp<InputMoverComponent>(entity.Owner, out var mover))
             return;
 
+        PlayWaddleAnimationUsing(
+            (entity.Owner, entity.Comp),
+            CalculateAnimationLength(entity.Comp, mover),
+            CalculateTumbleIntensity(entity.Comp)
+        );
+    }
 
-        if (!_actionBlocker.CanMove(uid, mover))
+    private void StopWaddling(Entity<WaddleAnimationComponent> entity)
+    {
+        if (!_animation.HasRunningAnimation(entity.Owner, entity.Comp.KeyName))
             return;
 
-        // Do nothing if buckled in
-        if (_buckle.IsBuckled(uid))
-            return;
+        _animation.Stop(entity.Owner, entity.Comp.KeyName);
 
-        // Do nothing if crit or dead (for obvious reasons)
-        if (_mobState.IsIncapacitated(uid))
+        if (!TryComp<SpriteComponent>(entity.Owner, out var sprite))
             return;
 
-        var tumbleIntensity = component.LastStep ? 360 - component.TumbleIntensity : component.TumbleIntensity;
-        var len = mover.Sprinting ? component.AnimationLength * component.RunAnimationLengthMultiplier : component.AnimationLength;
+        sprite.Offset = new Vector2();
+        sprite.Rotation = Angle.FromDegrees(0);
+    }
 
-        component.LastStep = !component.LastStep;
-        component.IsCurrentlyWaddling = true;
+    private void PlayWaddleAnimationUsing(Entity<WaddleAnimationComponent> entity, float len, float tumbleIntensity)
+    {
+        entity.Comp.LastStep = !entity.Comp.LastStep;
 
         var anim = new Animation()
         {
@@ -116,58 +137,13 @@ private void OnStartedWalking(EntityUid uid, WaddleAnimationComponent component,
                     KeyFrames =
                     {
                         new AnimationTrackProperty.KeyFrame(new Vector2(), 0),
-                        new AnimationTrackProperty.KeyFrame(component.HopIntensity, len/2),
+                        new AnimationTrackProperty.KeyFrame(entity.Comp.HopIntensity, len/2),
                         new AnimationTrackProperty.KeyFrame(new Vector2(), len/2),
                     }
                 }
             }
         };
 
-        _animation.Play(uid, anim, component.KeyName);
-    }
-
-    private void OnStoppedWalking(EntityUid uid, WaddleAnimationComponent component, StoppedWaddlingEvent args)
-    {
-        StopWaddling(uid, component);
-    }
-
-    private void OnAnimationCompleted(EntityUid uid, WaddleAnimationComponent component, AnimationCompletedEvent args)
-    {
-        var started = new StartedWaddlingEvent(uid);
-
-        RaiseLocalEvent(uid, ref started);
-    }
-
-    private void OnStunned(EntityUid uid, WaddleAnimationComponent component, StunnedEvent args)
-    {
-        StopWaddling(uid, component);
-    }
-
-    private void OnKnockedDown(EntityUid uid, WaddleAnimationComponent component, KnockedDownEvent args)
-    {
-        StopWaddling(uid, component);
-    }
-
-    private void OnBuckleChange(EntityUid uid, WaddleAnimationComponent component, BuckleChangeEvent args)
-    {
-        StopWaddling(uid, component);
-    }
-
-    private void StopWaddling(EntityUid uid, WaddleAnimationComponent component)
-    {
-        if (!component.IsCurrentlyWaddling)
-            return;
-
-        _animation.Stop(uid, component.KeyName);
-
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
-        {
-            return;
-        }
-
-        sprite.Offset = new Vector2();
-        sprite.Rotation = Angle.FromDegrees(0);
-
-        component.IsCurrentlyWaddling = false;
+        _animation.Play(entity.Owner, anim, entity.Comp.KeyName);
     }
 }
diff --git a/Content.Server/Movement/Systems/WaddleAnimationSystem.cs b/Content.Server/Movement/Systems/WaddleAnimationSystem.cs
new file mode 100644
index 000000000000..e6083210e1bf
--- /dev/null
+++ b/Content.Server/Movement/Systems/WaddleAnimationSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Movement.Systems;
+
+namespace Content.Server.Movement.Systems;
+
+public sealed class WaddleAnimationSystem : SharedWaddleAnimationSystem;
diff --git a/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs b/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs
index 5cd7a7245775..fb7490ef4fbe 100644
--- a/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs
+++ b/Content.Shared/Clothing/Components/WaddleWhenWornComponent.cs
@@ -1,35 +1,36 @@
 using System.Numerics;
+using Robust.Shared.GameStates;
 
 namespace Content.Shared.Clothing.Components;
 
 /// <summary>
 /// Defines something as causing waddling when worn.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class WaddleWhenWornComponent : Component
 {
     ///<summary>
     /// How high should they hop during the waddle? Higher hop = more energy.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Vector2 HopIntensity = new(0, 0.25f);
 
     /// <summary>
     /// How far should they rock backward and forward during the waddle?
     /// Each step will alternate between this being a positive and negative rotation. More rock = more scary.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float TumbleIntensity = 20.0f;
 
     /// <summary>
     /// How long should a complete step take? Less time = more chaos.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float AnimationLength = 0.66f;
 
     /// <summary>
     /// How much shorter should the animation be when running?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float RunAnimationLengthMultiplier = 0.568f;
 }
diff --git a/Content.Client/Clothing/Systems/WaddleClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/WaddleClothingSystem.cs
similarity index 59%
rename from Content.Client/Clothing/Systems/WaddleClothingSystem.cs
rename to Content.Shared/Clothing/EntitySystems/WaddleClothingSystem.cs
index b8ac3c207bf2..b445eb258e9a 100644
--- a/Content.Client/Clothing/Systems/WaddleClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/WaddleClothingSystem.cs
@@ -1,8 +1,9 @@
-using Content.Shared.Clothing.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Inventory.Events;
 
-namespace Content.Client.Clothing.Systems;
+namespace Content.Shared.Clothing.EntitySystems;
 
 public sealed class WaddleClothingSystem : EntitySystem
 {
@@ -10,13 +11,13 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<WaddleWhenWornComponent, GotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<WaddleWhenWornComponent, GotUnequippedEvent>(OnGotUnequipped);
+        SubscribeLocalEvent<WaddleWhenWornComponent, ClothingGotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<WaddleWhenWornComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
     }
 
-    private void OnGotEquipped(EntityUid entity, WaddleWhenWornComponent comp, GotEquippedEvent args)
+    private void OnGotEquipped(EntityUid entity, WaddleWhenWornComponent comp, ClothingGotEquippedEvent args)
     {
-        var waddleAnimComp = EnsureComp<WaddleAnimationComponent>(args.Equipee);
+        var waddleAnimComp = EnsureComp<WaddleAnimationComponent>(args.Wearer);
 
         waddleAnimComp.AnimationLength = comp.AnimationLength;
         waddleAnimComp.HopIntensity = comp.HopIntensity;
@@ -24,8 +25,8 @@ private void OnGotEquipped(EntityUid entity, WaddleWhenWornComponent comp, GotEq
         waddleAnimComp.TumbleIntensity = comp.TumbleIntensity;
     }
 
-    private void OnGotUnequipped(EntityUid entity, WaddleWhenWornComponent comp, GotUnequippedEvent args)
+    private void OnGotUnequipped(EntityUid entity, WaddleWhenWornComponent comp, ClothingGotUnequippedEvent args)
     {
-        RemComp<WaddleAnimationComponent>(args.Equipee);
+        RemComp<WaddleAnimationComponent>(args.Wearer);
     }
 }
diff --git a/Content.Shared/Movement/Components/WaddleAnimationComponent.cs b/Content.Shared/Movement/Components/WaddleAnimationComponent.cs
index c43ef3042eb9..3cd9a3749e81 100644
--- a/Content.Shared/Movement/Components/WaddleAnimationComponent.cs
+++ b/Content.Shared/Movement/Components/WaddleAnimationComponent.cs
@@ -1,31 +1,32 @@
 using System.Numerics;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Movement.Components;
 
 /// <summary>
 /// Declares that an entity has started to waddle like a duck/clown.
 /// </summary>
-/// <param name="Entity">The newly be-waddled.</param>
-[ByRefEvent]
-public record struct StartedWaddlingEvent(EntityUid Entity)
+/// <param name="entity">The newly be-waddled.</param>
+[Serializable, NetSerializable]
+public sealed class StartedWaddlingEvent(NetEntity entity) : EntityEventArgs
 {
-    public EntityUid Entity = Entity;
+    public NetEntity Entity = entity;
 }
 
 /// <summary>
 /// Declares that an entity has stopped waddling like a duck/clown.
 /// </summary>
-/// <param name="Entity">The former waddle-er.</param>
-[ByRefEvent]
-public record struct StoppedWaddlingEvent(EntityUid Entity)
+/// <param name="entity">The former waddle-er.</param>
+[Serializable, NetSerializable]
+public sealed class StoppedWaddlingEvent(NetEntity entity) : EntityEventArgs
 {
-    public EntityUid Entity = Entity;
+    public NetEntity Entity = entity;
 }
 
 /// <summary>
 /// Defines something as having a waddle animation when it moves.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentState]
 public sealed partial class WaddleAnimationComponent : Component
 {
     /// <summary>
@@ -38,26 +39,26 @@ public sealed partial class WaddleAnimationComponent : Component
     ///<summary>
     /// How high should they hop during the waddle? Higher hop = more energy.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Vector2 HopIntensity = new(0, 0.25f);
 
     /// <summary>
     /// How far should they rock backward and forward during the waddle?
     /// Each step will alternate between this being a positive and negative rotation. More rock = more scary.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float TumbleIntensity = 20.0f;
 
     /// <summary>
     /// How long should a complete step take? Less time = more chaos.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float AnimationLength = 0.66f;
 
     /// <summary>
     /// How much shorter should the animation be when running?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float RunAnimationLengthMultiplier = 0.568f;
 
     /// <summary>
@@ -68,5 +69,6 @@ public sealed partial class WaddleAnimationComponent : Component
     /// <summary>
     /// Stores if we're currently waddling so we can start/stop as appropriate and can tell other systems our state.
     /// </summary>
+    [AutoNetworkedField]
     public bool IsCurrentlyWaddling;
 }
diff --git a/Content.Shared/Movement/Systems/SharedWaddleAnimationSystem.cs b/Content.Shared/Movement/Systems/SharedWaddleAnimationSystem.cs
new file mode 100644
index 000000000000..2fcb4fc60bbe
--- /dev/null
+++ b/Content.Shared/Movement/Systems/SharedWaddleAnimationSystem.cs
@@ -0,0 +1,106 @@
+using Content.Shared.Buckle.Components;
+using Content.Shared.Gravity;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Standing;
+using Content.Shared.Stunnable;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Movement.Systems;
+
+public abstract class SharedWaddleAnimationSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        // Startup
+        SubscribeLocalEvent<WaddleAnimationComponent, ComponentStartup>(OnComponentStartup);
+
+        // Start moving possibilities
+        SubscribeLocalEvent<WaddleAnimationComponent, MoveInputEvent>(OnMovementInput);
+        SubscribeLocalEvent<WaddleAnimationComponent, StoodEvent>(OnStood);
+
+        // Stop moving possibilities
+        SubscribeLocalEvent((Entity<WaddleAnimationComponent> ent, ref StunnedEvent _) => StopWaddling(ent));
+        SubscribeLocalEvent((Entity<WaddleAnimationComponent> ent, ref DownedEvent _) => StopWaddling(ent));
+        SubscribeLocalEvent((Entity<WaddleAnimationComponent> ent, ref BuckleChangeEvent _) => StopWaddling(ent));
+        SubscribeLocalEvent<WaddleAnimationComponent, GravityChangedEvent>(OnGravityChanged);
+    }
+
+    private void OnGravityChanged(Entity<WaddleAnimationComponent> ent, ref GravityChangedEvent args)
+    {
+        if (!args.HasGravity && ent.Comp.IsCurrentlyWaddling)
+            StopWaddling(ent);
+    }
+
+    private void OnComponentStartup(Entity<WaddleAnimationComponent> entity, ref ComponentStartup args)
+    {
+        if (!TryComp<InputMoverComponent>(entity.Owner, out var moverComponent))
+            return;
+
+        // If the waddler is currently moving, make them start waddling
+        if ((moverComponent.HeldMoveButtons & MoveButtons.AnyDirection) == MoveButtons.AnyDirection)
+        {
+            RaiseNetworkEvent(new StartedWaddlingEvent(GetNetEntity(entity.Owner)));
+        }
+    }
+
+    private void OnMovementInput(Entity<WaddleAnimationComponent> entity, ref MoveInputEvent args)
+    {
+        // Prediction mitigation. Prediction means that MoveInputEvents are spammed repeatedly, even though you'd assume
+        // they're once-only for the user actually doing something. As such do nothing if we're just repeating this FoR.
+        if (!_timing.IsFirstTimePredicted)
+        {
+            return;
+        }
+
+        if (!args.HasDirectionalMovement && entity.Comp.IsCurrentlyWaddling)
+        {
+            StopWaddling(entity);
+
+            return;
+        }
+
+        // Only start waddling if we're not currently AND we're actually moving.
+        if (entity.Comp.IsCurrentlyWaddling || !args.HasDirectionalMovement)
+            return;
+
+        entity.Comp.IsCurrentlyWaddling = true;
+
+        RaiseNetworkEvent(new StartedWaddlingEvent(GetNetEntity(entity.Owner)));
+    }
+
+    private void OnStood(Entity<WaddleAnimationComponent> entity, ref StoodEvent args)
+    {
+        // Prediction mitigation. Prediction means that MoveInputEvents are spammed repeatedly, even though you'd assume
+        // they're once-only for the user actually doing something. As such do nothing if we're just repeating this FoR.
+        if (!_timing.IsFirstTimePredicted)
+        {
+            return;
+        }
+
+        if (!TryComp<InputMoverComponent>(entity.Owner, out var mover))
+        {
+            return;
+        }
+
+        if ((mover.HeldMoveButtons & MoveButtons.AnyDirection) == MoveButtons.None)
+            return;
+
+        if (entity.Comp.IsCurrentlyWaddling)
+            return;
+
+        entity.Comp.IsCurrentlyWaddling = true;
+
+        RaiseNetworkEvent(new StartedWaddlingEvent(GetNetEntity(entity.Owner)));
+    }
+
+    private void StopWaddling(Entity<WaddleAnimationComponent> entity)
+    {
+        entity.Comp.IsCurrentlyWaddling = false;
+
+        RaiseNetworkEvent(new StoppedWaddlingEvent(GetNetEntity(entity.Owner)));
+    }
+}

From 0b4fc7e298bc37cc7db053bf4d2c2adb7e873d0a Mon Sep 17 00:00:00 2001
From: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Date: Tue, 4 Jun 2024 14:26:19 +0100
Subject: [PATCH 283/568] Make projectile & hitscan reflection only try once
 with the best reflector (#28539)

---
 .../Weapons/Reflect/ReflectSystem.cs          | 250 ++++++++++--------
 .../Weapons/Reflect/ReflectUserComponent.cs   |   5 +-
 2 files changed, 143 insertions(+), 112 deletions(-)

diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 03ad97edff27..9b89be6202ad 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -49,73 +49,123 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<ReflectComponent, ProjectileReflectAttemptEvent>(OnReflectCollide);
-        SubscribeLocalEvent<ReflectComponent, HitScanReflectAttemptEvent>(OnReflectHitscan);
+        SubscribeLocalEvent<ReflectComponent, ProjectileReflectAttemptEvent>(OnObjectReflectProjectileAttempt);
+        SubscribeLocalEvent<ReflectComponent, HitScanReflectAttemptEvent>(OnObjectReflectHitscanAttempt);
         SubscribeLocalEvent<ReflectComponent, GotEquippedEvent>(OnReflectEquipped);
         SubscribeLocalEvent<ReflectComponent, GotUnequippedEvent>(OnReflectUnequipped);
         SubscribeLocalEvent<ReflectComponent, GotEquippedHandEvent>(OnReflectHandEquipped);
         SubscribeLocalEvent<ReflectComponent, GotUnequippedHandEvent>(OnReflectHandUnequipped);
         SubscribeLocalEvent<ReflectComponent, ItemToggledEvent>(OnToggleReflect);
 
-        SubscribeLocalEvent<ReflectUserComponent, ProjectileReflectAttemptEvent>(OnReflectUserCollide);
-        SubscribeLocalEvent<ReflectUserComponent, HitScanReflectAttemptEvent>(OnReflectUserHitscan);
+        SubscribeLocalEvent<ReflectUserComponent, ProjectileReflectAttemptEvent>(OnUserProjectileReflectAttempt);
+        SubscribeLocalEvent<ReflectUserComponent, HitScanReflectAttemptEvent>(OnUserHitscanReflectAttempt);
     }
 
-    private void OnReflectUserHitscan(EntityUid uid, ReflectUserComponent component, ref HitScanReflectAttemptEvent args)
+    private void OnUserHitscanReflectAttempt(Entity<ReflectUserComponent> user, ref HitScanReflectAttemptEvent args)
     {
         if (args.Reflected)
             return;
 
-        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.WITHOUT_POCKET))
-        {
-            if (!TryReflectHitscan(uid, ent, args.Shooter, args.SourceItem, args.Direction, out var dir))
-                continue;
+        if (!UserCanReflect(user, out var bestReflectorUid))
+            return;
 
-            args.Direction = dir.Value;
-            args.Reflected = true;
-            break;
-        }
+        if (!TryReflectHitscan(user.Owner, bestReflectorUid.Value, args.Shooter, args.SourceItem, args.Direction, out var dir))
+            return;
+
+        args.Direction = dir.Value;
+        args.Reflected = true;
     }
 
-    private void OnReflectUserCollide(EntityUid uid, ReflectUserComponent component, ref ProjectileReflectAttemptEvent args)
+    private void OnUserProjectileReflectAttempt(Entity<ReflectUserComponent> user, ref ProjectileReflectAttemptEvent args)
     {
-        foreach (var ent in _inventorySystem.GetHandOrInventoryEntities(uid, SlotFlags.WITHOUT_POCKET))
-        {
-            if (!TryReflectProjectile(uid, ent, args.ProjUid))
-                continue;
+        if (args.Cancelled)
+            return;
 
-            args.Cancelled = true;
-            break;
-        }
+        if (!TryComp<ReflectiveComponent>(args.ProjUid, out var reflectiveComponent))
+            return;
+
+        if (!UserCanReflect(user, out var bestReflectorUid, (args.ProjUid, reflectiveComponent)))
+            return;
+
+        if (!TryReflectProjectile(user, bestReflectorUid.Value, (args.ProjUid, args.Component)))
+            return;
+
+        args.Cancelled = true;
+    }
+
+    private void OnObjectReflectHitscanAttempt(Entity<ReflectComponent> obj, ref HitScanReflectAttemptEvent args)
+    {
+        if (args.Reflected || (obj.Comp.Reflects & args.Reflective) == 0x0)
+            return;
+
+        if (!TryReflectHitscan(obj, obj, args.Shooter, args.SourceItem, args.Direction, out var dir))
+            return;
+
+        args.Direction = dir.Value;
+        args.Reflected = true;
     }
 
-    private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref ProjectileReflectAttemptEvent args)
+    private void OnObjectReflectProjectileAttempt(Entity<ReflectComponent> obj, ref ProjectileReflectAttemptEvent args)
     {
         if (args.Cancelled)
             return;
 
-        if (TryReflectProjectile(uid, uid, args.ProjUid, reflect: component))
-            args.Cancelled = true;
+        if (!TryReflectProjectile(obj, obj, (args.ProjUid, args.Component)))
+            return;
+
+        args.Cancelled = true;
+    }
+
+    /// <summary>
+    /// Can a user reflect something that's hit them? Returns true if so, and the best reflector available in the user's equipment.
+    /// </summary>
+    private bool UserCanReflect(Entity<ReflectUserComponent> user, [NotNullWhen(true)] out Entity<ReflectComponent>? bestReflector, Entity<ReflectiveComponent>? projectile = null)
+    {
+        bestReflector = null;
+
+        foreach (var entityUid in _inventorySystem.GetHandOrInventoryEntities(user.Owner, SlotFlags.WITHOUT_POCKET))
+        {
+            if (!TryComp<ReflectComponent>(entityUid, out var comp))
+                continue;
+
+            if (!comp.Enabled)
+                continue;
+
+            if (bestReflector != null && bestReflector.Value.Comp.ReflectProb >= comp.ReflectProb)
+                continue;
+
+            if (projectile != null && (comp.Reflects & projectile.Value.Comp.Reflective) == 0x0)
+                continue;
+
+            bestReflector = (entityUid, comp);
+        }
+
+        return bestReflector != null;
     }
 
-    private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
+    private bool TryReflectProjectile(EntityUid user, Entity<ReflectComponent> reflector, Entity<ProjectileComponent> projectile)
     {
-        // Do we have the components needed to try a reflect at all?
         if (
-            !Resolve(reflector, ref reflect, false) ||
-            !reflect.Enabled ||
+            // Is it on?
+            !reflector.Comp.Enabled ||
+            // Is the projectile deflectable?
             !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
-            (reflect.Reflects & reflective.Reflective) == 0x0 ||
+            // Does the deflector deflect the type of projecitle?
+            (reflector.Comp.Reflects & reflective.Reflective) == 0x0 ||
+            // Is the projectile correctly set up with physics?
             !TryComp<PhysicsComponent>(projectile, out var physics) ||
-            TryComp<StaminaComponent>(reflector, out var staminaComponent) && staminaComponent.Critical ||
+            // If the user of the reflector is a mob with stamina, is it capable of deflecting?
+            TryComp<StaminaComponent>(user, out var staminaComponent) && staminaComponent.Critical ||
             _standing.IsDown(reflector)
         )
             return false;
 
-        if (!_random.Prob(CalcReflectChance(reflector, reflect)))
+        // If this dice roll fails, the shot isn't deflected
+        if (!_random.Prob(GetReflectChance(reflector)))
             return false;
 
-        var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
+        // Below handles what happens after being deflected.
+        var rotation = _random.NextAngle(-reflector.Comp.Spread / 2, reflector.Comp.Spread / 2).Opposite();
         var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
         var relativeVelocity = existingVelocity - _physics.GetMapLinearVelocity(user);
         var newVelocity = rotation.RotateVec(relativeVelocity);
@@ -132,98 +182,52 @@ private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid
         if (_netManager.IsServer)
         {
             _popup.PopupEntity(Loc.GetString("reflect-shot"), user);
-            _audio.PlayPvs(reflect.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
+            _audio.PlayPvs(reflector.Comp.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
         }
 
-        if (Resolve(projectile, ref projectileComp, false))
-        {
-            _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected {ToPrettyString(projectile)} from {ToPrettyString(projectileComp.Weapon)} shot by {projectileComp.Shooter}");
+        _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected {ToPrettyString(projectile)} from {ToPrettyString(projectile.Comp.Weapon)} shot by {projectile.Comp.Shooter}");
 
-            projectileComp.Shooter = user;
-            projectileComp.Weapon = user;
-            Dirty(projectile, projectileComp);
-        }
-        else
-        {
-            _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, $"{ToPrettyString(user)} reflected {ToPrettyString(projectile)}");
-        }
+        projectile.Comp.Shooter = user;
+        projectile.Comp.Weapon = user;
+        Dirty(projectile);
 
         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 ||
-            (component.Reflects & args.Reflective) == 0x0)
-        {
-            return;
-        }
-
-        if (TryReflectHitscan(uid, uid, args.Shooter, args.SourceItem, args.Direction, out var dir))
-        {
-            args.Direction = dir.Value;
-            args.Reflected = true;
-        }
-    }
-
     private bool TryReflectHitscan(
         EntityUid user,
-        EntityUid reflector,
+        Entity<ReflectComponent> reflector,
         EntityUid? shooter,
         EntityUid shotSource,
         Vector2 direction,
         [NotNullWhen(true)] out Vector2? newDirection)
     {
-        if (!TryComp<ReflectComponent>(reflector, out var reflect) ||
-            !reflect.Enabled ||
-            TryComp<StaminaComponent>(reflector, out var staminaComponent) && staminaComponent.Critical ||
-            _standing.IsDown(reflector))
+        if (
+            // Is the reflector enabled?
+            !reflector.Comp.Enabled ||
+            // If the user is a mob with stamina, is it capable of deflecting?
+            TryComp<StaminaComponent>(user, out var staminaComponent) && staminaComponent.Critical ||
+            _standing.IsDown(user))
         {
             newDirection = null;
             return false;
         }
 
-        if (!_random.Prob(CalcReflectChance(reflector, reflect)))
+        // If this dice roll fails, the shot is not deflected.
+        if (!_random.Prob(GetReflectChance(reflector)))
         {
             newDirection = null;
             return false;
         }
 
+        // Below handles what happens after being deflected.
         if (_netManager.IsServer)
         {
             _popup.PopupEntity(Loc.GetString("reflect-shot"), user);
-            _audio.PlayPvs(reflect.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
+            _audio.PlayPvs(reflector.Comp.SoundOnReflect, user, AudioHelpers.WithVariation(0.05f, _random));
         }
 
-        var spread = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2);
+        var spread = _random.NextAngle(-reflector.Comp.Spread / 2, reflector.Comp.Spread / 2);
         newDirection = -spread.RotateVec(direction);
 
         if (shooter != null)
@@ -234,51 +238,81 @@ private bool TryReflectHitscan(
         return true;
     }
 
-    private void OnReflectEquipped(EntityUid uid, ReflectComponent component, GotEquippedEvent args)
+    private float GetReflectChance(Entity<ReflectComponent> reflector)
+    {
+        /*
+         *  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.
+         */
+
+        if (reflector.Comp.Innate)
+            return reflector.Comp.ReflectProb;
+
+        if (_gravity.IsWeightless(reflector))
+            return reflector.Comp.MinReflectProb;
+
+        if (!TryComp<PhysicsComponent>(reflector, out var reflectorPhysics))
+            return reflector.Comp.ReflectProb;
+
+        return MathHelper.Lerp(
+            reflector.Comp.MinReflectProb,
+            reflector.Comp.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() - reflector.Comp.VelocityBeforeNotMaxProb) / (reflector.Comp.VelocityBeforeMinProb - reflector.Comp.VelocityBeforeNotMaxProb), 0, 1)
+        );
+    }
+
+    private void OnReflectEquipped(Entity<ReflectComponent> reflector, ref GotEquippedEvent args)
     {
         if (_gameTiming.ApplyingState)
             return;
 
         EnsureComp<ReflectUserComponent>(args.Equipee);
 
-        if (component.Enabled)
+        if (reflector.Comp.Enabled)
             EnableAlert(args.Equipee);
     }
 
-    private void OnReflectUnequipped(EntityUid uid, ReflectComponent comp, GotUnequippedEvent args)
+    private void OnReflectUnequipped(Entity<ReflectComponent> reflector, ref GotUnequippedEvent args)
     {
         RefreshReflectUser(args.Equipee);
     }
 
-    private void OnReflectHandEquipped(EntityUid uid, ReflectComponent component, GotEquippedHandEvent args)
+    private void OnReflectHandEquipped(Entity<ReflectComponent> reflector, ref GotEquippedHandEvent args)
     {
         if (_gameTiming.ApplyingState)
             return;
 
         EnsureComp<ReflectUserComponent>(args.User);
 
-        if (component.Enabled)
+        if (reflector.Comp.Enabled)
             EnableAlert(args.User);
     }
 
-    private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component, GotUnequippedHandEvent args)
+    private void OnReflectHandUnequipped(Entity<ReflectComponent> reflector, ref GotUnequippedHandEvent args)
     {
         RefreshReflectUser(args.User);
     }
 
-    private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggledEvent args)
+    private void OnToggleReflect(Entity<ReflectComponent> reflector, ref ItemToggledEvent args)
     {
-        comp.Enabled = args.Activated;
-        Dirty(uid, comp);
+        reflector.Comp.Enabled = args.Activated;
+        Dirty(reflector);
+
+        if (args.User == null)
+            return;
 
-        if (comp.Enabled)
-            EnableAlert(uid);
+        if (reflector.Comp.Enabled)
+            EnableAlert(args.User.Value);
         else
-            DisableAlert(uid);
+            DisableAlert(args.User.Value);
     }
 
     /// <summary>
-    /// Refreshes whether someone has reflection potential so we can raise directed events on them.
+    /// Refreshes whether someone has reflection potential, so we can raise directed events on them.
     /// </summary>
     private void RefreshReflectUser(EntityUid user)
     {
diff --git a/Content.Shared/Weapons/Reflect/ReflectUserComponent.cs b/Content.Shared/Weapons/Reflect/ReflectUserComponent.cs
index 44fe60813e78..44ef481a3724 100644
--- a/Content.Shared/Weapons/Reflect/ReflectUserComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectUserComponent.cs
@@ -7,7 +7,4 @@ namespace Content.Shared.Weapons.Reflect;
 /// Reflection events will then be relayed.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class ReflectUserComponent : Component
-{
-
-}
+public sealed partial class ReflectUserComponent : Component;

From b3cfd9b4ff7b1f06bd917c158058229773b92955 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 4 Jun 2024 13:27:27 +0000
Subject: [PATCH 284/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0ae775e19368..6a20b3a411d1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Romerol now properly works on the dead.
-    type: Tweak
-  id: 6179
-  time: '2024-03-18T06:25:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26222
 - author: ElectroJr
   changes:
   - message: Added an option to try and ignore some errors if a replay fails to load,
@@ -3850,3 +3843,11 @@
   id: 6678
   time: '2024-06-03T18:48:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27788
+- author: FairlySadPanda
+  changes:
+  - message: Stacking multiple deflecting items at once has been removed; now only
+      your best item is used.
+    type: Tweak
+  id: 6679
+  time: '2024-06-04T13:26:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28539

From d5019cee96a922f7e0547bc507fdfa1ed9471a39 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Tue, 4 Jun 2024 06:54:22 -0800
Subject: [PATCH 285/568] Add CVar to disable pow3r parallel processing
 (#28488)

* Add CVar to disable pow3r parallel processing

* Cache CVar value

* Fix pointyhat

* Move all CVar-ing to Content.Server
---
 .../Power/EntitySystems/PowerNetSystem.cs           | 13 ++++++++++++-
 Content.Server/Power/Pow3r/BatteryRampPegSolver.cs  |  9 +++++++--
 Content.Shared/CCVar/CCVars.cs                      |  6 ++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 7bd057951c9b..6c35ba20083c 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -3,9 +3,11 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
+using Content.Shared.CCVar;
 using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Configuration;
 using Robust.Shared.Threading;
 
 namespace Content.Server.Power.EntitySystems
@@ -18,6 +20,7 @@ public sealed class PowerNetSystem : EntitySystem
     {
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly PowerNetConnectorSystem _powerNetConnector = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IParallelManager _parMan = default!;
         [Dependency] private readonly PowerReceiverSystem _powerReceiver = default!;
 
@@ -25,13 +28,14 @@ public sealed class PowerNetSystem : EntitySystem
         private readonly HashSet<PowerNet> _powerNetReconnectQueue = new();
         private readonly HashSet<ApcNet> _apcNetReconnectQueue = new();
 
-        private readonly BatteryRampPegSolver _solver = new();
+        private BatteryRampPegSolver _solver = new();
 
         public override void Initialize()
         {
             base.Initialize();
 
             UpdatesAfter.Add(typeof(NodeGroupSystem));
+            _solver = new(_cfg.GetCVar(CCVars.DebugPow3rDisableParallel));
 
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentInit>(ApcPowerReceiverInit);
             SubscribeLocalEvent<ApcPowerReceiverComponent, ComponentShutdown>(ApcPowerReceiverShutdown);
@@ -53,6 +57,13 @@ public override void Initialize()
             SubscribeLocalEvent<PowerSupplierComponent, ComponentShutdown>(PowerSupplierShutdown);
             SubscribeLocalEvent<PowerSupplierComponent, EntityPausedEvent>(PowerSupplierPaused);
             SubscribeLocalEvent<PowerSupplierComponent, EntityUnpausedEvent>(PowerSupplierUnpaused);
+
+            Subs.CVar(_cfg, CCVars.DebugPow3rDisableParallel, DebugPow3rDisableParallelChanged);
+        }
+
+        private void DebugPow3rDisableParallelChanged(bool val)
+        {
+            _solver = new(val);
         }
 
         private void ApcPowerReceiverInit(EntityUid uid, ApcPowerReceiverComponent component, ComponentInit args)
diff --git a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
index 12118968b70f..599c55b6ba4b 100644
--- a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
+++ b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs
@@ -9,9 +9,11 @@ namespace Content.Server.Power.Pow3r
     public sealed class BatteryRampPegSolver : IPowerSolver
     {
         private UpdateNetworkJob _networkJob;
+        private bool _disableParallel;
 
-        public BatteryRampPegSolver()
+        public BatteryRampPegSolver(bool disableParallel = false)
         {
+            _disableParallel = disableParallel;
             _networkJob = new()
             {
                 Solver = this,
@@ -56,7 +58,10 @@ public void Tick(float frameTime, PowerState state, IParallelManager parallel)
                 // suppliers + discharger) Then decide based on total layer size whether its worth parallelizing that
                 // layer?
                 _networkJob.Networks = group;
-                parallel.ProcessNow(_networkJob, group.Count);
+                if (_disableParallel)
+                    parallel.ProcessSerialNow(_networkJob, group.Count);
+                else
+                    parallel.ProcessNow(_networkJob, group.Count);
             }
 
             ClearBatteries(state);
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index f41e0a1e6f10..b3da71fde1a4 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -2062,5 +2062,11 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<bool> DebugOptionVisualizerTest =
             CVarDef.Create("debug.option_visualizer_test", false, CVar.CLIENTONLY);
+
+        /// <summary>
+        /// Set to true to disable parallel processing in the pow3r solver.
+        /// </summary>
+        public static readonly CVarDef<bool> DebugPow3rDisableParallel =
+            CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
     }
 }

From 71a6e60818fbaab41b90a854e38dd2d8e6850304 Mon Sep 17 00:00:00 2001
From: Moony <moony@hellomouse.net>
Date: Tue, 4 Jun 2024 10:59:33 -0500
Subject: [PATCH 286/568] Revert "Buff the AME until somebody fixes
 engineering" (#28419)

---
 Content.Server/Ame/AmeNodeGroup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs
index 608356f76059..40da6222d201 100644
--- a/Content.Server/Ame/AmeNodeGroup.cs
+++ b/Content.Server/Ame/AmeNodeGroup.cs
@@ -182,7 +182,7 @@ public float CalculatePower(int fuel, int cores)
         // Fuel is squared so more fuel vastly increases power and efficiency
         // We divide by the number of cores so a larger AME is less efficient at the same fuel settings
         // this results in all AMEs having the same efficiency at the same fuel-per-core setting
-        return 2000000f * fuel * fuel / cores;
+        return 20000f * fuel * fuel / cores;
     }
 
     public int GetTotalStability()

From b394eb9e84ac2faf6018849a842c6fa7d999c1ed Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 4 Jun 2024 16:00:39 +0000
Subject: [PATCH 287/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6a20b3a411d1..600334df6b85 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: ElectroJr
-  changes:
-  - message: Added an option to try and ignore some errors if a replay fails to load,
-    type: Add
-  id: 6180
-  time: '2024-03-18T07:31:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26212
 - author: Tayrtahn
   changes:
   - message: Cyborg recharging stations are able to charge cyborgs again.
@@ -3851,3 +3844,11 @@
   id: 6679
   time: '2024-06-04T13:26:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28539
+- author: moonheart08
+  changes:
+  - message: AME power output is no longer super-buffed. Larger stations will now
+      require multiple engines to stay powered.
+    type: Tweak
+  id: 6680
+  time: '2024-06-04T15:59:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28419

From 627187988e76b97e81663747faafb21da182ebe0 Mon Sep 17 00:00:00 2001
From: icekot8 <93311212+icekot8@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:34:07 +0300
Subject: [PATCH 288/568] hand teleport portals now may start in the same grid.
 (#28556)

---
 Content.Server/Teleportation/HandTeleporterSystem.cs      | 2 +-
 .../Teleportation/Components/HandTeleporterComponent.cs   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Teleportation/HandTeleporterSystem.cs b/Content.Server/Teleportation/HandTeleporterSystem.cs
index d4c6753c4b52..1cd2e1d8c25c 100644
--- a/Content.Server/Teleportation/HandTeleporterSystem.cs
+++ b/Content.Server/Teleportation/HandTeleporterSystem.cs
@@ -98,7 +98,7 @@ private void HandlePortalUpdating(EntityUid uid, HandTeleporterComponent compone
             if (xform.ParentUid != xform.GridUid) // Still, don't portal.
                 return;
 
-            if (xform.ParentUid != Transform(component.FirstPortal!.Value).ParentUid)
+            if (!component.AllowPortalsOnDifferentGrids && xform.ParentUid != Transform(component.FirstPortal!.Value).ParentUid)
             {
                 // Whoops. Fizzle time. Crime time too because yippee I'm not refactoring this logic right now (I started to, I'm not going to.)
                 FizzlePortals(uid, component, user, true);
diff --git a/Content.Shared/Teleportation/Components/HandTeleporterComponent.cs b/Content.Shared/Teleportation/Components/HandTeleporterComponent.cs
index 6abd4a7d2114..6ea29d3fd6ad 100644
--- a/Content.Shared/Teleportation/Components/HandTeleporterComponent.cs
+++ b/Content.Shared/Teleportation/Components/HandTeleporterComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.DoAfter;
+using Content.Shared.DoAfter;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -20,6 +20,12 @@ public sealed partial class HandTeleporterComponent : Component
     [ViewVariables, DataField("secondPortal")]
     public EntityUid? SecondPortal = null;
 
+    /// <summary>
+    ///     Portals can't be placed on different grids?
+    /// </summary>
+    [DataField]
+    public bool AllowPortalsOnDifferentGrids;
+
     [DataField("firstPortalPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string FirstPortalPrototype = "PortalRed";
 

From 0e93d13cb78b86136d11daeec06464ef26ccff65 Mon Sep 17 00:00:00 2001
From: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:12:01 -0400
Subject: [PATCH 289/568] Microwave recipes now uses stacktype id instead of
 entity prototype id for stacked entities (#28225)

---
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  | 64 ++++++++++++++++---
 .../Recipes/Cooking/medical_recipes.yml       |  4 +-
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 8938aa8b1dc4..c69ed49d50a6 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -35,6 +35,7 @@
 using System.Linq;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared.Stacks;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
@@ -58,6 +59,8 @@ 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!;
 
         [ValidatePrototypeId<EntityPrototype>]
         private const string MalfunctionSpark = "Spark";
@@ -199,16 +202,41 @@ private void SubtractContents(MicrowaveComponent component, FoodRecipePrototype
                 {
                     foreach (var item in component.Storage.ContainedEntities)
                     {
-                        var metaData = MetaData(item);
-                        if (metaData.EntityPrototype == null)
+                        string? itemID = null;
+
+                        // If an entity has a stack component, use the stacktype instead of prototype id
+                        if (TryComp<StackComponent>(item, out var stackComp))
+                        {
+                            itemID = _prototype.Index<StackPrototype>(stackComp.StackTypeId).Spawn;
+                        }
+                        else
+                        {
+                            var metaData = MetaData(item);
+                            if (metaData.EntityPrototype == null)
+                            {
+                                continue;
+                            }
+                            itemID = metaData.EntityPrototype.ID;
+                        }
+
+                        if (itemID != recipeSolid.Key)
                         {
                             continue;
                         }
 
-                        if (metaData.EntityPrototype.ID == recipeSolid.Key)
+                        if (stackComp is not null)
+                        {
+                            if (stackComp.Count == 1)
+                            {
+                                _container.Remove(item, component.Storage);
+                            }
+                            _stack.Use(item, 1, stackComp);
+                            break;
+                        }
+                        else
                         {
                             _container.Remove(item, component.Storage);
-                            EntityManager.DeleteEntity(item);
+                            Del(item);
                             break;
                         }
                     }
@@ -448,17 +476,35 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
 
                 AddComp<ActivelyMicrowavedComponent>(item);
 
-                var metaData = MetaData(item); //this simply begs for cooking refactor
-                if (metaData.EntityPrototype == null)
+                string? solidID = null;
+                int amountToAdd = 1;
+
+                // If a microwave recipe uses a stacked item, use the default stack prototype id instead of prototype id
+                if (TryComp<StackComponent>(item, out var stackComp))
+                {
+                    solidID = _prototype.Index<StackPrototype>(stackComp.StackTypeId).Spawn;
+                    amountToAdd = stackComp.Count;
+                }
+                else
+                {
+                    var metaData = MetaData(item); //this simply begs for cooking refactor
+                    if (metaData.EntityPrototype is not null)
+                        solidID = metaData.EntityPrototype.ID;
+                }
+
+                if (solidID is null)
+                {
                     continue;
+                }
+
 
-                if (solidsDict.ContainsKey(metaData.EntityPrototype.ID))
+                if (solidsDict.ContainsKey(solidID))
                 {
-                    solidsDict[metaData.EntityPrototype.ID]++;
+                    solidsDict[solidID] += amountToAdd;
                 }
                 else
                 {
-                    solidsDict.Add(metaData.EntityPrototype.ID, 1);
+                    solidsDict.Add(solidID, amountToAdd);
                 }
 
                 if (!TryComp<SolutionContainerManagerComponent>(item, out var solMan))
diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
index 9d1947f03ebc..3bc9e22b0e4f 100644
--- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -13,7 +13,7 @@
   time: 10
   solids:
     FoodPoppy: 1
-    Brutepack: 1
+    Brutepack: 10
     MaterialCloth1: 1
   reagents:
     TranexamicAcid: 20
@@ -26,7 +26,7 @@
   time: 10
   solids:
     FoodAloe: 1
-    Ointment: 1
+    Ointment: 10
     MaterialCloth1: 1
   reagents:
     Sigynate: 20

From 1de261d1b1813ef00e5ef665594bc8d5e66dc77e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 4 Jun 2024 17:13:07 +0000
Subject: [PATCH 290/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 600334df6b85..b14fae9c41ad 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Cyborg recharging stations are able to charge cyborgs again.
-    type: Fix
-  id: 6181
-  time: '2024-03-18T13:37:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26230
 - author: DoutorWhite
   changes:
   - message: Introduce new health status icons.
@@ -3852,3 +3845,10 @@
   id: 6680
   time: '2024-06-04T15:59:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28419
+- author: blueDev2
+  changes:
+  - message: Fixed microwave recipes that use stacked materials
+    type: Fix
+  id: 6681
+  time: '2024-06-04T17:12:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28225

From a4881f56b021d6512955b2add88135ef446953d6 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 4 Jun 2024 14:48:24 -0400
Subject: [PATCH 291/568] Add "fill level" sprites to mops and damp rag
 (#28590)

---
 .../Objects/Specific/Janitorial/janitor.yml   |  34 ++++++++-
 .../Specific/Janitorial/advmop.rsi/fill-1.png | Bin 0 -> 200 bytes
 .../Specific/Janitorial/advmop.rsi/fill-2.png | Bin 0 -> 216 bytes
 .../advmop.rsi/inhand-left-fill-1.png         | Bin 0 -> 155 bytes
 .../advmop.rsi/inhand-left-fill-2.png         | Bin 0 -> 187 bytes
 .../advmop.rsi/inhand-right-fill-1.png        | Bin 0 -> 157 bytes
 .../advmop.rsi/inhand-right-fill-2.png        | Bin 0 -> 195 bytes
 .../Specific/Janitorial/advmop.rsi/meta.json  |  62 +++++++++++++----
 .../advmop.rsi/wielded-inhand-left-fill-1.png | Bin 0 -> 252 bytes
 .../advmop.rsi/wielded-inhand-left-fill-2.png | Bin 0 -> 282 bytes
 .../wielded-inhand-right-fill-1.png           | Bin 0 -> 254 bytes
 .../wielded-inhand-right-fill-2.png           | Bin 0 -> 279 bytes
 .../Specific/Janitorial/mop.rsi/fill-1.png    | Bin 0 -> 179 bytes
 .../Specific/Janitorial/mop.rsi/fill-2.png    | Bin 0 -> 191 bytes
 .../Specific/Janitorial/mop.rsi/fill-3.png    | Bin 0 -> 197 bytes
 .../Janitorial/mop.rsi/inhand-left-fill-1.png | Bin 0 -> 145 bytes
 .../Janitorial/mop.rsi/inhand-left-fill-2.png | Bin 0 -> 156 bytes
 .../mop.rsi/inhand-right-fill-1.png           | Bin 0 -> 147 bytes
 .../mop.rsi/inhand-right-fill-2.png           | Bin 0 -> 160 bytes
 .../Specific/Janitorial/mop.rsi/meta.json     |  65 ++++++++++++++----
 .../mop.rsi/wielded-inhand-left-fill-1.png    | Bin 0 -> 153 bytes
 .../mop.rsi/wielded-inhand-left-fill-2.png    | Bin 0 -> 186 bytes
 .../mop.rsi/wielded-inhand-right-fill-1.png   | Bin 0 -> 151 bytes
 .../mop.rsi/wielded-inhand-right-fill-2.png   | Bin 0 -> 189 bytes
 .../Specific/Janitorial/rag.rsi/fill-1.png    | Bin 0 -> 133 bytes
 .../Specific/Janitorial/rag.rsi/fill-2.png    | Bin 0 -> 163 bytes
 .../Specific/Janitorial/rag.rsi/fill-3.png    | Bin 0 -> 173 bytes
 .../Specific/Janitorial/rag.rsi/meta.json     |  35 ++++++----
 28 files changed, 156 insertions(+), 40 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 868d012a87b9..cb5f875204bd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -6,7 +6,17 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Janitorial/mop.rsi
-    state: mop
+    layers:
+      - state: mop
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: fill-3
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: fill-
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 2
   - type: MeleeWeapon
     damage:
       types:
@@ -49,7 +59,17 @@
   components:
     - type: Sprite
       sprite: Objects/Specific/Janitorial/advmop.rsi
-      state: advmop
+      layers:
+      - state: advmop
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: fill-2
+        visible: false
+    - type: Appearance
+    - type: SolutionContainerVisuals
+      maxFillLevels: 2
+      fillBaseName: fill-
+      inHandsFillBaseName: -fill-
+      inHandsMaxFillLevels: 2
     - type: MeleeWeapon
       damage:
         types:
@@ -244,7 +264,15 @@
   components:
     - type: Sprite
       sprite: Objects/Specific/Janitorial/rag.rsi
-      state: rag
+      layers:
+      - state: rag
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: fill-3
+        visible: false
+    - type: Appearance
+    - type: SolutionContainerVisuals
+      maxFillLevels: 3
+      fillBaseName: fill-
     - type: Spillable
       solution: absorbed
     - type: MeleeWeapon
diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7e1ad3ef2f064a8d1ea982f935565ac368e0949
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(Tn`*L
zkgGGtOR=cm>{y-Q#x~>KW%|qK#p*D)<uE9^9X)z<V}{|1Wc^*cc4aXzY}l}2*|KH-
z!N9H~c@EGJ;gTS~U<QZ~f;`snfzj3qC@tsd;uvDlo17rQx;R0DN%0UDhlb*c1df@G
dE)^448UFb&Dt4!LO953fc)I$ztaD0e0syw<OrQV&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b244e229a6abfec89cfc0a3c1bc80878d9c4c012
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(Tn`*L
zkgGGtOR=cm>{y-Q#x~>KW%|qK#p*D)<uE9^9X)z<V}{|1Wc^*cc4aXzY}l}2*|KH-
z!N9H~c@EGJ;gTS~U<QZ~f;`snfzj3qD6Qw|;uvDlo17rQx;R0hK|rxm@sAcuquPT|
t#S;o0_jwLFrn1E`1UWGXggA&XFto@pRW7^8HUp@W!PC{xWt~$(69DA}Qa}Iz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab85649044f12318e0a67f27f50ee3aa42e0b29
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|LOop^Ln`LH
zy=BeipvdFuxVgBzZf%^VSlxqzJ~JC8{o4Z42m;4dUwZz^`sTIwM@m^t=+~S7ZZkq8
s4)nh<W7z(yadqv1RopjfU%NOPFl-ml$dh;c{~M&j)78&qol`;+0QFZi<p2Nx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..649c07125470be9a0b5e7591b8817a29f9bdb81a
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N<Cd1Ln`LH
zy|tUS!GMR=;Y<Y2ftZ=yj1i|zrg$`TI2VVj1^!ui--HpU76>lHr)@ivQ=Y!~jB@u~
z-k-;X7VSD<d8I1SCdu;t8}aMWE?ah;gQ#S9@jjbvftIs@iu{GmAMbf<oMyK<$-3vy
cdKKpahVFybj|;6P&IKv;boFyt=akR{0GIbdKL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8436423da2c5906f54fadfe3f279c3892a0f3d3b
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|!aZFaLn`LH
zy=BP7pvc4G@VU5tU$|^c;&P34<5Uhs#kbo)I)UJT>!dF#f4|6C*W|C=ZjiNRRpQ_N
uyh=TYBt!I>XFO%kMY4`g2>sb4Y}v}bd!}~A6ie52AbC$$KbLh*2~7Y_j4>Ag

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5136f499b53fabcea456e3dd7281420130e70b1
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|YCT;XLn`LH
zy>*bc*?@;N;7kP1g`Gy?%q6<T4+9)mwlwwJ+E?DAeEOVey#!D>2>kO*+jb_W{CwcU
z((4~%H&!k1y8SoFwnpyGeC0*5SN0v-_2uz9ONdg2I`{l@3#^uJIL-cLN708>?j85o
k=Ks5=oMd%#waxMk3^&cKm%V8e@&l>%boFyt=akR{0QfdalmGw#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
index 31192c23bf2e..b176776adbef 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
@@ -1,30 +1,68 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a, wielded versions by Psychpsyo. Fill levels by Tayrtahn on GitHub.",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "advmop"
+        "name": "advmop"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "fill-1"
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "fill-2"
     },
-  	{
-      "name": "wielded-inhand-left",
-      "directions": 4
+    {
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-2",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-2",
+        "directions": 4
     },
-	  {
-      "name": "wielded-inhand-right",
-      "directions": 4
+    {
+        "name": "wielded-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left-fill-2",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right-fill-2",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..57c1acc26e0a8cf5bc31f91b52fbbbb1cc5793a8
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxOyoT
z)fsL~Gd`2XaHglHCs$|AyjUHEgvktUIkmO5D_5?}0;*(S_zwoN*T_5sa`;Pv{DL7O
z5R&0oLubXJYe1<aPZ!6Kh}O5)9Jv?-1X>f>XFU6Ne5;~}vGU17|GjkP>6cA@V!#Ph
z_(0s@bQNm`qt79>W3|E;_zXC>XUsqBU;vZ?g8K~T5(2rk4@hc9J>*(&@9RE;ddCm{
dvlEmVlq7$J9&mMWvd{vl^K|udS?83{1OR07UM&Cs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f0245bb850ed5f5adabb9c7ab427bd9771da2c6
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxOyoT
z)fsL~Gd`2XaHglHCs$|AyjUHEgvktUIkmO5D_5?}0;*(S_zwoN*T_5sa`;Pv{DL7O
z5R&0oLubXJYe1<6PZ!6Kh}O5)E^-}E;9$LAr||dx`PkxSnH#!N&79lWId{nkRBgC2
zeYt>wLxTgKL+o9~kfou48Z{hq-m)byF<gu5y}@*Z(a6V9VV^#8cRK?k6AOoc2h)SS
zOW55GY>ip)&su=_tthjt0Mn`p^$(346Fh$_3-lYzyw6_uhyN1;`=x~klC`w7+d+=@
MboFyt=akR{0L9{JbpQYW

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..07d042cc75b5da0ffa1eeecddfeeab4db9ab278b
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxYikN
z^inM9>FG&hIFn|4X64G2wY9bLVs#i2CNsF@<m$}H0;*(S_zwn~19|rVIs7F-e!&nC
z2+44)p|fJqHK0_Ar;B4qMC;qDhFk{>I2;1`74H4tA$#cp&(@~24G*pB<r`U)qGT9>
zDlIrS9NL!4w5f&HfxE#^!TARBlXC^{ODfobazOC6;Y0D)W=@tC`5Y#<kDV2bI<5xq
e9j9miF)d*H(|W-5*}l7cAa$OuelF{r5}E))v0+~T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/wielded-inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b165da985c704ba7b05d161d184543c3abc9eca0
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`=mz+NxYikN
z^inM9>FG&hIFn|4X64G2wY9bLVs#i2CNsF@<m$}H0;*(S_zwn~19|rVIs7F-e!&nC
z2+44)p|fJqHK0_jr;B4qMC;pYj$8)}I9MFy1^)gozP)AYlK|zMstp_FUAOF5aLLS@
zLqNe{flxxh=GX=)tr;)P89cs}?QLIiL1N8z>jex8m@^bEux$ur0V!*6@KmrppZLIX
z-OY9Zb{UTjiwDpD))<Ak$V|}O_(y0_gHPv@d(5fd9-KeGc-Q_wy6tZT6OfBNUHx3v
IIVCg!01dWqR{#J2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..71169a1df26468eab3c0bde0e7d99625eaf8df1e
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HTn`*L
z5Fa0Z<L2$w_HNVoW1%&-N~XX54+hcv2TXy=I7@>3f*Bw}#~OaxR2>Ei8hW}ohFJ6_
zCrGd^PDo+m<J)uT%^Qcx8ZQfp8wWpCTwyqya6Frh^V$RR<_4}mVGr0CrkrIsckjza
QKcHp?Pgg&ebxsLQ03NVLk^lez

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8b37b577c5e982fed2c78bc103a708f865b63a0
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HTn`*L
z5Fa0Z<L2$w_HNVoW1%&-N~XX54+hcv2TXy=I7@>3f*Bw}#~OaxR2>Ei+IqS;hFJ8z
z?K9*9+HmAX)&Kg9O>6Ev$jCY565R2lCeFoHc)^|XT(>893v_t(2zB<(F%Em-U&E{&
b@~n-OS(Y&%euoAl&>#j+S3j3^P6<r_(XdI@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e367772c5c78436cbbac8f2d911f32e40907fbcb
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|qyv0HTn`*L
z5Fa0Z<L2$w_HNVoW1%&-N~XX54+hcv2TXy=I7@>3f*Bw}#~OaxR2>EiI(xb}hFJ8z
z?NbzDP~bWI>em1LGm@<f);cJL&5kikF#BEHHD!{5ej)e7%_7yyE8Kf7^sX>jE?OWR
j_rhPtzE>sWSt|EC4kopd?F)K=#xZ!h`njxgN@xNAXQfPj

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3007efa01e25ef63550f83ec0f74af6f5ccbc648
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|yggkULn`LH
zy|t0|fB_G)!Oyk-`u9D3^EODqx2++DHG=&FCr}j#$gD4$Qu6(;*1BE$o<T$y4oq44
jpYi<N`m)def5%PY={P9BeC2#qD@fMU)z4*}Q$iB}GUYM8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8ee5a3f589a4160b74e4fec1e5c5f4cb7dbdac7
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|!aQ9ZLn`LH
zy=BeU;K0Fp;Azx7`)b`aI#*rf@A_~*3_ctMR0IM7m+$W0{r&!&Ewl1IYzYXJ&Hp%a
vB}9fnL96z&|8?o#{5zySy*_In`@V?j-%CB|u>9TAK`K05{an^LB{Ts5HPkhR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..17495e71826c0b9ad172f6879e8026e96b408c66
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|d_7$pLn`LH
zy=lnTV8Fxd@I3nO{vTmCx>=Z87w(Eyjy(5<1*i%HwuO6Mx_kU-fa$;WpL_5AXNHJ2
luy0jLxp)75-uu;`-_7y3Ai%uoLy#ay&ePS;Wt~$(699$tGM4}V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c3bd2c42ff3e804745f8b893da469f69a79668
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|qC8z3Ln`LH
zy>*bc!GMSPK$`Bi@atT{TRbj^aK2;P@TUBd6i^ii*iW8mYyA7Rtya&rqd5gGGF!L4
ys;!lW$T38({il25>uLdiW;fOM_wI#1kF{jfFw>KEc$QWNQsU|A=d#Wzp$PzY&ofm3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json
index 5ef52189cab3..34768c16f71f 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json
@@ -1,30 +1,71 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll", 
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, wielded versions from Easypoll, fill levels by Tayrtahn on GitHub.",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "mop"
+        "name": "mop"
     },
     {
-      "name": "inhand-left",
-      "directions": 4
+        "name": "fill-1"
     },
     {
-      "name": "inhand-right",
-      "directions": 4
+        "name": "fill-2"
     },
-  	{
-      "name": "wielded-inhand-left",
-      "directions": 4
+    {
+        "name": "fill-3"
+    },
+    {
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left-fill-2",
+        "directions": 4
     },
-	  {
-      "name": "wielded-inhand-right",
-      "directions": 4
+    {
+        "name": "inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right-fill-2",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left",
+        "directions": 4
+    },
+	{
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left-fill-2",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right-fill-1",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right-fill-2",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..997f3ae0398d3aab2bf9de11d8ba7e1ad495a62e
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|f<0XvLn`LH
zy}6P1fPw&v<C9Y_|HL%;GU$IaeyIM!ER_eShJoRmr&0L3-L~rTzojBYA9kpG_HS6N
u43=SFh*|m7KmX~EPaoDE56`ldW4N|gWVXRgo<zO5AO)VTelF{r5}E*U7BZLs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-left-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..288492b96a7822b67d8c0992a7f5869d74cc1994
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N<3X0Ln`LH
zy|t0I)qsc9;Y)k6-m>Ji?#|6e*n=7ZcW4WH_dPB-X8=^nz;H+7<dseLrm6%_`g#6d
zOd;p~<w9$Z_Npf)Z`V(J`yuapbP`w@14G>M+n(=5-Rl|Wors-SUfgi%(P{TL^Y!*!
dTHejxP{tklFT8&(L;4nwYEM@`mvv4FO#u8pM2!Fd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..956f9bbbd19035e10cfb628e544b645c0be7dabc
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0zF+ELn`LH
zy=lnT;K0G+@aXjW=h^uSTLXE{Z83Qh6vPTt!|=h~GweHGzQwaU=h`mEJoDbPY?^_k
tG)RVl;ehSFl~<z=rSmOlN%LZ8aDNl3Z*VigZniu~($m$?Wt~$(6979yG4ucc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/wielded-inhand-right-fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f8cd98644b780c88c20717247edf20e1c03d598
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|$~|2iLn`LH
zz2(T&?7+hs@UdXt>C0!g?voY|n;^ENcgcI*_D0XTX_GUVfQlLZ1x?zzt1W)V8{?BN
z<eVm%p0t>EcDc3pb%AgDrj<`WX1P$$>O06LAh>ho>+&DTSFM@*B^**Yt}<6>F8TD<
hy(Qpe5;H^1Q8t~{@P5-ruOEPvdb;|#taD0e0swh>MyCJ(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fb322fbdf212a7f567ac6f49be5a319b6679acb
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}_MR?|ArY-_
zFKiTKP~dU8xM3M{+S!PkH!8Zq{#`FFZ~-b|Shgz5FK+uO)u)#k7yAUAJ9=)yTK2H=
d`TH0i<jd|mC?4(As-F!~=jrO_vd$@?2>|y~EXe=>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7114d9a2e74ef60e00ed2786870d451fa2eea9b4
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY-_
z&j)ffC<wG9s#`5(|6+1Cvub68R!3NT%YWuV!IEPja}2C+Z+-sHXqCsbD!t?Py|ZST
zU)!HJ>6Yz{Z)v-aZ1$OXp2_{f&a4~jD=R)kPYifr$UNg5--lb?iV_n)iUPGWc)I$z
JtaD0e0sv&AJiPz_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0705b79b5086902440124793aea3a85690e2f1d2
GIT binary patch
literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>7Fi*ArY-_
zFCOGPpup4m@P?u6VMm$8mv>x#ebhNB!?Rh0>wkIoq3+H!pyD6Ko}rf}glv|)y=eQE
zH_Bey9_QRhyXn7h>6@E(Zl~2<T_^YN+<e!~&eA)4elMB5_qM|iZlz$|c-sbj8Jl8v
Vw)Uq^7C=)NJYD@<);T3K0RTU!L$3e;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
index b750bcc3d1af..7051793e030f 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
@@ -1,14 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "rag"
-    }
-  ]
-}
\ No newline at end of file
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9. Fill levels by Tayrtahn on GitHub",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "rag"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}

From 3a0880fb832bc7b7f004012ab5ebeb9f4de4981e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 4 Jun 2024 18:49:31 +0000
Subject: [PATCH 292/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b14fae9c41ad..574ea1adb35b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: DoutorWhite
-  changes:
-  - message: Introduce new health status icons.
-    type: Add
-  - message: Enhance the Medical HUD to display the health status of players and mobs
-      using the newly added icons.
-    type: Tweak
-  id: 6182
-  time: '2024-03-18T13:56:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26027
 - author: Plykiya
   changes:
   - message: Lone operatives now start with 60TC instead of 40TC.
@@ -3852,3 +3842,10 @@
   id: 6681
   time: '2024-06-04T17:12:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28225
+- author: Tayrtahn
+  changes:
+  - message: Mops and rags now show the liquids they soak up.
+    type: Add
+  id: 6682
+  time: '2024-06-04T18:48:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28590

From ec5a3b0fd2c56749e0addddacc90caf6ff002078 Mon Sep 17 00:00:00 2001
From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:47:52 +0200
Subject: [PATCH 293/568] Reword some criminal records text (#28597)

* Update criminal-records.ftl

* Update criminal-records.ftl

* Update criminal-records.ftl
---
 .../Locale/en-US/criminal-records/criminal-records.ftl    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index f603b446666c..6d6a97300c23 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -31,14 +31,14 @@ criminal-records-permission-denied = Permission denied
 
 ## Security channel notifications
 
-criminal-records-console-wanted = {$name} is wanted by {$officer} for: {$reason}.
+criminal-records-console-wanted = {$name} was made wanted by {$officer} for: {$reason}.
 criminal-records-console-suspected = {$officer} marked {$name} as suspicious because of: {$reason}
-criminal-records-console-not-suspected = {$name} has been cleared as a suspect by {$officer}.
+criminal-records-console-not-suspected = {$name} has been cleared of suspicion by {$officer}.
 criminal-records-console-detained = {$name} has been detained by {$officer}.
 criminal-records-console-released = {$name} has been released by {$officer}.
-criminal-records-console-not-wanted = {$name} is no longer wanted, according to {$officer}.
+criminal-records-console-not-wanted = {$officer} cleared the wanted status of {$name}.
 criminal-records-console-paroled = {$name} has been released on parole by {$officer}.
-criminal-records-console-not-parole = {$name}'s parole status has been lifted by {$officer}.
+criminal-records-console-not-parole = {$officer} cleared the parole status of {$name}.
 criminal-records-console-unknown-officer = <unknown officer>
 
 ## Filters

From 41549db28284d75fbf5c376030af7171aeb6278a Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:04:31 -0700
Subject: [PATCH 294/568] Remove obsolete VisibilitySystem functions (#28610)

Remove obsolete visibility functions

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Server/Ghost/GhostSystem.cs              | 16 ++++++++--------
 .../Pointing/EntitySystems/PointingSystem.cs     |  2 +-
 .../Revenant/EntitySystems/CorporealSystem.cs    | 10 +++++-----
 .../Revenant/EntitySystems/RevenantSystem.cs     | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 1a411f13a05f..dce80a450fd5 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -154,8 +154,8 @@ private void OnGhostStartup(EntityUid uid, GhostComponent component, ComponentSt
 
             if (_ticker.RunLevel != GameRunLevel.PostRound)
             {
-                _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
-                _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
+                _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
+                _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
                 _visibilitySystem.RefreshVisibility(uid, visibilityComponent: visibility);
             }
 
@@ -174,8 +174,8 @@ private void OnGhostShutdown(EntityUid uid, GhostComponent component, ComponentS
             // Entity can't be seen by ghosts anymore.
             if (TryComp(uid, out VisibilityComponent? visibility))
             {
-                _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
-                _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
+                _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
+                _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
                 _visibilitySystem.RefreshVisibility(uid, visibilityComponent: visibility);
             }
 
@@ -382,13 +382,13 @@ public void MakeVisible(bool visible)
             {
                 if (visible)
                 {
-                    _visibilitySystem.AddLayer(uid, vis, (int) VisibilityFlags.Normal, false);
-                    _visibilitySystem.RemoveLayer(uid, vis, (int) VisibilityFlags.Ghost, false);
+                    _visibilitySystem.AddLayer((uid, vis), (int) VisibilityFlags.Normal, false);
+                    _visibilitySystem.RemoveLayer((uid, vis), (int) VisibilityFlags.Ghost, false);
                 }
                 else
                 {
-                    _visibilitySystem.AddLayer(uid, vis, (int) VisibilityFlags.Ghost, false);
-                    _visibilitySystem.RemoveLayer(uid, vis, (int) VisibilityFlags.Normal, false);
+                    _visibilitySystem.AddLayer((uid, vis), (int) VisibilityFlags.Ghost, false);
+                    _visibilitySystem.RemoveLayer((uid, vis), (int) VisibilityFlags.Normal, false);
                 }
                 _visibilitySystem.RefreshVisibility(uid, visibilityComponent: vis);
             }
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index 960c8dc28aa5..9dc3b5e1e67e 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -174,7 +174,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
             {
                 var arrowVisibility = EntityManager.EnsureComponent<VisibilityComponent>(arrow);
                 layer = playerVisibility.Layer;
-                _visibilitySystem.SetLayer(arrow, arrowVisibility, layer);
+                _visibilitySystem.SetLayer((arrow, arrowVisibility), (ushort) layer);
             }
 
             // Get players that are in range and whose visibility layer matches the arrow's.
diff --git a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
index 1d43cb3ac851..5f31a2f280a5 100644
--- a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.Eye;
 using Content.Shared.Revenant.Components;
 using Content.Shared.Revenant.EntitySystems;
@@ -17,8 +17,8 @@ public override void OnStartup(EntityUid uid, CorporealComponent component, Comp
 
         if (TryComp<VisibilityComponent>(uid, out var visibility))
         {
-            _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
-            _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
+            _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
+            _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
             _visibilitySystem.RefreshVisibility(uid, visibility);
         }
     }
@@ -29,8 +29,8 @@ public override void OnShutdown(EntityUid uid, CorporealComponent component, Com
 
         if (TryComp<VisibilityComponent>(uid, out var visibility) && _ticker.RunLevel != GameRunLevel.PostRound)
         {
-            _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
-            _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
+            _visibilitySystem.AddLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
+            _visibilitySystem.RemoveLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
             _visibilitySystem.RefreshVisibility(uid, visibility);
         }
     }
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index a05105662d4d..fa4f6db240c2 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -78,8 +78,8 @@ private void OnStartup(EntityUid uid, RevenantComponent component, ComponentStar
 
         if (_ticker.RunLevel == GameRunLevel.PostRound && TryComp<VisibilityComponent>(uid, out var visibility))
         {
-            _visibility.AddLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
-            _visibility.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
+            _visibility.AddLayer((uid, visibility), (int) VisibilityFlags.Ghost, false);
+            _visibility.RemoveLayer((uid, visibility), (int) VisibilityFlags.Normal, false);
             _visibility.RefreshVisibility(uid, visibility);
         }
 
@@ -192,13 +192,13 @@ public void MakeVisible(bool visible)
         {
             if (visible)
             {
-                _visibility.AddLayer(uid, vis, (int) VisibilityFlags.Normal, false);
-                _visibility.RemoveLayer(uid, vis, (int) VisibilityFlags.Ghost, false);
+                _visibility.AddLayer((uid, vis), (int) VisibilityFlags.Normal, false);
+                _visibility.RemoveLayer((uid, vis), (int) VisibilityFlags.Ghost, false);
             }
             else
             {
-                _visibility.AddLayer(uid, vis, (int) VisibilityFlags.Ghost, false);
-                _visibility.RemoveLayer(uid, vis, (int) VisibilityFlags.Normal, false);
+                _visibility.AddLayer((uid, vis), (int) VisibilityFlags.Ghost, false);
+                _visibility.RemoveLayer((uid, vis), (int) VisibilityFlags.Normal, false);
             }
             _visibility.RefreshVisibility(uid, vis);
         }

From 86cf5cc7d1f5886be4fb41ca224b8cf13cb45606 Mon Sep 17 00:00:00 2001
From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:32:58 +0200
Subject: [PATCH 295/568] Prayable datafield typo (#28622)

* notifiactionPrefix -> notificationPrefix

* notifiactionPrefix -> notificationPrefix
---
 Content.Shared/Prayer/PrayableComponent.cs                  | 2 +-
 .../Entities/Objects/Fun/Instruments/instruments_misc.yml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Prayer/PrayableComponent.cs b/Content.Shared/Prayer/PrayableComponent.cs
index 71251af81008..b6dcc1c21087 100644
--- a/Content.Shared/Prayer/PrayableComponent.cs
+++ b/Content.Shared/Prayer/PrayableComponent.cs
@@ -26,7 +26,7 @@ public sealed partial class PrayableComponent : Component
     /// <summary>
     /// Prefix used in the notification to admins
     /// </summary>
-    [DataField("notifiactionPrefix")]
+    [DataField("notificationPrefix")]
     [ViewVariables(VVAccess.ReadWrite)]
     public string NotificationPrefix = "prayer-chat-notify-pray";
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index edad2b406312..8cb3d88ede27 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -59,7 +59,7 @@
     size: Small
   - type: Prayable
     sentMessage: prayer-popup-notify-centcom-sent
-    notifiactionPrefix: prayer-chat-notify-centcom
+    notificationPrefix: prayer-chat-notify-centcom
     verb: prayer-verbs-call
     verbImage: null
 
@@ -74,7 +74,7 @@
     state: icon
   - type: Prayable
     sentMessage: prayer-popup-notify-syndicate-sent
-    notifiactionPrefix: prayer-chat-notify-syndicate
+    notificationPrefix: prayer-chat-notify-syndicate
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -185,6 +185,6 @@
         - ItemMask
   - type: Prayable
     sentMessage: prayer-popup-notify-honkmother-sent
-    notifiactionPrefix: prayer-chat-notify-honkmother
+    notificationPrefix: prayer-chat-notify-honkmother
     verb: prayer-verbs-call
     verbImage: null

From 0f3a2424e8e034bb862700c242c3541d71aaabd0 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:21:47 +1200
Subject: [PATCH 296/568] Update engine to v224.1.0 (#28624)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index f64821875655..a628d31c4b82 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit f64821875655dfec4e2c951d5c22c0db873fe86e
+Subproject commit a628d31c4b82612eec2c42ba33024acc1c4d9d7e

From 7bd1b45f2b32ce5a99c719d2b9899df844c51dd9 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:37:22 +1200
Subject: [PATCH 297/568] Use dummy sessions in NukeOpsTest (#28549)

* Add dummy sessions

* Update NukeOpsTest

* Fix PvsBenchmark
---
 Content.Benchmarks/PvsBenchmark.cs            | 41 ++++++---------
 .../Pair/TestPair.Helpers.cs                  | 13 +++--
 .../Pair/TestPair.Recycle.cs                  |  2 +
 Content.IntegrationTests/Pair/TestPair.cs     |  5 +-
 .../Tests/GameRules/NukeOpsTest.cs            | 52 ++++++++++++++++---
 5 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/Content.Benchmarks/PvsBenchmark.cs b/Content.Benchmarks/PvsBenchmark.cs
index 0b4dd907621e..fa7f9d454226 100644
--- a/Content.Benchmarks/PvsBenchmark.cs
+++ b/Content.Benchmarks/PvsBenchmark.cs
@@ -1,19 +1,17 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
+using Content.Server.Mind;
 using Content.Server.Warps;
 using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
-using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
 using Robust.Shared.Map;
-using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 
@@ -58,15 +56,20 @@ public void Setup()
         _pair.Server.CfgMan.SetCVar(CVars.NetPvsAsync, false);
         _sys = _entMan.System<SharedTransformSystem>();
 
+        SetupAsync().Wait();
+    }
+
+    private async Task SetupAsync()
+    {
         // Spawn the map
         _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
-        _pair.Server.WaitPost(() =>
+        await _pair.Server.WaitPost(() =>
         {
             var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
             if (!success)
                 throw new Exception("Map load failed");
             _pair.Server.MapMan.DoMapInitialize(_mapId);
-        }).Wait();
+        });
 
         // Get list of ghost warp positions
         _spawns = _entMan.AllComponentsList<WarpPointComponent>()
@@ -76,17 +79,19 @@ public void Setup()
 
         Array.Resize(ref _players, PlayerCount);
 
-        // Spawn "Players".
-        _pair.Server.WaitPost(() =>
+        // Spawn "Players"
+        _players = await _pair.Server.AddDummySessions(PlayerCount);
+        await _pair.Server.WaitPost(() =>
         {
+            var mind = _pair.Server.System<MindSystem>();
             for (var i = 0; i < PlayerCount; i++)
             {
                 var pos = _spawns[i % _spawns.Length];
                 var uid =_entMan.SpawnEntity("MobHuman", pos);
                 _pair.Server.ConsoleHost.ExecuteCommand($"setoutfit {_entMan.GetNetEntity(uid)} CaptainGear");
-                _players[i] = new DummySession{AttachedEntity = uid};
+                mind.ControlMob(_players[i].UserId, uid);
             }
-        }).Wait();
+        });
 
         // Repeatedly move players around so that they "explore" the map and see lots of entities.
         // This will populate their PVS data with out-of-view entities.
@@ -168,20 +173,4 @@ public void CycleTick()
         }).Wait();
         _pair.Server.PvsTick(_players);
     }
-
-    private sealed class DummySession : ICommonSession
-    {
-        public SessionStatus Status => SessionStatus.InGame;
-        public EntityUid? AttachedEntity {get; set; }
-        public NetUserId UserId => default;
-        public string Name => string.Empty;
-        public short Ping => default;
-        public INetChannel Channel { get; set; } = default!;
-        public LoginType AuthType => default;
-        public HashSet<EntityUid> ViewSubscriptions { get; } = new();
-        public DateTime ConnectedTime { get; set; }
-        public SessionState State => default!;
-        public SessionData Data => default!;
-        public bool ClientSide { get; set; }
-    }
 }
diff --git a/Content.IntegrationTests/Pair/TestPair.Helpers.cs b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
index cc83232a0663..1e8306a02c60 100644
--- a/Content.IntegrationTests/Pair/TestPair.Helpers.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
@@ -7,6 +7,8 @@
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.UnitTesting;
 
@@ -136,10 +138,15 @@ public List<EntityPrototype> GetPrototypesWithComponent<T>(
     /// Helper method for enabling or disabling a antag role
     /// </summary>
     public async Task SetAntagPref(ProtoId<AntagPrototype> id, bool value)
+    {
+        await SetAntagPref(Client.User!.Value, id, value);
+    }
+
+    public async Task SetAntagPref(NetUserId user, ProtoId<AntagPrototype> id, bool value)
     {
         var prefMan = Server.ResolveDependency<IServerPreferencesManager>();
 
-        var prefs = prefMan.GetPreferences(Client.User!.Value);
+        var prefs = prefMan.GetPreferences(user);
         // what even is the point of ICharacterProfile if we always cast it to HumanoidCharacterProfile to make it usable?
         var profile = (HumanoidCharacterProfile) prefs.SelectedCharacter;
 
@@ -148,11 +155,11 @@ public async Task SetAntagPref(ProtoId<AntagPrototype> id, bool value)
 
         await Server.WaitPost(() =>
         {
-            prefMan.SetProfile(Client.User.Value, prefs.SelectedCharacterIndex, newProfile).Wait();
+            prefMan.SetProfile(user, prefs.SelectedCharacterIndex, newProfile).Wait();
         });
 
         // And why the fuck does it always create a new preference and profile object instead of just reusing them?
-        var newPrefs = prefMan.GetPreferences(Client.User.Value);
+        var newPrefs = prefMan.GetPreferences(user);
         var newProf = (HumanoidCharacterProfile) newPrefs.SelectedCharacter;
         Assert.That(newProf.AntagPreferences.Contains(id), Is.EqualTo(value));
     }
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 8d1e425553b3..4cae4affc4d2 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -34,6 +34,8 @@ private async Task OnDirtyDispose()
 
     private async Task OnCleanDispose()
     {
+        await Server.RemoveAllDummySessions();
+
         if (TestMap != null)
         {
             await Server.WaitPost(() => Server.EntMan.DeleteEntity(TestMap.MapUid));
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 7ee5dbd55c7a..0b18c3823903 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -37,7 +37,10 @@ public void Deconstruct(
         client = Client;
     }
 
-    public ICommonSession? Player => Server.PlayerMan.Sessions.FirstOrDefault();
+    public ICommonSession? Player => Client.User == null
+        ? null
+        : Server.PlayerMan.SessionsDict.GetValueOrDefault(Client.User.Value);
+
     public ContentPlayerData? PlayerData => Player?.Data.ContentData();
 
     public PoolTestLogHandler ServerLogHandler { get;  private set; } = default!;
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index 2360ea0bf4f2..f56baba3426d 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -57,8 +57,17 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(client.AttachedEntity, Is.Null);
         Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay));
 
+        // Add several dummy players
+        var dummies = await pair.Server.AddDummySessions(3);
+        await pair.RunTicksSync(5);
+
         // Opt into the nukies role.
         await pair.SetAntagPref("NukeopsCommander", true);
+        await pair.SetAntagPref(dummies[1].UserId, "NukeopsMedic", true);
+
+        // Initially, the players have no attached entities
+        Assert.That(pair.Player?.AttachedEntity, Is.Null);
+        Assert.That(dummies.All(x => x.AttachedEntity  == null));
 
         // There are no grids or maps
         Assert.That(entMan.Count<MapComponent>(), Is.Zero);
@@ -75,17 +84,20 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(entMan.Count<NukeOperativeSpawnerComponent>(), Is.Zero);
 
         // Ready up and start nukeops
-        await pair.WaitClientCommand("toggleready True");
-        Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.ReadyToPlay));
+        ticker.ToggleReadyAll(true);
+        Assert.That(ticker.PlayerGameStatuses.Values.All(x => x == PlayerGameStatus.ReadyToPlay));
         await pair.WaitCommand("forcepreset Nukeops");
         await pair.RunTicksSync(10);
 
         // Game should have started
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.InRound));
-        Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.JoinedGame));
+        Assert.That(ticker.PlayerGameStatuses.Values.All(x => x == PlayerGameStatus.JoinedGame));
         Assert.That(client.EntMan.EntityExists(client.AttachedEntity));
+
+        var dummyEnts = dummies.Select(x => x.AttachedEntity ?? default).ToArray();
         var player = pair.Player!.AttachedEntity!.Value;
         Assert.That(entMan.EntityExists(player));
+        Assert.That(dummyEnts.All(e => entMan.EntityExists(e)));
 
         // Maps now exist
         Assert.That(entMan.Count<MapComponent>(), Is.GreaterThan(0));
@@ -96,8 +108,8 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
 
         // And we now have nukie related components
         Assert.That(entMan.Count<NukeopsRuleComponent>(), Is.EqualTo(1));
-        Assert.That(entMan.Count<NukeopsRoleComponent>(), Is.EqualTo(1));
-        Assert.That(entMan.Count<NukeOperativeComponent>(), Is.EqualTo(1));
+        Assert.That(entMan.Count<NukeopsRoleComponent>(), Is.EqualTo(2));
+        Assert.That(entMan.Count<NukeOperativeComponent>(), Is.EqualTo(2));
         Assert.That(entMan.Count<NukeOpsShuttleComponent>(), Is.EqualTo(1));
 
         // The player entity should be the nukie commander
@@ -107,11 +119,36 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(mind));
         Assert.That(factionSys.IsMember(player, "Syndicate"), Is.True);
         Assert.That(factionSys.IsMember(player, "NanoTrasen"), Is.False);
-
         var roles = roleSys.MindGetAllRoles(mind);
         var cmdRoles = roles.Where(x => x.Prototype == "NukeopsCommander" && x.Component is NukeopsRoleComponent);
         Assert.That(cmdRoles.Count(), Is.EqualTo(1));
 
+        // The second dummy player should be a medic
+        var dummyMind = mindSys.GetMind(dummyEnts[1])!.Value;
+        Assert.That(entMan.HasComponent<NukeOperativeComponent>(dummyEnts[1]));
+        Assert.That(roleSys.MindIsAntagonist(dummyMind));
+        Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(dummyMind));
+        Assert.That(factionSys.IsMember(dummyEnts[1], "Syndicate"), Is.True);
+        Assert.That(factionSys.IsMember(dummyEnts[1], "NanoTrasen"), Is.False);
+        roles = roleSys.MindGetAllRoles(dummyMind);
+        cmdRoles = roles.Where(x => x.Prototype == "NukeopsMedic" && x.Component is NukeopsRoleComponent);
+        Assert.That(cmdRoles.Count(), Is.EqualTo(1));
+
+        // The other two players should have just spawned in as normal.
+        CheckDummy(0);
+        CheckDummy(2);
+        void CheckDummy(int i)
+        {
+            var ent = dummyEnts[i];
+            var mind = mindSys.GetMind(ent)!.Value;
+            Assert.That(entMan.HasComponent<NukeOperativeComponent>(ent), Is.False);
+            Assert.That(roleSys.MindIsAntagonist(mind), Is.False);
+            Assert.That(roleSys.MindHasRole<NukeopsRoleComponent>(mind), Is.False);
+            Assert.That(factionSys.IsMember(ent, "Syndicate"), Is.False);
+            Assert.That(factionSys.IsMember(ent, "NanoTrasen"), Is.True);
+            Assert.That(roleSys.MindGetAllRoles(mind).Any(x => x.Component is NukeopsRoleComponent), Is.False);
+        }
+
         // The game rule exists, and all the stations/shuttles/maps are properly initialized
         var rule = entMan.AllComponents<NukeopsRuleComponent>().Single().Component;
         var gridsRule = entMan.AllComponents<RuleGridsComponent>().Single().Component;
@@ -178,7 +215,7 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         // While we're at it, lets make sure they aren't naked. I don't know how many inventory slots all mobs will be
         // likely to have in the future. But nukies should probably have at least 3 slots with something in them.
         var enumerator = invSys.GetSlotEnumerator(player);
-        int total = 0;
+        var total = 0;
         while (enumerator.NextItem(out _))
         {
             total++;
@@ -200,6 +237,7 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
 
         ticker.SetGamePreset((GamePresetPrototype?)null);
         await pair.SetAntagPref("NukeopsCommander", false);
+        await pair.SetAntagPref(dummies[1].UserId, "NukeopsMedic", false);
         await pair.CleanReturnAsync();
     }
 }

From e1541351a5a26eac8fca0db8ae3e4cc827d65691 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 6 Jun 2024 01:00:33 +1200
Subject: [PATCH 298/568] Update engine to v224.1.1 (#28632)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index a628d31c4b82..fcd507d1f9e6 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit a628d31c4b82612eec2c42ba33024acc1c4d9d7e
+Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e

From adeed705e64ee03f1e7d462c486f98859d6e2dc5 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 6 Jun 2024 02:19:24 +1200
Subject: [PATCH 299/568] Add Job preference tests (#28625)

* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
---
 .../GameTicking/Managers/ClientGameTicker.cs  |  11 +-
 Content.Client/LateJoin/LateJoinGui.cs        |   8 +-
 Content.Client/Lobby/LobbyUIController.cs     |   2 +-
 .../Lobby/UI/CharacterPickerButton.xaml.cs    |   4 +-
 .../Pair/TestPair.Helpers.cs                  |  74 ++++--
 .../Pair/TestPair.Recycle.cs                  |  15 ++
 Content.IntegrationTests/Pair/TestPair.cs     |   6 +-
 Content.IntegrationTests/PoolManager.Cvars.cs |   1 +
 Content.IntegrationTests/Tests/EntityTest.cs  |   1 +
 .../Tests/GameRules/AntagPreferenceTest.cs    |   4 +-
 .../Tests/GameRules/NukeOpsTest.cs            |   6 +-
 .../Tests/PostMapInitTest.cs                  |  21 +-
 .../Tests/Round/JobTest.cs                    | 222 ++++++++++++++++++
 .../Tests/Station/StationJobsTest.cs          |  13 +-
 Content.Server/Database/ServerDbBase.cs       |   7 +-
 .../GameTicking/GameTicker.RoundFlow.cs       |   2 +-
 .../Managers/ServerPreferencesManager.cs      |   6 +-
 .../Components/SpawnPointComponent.cs         |   9 +-
 .../EntitySystems/SpawnPointSystem.cs         |   2 +-
 .../Components/StationJobsComponent.cs        |  46 ++--
 .../Systems/StationJobsSystem.Roundstart.cs   |  23 +-
 .../Station/Systems/StationJobsSystem.cs      | 138 ++++++-----
 .../GameTicking/SharedGameTicker.cs           |  15 +-
 .../Preferences/HumanoidCharacterProfile.cs   | 104 ++++++--
 Content.Shared/Roles/JobPrototype.cs          |   4 +-
 Content.Shared/Roles/Jobs/SharedJobSystem.cs  |  12 +
 Resources/Prototypes/Maps/arenas.yml          |   2 -
 Resources/Prototypes/Maps/atlas.yml           |   2 -
 Resources/Prototypes/Maps/bagel.yml           |   2 -
 Resources/Prototypes/Maps/box.yml             |   2 -
 Resources/Prototypes/Maps/cluster.yml         |   2 -
 Resources/Prototypes/Maps/core.yml            |   2 -
 Resources/Prototypes/Maps/debug.yml           |   6 -
 Resources/Prototypes/Maps/europa.yml          |   2 -
 Resources/Prototypes/Maps/fland.yml           |   2 -
 Resources/Prototypes/Maps/marathon.yml        |   2 -
 Resources/Prototypes/Maps/meta.yml            |   2 -
 Resources/Prototypes/Maps/oasis.yml           |   4 +-
 Resources/Prototypes/Maps/omega.yml           |   2 -
 Resources/Prototypes/Maps/origin.yml          |   2 -
 Resources/Prototypes/Maps/packed.yml          |   2 -
 Resources/Prototypes/Maps/reach.yml           |   2 -
 Resources/Prototypes/Maps/saltern.yml         |   2 -
 Resources/Prototypes/Maps/train.yml           |   2 -
 44 files changed, 537 insertions(+), 261 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Round/JobTest.cs

diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 309db2eb4e6a..fcf5ae91a497 100644
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -4,10 +4,12 @@
 using Content.Client.RoundEnd;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
+using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Client.UserInterface;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.GameTicking.Managers
 {
@@ -17,10 +19,9 @@ public sealed class ClientGameTicker : SharedGameTicker
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IClientAdminManager _admin = default!;
         [Dependency] private readonly IClyde _clyde = default!;
-        [Dependency] private readonly SharedMapSystem _map = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
 
-        private Dictionary<NetEntity, Dictionary<string, uint?>>  _jobsAvailable = new();
+        private Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>  _jobsAvailable = new();
         private Dictionary<NetEntity, string> _stationNames = new();
 
         [ViewVariables] public bool AreWeReady { get; private set; }
@@ -32,13 +33,13 @@ public sealed class ClientGameTicker : SharedGameTicker
         [ViewVariables] public TimeSpan StartTime { get; private set; }
         [ViewVariables] public new bool Paused { get; private set; }
 
-        [ViewVariables] public IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> JobsAvailable => _jobsAvailable;
+        [ViewVariables] public IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> JobsAvailable => _jobsAvailable;
         [ViewVariables] public IReadOnlyDictionary<NetEntity, string> StationNames => _stationNames;
 
         public event Action? InfoBlobUpdated;
         public event Action? LobbyStatusUpdated;
         public event Action? LobbyLateJoinStatusUpdated;
-        public event Action<IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>>>? LobbyJobsAvailableUpdated;
+        public event Action<IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>>? LobbyJobsAvailableUpdated;
 
         public override void Initialize()
         {
@@ -69,7 +70,7 @@ private void OnAdminUpdated()
             // reading the console. E.g., logs like this one could leak the nuke station/grid:
             // > Grid NT-Arrivals 1101 (122/n25896) changed parent. Old parent: map 10 (121/n25895). New parent: FTL (123/n26470)
 #if !DEBUG
-            _map.Log.Level = _admin.IsAdmin() ? LogLevel.Info : LogLevel.Warning;
+            EntityManager.System<SharedMapSystem>().Log.Level = _admin.IsAdmin() ? LogLevel.Info : LogLevel.Warning;
 #endif
         }
 
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 252aa9aafad4..62a06629f294 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -290,7 +290,7 @@ private void RebuildUI()
             }
         }
 
-        private void JobsAvailableUpdated(IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> updatedJobs)
+        private void JobsAvailableUpdated(IReadOnlyDictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> updatedJobs)
         {
             foreach (var stationEntries in updatedJobs)
             {
@@ -337,10 +337,10 @@ sealed class JobButton : ContainerButton
         public Label JobLabel { get; }
         public string JobId { get; }
         public string JobLocalisedName { get; }
-        public uint? Amount { get; private set; }
+        public int? Amount { get; private set; }
         private bool _initialised = false;
 
-        public JobButton(Label jobLabel, string jobId, string jobLocalisedName, uint? amount)
+        public JobButton(Label jobLabel, ProtoId<JobPrototype> jobId, string jobLocalisedName, int? amount)
         {
             JobLabel = jobLabel;
             JobId = jobId;
@@ -350,7 +350,7 @@ public JobButton(Label jobLabel, string jobId, string jobLocalisedName, uint? am
             _initialised = true;
         }
 
-        public void RefreshLabel(uint? amount)
+        public void RefreshLabel(int? amount)
         {
             if (Amount == amount && _initialised)
             {
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index f6a3eed962c1..05b98606ab99 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -302,7 +302,7 @@ public JobPrototype GetPreferredJob(HumanoidCharacterProfile profile)
     {
         var highPriorityJob = profile.JobPriorities.FirstOrDefault(p => p.Value == JobPriority.High).Key;
         // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract (what is resharper smoking?)
-        return _prototypeManager.Index<JobPrototype>(highPriorityJob ?? SharedGameTicker.FallbackOverflowJob);
+        return _prototypeManager.Index<JobPrototype>(highPriorityJob.Id ?? SharedGameTicker.FallbackOverflowJob);
     }
 
     public void GiveDummyLoadout(EntityUid uid, RoleLoadout? roleLoadout)
diff --git a/Content.Client/Lobby/UI/CharacterPickerButton.xaml.cs b/Content.Client/Lobby/UI/CharacterPickerButton.xaml.cs
index 2ad8de7445f4..7efd1c594fb5 100644
--- a/Content.Client/Lobby/UI/CharacterPickerButton.xaml.cs
+++ b/Content.Client/Lobby/UI/CharacterPickerButton.xaml.cs
@@ -53,9 +53,9 @@ public CharacterPickerButton(
                 .LoadProfileEntity(humanoid, null, true);
 
             var highPriorityJob = humanoid.JobPriorities.SingleOrDefault(p => p.Value == JobPriority.High).Key;
-            if (highPriorityJob != null)
+            if (highPriorityJob != default)
             {
-                var jobName = prototypeManager.Index<JobPrototype>(highPriorityJob).LocalizedName;
+                var jobName = prototypeManager.Index(highPriorityJob).LocalizedName;
                 description = $"{description}\n{jobName}";
             }
         }
diff --git a/Content.IntegrationTests/Pair/TestPair.Helpers.cs b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
index 1e8306a02c60..588cf0d80e04 100644
--- a/Content.IntegrationTests/Pair/TestPair.Helpers.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Helpers.cs
@@ -8,7 +8,6 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.UnitTesting;
 
@@ -135,32 +134,73 @@ public List<EntityPrototype> GetPrototypesWithComponent<T>(
     }
 
     /// <summary>
-    /// Helper method for enabling or disabling a antag role
+    /// Set a user's antag preferences. Modified preferences are automatically reset at the end of the test.
     /// </summary>
-    public async Task SetAntagPref(ProtoId<AntagPrototype> id, bool value)
+    public async Task SetAntagPreference(ProtoId<AntagPrototype> id, bool value, NetUserId? user = null)
     {
-        await SetAntagPref(Client.User!.Value, id, value);
+        user ??= Client.User!.Value;
+        if (user is not {} userId)
+            return;
+
+        var prefMan = Server.ResolveDependency<IServerPreferencesManager>();
+        var prefs = prefMan.GetPreferences(userId);
+
+        // Automatic preference resetting only resets slot 0.
+        Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(0));
+
+        var profile = (HumanoidCharacterProfile) prefs.Characters[0];
+        var newProfile = profile.WithAntagPreference(id, value);
+        _modifiedProfiles.Add(userId);
+        await Server.WaitPost(() => prefMan.SetProfile(userId, 0, newProfile).Wait());
     }
 
-    public async Task SetAntagPref(NetUserId user, ProtoId<AntagPrototype> id, bool value)
+    /// <summary>
+    /// Set a user's job preferences.  Modified preferences are automatically reset at the end of the test.
+    /// </summary>
+    public async Task SetJobPriority(ProtoId<JobPrototype> id, JobPriority value, NetUserId? user = null)
     {
-        var prefMan = Server.ResolveDependency<IServerPreferencesManager>();
+        user ??= Client.User!.Value;
+        if (user is { } userId)
+            await SetJobPriorities(userId, (id, value));
+    }
+
+    /// <inheritdoc cref="SetJobPriority"/>
+    public async Task SetJobPriorities(params (ProtoId<JobPrototype>, JobPriority)[] priorities)
+        => await SetJobPriorities(Client.User!.Value, priorities);
 
+    /// <inheritdoc cref="SetJobPriority"/>
+    public async Task SetJobPriorities(NetUserId user, params (ProtoId<JobPrototype>, JobPriority)[] priorities)
+    {
+        var highCount = priorities.Count(x => x.Item2 == JobPriority.High);
+        Assert.That(highCount, Is.LessThanOrEqualTo(1), "Cannot have more than one high priority job");
+
+        var prefMan = Server.ResolveDependency<IServerPreferencesManager>();
         var prefs = prefMan.GetPreferences(user);
-        // what even is the point of ICharacterProfile if we always cast it to HumanoidCharacterProfile to make it usable?
-        var profile = (HumanoidCharacterProfile) prefs.SelectedCharacter;
+        var profile = (HumanoidCharacterProfile) prefs.Characters[0];
+        var dictionary = new Dictionary<ProtoId<JobPrototype>, JobPriority>(profile.JobPriorities);
 
-        Assert.That(profile.AntagPreferences.Contains(id), Is.EqualTo(!value));
-        var newProfile = profile.WithAntagPreference(id, value);
+        // Automatic preference resetting only resets slot 0.
+        Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(0));
 
-        await Server.WaitPost(() =>
+        if (highCount != 0)
         {
-            prefMan.SetProfile(user, prefs.SelectedCharacterIndex, newProfile).Wait();
-        });
+            foreach (var (key, priority) in dictionary)
+            {
+                if (priority == JobPriority.High)
+                    dictionary[key] = JobPriority.Medium;
+            }
+        }
+
+        foreach (var (job, priority) in priorities)
+        {
+            if (priority == JobPriority.Never)
+                dictionary.Remove(job);
+            else
+                dictionary[job] = priority;
+        }
 
-        // And why the fuck does it always create a new preference and profile object instead of just reusing them?
-        var newPrefs = prefMan.GetPreferences(user);
-        var newProf = (HumanoidCharacterProfile) newPrefs.SelectedCharacter;
-        Assert.That(newProf.AntagPreferences.Contains(id), Is.EqualTo(value));
+        var newProfile = profile.WithJobPriorities(dictionary);
+        _modifiedProfiles.Add(user);
+        await Server.WaitPost(() => prefMan.SetProfile(user, 0, newProfile).Wait());
     }
 }
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 4cae4affc4d2..89a9eb64638c 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,9 @@ private async Task OnDirtyDispose()
 
     private async Task OnCleanDispose()
     {
+        await Server.WaitIdleAsync();
+        await Client.WaitIdleAsync();
+        await ResetModifiedPreferences();
         await Server.RemoveAllDummySessions();
 
         if (TestMap != null)
@@ -81,6 +86,16 @@ private async Task OnCleanDispose()
         await _testOut.WriteLineAsync($"{nameof(CleanReturnAsync)}: PoolManager took {returnTime.TotalMilliseconds} ms to put pair {Id} back into the pool");
     }
 
+    private async Task ResetModifiedPreferences()
+    {
+        var prefMan = Server.ResolveDependency<IServerPreferencesManager>();
+        foreach (var user in _modifiedProfiles)
+        {
+            await Server.WaitPost(() => prefMan.SetProfile(user, 0, new HumanoidCharacterProfile()).Wait());
+        }
+        _modifiedProfiles.Clear();
+    }
+
     public async ValueTask CleanReturnAsync()
     {
         if (State != PairState.InUse)
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index 0b18c3823903..0b681dcde10d 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -26,6 +26,8 @@ public sealed partial class TestPair
     public readonly List<string> TestHistory = new();
     public PoolSettings Settings = default!;
     public TestMapData? TestMap;
+    private List<NetUserId> _modifiedProfiles = new();
+
     public RobustIntegrationTest.ServerIntegrationInstance Server { get; private set; } = default!;
     public RobustIntegrationTest.ClientIntegrationInstance Client { get;  private set; } = default!;
 
@@ -37,9 +39,7 @@ public void Deconstruct(
         client = Client;
     }
 
-    public ICommonSession? Player => Client.User == null
-        ? null
-        : Server.PlayerMan.SessionsDict.GetValueOrDefault(Client.User.Value);
+    public ICommonSession? Player => Server.PlayerMan.SessionsDict.GetValueOrDefault(Client.User!.Value);
 
     public ContentPlayerData? PlayerData => Player?.Data.ContentData();
 
diff --git a/Content.IntegrationTests/PoolManager.Cvars.cs b/Content.IntegrationTests/PoolManager.Cvars.cs
index 5acd9d502c1b..bcd48f823805 100644
--- a/Content.IntegrationTests/PoolManager.Cvars.cs
+++ b/Content.IntegrationTests/PoolManager.Cvars.cs
@@ -28,6 +28,7 @@ private static readonly (string cvar, string value)[] TestCvars =
         (CCVars.EmergencyShuttleEnabled.Name, "false"),
         (CCVars.ProcgenPreload.Name,          "false"),
         (CCVars.WorldgenEnabled.Name,         "false"),
+        (CCVars.GatewayGeneratorEnabled.Name, "false"),
         (CVars.ReplayClientRecordingEnabled.Name, "false"),
         (CVars.ReplayServerRecordingEnabled.Name, "false"),
         (CCVars.GameDummyTicker.Name, "true"),
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 926374cf0500..1fc739fb0c70 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -340,6 +340,7 @@ public async Task AllComponentsOneToOneDeleteTest()
                 "MapGrid",
                 "Broadphase",
                 "StationData", // errors when removed mid-round
+                "StationJobs",
                 "Actor", // We aren't testing actor components, those need their player session set.
                 "BlobFloorPlanBuilder", // Implodes if unconfigured.
                 "DebrisFeaturePlacerController", // Above.
diff --git a/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
index 662ea3b97470..1bea33a82bcd 100644
--- a/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/AntagPreferenceTest.cs
@@ -52,7 +52,7 @@ public async Task TestLobbyPlayersValid()
         Assert.That(pool.Count, Is.EqualTo(0));
 
         // Opt into the traitor role.
-        await pair.SetAntagPref("Traitor", true);
+        await pair.SetAntagPreference("Traitor", true);
 
         Assert.That(sys.IsSessionValid(rule, pair.Player, def), Is.True);
         Assert.That(sys.IsEntityValid(client.AttachedEntity, def), Is.True);
@@ -63,7 +63,7 @@ public async Task TestLobbyPlayersValid()
         Assert.That(sessions.Count, Is.EqualTo(1));
 
         // opt back out
-        await pair.SetAntagPref("Traitor", false);
+        await pair.SetAntagPreference("Traitor", false);
 
         Assert.That(sys.IsSessionValid(rule, pair.Player, def), Is.True);
         Assert.That(sys.IsEntityValid(client.AttachedEntity, def), Is.True);
diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
index f56baba3426d..fc50d0bd334f 100644
--- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -62,8 +62,8 @@ public async Task TryStopNukeOpsFromConstantlyFailing()
         await pair.RunTicksSync(5);
 
         // Opt into the nukies role.
-        await pair.SetAntagPref("NukeopsCommander", true);
-        await pair.SetAntagPref(dummies[1].UserId, "NukeopsMedic", true);
+        await pair.SetAntagPreference("NukeopsCommander", true);
+        await pair.SetAntagPreference( "NukeopsMedic", true, dummies[1].UserId);
 
         // Initially, the players have no attached entities
         Assert.That(pair.Player?.AttachedEntity, Is.Null);
@@ -236,8 +236,6 @@ void CheckDummy(int i)
         }
 
         ticker.SetGamePreset((GamePresetPrototype?)null);
-        await pair.SetAntagPref("NukeopsCommander", false);
-        await pair.SetAntagPref(dummies[1].UserId, "NukeopsMedic", false);
         await pair.CleanReturnAsync();
     }
 }
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 17c5e199a751..2ae438984181 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -245,22 +245,15 @@ await server.WaitPost(() =>
 
                     // Test all availableJobs have spawnPoints
                     // This is done inside gamemap test because loading the map takes ages and we already have it.
-                    var jobList = entManager.GetComponent<StationJobsComponent>(station).RoundStartJobList
-                        .Where(x => x.Value != 0)
-                        .Select(x => x.Key);
+                    var comp = entManager.GetComponent<StationJobsComponent>(station);
+                    var jobs = new HashSet<ProtoId<JobPrototype>>(comp.SetupAvailableJobs.Keys);
+
                     var spawnPoints = entManager.EntityQuery<SpawnPointComponent>()
-                        .Where(spawnpoint => spawnpoint.SpawnType == SpawnPointType.Job)
-                        .Select(spawnpoint => spawnpoint.Job.ID)
-                        .Distinct();
-                    List<string> missingSpawnPoints = new();
-                    foreach (var spawnpoint in jobList.Except(spawnPoints))
-                    {
-                        if (protoManager.Index<JobPrototype>(spawnpoint).SetPreference)
-                            missingSpawnPoints.Add(spawnpoint);
-                    }
+                        .Where(x => x.SpawnType == SpawnPointType.Job)
+                        .Select(x => x.Job!.Value);
 
-                    Assert.That(missingSpawnPoints, Has.Count.EqualTo(0),
-                        $"There is no spawnpoint for {string.Join(", ", missingSpawnPoints)} on {mapProto}.");
+                    jobs.ExceptWith(spawnPoints);
+                    Assert.That(jobs, Is.Empty,$"There is no spawnpoints for {string.Join(", ", jobs)} on {mapProto}.");
                 }
 
                 try
diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs
new file mode 100644
index 000000000000..716e3cf4c218
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Round/JobTest.cs
@@ -0,0 +1,222 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using Content.IntegrationTests.Pair;
+using Content.Server.GameTicking;
+using Content.Server.Mind;
+using Content.Server.Roles;
+using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Round;
+
+[TestFixture]
+public sealed class JobTest
+{
+    private static ProtoId<JobPrototype> _passenger = "Passenger";
+    private static ProtoId<JobPrototype> _engineer = "StationEngineer";
+    private static ProtoId<JobPrototype> _captain = "Captain";
+
+    private static string _map = "JobTestMap";
+
+    [TestPrototypes]
+    public static string JobTestMap = @$"
+- type: gameMap
+  id: {_map}
+  mapName: {_map}
+  mapPath: /Maps/Test/empty.yml
+  minPlayers: 0
+  stations:
+    Empty:
+      stationProto: StandardNanotrasenStation
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: ""Empty""
+        - type: StationJobs
+          availableJobs:
+            {_passenger}: [ -1, -1 ]
+            {_engineer}: [ -1, -1 ]
+            {_captain}: [ 1, 1 ]
+";
+
+    public void AssertJob(TestPair pair, ProtoId<JobPrototype> job, NetUserId? user = null, bool isAntag = false)
+    {
+        var jobSys = pair.Server.System<SharedJobSystem>();
+        var mindSys = pair.Server.System<MindSystem>();
+        var roleSys = pair.Server.System<RoleSystem>();
+        var ticker = pair.Server.System<GameTicker>();
+
+        user ??= pair.Client.User!.Value;
+
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.InRound));
+        Assert.That(ticker.PlayerGameStatuses[user.Value], Is.EqualTo(PlayerGameStatus.JoinedGame));
+
+        var uid = pair.Server.PlayerMan.SessionsDict.GetValueOrDefault(user.Value)?.AttachedEntity;
+        Assert.That(pair.Server.EntMan.EntityExists(uid));
+        var mind = mindSys.GetMind(uid!.Value);
+        Assert.That(pair.Server.EntMan.EntityExists(mind));
+        Assert.That(jobSys.MindTryGetJobId(mind, out var actualJob));
+        Assert.That(actualJob, Is.EqualTo(job));
+        Assert.That(roleSys.MindIsAntagonist(mind), Is.EqualTo(isAntag));
+    }
+
+    /// <summary>
+    /// Simple test that checks that starting the round spawns the player into the test map as a passenger.
+    /// </summary>
+    [Test]
+    public async Task StartRoundTest()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            DummyTicker = false,
+            Connected = true,
+            InLobby = true
+        });
+
+        pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
+        var ticker = pair.Server.System<GameTicker>();
+
+        // Initially in the lobby
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        Assert.That(pair.Client.AttachedEntity, Is.Null);
+        Assert.That(ticker.PlayerGameStatuses[pair.Client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay));
+
+        // Ready up and start the round
+        ticker.ToggleReadyAll(true);
+        Assert.That(ticker.PlayerGameStatuses[pair.Client.User!.Value], Is.EqualTo(PlayerGameStatus.ReadyToPlay));
+        await pair.Server.WaitPost(() => ticker.StartRound());
+        await pair.RunTicksSync(10);
+
+        AssertJob(pair, _passenger);
+
+        await pair.Server.WaitPost(() => ticker.RestartRound());
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Check that job preferences are respected.
+    /// </summary>
+    [Test]
+    public async Task JobPreferenceTest()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            DummyTicker = false,
+            Connected = true,
+            InLobby = true
+        });
+
+        pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
+        var ticker = pair.Server.System<GameTicker>();
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        Assert.That(pair.Client.AttachedEntity, Is.Null);
+
+        await pair.SetJobPriorities((_passenger, JobPriority.Medium), (_engineer, JobPriority.High));
+        ticker.ToggleReadyAll(true);
+        await pair.Server.WaitPost(() => ticker.StartRound());
+        await pair.RunTicksSync(10);
+
+        AssertJob(pair, _engineer);
+
+        await pair.Server.WaitPost(() => ticker.RestartRound());
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        await pair.SetJobPriorities((_passenger, JobPriority.High), (_engineer, JobPriority.Medium));
+        ticker.ToggleReadyAll(true);
+        await pair.Server.WaitPost(() => ticker.StartRound());
+        await pair.RunTicksSync(10);
+
+        AssertJob(pair, _passenger);
+
+        await pair.Server.WaitPost(() => ticker.RestartRound());
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Check high priority jobs (e.g., captain) are selected before other roles, even if it means a player does not
+    /// get their preferred job.
+    /// </summary>
+    [Test]
+    public async Task JobWeightTest()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            DummyTicker = false,
+            Connected = true,
+            InLobby = true
+        });
+
+        pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
+        var ticker = pair.Server.System<GameTicker>();
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        Assert.That(pair.Client.AttachedEntity, Is.Null);
+
+        var captain = pair.Server.ProtoMan.Index(_captain);
+        var engineer = pair.Server.ProtoMan.Index(_engineer);
+        var passenger = pair.Server.ProtoMan.Index(_passenger);
+        Assert.That(captain.Weight, Is.GreaterThan(engineer.Weight));
+        Assert.That(engineer.Weight, Is.EqualTo(passenger.Weight));
+
+        await pair.SetJobPriorities((_passenger, JobPriority.Medium), (_engineer, JobPriority.High), (_captain, JobPriority.Low));
+        ticker.ToggleReadyAll(true);
+        await pair.Server.WaitPost(() => ticker.StartRound());
+        await pair.RunTicksSync(10);
+
+        AssertJob(pair, _captain);
+
+        await pair.Server.WaitPost(() => ticker.RestartRound());
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Check that jobs are preferentially given to players that have marked those jobs as higher priority.
+    /// </summary>
+    [Test]
+    public async Task JobPriorityTest()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings
+        {
+            DummyTicker = false,
+            Connected = true,
+            InLobby = true
+        });
+
+        pair.Server.CfgMan.SetCVar(CCVars.GameMap, _map);
+        var ticker = pair.Server.System<GameTicker>();
+        Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
+        Assert.That(pair.Client.AttachedEntity, Is.Null);
+
+        await pair.Server.AddDummySessions(5);
+        await pair.RunTicksSync(5);
+
+        var engineers = pair.Server.PlayerMan.Sessions.Select(x => x.UserId).ToList();
+        var captain = engineers[3];
+        engineers.RemoveAt(3);
+
+        await pair.SetJobPriorities(captain, (_captain, JobPriority.High), (_engineer, JobPriority.Medium));
+        foreach (var engi in engineers)
+        {
+            await pair.SetJobPriorities(engi, (_captain, JobPriority.Medium), (_engineer, JobPriority.High));
+        }
+
+        ticker.ToggleReadyAll(true);
+        await pair.Server.WaitPost(() => ticker.StartRound());
+        await pair.RunTicksSync(10);
+
+        AssertJob(pair, _captain, captain);
+        Assert.Multiple(() =>
+        {
+            foreach (var engi in engineers)
+            {
+                AssertJob(pair, _engineer, engi);
+            }
+        });
+
+        await pair.Server.WaitPost(() => ticker.RestartRound());
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
index 0085472c33cc..d68fdafb769e 100644
--- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
+++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs
@@ -7,7 +7,6 @@
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
-using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -46,8 +45,6 @@ public sealed class StationJobsTest
       stationProto: StandardNanotrasenStation
       components:
         - type: StationJobs
-          overflowJobs:
-          - Passenger
           availableJobs:
             TMime: [0, -1]
             TAssistant: [-1, -1]
@@ -164,7 +161,6 @@ public async Task AdjustJobsTest()
         var server = pair.Server;
 
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-        var mapManager = server.ResolveDependency<IMapManager>();
         var fooStationProto = prototypeManager.Index<GameMapPrototype>("FooStation");
         var entSysMan = server.ResolveDependency<IEntityManager>().EntitySysManager;
         var stationJobs = entSysMan.GetEntitySystem<StationJobsSystem>();
@@ -215,6 +211,8 @@ public async Task InvalidRoundstartJobsTest()
         var server = pair.Server;
 
         var prototypeManager = server.ResolveDependency<IPrototypeManager>();
+        var compFact = server.ResolveDependency<IComponentFactory>();
+        var name = compFact.GetComponentName<StationJobsComponent>();
 
         await server.WaitAssertion(() =>
         {
@@ -233,11 +231,14 @@ await server.WaitAssertion(() =>
                 {
                     foreach (var (stationId, station) in gameMap.Stations)
                     {
-                        if (!station.StationComponentOverrides.TryGetComponent("StationJobs", out var comp))
+                        if (!station.StationComponentOverrides.TryGetComponent(name, out var comp))
                             continue;
 
-                        foreach (var (job, _) in ((StationJobsComponent) comp).SetupAvailableJobs)
+                        foreach (var (job, array) in ((StationJobsComponent) comp).SetupAvailableJobs)
                         {
+                            Assert.That(array.Length, Is.EqualTo(2));
+                            Assert.That(array[0] is -1 or >= 0);
+                            Assert.That(array[1] is -1 or >= 0);
                             Assert.That(invalidJobs, Does.Not.Contain(job), $"Station {stationId} contains job prototype {job} which cannot be present roundstart.");
                         }
                     }
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index be6c7196d5f9..cd03af7087b9 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
+using Content.Shared.Traits;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
@@ -183,9 +184,9 @@ private static async Task SetSelectedCharacterSlotAsync(NetUserId userId, int ne
 
         private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
         {
-            var jobs = profile.Jobs.ToDictionary(j => j.JobName, j => (JobPriority) j.Priority);
-            var antags = profile.Antags.Select(a => a.AntagName);
-            var traits = profile.Traits.Select(t => t.TraitName);
+            var jobs = profile.Jobs.ToDictionary(j => new ProtoId<JobPrototype>(j.JobName), j => (JobPriority) j.Priority);
+            var antags = profile.Antags.Select(a => new ProtoId<AntagPrototype>(a.AntagName));
+            var traits = profile.Traits.Select(t => new ProtoId<TraitPrototype>(t.TraitName));
 
             var sex = Sex.Male;
             if (Enum.TryParse<Sex>(profile.Sex, true, out var sexVal))
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 6eb42b65c03a..98fcc6441045 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -239,7 +239,7 @@ public void StartRound(bool force = false)
                 HumanoidCharacterProfile profile;
                 if (_prefsManager.TryGetCachedPreferences(userId, out var preferences))
                 {
-                    profile = (HumanoidCharacterProfile) preferences.GetProfile(preferences.SelectedCharacterIndex);
+                    profile = (HumanoidCharacterProfile) preferences.SelectedCharacter;
                 }
                 else
                 {
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index f7c15a234058..8de458b6ee64 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -305,11 +305,7 @@ public IEnumerable<KeyValuePair<NetUserId, ICharacterProfile>> GetSelectedProfil
             return usernames
                 .Select(p => (_cachedPlayerPrefs[p].Prefs, p))
                 .Where(p => p.Prefs != null)
-                .Select(p =>
-                {
-                    var idx = p.Prefs!.SelectedCharacterIndex;
-                    return new KeyValuePair<NetUserId, ICharacterProfile>(p.p, p.Prefs!.GetProfile(idx));
-                });
+                .Select(p => new KeyValuePair<NetUserId, ICharacterProfile>(p.p, p.Prefs!.SelectedCharacter));
         }
 
         internal static bool ShouldStorePrefs(LoginType loginType)
diff --git a/Content.Server/Spawners/Components/SpawnPointComponent.cs b/Content.Server/Spawners/Components/SpawnPointComponent.cs
index 5cf231f224e8..c6d14dfeb31c 100644
--- a/Content.Server/Spawners/Components/SpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/SpawnPointComponent.cs
@@ -6,11 +6,8 @@ namespace Content.Server.Spawners.Components;
 [RegisterComponent]
 public sealed partial class SpawnPointComponent : Component, ISpawnPoint
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField("job_id")]
-    private string? _jobId;
+    public ProtoId<JobPrototype>? Job;
 
     /// <summary>
     /// The type of spawn point
@@ -18,11 +15,9 @@ public sealed partial class SpawnPointComponent : Component, ISpawnPoint
     [DataField("spawn_type"), ViewVariables(VVAccess.ReadWrite)]
     public SpawnPointType SpawnType { get; set; } = SpawnPointType.Unset;
 
-    public JobPrototype? Job => string.IsNullOrEmpty(_jobId) ? null : _prototypeManager.Index<JobPrototype>(_jobId);
-
     public override string ToString()
     {
-        return $"{_jobId} {SpawnType}";
+        return $"{Job} {SpawnType}";
     }
 }
 
diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
index 5be4ff10f4f4..be555dd54aca 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
@@ -39,7 +39,7 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
 
             if (_gameTicker.RunLevel != GameRunLevel.InRound &&
                 spawnPoint.SpawnType == SpawnPointType.Job &&
-                (args.Job == null || spawnPoint.Job?.ID == args.Job.Prototype))
+                (args.Job == null || spawnPoint.Job == args.Job.Prototype))
             {
                 possiblePositions.Add(xform.Coordinates);
             }
diff --git a/Content.Server/Station/Components/StationJobsComponent.cs b/Content.Server/Station/Components/StationJobsComponent.cs
index 74399bf412db..3681ec9674f5 100644
--- a/Content.Server/Station/Components/StationJobsComponent.cs
+++ b/Content.Server/Station/Components/StationJobsComponent.cs
@@ -1,4 +1,5 @@
-using Content.Server.Station.Systems;
+using System.Linq;
+using Content.Server.Station.Systems;
 using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Shared.Network;
@@ -14,25 +15,21 @@ namespace Content.Server.Station.Components;
 [RegisterComponent, Access(typeof(StationJobsSystem)), PublicAPI]
 public sealed partial class StationJobsComponent : Component
 {
-    /// <summary>
-    /// Total *round-start* jobs at station start.
-    /// </summary>
-    [DataField("roundStartTotalJobs")] public int RoundStartTotalJobs;
-
     /// <summary>
     /// Total *mid-round* jobs at station start.
+    /// This is inferred automatically from <see cref="SetupAvailableJobs"/>.
     /// </summary>
-    [DataField("midRoundTotalJobs")] public int MidRoundTotalJobs;
+    [ViewVariables] public int MidRoundTotalJobs;
 
     /// <summary>
     /// Current total jobs.
     /// </summary>
-    [DataField("totalJobs")] public int TotalJobs;
+    [DataField] public int TotalJobs;
 
     /// <summary>
     /// Station is running on extended access.
     /// </summary>
-    [DataField("extendedAccess")] public bool ExtendedAccess;
+    [DataField] public bool ExtendedAccess;
 
     /// <summary>
     /// If there are less than or equal this amount of players in the game at round start,
@@ -41,7 +38,7 @@ public sealed partial class StationJobsComponent : Component
     /// <remarks>
     /// Set to -1 to disable extended access.
     /// </remarks>
-    [DataField("extendedAccessThreshold")]
+    [DataField]
     public int ExtendedAccessThreshold { get; set; } = 15;
 
     /// <summary>
@@ -54,28 +51,20 @@ public sealed partial class StationJobsComponent : Component
     public float? PercentJobsRemaining => MidRoundTotalJobs > 0 ? TotalJobs / (float) MidRoundTotalJobs : null;
 
     /// <summary>
-    /// The current list of jobs.
+    /// The current list of jobs of available jobs. Null implies that is no limit.
     /// </summary>
     /// <remarks>
     /// This should not be mutated or used directly unless you really know what you're doing, go through StationJobsSystem.
     /// </remarks>
-    [DataField("jobList", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<uint?, JobPrototype>))]
-    public Dictionary<string, uint?> JobList = new();
-
-    /// <summary>
-    /// The round-start list of jobs.
-    /// </summary>
-    /// <remarks>
-    /// This should not be mutated, ever.
-    /// </remarks>
-    [DataField("roundStartJobList", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<uint?, JobPrototype>))]
-    public Dictionary<string, uint?> RoundStartJobList = new();
+    [DataField]
+    public Dictionary<ProtoId<JobPrototype>, int?> JobList = new();
 
     /// <summary>
     /// Overflow jobs that round-start can spawn infinitely many of.
+    /// This is inferred automatically from <see cref="SetupAvailableJobs"/>.
     /// </summary>
-    [DataField("overflowJobs", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<JobPrototype>))]
-    public HashSet<string> OverflowJobs = new();
+    [ViewVariables]
+    public IReadOnlySet<ProtoId<JobPrototype>> OverflowJobs = default!;
 
     /// <summary>
     /// A dictionary relating a NetUserId to the jobs they have on station.
@@ -84,7 +73,10 @@ public sealed partial class StationJobsComponent : Component
     [DataField]
     public Dictionary<NetUserId, List<ProtoId<JobPrototype>>> PlayerJobs = new();
 
-    [DataField("availableJobs", required: true,
-        customTypeSerializer: typeof(PrototypeIdDictionarySerializer<List<int?>, JobPrototype>))]
-    public Dictionary<string, List<int?>> SetupAvailableJobs = default!;
+    /// <summary>
+    /// Mapping of jobs to an int[2] array that specifies jobs available at round start, and midround.
+    /// Negative values implies that there is no limit.
+    /// </summary>
+    [DataField("availableJobs", required: true)]
+    public Dictionary<ProtoId<JobPrototype>, int[]> SetupAvailableJobs = default!;
 }
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
index c3c3865c7bfa..e145e233e9e0 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
@@ -52,23 +52,23 @@ private void InitializeRoundStart()
     /// as there may end up being more round-start slots than available slots, which can cause weird behavior.
     /// A warning to all who enter ye cursed lands: This function is long and mildly incomprehensible. Best used without touching.
     /// </remarks>
-    public Dictionary<NetUserId, (string?, EntityUid)> AssignJobs(Dictionary<NetUserId, HumanoidCharacterProfile> profiles, IReadOnlyList<EntityUid> stations, bool useRoundStartJobs = true)
+    public Dictionary<NetUserId, (ProtoId<JobPrototype>?, EntityUid)> AssignJobs(Dictionary<NetUserId, HumanoidCharacterProfile> profiles, IReadOnlyList<EntityUid> stations, bool useRoundStartJobs = true)
     {
         DebugTools.Assert(stations.Count > 0);
 
         InitializeRoundStart();
 
         if (profiles.Count == 0)
-            return new Dictionary<NetUserId, (string?, EntityUid)>();
+            return new();
 
         // We need to modify this collection later, so make a copy of it.
         profiles = profiles.ShallowClone();
 
         // Player <-> (job, station)
-        var assigned = new Dictionary<NetUserId, (string?, EntityUid)>(profiles.Count);
+        var assigned = new Dictionary<NetUserId, (ProtoId<JobPrototype>?, EntityUid)>(profiles.Count);
 
         // The jobs left on the stations. This collection is modified as jobs are assigned to track what's available.
-        var stationJobs = new Dictionary<EntityUid, Dictionary<string, uint?>>();
+        var stationJobs = new Dictionary<EntityUid, Dictionary<ProtoId<JobPrototype>, int?>>();
         foreach (var station in stations)
         {
             if (useRoundStartJobs)
@@ -83,15 +83,15 @@ private void InitializeRoundStart()
 
 
         // We reuse this collection. It tracks what jobs we're currently trying to select players for.
-        var currentlySelectingJobs = new Dictionary<EntityUid, Dictionary<string, uint?>>(stations.Count);
+        var currentlySelectingJobs = new Dictionary<EntityUid, Dictionary<ProtoId<JobPrototype>, int?>>(stations.Count);
         foreach (var station in stations)
         {
-            currentlySelectingJobs.Add(station, new Dictionary<string, uint?>());
+            currentlySelectingJobs.Add(station, new Dictionary<ProtoId<JobPrototype>, int?>());
         }
 
         // And these.
         // Tracks what players are available for a given job in the current iteration of selection.
-        var jobPlayerOptions = new Dictionary<string, HashSet<NetUserId>>();
+        var jobPlayerOptions = new Dictionary<ProtoId<JobPrototype>, HashSet<NetUserId>>();
         // Tracks the total number of slots for the given stations in the current iteration of selection.
         var stationTotalSlots = new Dictionary<EntityUid, int>(stations.Count);
         // The share of the players each station gets in the current iteration of job selection.
@@ -112,7 +112,7 @@ private void InitializeRoundStart()
                 var optionsRemaining = 0;
 
                 // Assigns a player to the given station, updating all the bookkeeping while at it.
-                void AssignPlayer(NetUserId player, string job, EntityUid station)
+                void AssignPlayer(NetUserId player, ProtoId<JobPrototype> job, EntityUid station)
                 {
                     // Remove the player from all possible jobs as that's faster than actually checking what they have selected.
                     foreach (var (k, players) in jobPlayerOptions)
@@ -273,8 +273,11 @@ void AssignPlayer(NetUserId player, string job, EntityUid station)
     /// <param name="allPlayersToAssign">All players that might need an overflow assigned.</param>
     /// <param name="profiles">Player character profiles.</param>
     /// <param name="stations">The stations to consider for spawn location.</param>
-    public void AssignOverflowJobs(ref Dictionary<NetUserId, (string?, EntityUid)> assignedJobs,
-        IEnumerable<NetUserId> allPlayersToAssign, IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> profiles, IReadOnlyList<EntityUid> stations)
+    public void AssignOverflowJobs(
+        ref Dictionary<NetUserId, (ProtoId<JobPrototype>?, EntityUid)> assignedJobs,
+        IEnumerable<NetUserId> allPlayersToAssign,
+        IReadOnlyDictionary<NetUserId, HumanoidCharacterProfile> profiles,
+        IReadOnlyList<EntityUid> stations)
     {
         var givenStations = stations.ToList();
         if (givenStations.Count == 0)
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index 3bfa815af1ef..307610d136fe 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
+using Content.Shared.FixedPoint;
 using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -31,12 +32,25 @@ public sealed partial class StationJobsSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<StationInitializedEvent>(OnStationInitialized);
+        SubscribeLocalEvent<StationJobsComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<StationJobsComponent, StationRenamedEvent>(OnStationRenamed);
         SubscribeLocalEvent<StationJobsComponent, ComponentShutdown>(OnStationDeletion);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
         Subs.CVar(_configurationManager, CCVars.GameDisallowLateJoins, _ => UpdateJobsAvailable(), true);
     }
 
+    private void OnInit(Entity<StationJobsComponent> ent, ref ComponentInit args)
+    {
+        ent.Comp.MidRoundTotalJobs = ent.Comp.SetupAvailableJobs.Values
+            .Select(x => Math.Max(x[1], 0))
+            .Sum();
+
+        ent.Comp.OverflowJobs = ent.Comp.SetupAvailableJobs
+            .Where(x => x.Value[0] < 0)
+            .Select(x => x.Key)
+            .ToHashSet();
+    }
+
     public override void Update(float _)
     {
         if (_availableJobsDirty)
@@ -57,28 +71,11 @@ private void OnStationInitialized(StationInitializedEvent msg)
         if (!TryComp<StationJobsComponent>(msg.Station, out var stationJobs))
             return;
 
-        var mapJobList = stationJobs.SetupAvailableJobs;
-
-        stationJobs.RoundStartTotalJobs = mapJobList.Values.Where(x => x[0] is not null && x[0] > 0).Sum(x => x[0]!.Value);
-        stationJobs.MidRoundTotalJobs = mapJobList.Values.Where(x => x[1] is not null && x[1] > 0).Sum(x => x[1]!.Value);
-
-        stationJobs.TotalJobs = stationJobs.MidRoundTotalJobs;
-
-        stationJobs.JobList = mapJobList.ToDictionary(x => x.Key, x =>
-        {
-            if (x.Value[1] <= -1)
-                return null;
-            return (uint?) x.Value[1];
-        });
-
-        stationJobs.RoundStartJobList = mapJobList.ToDictionary(x => x.Key, x =>
-        {
-            if (x.Value[0] <= -1)
-                return null;
-            return (uint?) x.Value[0];
-        });
+        stationJobs.JobList = stationJobs.SetupAvailableJobs.ToDictionary(
+            x => x.Key,
+            x=> (int?)(x.Value[1] < 0 ? null : x.Value[1]));
 
-        stationJobs.OverflowJobs = stationJobs.OverflowJobs.ToHashSet();
+        stationJobs.TotalJobs = stationJobs.JobList.Values.Select(x => x ?? 0).Sum();
 
         UpdateJobsAvailable();
     }
@@ -141,7 +138,11 @@ public bool TryAdjustJobSlot(EntityUid station, JobPrototype job, int amount, bo
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns>Whether or not slot adjustment was a success.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
-    public bool TryAdjustJobSlot(EntityUid station, string jobPrototypeId, int amount, bool createSlot = false, bool clamp = false,
+    public bool TryAdjustJobSlot(EntityUid station,
+        string jobPrototypeId,
+        int amount,
+        bool createSlot = false,
+        bool clamp = false,
         StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
@@ -156,7 +157,11 @@ public bool TryAdjustJobSlot(EntityUid station, string jobPrototypeId, int amoun
         // - Return false when you remove from a job that doesn't exist.
         // - Return false when you remove and exceed the number of slots available.
         // And additionally, if adding would add a job not previously on the manifest when createSlot is false, return false and do nothing.
-        switch (jobList.ContainsKey(jobPrototypeId))
+
+        if (amount == 0)
+            return true;
+
+        switch (jobList.TryGetValue(jobPrototypeId, out var available))
         {
             case false when amount < 0:
                 return false;
@@ -164,31 +169,20 @@ public bool TryAdjustJobSlot(EntityUid station, string jobPrototypeId, int amoun
                 if (!createSlot)
                     return false;
                 stationJobs.TotalJobs += amount;
-                jobList[jobPrototypeId] = (uint?)amount;
+                jobList[jobPrototypeId] = amount;
                 UpdateJobsAvailable();
                 return true;
             case true:
                 // Job is unlimited so just say we adjusted it and do nothing.
-                if (jobList[jobPrototypeId] == null)
+                if (available is not {} avail)
                     return true;
 
                 // Would remove more jobs than we have available.
-                if (amount < 0 && (jobList[jobPrototypeId] + amount < 0 && !clamp))
+                if (available + amount < 0 && !clamp)
                     return false;
 
-                stationJobs.TotalJobs += amount;
-
-                //C# type handling moment
-                if (amount > 0)
-                    jobList[jobPrototypeId] += (uint)amount;
-                else
-                {
-                    if ((int)jobList[jobPrototypeId]!.Value - Math.Abs(amount) <= 0)
-                        jobList[jobPrototypeId] = 0;
-                    else
-                        jobList[jobPrototypeId] -= (uint) Math.Abs(amount);
-                }
-
+                jobList[jobPrototypeId] = Math.Max(avail + amount, 0);
+                stationJobs.TotalJobs = jobList.Values.Select(x => x ?? 0).Sum();
                 UpdateJobsAvailable();
                 return true;
         }
@@ -239,7 +233,10 @@ public bool TrySetJobSlot(EntityUid station, JobPrototype jobPrototype, int amou
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns>Whether or not setting the value succeeded.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
-    public bool TrySetJobSlot(EntityUid station, string jobPrototypeId, int amount, bool createSlot = false,
+    public bool TrySetJobSlot(EntityUid station,
+        string jobPrototypeId,
+        int amount,
+        bool createSlot = false,
         StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
@@ -255,13 +252,13 @@ public bool TrySetJobSlot(EntityUid station, string jobPrototypeId, int amount,
                 if (!createSlot)
                     return false;
                 stationJobs.TotalJobs += amount;
-                jobList[jobPrototypeId] = (uint?)amount;
+                jobList[jobPrototypeId] = amount;
                 UpdateJobsAvailable();
                 return true;
             case true:
-                stationJobs.TotalJobs += amount - (int) (jobList[jobPrototypeId] ?? 0);
+                stationJobs.TotalJobs += amount - (jobList[jobPrototypeId] ?? 0);
 
-                jobList[jobPrototypeId] = (uint)amount;
+                jobList[jobPrototypeId] = amount;
                 UpdateJobsAvailable();
                 return true;
         }
@@ -289,8 +286,8 @@ public void MakeJobUnlimited(EntityUid station, string jobPrototypeId, StationJo
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
         // Subtract out the job we're fixing to make have unlimited slots.
-        if (stationJobs.JobList.ContainsKey(jobPrototypeId) && stationJobs.JobList[jobPrototypeId] != null)
-            stationJobs.TotalJobs -= (int)stationJobs.JobList[jobPrototypeId]!.Value;
+        if (stationJobs.JobList.TryGetValue(jobPrototypeId, out var existing))
+            stationJobs.TotalJobs -= existing ?? 0;
 
         stationJobs.JobList[jobPrototypeId] = null;
 
@@ -319,8 +316,7 @@ public bool IsJobUnlimited(EntityUid station, string jobPrototypeId, StationJobs
         if (!Resolve(station, ref stationJobs))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
-        var res = stationJobs.JobList.TryGetValue(jobPrototypeId, out var job) && job == null;
-        return res;
+        return stationJobs.JobList.TryGetValue(jobPrototypeId, out var job) && job == null;
     }
 
     /// <inheritdoc cref="TryGetJobSlot(Robust.Shared.GameObjects.EntityUid,string,out System.Nullable{uint},Content.Server.Station.Components.StationJobsComponent?)"/>
@@ -328,7 +324,7 @@ public bool IsJobUnlimited(EntityUid station, string jobPrototypeId, StationJobs
     /// <param name="job">Job to get slot info for.</param>
     /// <param name="slots">The number of slots remaining. Null if infinite.</param>
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
-    public bool TryGetJobSlot(EntityUid station, JobPrototype job, out uint? slots, StationJobsComponent? stationJobs = null)
+    public bool TryGetJobSlot(EntityUid station, JobPrototype job, out int? slots, StationJobsComponent? stationJobs = null)
     {
         return TryGetJobSlot(station, job.ID, out slots, stationJobs);
     }
@@ -343,21 +339,12 @@ public bool TryGetJobSlot(EntityUid station, JobPrototype job, out uint? slots,
     /// <returns>Whether or not the slot exists.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
     /// <remarks>slots will be null if the slot doesn't exist, as well, so make sure to check the return value.</remarks>
-    public bool TryGetJobSlot(EntityUid station, string jobPrototypeId, out uint? slots, StationJobsComponent? stationJobs = null)
+    public bool TryGetJobSlot(EntityUid station, string jobPrototypeId, out int? slots, StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
-        if (stationJobs.JobList.TryGetValue(jobPrototypeId, out var job))
-        {
-            slots = job;
-            return true;
-        }
-        else // Else if slot isn't present return null.
-        {
-            slots = null;
-            return false;
-        }
+        return stationJobs.JobList.TryGetValue(jobPrototypeId, out slots);
     }
 
     /// <summary>
@@ -367,12 +354,14 @@ public bool TryGetJobSlot(EntityUid station, string jobPrototypeId, out uint? sl
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns>Set containing all jobs available.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
-    public IReadOnlySet<string> GetAvailableJobs(EntityUid station, StationJobsComponent? stationJobs = null)
+    public IEnumerable<ProtoId<JobPrototype>> GetAvailableJobs(EntityUid station, StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
-        return stationJobs.JobList.Where(x => x.Value != 0).Select(x => x.Key).ToHashSet();
+        return stationJobs.JobList
+            .Where(x => x.Value != 0)
+            .Select(x => x.Key);
     }
 
     /// <summary>
@@ -382,12 +371,12 @@ public IReadOnlySet<string> GetAvailableJobs(EntityUid station, StationJobsCompo
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns>Set containing all overflow jobs available.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
-    public IReadOnlySet<string> GetOverflowJobs(EntityUid station, StationJobsComponent? stationJobs = null)
+    public IReadOnlySet<ProtoId<JobPrototype>> GetOverflowJobs(EntityUid station, StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
-        return stationJobs.OverflowJobs.ToHashSet();
+        return stationJobs.OverflowJobs;
     }
 
     /// <summary>
@@ -397,7 +386,7 @@ public IReadOnlySet<string> GetOverflowJobs(EntityUid station, StationJobsCompon
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns>List of all jobs on the station.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
-    public IReadOnlyDictionary<string, uint?> GetJobs(EntityUid station, StationJobsComponent? stationJobs = null)
+    public IReadOnlyDictionary<ProtoId<JobPrototype>, int?> GetJobs(EntityUid station, StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
@@ -412,12 +401,14 @@ public IReadOnlySet<string> GetOverflowJobs(EntityUid station, StationJobsCompon
     /// <param name="stationJobs">Resolve pattern, station jobs component of the station.</param>
     /// <returns>List of all round-start jobs.</returns>
     /// <exception cref="ArgumentException">Thrown when the given station is not a station.</exception>
-    public IReadOnlyDictionary<string, uint?> GetRoundStartJobs(EntityUid station, StationJobsComponent? stationJobs = null)
+    public Dictionary<ProtoId<JobPrototype>, int?> GetRoundStartJobs(EntityUid station, StationJobsComponent? stationJobs = null)
     {
         if (!Resolve(station, ref stationJobs))
             throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
 
-        return stationJobs.RoundStartJobList;
+        return stationJobs.SetupAvailableJobs.ToDictionary(
+            x => x.Key,
+            x=> (int?)(x.Value[0] < 0 ? null : x.Value[0]));
     }
 
     /// <summary>
@@ -428,13 +419,13 @@ public IReadOnlySet<string> GetOverflowJobs(EntityUid station, StationJobsCompon
     /// <param name="pickOverflows">Whether or not to pick from the overflow list.</param>
     /// <param name="disallowedJobs">A set of disallowed jobs, if any.</param>
     /// <returns>The selected job, if any.</returns>
-    public string? PickBestAvailableJobWithPriority(EntityUid station, IReadOnlyDictionary<string, JobPriority> jobPriorities, bool pickOverflows, IReadOnlySet<ProtoId<JobPrototype>>? disallowedJobs = null)
+    public ProtoId<JobPrototype>? PickBestAvailableJobWithPriority(EntityUid station, IReadOnlyDictionary<ProtoId<JobPrototype>, JobPriority> jobPriorities, bool pickOverflows, IReadOnlySet<ProtoId<JobPrototype>>? disallowedJobs = null)
     {
         if (station == EntityUid.Invalid)
             return null;
 
         var available = GetAvailableJobs(station);
-        bool TryPick(JobPriority priority, [NotNullWhen(true)] out string? jobId)
+        bool TryPick(JobPriority priority, [NotNullWhen(true)] out ProtoId<JobPrototype>? jobId)
         {
             var filtered = jobPriorities
                 .Where(p =>
@@ -474,7 +465,10 @@ bool TryPick(JobPriority priority, [NotNullWhen(true)] out string? jobId)
             return null;
 
         var overflows = GetOverflowJobs(station);
-        return overflows.Count != 0 ? _random.Pick(overflows) : null;
+        if (overflows.Count == 0)
+            return null;
+
+        return _random.Pick(overflows);
     }
 
     #endregion Public API
@@ -483,7 +477,7 @@ bool TryPick(JobPriority priority, [NotNullWhen(true)] out string? jobId)
 
     private bool _availableJobsDirty;
 
-    private TickerJobsAvailableEvent _cachedAvailableJobs = new (new Dictionary<NetEntity, string>(), new Dictionary<NetEntity, Dictionary<string, uint?>>());
+    private TickerJobsAvailableEvent _cachedAvailableJobs = new(new(), new());
 
     /// <summary>
     /// Assembles an event from the current available-to-play jobs.
@@ -494,9 +488,9 @@ private TickerJobsAvailableEvent GenerateJobsAvailableEvent()
     {
         // If late join is disallowed, return no available jobs.
         if (_gameTicker.DisallowLateJoin)
-            return new TickerJobsAvailableEvent(new Dictionary<NetEntity, string>(), new Dictionary<NetEntity, Dictionary<string, uint?>>());
+            return new TickerJobsAvailableEvent(new(), new());
 
-        var jobs = new Dictionary<NetEntity, Dictionary<string, uint?>>();
+        var jobs = new Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>>();
         var stationNames = new Dictionary<NetEntity, string>();
 
         var query = EntityQueryEnumerator<StationJobsComponent>();
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 95da4f4c38d3..308476baa8d6 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Roles;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -128,19 +129,17 @@ public TickerLobbyCountdownEvent(TimeSpan startTime, bool paused)
     }
 
     [Serializable, NetSerializable]
-    public sealed class TickerJobsAvailableEvent : EntityEventArgs
+    public sealed class TickerJobsAvailableEvent(
+        Dictionary<NetEntity, string> stationNames,
+        Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> jobsAvailableByStation)
+        : EntityEventArgs
     {
         /// <summary>
         /// The Status of the Player in the lobby (ready, observer, ...)
         /// </summary>
-        public Dictionary<NetEntity, Dictionary<string, uint?>> JobsAvailableByStation { get; }
-        public Dictionary<NetEntity, string> StationNames { get; }
+        public Dictionary<NetEntity, Dictionary<ProtoId<JobPrototype>, int?>> JobsAvailableByStation { get; } = jobsAvailableByStation;
 
-        public TickerJobsAvailableEvent(Dictionary<NetEntity, string> stationNames, Dictionary<NetEntity, Dictionary<string, uint?>> jobsAvailableByStation)
-        {
-            StationNames = stationNames;
-            JobsAvailableByStation = jobsAvailableByStation;
-        }
+        public Dictionary<NetEntity, string> StationNames { get; } = stationNames;
     }
 
     [Serializable, NetSerializable, DataDefinition]
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index bd55bbb40a8f..20c54cd2687b 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -35,7 +35,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         /// Job preferences for initial spawn.
         /// </summary>
         [DataField]
-        private Dictionary<string, JobPriority> _jobPriorities = new()
+        private Dictionary<ProtoId<JobPrototype>, JobPriority> _jobPriorities = new()
         {
             {
                 SharedGameTicker.FallbackOverflowJob, JobPriority.High
@@ -46,13 +46,13 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         /// Antags we have opted in to.
         /// </summary>
         [DataField]
-        private HashSet<string> _antagPreferences = new();
+        private HashSet<ProtoId<AntagPrototype>> _antagPreferences = new();
 
         /// <summary>
         /// Enabled traits.
         /// </summary>
         [DataField]
-        private HashSet<string> _traitPreferences = new();
+        private HashSet<ProtoId<TraitPrototype>> _traitPreferences = new();
 
         /// <summary>
         /// <see cref="_loadouts"/>
@@ -75,7 +75,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         /// Associated <see cref="SpeciesPrototype"/> for this profile.
         /// </summary>
         [DataField]
-        public string Species { get; set; } = SharedHumanoidAppearanceSystem.DefaultSpecies;
+        public ProtoId<SpeciesPrototype> Species { get; set; } = SharedHumanoidAppearanceSystem.DefaultSpecies;
 
         [DataField]
         public int Age { get; set; } = 18;
@@ -106,17 +106,17 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         /// <summary>
         /// <see cref="_jobPriorities"/>
         /// </summary>
-        public IReadOnlyDictionary<string, JobPriority> JobPriorities => _jobPriorities;
+        public IReadOnlyDictionary<ProtoId<JobPrototype>, JobPriority> JobPriorities => _jobPriorities;
 
         /// <summary>
         /// <see cref="_antagPreferences"/>
         /// </summary>
-        public IReadOnlySet<string> AntagPreferences => _antagPreferences;
+        public IReadOnlySet<ProtoId<AntagPrototype>> AntagPreferences => _antagPreferences;
 
         /// <summary>
         /// <see cref="_traitPreferences"/>
         /// </summary>
-        public IReadOnlySet<string> TraitPreferences => _traitPreferences;
+        public IReadOnlySet<ProtoId<TraitPrototype>> TraitPreferences => _traitPreferences;
 
         /// <summary>
         /// If we're unable to get one of our preferred jobs do we spawn as a fallback job or do we stay in lobby.
@@ -134,10 +134,10 @@ public HumanoidCharacterProfile(
             Gender gender,
             HumanoidCharacterAppearance appearance,
             SpawnPriorityPreference spawnPriority,
-            Dictionary<string, JobPriority> jobPriorities,
+            Dictionary<ProtoId<JobPrototype>, JobPriority> jobPriorities,
             PreferenceUnavailableMode preferenceUnavailable,
-            HashSet<string> antagPreferences,
-            HashSet<string> traitPreferences,
+            HashSet<ProtoId<AntagPrototype>> antagPreferences,
+            HashSet<ProtoId<TraitPrototype>> traitPreferences,
             Dictionary<string, RoleLoadout> loadouts)
         {
             Name = name;
@@ -153,6 +153,20 @@ public HumanoidCharacterProfile(
             _antagPreferences = antagPreferences;
             _traitPreferences = traitPreferences;
             _loadouts = loadouts;
+
+            var hasHighPrority = false;
+            foreach (var (key, value) in _jobPriorities)
+            {
+                if (value == JobPriority.Never)
+                    _jobPriorities.Remove(key);
+                else if (value != JobPriority.High)
+                    continue;
+
+                if (hasHighPrority)
+                    _jobPriorities[key] = JobPriority.Medium;
+
+                hasHighPrority = true;
+            }
         }
 
         /// <summary>Copy constructor</summary>
@@ -165,10 +179,10 @@ public HumanoidCharacterProfile(HumanoidCharacterProfile other)
                 other.Gender,
                 other.Appearance.Clone(),
                 other.SpawnPriority,
-                new Dictionary<string, JobPriority>(other.JobPriorities),
+                new Dictionary<ProtoId<JobPrototype>, JobPriority>(other.JobPriorities),
                 other.PreferenceUnavailable,
-                new HashSet<string>(other.AntagPreferences),
-                new HashSet<string>(other.TraitPreferences),
+                new HashSet<ProtoId<AntagPrototype>>(other.AntagPreferences),
+                new HashSet<ProtoId<TraitPrototype>>(other.TraitPreferences),
                 new Dictionary<string, RoleLoadout>(other.Loadouts))
         {
         }
@@ -289,21 +303,48 @@ public HumanoidCharacterProfile WithSpawnPriorityPreference(SpawnPriorityPrefere
             return new(this) { SpawnPriority = spawnPriority };
         }
 
-        public HumanoidCharacterProfile WithJobPriorities(IEnumerable<KeyValuePair<string, JobPriority>> jobPriorities)
+        public HumanoidCharacterProfile WithJobPriorities(IEnumerable<KeyValuePair<ProtoId<JobPrototype>, JobPriority>> jobPriorities)
         {
+            var dictionary = new Dictionary<ProtoId<JobPrototype>, JobPriority>(jobPriorities);
+            var hasHighPrority = false;
+
+            foreach (var (key, value) in dictionary)
+            {
+                if (value == JobPriority.Never)
+                    dictionary.Remove(key);
+                else if (value != JobPriority.High)
+                    continue;
+
+                if (hasHighPrority)
+                    dictionary[key] = JobPriority.Medium;
+
+                hasHighPrority = true;
+            }
+
             return new(this)
             {
-                _jobPriorities = new Dictionary<string, JobPriority>(jobPriorities),
+                _jobPriorities = dictionary
             };
         }
 
-        public HumanoidCharacterProfile WithJobPriority(string jobId, JobPriority priority)
+        public HumanoidCharacterProfile WithJobPriority(ProtoId<JobPrototype> jobId, JobPriority priority)
         {
-            var dictionary = new Dictionary<string, JobPriority>(_jobPriorities);
+            var dictionary = new Dictionary<ProtoId<JobPrototype>, JobPriority>(_jobPriorities);
             if (priority == JobPriority.Never)
             {
                 dictionary.Remove(jobId);
             }
+            else if (priority == JobPriority.High)
+            {
+                // There can only ever be one high priority job.
+                foreach (var (job, value) in dictionary)
+                {
+                    if (value == JobPriority.High)
+                        dictionary[job] = JobPriority.Medium;
+                }
+
+                dictionary[jobId] = priority;
+            }
             else
             {
                 dictionary[jobId] = priority;
@@ -320,17 +361,17 @@ public HumanoidCharacterProfile WithPreferenceUnavailable(PreferenceUnavailableM
             return new(this) { PreferenceUnavailable = mode };
         }
 
-        public HumanoidCharacterProfile WithAntagPreferences(IEnumerable<string> antagPreferences)
+        public HumanoidCharacterProfile WithAntagPreferences(IEnumerable<ProtoId<AntagPrototype>> antagPreferences)
         {
             return new(this)
             {
-                _antagPreferences = new HashSet<string>(antagPreferences),
+                _antagPreferences = new (antagPreferences),
             };
         }
 
-        public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
+        public HumanoidCharacterProfile WithAntagPreference(ProtoId<AntagPrototype> antagId, bool pref)
         {
-            var list = new HashSet<string>(_antagPreferences);
+            var list = new HashSet<ProtoId<AntagPrototype>>(_antagPreferences);
             if (pref)
             {
                 list.Add(antagId);
@@ -346,16 +387,16 @@ public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
             };
         }
 
-        public HumanoidCharacterProfile WithTraitPreference(string traitId, string? categoryId, bool pref)
+        public HumanoidCharacterProfile WithTraitPreference(ProtoId<TraitPrototype> traitId, string? categoryId, bool pref)
         {
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            var traitProto = prototypeManager.Index<TraitPrototype>(traitId);
+            var traitProto = prototypeManager.Index(traitId);
 
             TraitCategoryPrototype? categoryProto = null;
             if (categoryId != null && categoryId != "default")
                 categoryProto = prototypeManager.Index<TraitCategoryPrototype>(categoryId);
 
-            var list = new HashSet<string>(_traitPreferences);
+            var list = new HashSet<ProtoId<TraitPrototype>>(_traitPreferences);
 
             if (pref)
             {
@@ -372,7 +413,7 @@ public HumanoidCharacterProfile WithTraitPreference(string traitId, string? cate
                 var count = 0;
                 foreach (var trait in list)
                 {
-                    var traitProtoTemp = prototypeManager.Index<TraitPrototype>(trait);
+                    var traitProtoTemp = prototypeManager.Index(trait);
                     count += traitProtoTemp.Cost;
                 }
 
@@ -514,7 +555,7 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
                 _ => SpawnPriorityPreference.None // Invalid enum values.
             };
 
-            var priorities = new Dictionary<string, JobPriority>(JobPriorities
+            var priorities = new Dictionary<ProtoId<JobPrototype>, JobPriority>(JobPriorities
                 .Where(p => prototypeManager.TryIndex<JobPrototype>(p.Key, out var job) && job.SetPreference && p.Value switch
                 {
                     JobPriority.Never => false, // Drop never since that's assumed default.
@@ -524,6 +565,17 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
                     _ => false
                 }));
 
+            var hasHighPrio = false;
+            foreach (var (key, value) in priorities)
+            {
+                if (value != JobPriority.High)
+                    continue;
+
+                if (hasHighPrio)
+                    priorities[key] = JobPriority.Medium;
+                hasHighPrio = true;
+            }
+
             var antags = AntagPreferences
                 .Where(id => prototypeManager.TryIndex<AntagPrototype>(id, out var antag) && antag.SetPreference)
                 .ToList();
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 0b3bfb44384c..dd67e7b10474 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -63,8 +63,8 @@ public sealed partial class JobPrototype : IPrototype
         public bool CanBeAntag { get; private set; } = true;
 
         /// <summary>
-        ///     Whether this job is a head.
-        ///     The job system will try to pick heads before other jobs on the same priority level.
+        ///     The "weight" or importance of this job. If this number is large, the job system will assign this job
+        ///     before assigning other jobs.
         /// </summary>
         [DataField("weight")]
         public int Weight { get; private set; }
diff --git a/Content.Shared/Roles/Jobs/SharedJobSystem.cs b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
index fcf76052785e..ce4428d9fea7 100644
--- a/Content.Shared/Roles/Jobs/SharedJobSystem.cs
+++ b/Content.Shared/Roles/Jobs/SharedJobSystem.cs
@@ -118,6 +118,18 @@ public bool MindTryGetJob(
                _prototypes.TryIndex(comp.Prototype, out prototype);
     }
 
+    public bool MindTryGetJobId([NotNullWhen(true)] EntityUid? mindId, out ProtoId<JobPrototype>? job)
+    {
+        if (!TryComp(mindId, out JobComponent? comp))
+        {
+            job = null;
+            return false;
+        }
+
+        job = comp.Prototype;
+        return true;
+    }
+
     /// <summary>
     ///     Tries to get the job name for this mind.
     ///     Returns unknown if not found.
diff --git a/Resources/Prototypes/Maps/arenas.yml b/Resources/Prototypes/Maps/arenas.yml
index 32f85437225a..7ad7a16bc2a9 100644
--- a/Resources/Prototypes/Maps/arenas.yml
+++ b/Resources/Prototypes/Maps/arenas.yml
@@ -10,7 +10,5 @@
         - type: StationNameSetup
           mapNameTemplate: "Meteor Arena"
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             Passenger: [ -1, -1 ]
diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml
index ef7523c72795..6fe3eff030ad 100644
--- a/Resources/Prototypes/Maps/atlas.yml
+++ b/Resources/Prototypes/Maps/atlas.yml
@@ -14,8 +14,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'R4' # R4407/Goon. GS isn't as cool sounding.
         - type: StationJobs
-          overflowJobs:
-          - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index 24ca17339fcc..ea06153d7e45 100644
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -16,8 +16,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml
index 50826fc5e097..89ba3779c657 100644
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -15,8 +15,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml
index fe445b008134..10a12c4f44e2 100644
--- a/Resources/Prototypes/Maps/cluster.yml
+++ b/Resources/Prototypes/Maps/cluster.yml
@@ -16,8 +16,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
index 6b85aca51d38..d7a15f2b1da4 100644
--- a/Resources/Prototypes/Maps/core.yml
+++ b/Resources/Prototypes/Maps/core.yml
@@ -18,8 +18,6 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_core.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Bartender: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml
index 2f475c1e5795..8d4cc550a27c 100644
--- a/Resources/Prototypes/Maps/debug.yml
+++ b/Resources/Prototypes/Maps/debug.yml
@@ -10,8 +10,6 @@
         - type: StationNameSetup
           mapNameTemplate: "Empty"
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             Passenger: [ -1, -1 ]
 
@@ -27,8 +25,6 @@
         - type: StationNameSetup
           mapNameTemplate: "Dev"
         - type: StationJobs
-          overflowJobs:
-          - Captain
           availableJobs:
             Captain: [ -1, -1 ]
 
@@ -44,7 +40,5 @@
         - type: StationNameSetup
           mapNameTemplate: "TEG"
         - type: StationJobs
-          overflowJobs:
-            - ChiefEngineer
           availableJobs:
             ChiefEngineer: [ -1, -1 ]
diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml
index 0c9f1d975b25..412e1b46569f 100644
--- a/Resources/Prototypes/Maps/europa.yml
+++ b/Resources/Prototypes/Maps/europa.yml
@@ -21,8 +21,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_transit.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Bartender: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
index f0c35f99e57e..f22c44cb6300 100644
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -17,8 +17,6 @@
         - type: StationCargoShuttle
           path: /Maps/Shuttles/cargo_fland.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index f82ee1d4344e..32ad8d576c24 100644
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -16,8 +16,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml
index 2bee606e95ab..ebd6954aa763 100644
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -15,8 +15,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_meta.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
index b5e0f97190a8..a4cc6eb43d62 100644
--- a/Resources/Prototypes/Maps/oasis.yml
+++ b/Resources/Prototypes/Maps/oasis.yml
@@ -15,8 +15,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
@@ -62,4 +60,4 @@
             Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
-            Musician: [ 1, 1 ]
\ No newline at end of file
+            Musician: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml
index f90c5f5b658d..b94fdbc05d18 100644
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -16,8 +16,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml
index 128148989129..24214b37a1f3 100644
--- a/Resources/Prototypes/Maps/origin.yml
+++ b/Resources/Prototypes/Maps/origin.yml
@@ -15,8 +15,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml
index 20d6c7a7bd7b..b844636bf831 100644
--- a/Resources/Prototypes/Maps/packed.yml
+++ b/Resources/Prototypes/Maps/packed.yml
@@ -14,8 +14,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'VG'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml
index 03a688cf23c8..a0d6752c1fb8 100644
--- a/Resources/Prototypes/Maps/reach.yml
+++ b/Resources/Prototypes/Maps/reach.yml
@@ -16,8 +16,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency.yml
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             Captain: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index bc12eca65461..e9d26ce3192c 100644
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -15,8 +15,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '14'
         - type: StationJobs
-          overflowJobs:
-          - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml
index b18db7aea8d1..7f24fcdd6771 100644
--- a/Resources/Prototypes/Maps/train.yml
+++ b/Resources/Prototypes/Maps/train.yml
@@ -18,8 +18,6 @@
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # To do - add railway station
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]

From f933922c9e7e561b83daea356450755e4ee830a3 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Wed, 5 Jun 2024 07:19:54 -0700
Subject: [PATCH 300/568] Add logs that provide session to player admin logs
 (#28628)

---
 Content.Server/Administration/Logs/AdminLogManager.Json.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.Server/Administration/Logs/AdminLogManager.Json.cs b/Content.Server/Administration/Logs/AdminLogManager.Json.cs
index 0a67d61cefe7..9e6274a49330 100644
--- a/Content.Server/Administration/Logs/AdminLogManager.Json.cs
+++ b/Content.Server/Administration/Logs/AdminLogManager.Json.cs
@@ -65,6 +65,10 @@ private void InitializeJson()
             {
                 players.Add(actor.PlayerSession.UserId.UserId);
             }
+            else if (value is SerializablePlayer player)
+            {
+                players.Add(player.Player.UserId.UserId);
+            }
         }
 
         return (JsonSerializer.SerializeToDocument(parsed, _jsonOptions), players);

From bc360784ff90d4211999fa7dfcc52812d3de6b9b Mon Sep 17 00:00:00 2001
From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:50:37 +0200
Subject: [PATCH 301/568] Cluster Update (#28627)

done here
---
 Resources/Maps/cluster.yml | 981 +++++++++++++++----------------------
 1 file changed, 401 insertions(+), 580 deletions(-)

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index b8540c6f68da..a9f601114c60 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -38,6 +38,7 @@ tilemap:
   113: FloorWhiteMono
   1: FloorWhitePlastic
   118: FloorWood
+  3: FloorWoodLarge
   120: Lattice
   121: Plating
 entities:
@@ -65,7 +66,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: WQAAAAACWQAAAAACWQAAAAABeQAAAAAAdgAAAAADdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAABeQAAAAAAdgAAAAACdgAAAAABdgAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATAAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAABTAAAAAAAWQAAAAABWQAAAAACWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAWQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAAAZAAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABZAAAAAAAWQAAAAABJAAAAAACJAAAAAAAJAAAAAADOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAZAAAAAABJAAAAAABJAAAAAADJAAAAAABOgAAAAAAJAAAAAABJAAAAAABeQAAAAAAYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAABOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAABTAAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAABHQAAAAAC
+          tiles: WQAAAAACWQAAAAACWQAAAAABeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAABeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATAAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAABTAAAAAAAWQAAAAABWQAAAAACWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAWQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAAAZAAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABZAAAAAAAWQAAAAABJAAAAAACJAAAAAAAJAAAAAADOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAZAAAAAABJAAAAAABJAAAAAADJAAAAAABOgAAAAAAJAAAAAABJAAAAAABeQAAAAAAYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAABOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAABTAAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAABHQAAAAAC
           version: 6
         -1,1:
           ind: -1,1
@@ -85,7 +86,7 @@ entities:
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: YAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAYAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACZAAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACYAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAACZAAAAAACeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAACWQAAAAACYAAAAAAAWQAAAAACWQAAAAADZAAAAAADWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAABYAAAAAAAeQAAAAAAWQAAAAADWQAAAAABYAAAAAAAWQAAAAAAZAAAAAABWQAAAAABYAAAAAAAYAAAAAAAWQAAAAACWQAAAAACWQAAAAAAYAAAAAAAWQAAAAACWQAAAAABWQAAAAADZAAAAAADWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAZAAAAAADYAAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAZAAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAWQAAAAADWQAAAAABWQAAAAABYAAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABdgAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAdgAAAAAAdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA
+          tiles: YAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAYAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACZAAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACYAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAACZAAAAAACeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAACWQAAAAACYAAAAAAAWQAAAAACWQAAAAADZAAAAAADWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAABYAAAAAAAeQAAAAAAWQAAAAADWQAAAAABYAAAAAAAWQAAAAAAZAAAAAABWQAAAAABYAAAAAAAYAAAAAAAWQAAAAACWQAAAAACWQAAAAAAYAAAAAAAWQAAAAACWQAAAAABWQAAAAADZAAAAAADWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAZAAAAAADYAAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAZAAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAWQAAAAADWQAAAAABWQAAAAABYAAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAdgAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA
           version: 6
         -2,1:
           ind: -2,1
@@ -7651,11 +7652,6 @@ entities:
       parent: 1
 - proto: Bed
   entities:
-  - uid: 1805
-    components:
-    - type: Transform
-      pos: 25.5,12.5
-      parent: 1
   - uid: 1806
     components:
     - type: Transform
@@ -7676,6 +7672,11 @@ entities:
     - type: Transform
       pos: -20.5,-3.5
       parent: 1
+  - uid: 1852
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 1
   - uid: 3482
     components:
     - type: Transform
@@ -7711,15 +7712,15 @@ entities:
     - type: Transform
       pos: 11.5,5.5
       parent: 1
-  - uid: 5663
+  - uid: 5671
     components:
     - type: Transform
-      pos: 16.5,-15.5
+      pos: 20.5,-15.5
       parent: 1
-  - uid: 7442
+  - uid: 7446
     components:
     - type: Transform
-      pos: 4.5,-17.5
+      pos: 6.5,-14.5
       parent: 1
   - uid: 7714
     components:
@@ -7765,11 +7766,10 @@ entities:
       parent: 1
 - proto: BedsheetCE
   entities:
-  - uid: 5662
+  - uid: 4918
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-15.5
+      pos: 20.5,-15.5
       parent: 1
 - proto: BedsheetClown
   entities:
@@ -7829,7 +7829,7 @@ entities:
       parent: 1
 - proto: BedsheetHOS
   entities:
-  - uid: 5373
+  - uid: 1863
     components:
     - type: Transform
       pos: 25.5,12.5
@@ -7877,11 +7877,10 @@ entities:
       parent: 1
 - proto: BedsheetQM
   entities:
-  - uid: 7441
+  - uid: 5395
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-17.5
+      pos: 6.5,-14.5
       parent: 1
 - proto: BedsheetRD
   entities:
@@ -8242,6 +8241,11 @@ entities:
       parent: 1
 - proto: BoxFolderBase
   entities:
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: -22.477488,-1.5542104
+      parent: 1
   - uid: 1857
     components:
     - type: Transform
@@ -8287,6 +8291,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.510255,48.552643
       parent: 1
+  - uid: 5634
+    components:
+    - type: Transform
+      pos: -22.289988,-1.3667104
+      parent: 1
   - uid: 6055
     components:
     - type: Transform
@@ -8348,16 +8357,6 @@ entities:
       parent: 1
 - proto: BoxFolderGrey
   entities:
-  - uid: 1883
-    components:
-    - type: Transform
-      pos: -21.598257,-1.4382241
-      parent: 1
-  - uid: 1884
-    components:
-    - type: Transform
-      pos: -21.473257,-1.3444741
-      parent: 1
   - uid: 6069
     components:
     - type: Transform
@@ -8385,11 +8384,6 @@ entities:
     - type: Transform
       pos: 28.678442,8.532815
       parent: 1
-  - uid: 5390
-    components:
-    - type: Transform
-      pos: 27.618711,13.570517
-      parent: 1
   - uid: 5397
     components:
     - type: Transform
@@ -8407,18 +8401,28 @@ entities:
       parent: 1
 - proto: BoxFolderWhite
   entities:
-  - uid: 1879
+  - uid: 5377
     components:
     - type: Transform
-      pos: -19.351341,14.63665
+      pos: -19.312119,13.611187
       parent: 1
-  - uid: 1880
+  - uid: 5655
     components:
     - type: Transform
-      pos: -19.445091,14.558525
+      pos: -19.593369,13.439312
       parent: 1
 - proto: BoxFolderYellow
   entities:
+  - uid: 1879
+    components:
+    - type: Transform
+      pos: 4.418282,-17.420078
+      parent: 1
+  - uid: 1881
+    components:
+    - type: Transform
+      pos: 4.277657,-17.638828
+      parent: 1
   - uid: 5095
     components:
     - type: Transform
@@ -8427,7 +8431,7 @@ entities:
   - uid: 5677
     components:
     - type: Transform
-      pos: 18.605122,-14.452038
+      pos: 17.707003,-15.576565
       parent: 1
   - uid: 6787
     components:
@@ -8469,16 +8473,6 @@ entities:
     - type: Transform
       pos: 11.422744,-18.443436
       parent: 1
-  - uid: 7448
-    components:
-    - type: Transform
-      pos: 5.6525464,-15.315514
-      parent: 1
-  - uid: 7449
-    components:
-    - type: Transform
-      pos: 5.4181714,-15.456139
-      parent: 1
   - uid: 9600
     components:
     - type: Transform
@@ -22162,7 +22156,7 @@ entities:
   - uid: 4981
     components:
     - type: Transform
-      pos: 4.562398,31.612326
+      pos: 5.6753416,30.52142
       parent: 1
 - proto: CarbonDioxideCanister
   entities:
@@ -22238,30 +22232,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,13.5
       parent: 1
-  - uid: 5625
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,14.5
-      parent: 1
-  - uid: 5626
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,13.5
-      parent: 1
-  - uid: 5627
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,14.5
-      parent: 1
-  - uid: 5628
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,13.5
-      parent: 1
   - uid: 5629
     components:
     - type: Transform
@@ -22286,18 +22256,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,14.5
       parent: 1
-  - uid: 5633
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,12.5
-      parent: 1
-  - uid: 5634
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,12.5
-      parent: 1
   - uid: 5635
     components:
     - type: Transform
@@ -22404,6 +22362,11 @@ entities:
       parent: 1
 - proto: CarpetBlue
   entities:
+  - uid: 4091
+    components:
+    - type: Transform
+      pos: -20.5,15.5
+      parent: 1
   - uid: 5645
     components:
     - type: Transform
@@ -22452,35 +22415,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,15.5
       parent: 1
-  - uid: 5653
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-2.5
-      parent: 1
-  - uid: 5654
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-2.5
-      parent: 1
-  - uid: 5655
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-3.5
-      parent: 1
-  - uid: 5656
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-2.5
-      parent: 1
-  - uid: 5657
+  - uid: 7444
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-3.5
+      pos: -20.5,16.5
       parent: 1
 - proto: CarpetGreen
   entities:
@@ -22621,52 +22559,93 @@ entities:
       parent: 1
 - proto: CarpetOrange
   entities:
-  - uid: 5658
+  - uid: 1845
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-14.5
+      pos: 6.5,-14.5
       parent: 1
-  - uid: 5659
+  - uid: 5415
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-15.5
+      pos: 19.5,-15.5
+      parent: 1
+  - uid: 5626
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 5627
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 5628
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 5653
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
       parent: 1
   - uid: 5660
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-14.5
+      pos: 20.5,-14.5
       parent: 1
   - uid: 5661
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-15.5
+      pos: 20.5,-15.5
       parent: 1
-  - uid: 12419
+  - uid: 5662
     components:
     - type: Transform
-      pos: 4.5,-17.5
+      pos: 20.5,-13.5
       parent: 1
-  - uid: 12420
+  - uid: 5672
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: 19.5,-14.5
       parent: 1
-  - uid: 12421
+  - uid: 5673
     components:
     - type: Transform
-      pos: 5.5,-17.5
+      pos: 19.5,-13.5
       parent: 1
-  - uid: 12422
+  - uid: 7447
     components:
     - type: Transform
-      pos: 5.5,-16.5
+      pos: 4.5,-15.5
       parent: 1
 - proto: CarpetPurple
   entities:
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: -22.5,-2.5
+      parent: 1
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: -20.5,-2.5
+      parent: 1
+  - uid: 1873
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 1
+  - uid: 1874
+    components:
+    - type: Transform
+      pos: -20.5,-3.5
+      parent: 1
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: -21.5,-2.5
+      parent: 1
   - uid: 5018
     components:
     - type: Transform
@@ -22682,6 +22661,11 @@ entities:
     - type: Transform
       pos: 5.5,10.5
       parent: 1
+  - uid: 5369
+    components:
+    - type: Transform
+      pos: -22.5,-3.5
+      parent: 1
 - proto: CarpetSBlue
   entities:
   - uid: 5639
@@ -26173,17 +26157,17 @@ entities:
     - type: Transform
       pos: 14.5,13.5
       parent: 1
-  - uid: 1710
+  - uid: 1875
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-16.5
+      pos: -21.5,-2.5
       parent: 1
-  - uid: 1875
+  - uid: 1883
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 5.512032,-16.451328
       parent: 1
   - uid: 2868
     components:
@@ -26342,11 +26326,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,17.5
       parent: 1
-  - uid: 5375
+  - uid: 5393
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,13.5
+      pos: 28.500902,13.478384
       parent: 1
   - uid: 5574
     components:
@@ -26360,12 +26343,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -36.5,-3.5
       parent: 1
-  - uid: 5673
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-14.5
-      parent: 1
   - uid: 5674
     components:
     - type: Transform
@@ -26400,6 +26377,12 @@ entities:
     - type: Transform
       pos: 12.5,-26.5
       parent: 1
+  - uid: 7452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.488253,-14.435939
+      parent: 1
   - uid: 8013
     components:
     - type: Transform
@@ -26449,11 +26432,6 @@ entities:
       parent: 1
 - proto: ChairOfficeLight
   entities:
-  - uid: 1874
-    components:
-    - type: Transform
-      pos: -19.5,15.5
-      parent: 1
   - uid: 5608
     components:
     - type: Transform
@@ -26472,6 +26450,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,6.5
       parent: 1
+  - uid: 5633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.499619,14.564312
+      parent: 1
   - uid: 5921
     components:
     - type: Transform
@@ -26636,18 +26620,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-29.5
       parent: 1
-- proto: chem_master
-  entities:
-  - uid: 5604
-    components:
-    - type: Transform
-      pos: -8.5,14.5
-      parent: 1
-  - uid: 5605
-    components:
-    - type: Transform
-      pos: -11.5,16.5
-      parent: 1
 - proto: ChemDispenser
   entities:
   - uid: 5606
@@ -26674,6 +26646,18 @@ entities:
     - type: Transform
       pos: -11.5,13.5
       parent: 1
+- proto: ChemMaster
+  entities:
+  - uid: 5604
+    components:
+    - type: Transform
+      pos: -8.5,14.5
+      parent: 1
+  - uid: 5605
+    components:
+    - type: Transform
+      pos: -11.5,16.5
+      parent: 1
 - proto: ChessBoard
   entities:
   - uid: 5058
@@ -27514,6 +27498,13 @@ entities:
     - type: Transform
       pos: -13.503023,28.53958
       parent: 1
+- proto: ClothingHeadHatBeretCmo
+  entities:
+  - uid: 7450
+    components:
+    - type: Transform
+      pos: -20.687119,13.736187
+      parent: 1
 - proto: ClothingHeadHatFedoraBrown
   entities:
   - uid: 12535
@@ -27630,21 +27621,7 @@ entities:
   - uid: 6397
     components:
     - type: Transform
-      pos: 4.585783,31.487268
-      parent: 1
-- proto: ClothingNeckMantleCE
-  entities:
-  - uid: 5675
-    components:
-    - type: Transform
-      pos: 18.495747,-13.358288
-      parent: 1
-- proto: ClothingNeckMantleCMO
-  entities:
-  - uid: 1869
-    components:
-    - type: Transform
-      pos: -20.496048,14.567978
+      pos: 5.4722166,31.005795
       parent: 1
 - proto: ClothingNeckMantleHOP
   entities:
@@ -27655,13 +27632,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingNeckMantleRD
-  entities:
-  - uid: 1877
-    components:
-    - type: Transform
-      pos: -22.452333,-1.4018333
-      parent: 1
 - proto: ClothingNeckScarfStripedBlue
   entities:
   - uid: 1899
@@ -27779,15 +27749,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterWinterCE
-  entities:
-  - uid: 5670
-    components:
-    - type: Transform
-      parent: 5669
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingOuterWinterCMO
   entities:
   - uid: 1868
@@ -27806,33 +27767,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterWinterHoS
-  entities:
-  - uid: 12478
-    components:
-    - type: Transform
-      parent: 5374
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterWinterQM
-  entities:
-  - uid: 7444
-    components:
-    - type: Transform
-      parent: 7443
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterWinterRD
-  entities:
-  - uid: 12418
-    components:
-    - type: Transform
-      parent: 1845
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingShoesBootsCombat
   entities:
   - uid: 8275
@@ -27914,16 +27848,17 @@ entities:
       parent: 1
 - proto: ComfyChair
   entities:
-  - uid: 1711
+  - uid: 794
     components:
     - type: Transform
-      pos: 5.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: 26.5,12.5
       parent: 1
-  - uid: 1873
+  - uid: 1848
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-15.5
       parent: 1
   - uid: 1876
     components:
@@ -27968,12 +27903,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,25.5
       parent: 1
-  - uid: 5377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,13.5
-      parent: 1
   - uid: 5573
     components:
     - type: Transform
@@ -27986,6 +27915,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,5.5
       parent: 1
+  - uid: 7454
+    components:
+    - type: Transform
+      pos: 19.5,-13.5
+      parent: 1
   - uid: 7712
     components:
     - type: Transform
@@ -28006,11 +27940,16 @@ entities:
         - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
 - proto: ComputerCargoBounty
   entities:
-  - uid: 7247
+  - uid: 1880
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-23.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 5669
+    components:
+    - type: Transform
+      pos: 8.5,-19.5
       parent: 1
 - proto: ComputerCargoOrders
   entities:
@@ -28020,18 +27959,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-22.5
       parent: 1
-  - uid: 7395
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-14.5
-      parent: 1
-- proto: ComputerCargoShuttle
-  entities:
-  - uid: 4918
+  - uid: 5366
     components:
     - type: Transform
-      pos: 8.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-17.5
       parent: 1
 - proto: ComputerComms
   entities:
@@ -28048,6 +27980,12 @@ entities:
       parent: 1
 - proto: ComputerCrewMonitoring
   entities:
+  - uid: 1844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,14.5
+      parent: 1
   - uid: 1888
     components:
     - type: Transform
@@ -28066,10 +28004,11 @@ entities:
     - type: Transform
       pos: 14.5,15.5
       parent: 1
-  - uid: 5366
+  - uid: 1869
     components:
     - type: Transform
-      pos: 25.5,14.5
+      rot: 3.141592653589793 rad
+      pos: 28.5,12.5
       parent: 1
   - uid: 5370
     components:
@@ -28114,14 +28053,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,19.5
       parent: 1
-- proto: ComputerMedicalRecords
-  entities:
-  - uid: 1871
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,13.5
-      parent: 1
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 4072
@@ -28129,10 +28060,11 @@ entities:
     - type: Transform
       pos: -5.5,31.5
       parent: 1
-  - uid: 5415
+  - uid: 5665
     components:
     - type: Transform
-      pos: 19.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-14.5
       parent: 1
   - uid: 5668
     components:
@@ -28156,11 +28088,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-3.5
       parent: 1
-  - uid: 5365
+  - uid: 5385
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -21.5,-1.5
       parent: 1
 - proto: ComputerRoboticsControl
   entities:
@@ -28186,6 +28118,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-27.5
       parent: 1
+- proto: ComputerShuttleSalvage
+  entities:
+  - uid: 5666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-23.5
+      parent: 1
 - proto: ComputerSolarControl
   entities:
   - uid: 2557
@@ -28244,6 +28184,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,12.5
       parent: 1
+  - uid: 1884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,13.5
+      parent: 1
   - uid: 3794
     components:
     - type: Transform
@@ -28266,11 +28212,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 25.5,6.5
       parent: 1
-  - uid: 5369
-    components:
-    - type: Transform
-      pos: 26.5,14.5
-      parent: 1
 - proto: ComputerTechnologyDiskTerminal
   entities:
   - uid: 3822
@@ -28822,6 +28763,39 @@ entities:
     - type: Transform
       pos: -41.5,-23.5
       parent: 1
+- proto: CurtainsBlueOpen
+  entities:
+  - uid: 5391
+    components:
+    - type: Transform
+      pos: -18.5,16.5
+      parent: 1
+- proto: CurtainsOrangeOpen
+  entities:
+  - uid: 4933
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 1
+  - uid: 5625
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+- proto: CurtainsPurpleOpen
+  entities:
+  - uid: 5390
+    components:
+    - type: Transform
+      pos: -20.5,-3.5
+      parent: 1
+- proto: CurtainsRedOpen
+  entities:
+  - uid: 5394
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 1
 - proto: d20Dice
   entities:
   - uid: 5591
@@ -32502,6 +32476,48 @@ entities:
     - type: Transform
       pos: 5.5,29.5
       parent: 1
+- proto: DresserCaptainFilled
+  entities:
+  - uid: 7445
+    components:
+    - type: Transform
+      pos: 4.5,31.5
+      parent: 1
+- proto: DresserChiefEngineerFilled
+  entities:
+  - uid: 5659
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 1
+- proto: DresserChiefMedicalOfficerFilled
+  entities:
+  - uid: 5657
+    components:
+    - type: Transform
+      pos: -19.5,16.5
+      parent: 1
+- proto: DresserHeadOfSecurityFilled
+  entities:
+  - uid: 6044
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 1
+- proto: DresserQuarterMasterFilled
+  entities:
+  - uid: 5373
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+- proto: DresserResearchDirectorFilled
+  entities:
+  - uid: 7442
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 1
 - proto: Drill
   entities:
   - uid: 9639
@@ -38592,10 +38608,14 @@ entities:
   - uid: 8794
     components:
     - type: Transform
+      anchored: False
       pos: -14.5,-45.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 10091
     components:
     - type: Transform
@@ -38830,11 +38850,15 @@ entities:
   - uid: 10130
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 21.5,-11.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 10131
     components:
     - type: Transform
@@ -43075,13 +43099,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10974
-    components:
-    - type: Transform
-      pos: -4.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10975
     components:
     - type: Transform
@@ -44040,11 +44057,15 @@ entities:
   - uid: 11152
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: -37.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 11153
     components:
     - type: Transform
@@ -47036,11 +47057,15 @@ entities:
   - uid: 12253
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -4.5,56.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 12254
     components:
     - type: Transform
@@ -54986,27 +55011,11 @@ entities:
       parent: 1
 - proto: HospitalCurtainsOpen
   entities:
-  - uid: 794
-    components:
-    - type: Transform
-      pos: 25.5,12.5
-      parent: 1
   - uid: 1804
     components:
     - type: Transform
       pos: 28.5,5.5
       parent: 1
-  - uid: 1843
-    components:
-    - type: Transform
-      pos: -20.5,-3.5
-      parent: 1
-  - uid: 1852
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,16.5
-      parent: 1
   - uid: 5371
     components:
     - type: Transform
@@ -55023,18 +55032,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,16.5
       parent: 1
-  - uid: 5672
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-15.5
-      parent: 1
-  - uid: 7440
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-17.5
-      parent: 1
   - uid: 7718
     components:
     - type: Transform
@@ -55745,40 +55742,11 @@ entities:
       parent: 1
 - proto: LockerChiefEngineerFilled
   entities:
-  - uid: 5669
+  - uid: 5658
     components:
     - type: Transform
-      pos: 20.5,-15.5
+      pos: 20.5,-13.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 93.465614
-        moles:
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 5670
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerChiefMedicalOfficerFilled
   entities:
   - uid: 1867
@@ -55986,40 +55954,11 @@ entities:
           ent: null
 - proto: LockerHeadOfSecurityFilled
   entities:
-  - uid: 5374
+  - uid: 7441
     components:
     - type: Transform
-      pos: 29.5,12.5
+      pos: 25.5,14.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:
-          - 12478
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerMedicalFilled
   entities:
   - uid: 1908
@@ -56056,76 +55995,18 @@ entities:
       parent: 1
 - proto: LockerQuarterMasterFilled
   entities:
-  - uid: 7443
+  - uid: 5656
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: 4.5,-14.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 75.31249
-        moles:
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7444
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerResearchDirectorFilled
   entities:
-  - uid: 1845
+  - uid: 7395
     components:
     - type: Transform
-      pos: -21.5,-3.5
+      pos: -22.5,-2.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:
-          - 12418
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerSalvageSpecialistFilled
   entities:
   - uid: 3594
@@ -56329,15 +56210,15 @@ entities:
       parent: 1
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
-  - uid: 5386
+  - uid: 1865
     components:
     - type: Transform
-      pos: 27.431211,14.508017
+      pos: 27.625902,12.337759
       parent: 1
-  - uid: 5387
+  - uid: 5365
     components:
     - type: Transform
-      pos: 27.431211,14.367392
+      pos: 27.579027,12.494009
       parent: 1
 - proto: MagazineRifle
   entities:
@@ -57473,12 +57354,6 @@ entities:
     - type: Transform
       pos: 5.5,-20.5
       parent: 1
-  - uid: 7447
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-15.5
-      parent: 1
   - uid: 7782
     components:
     - type: Transform
@@ -57540,6 +57415,23 @@ entities:
     - type: Transform
       pos: 4.593648,27.643576
       parent: 1
+- proto: PaperCargoInvoice
+  entities:
+  - uid: 798
+    components:
+    - type: Transform
+      pos: 4.715157,-17.670078
+      parent: 1
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: 4.777657,-17.498203
+      parent: 1
+  - uid: 5392
+    components:
+    - type: Transform
+      pos: 4.777657,-17.310703
+      parent: 1
 - proto: PaperOffice
   entities:
   - uid: 3999
@@ -57682,26 +57574,6 @@ entities:
     - type: Transform
       pos: -4.5472007,19.595882
       parent: 1
-  - uid: 5391
-    components:
-    - type: Transform
-      pos: 27.337461,13.773642
-      parent: 1
-  - uid: 5392
-    components:
-    - type: Transform
-      pos: 27.368711,13.758017
-      parent: 1
-  - uid: 5393
-    components:
-    - type: Transform
-      pos: 27.415586,13.711142
-      parent: 1
-  - uid: 5394
-    components:
-    - type: Transform
-      pos: 27.478086,13.679892
-      parent: 1
   - uid: 5398
     components:
     - type: Transform
@@ -57725,22 +57597,12 @@ entities:
   - uid: 5678
     components:
     - type: Transform
-      pos: 18.339497,-14.389538
-      parent: 1
-  - uid: 5679
-    components:
-    - type: Transform
-      pos: 18.339497,-14.295788
-      parent: 1
-  - uid: 5680
-    components:
-    - type: Transform
-      pos: 18.339497,-14.186413
+      pos: 17.441378,-15.404689
       parent: 1
   - uid: 5681
     components:
     - type: Transform
-      pos: 18.355122,-14.061413
+      pos: 17.332003,-15.56094
       parent: 1
   - uid: 5875
     components:
@@ -57872,25 +57734,10 @@ entities:
     - type: Transform
       pos: 11.453994,-18.162186
       parent: 1
-  - uid: 7450
-    components:
-    - type: Transform
-      pos: 5.1056714,-15.299889
-      parent: 1
-  - uid: 7451
-    components:
-    - type: Transform
-      pos: 5.1056714,-15.299889
-      parent: 1
-  - uid: 7452
-    components:
-    - type: Transform
-      pos: 5.1056714,-15.299889
-      parent: 1
   - uid: 7453
     components:
     - type: Transform
-      pos: 5.1056714,-15.299889
+      pos: 17.566378,-15.264064
       parent: 1
   - uid: 8247
     components:
@@ -58038,15 +57885,10 @@ entities:
       parent: 1
 - proto: Pen
   entities:
-  - uid: 1881
-    components:
-    - type: Transform
-      pos: -19.882591,14.621025
-      parent: 1
-  - uid: 1882
+  - uid: 1780
     components:
     - type: Transform
-      pos: -21.958109,-1.4018333
+      pos: -22.696238,-1.2729604
       parent: 1
   - uid: 3995
     components:
@@ -58092,11 +57934,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.773567,10.670956
       parent: 1
-  - uid: 5395
+  - uid: 5386
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.587461,13.804892
+      pos: -19.937119,13.673687
       parent: 1
   - uid: 5402
     components:
@@ -58119,11 +57960,10 @@ entities:
     - type: Transform
       pos: -39.229885,-5.2659664
       parent: 1
-  - uid: 5682
+  - uid: 5675
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.651997,-14.061413
+      pos: 17.097628,-15.217189
       parent: 1
   - uid: 5879
     components:
@@ -58151,10 +57991,10 @@ entities:
     - type: Transform
       pos: 5.313369,-21.14656
       parent: 1
-  - uid: 7454
+  - uid: 7451
     components:
     - type: Transform
-      pos: 5.6369214,-15.503014
+      pos: 4.230782,-17.216953
       parent: 1
   - uid: 9046
     components:
@@ -62393,32 +62233,32 @@ entities:
       parent: 1
 - proto: RCD
   entities:
-  - uid: 7135
+  - uid: 5679
     components:
     - type: Transform
-      pos: 31.574986,-16.418343
+      pos: 16.410128,-15.420314
       parent: 1
-  - uid: 12468
+  - uid: 7135
     components:
     - type: Transform
-      pos: 18.51267,-13.338883
+      pos: 31.574986,-16.418343
       parent: 1
 - proto: RCDAmmo
   entities:
-  - uid: 7136
+  - uid: 5663
     components:
     - type: Transform
-      pos: 31.27811,-16.605843
+      pos: 16.878878,-15.467189
       parent: 1
-  - uid: 12469
+  - uid: 5680
     components:
     - type: Transform
-      pos: 18.278296,-13.526383
+      pos: 17.050753,-15.467189
       parent: 1
-  - uid: 12470
+  - uid: 7136
     components:
     - type: Transform
-      pos: 18.434546,-13.526383
+      pos: 31.27811,-16.605843
       parent: 1
 - proto: ReagentContainerFlour
   entities:
@@ -64453,10 +64293,10 @@ entities:
       parent: 1
 - proto: ResearchAndDevelopmentServer
   entities:
-  - uid: 1848
+  - uid: 4973
     components:
     - type: Transform
-      pos: -22.5,-3.5
+      pos: -22.5,-0.5
       parent: 1
 - proto: RightArmBorg
   entities:
@@ -65035,7 +64875,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5684
     components:
     - type: Transform
@@ -65043,7 +64883,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5685
     components:
     - type: Transform
@@ -65051,7 +64891,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5686
     components:
     - type: Transform
@@ -65059,15 +64899,12 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5687
     components:
     - type: Transform
       pos: 21.5,-15.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 5671
   - uid: 5887
     components:
     - type: Transform
@@ -65455,16 +65292,14 @@ entities:
         - Pressed: Toggle
         1866:
         - Pressed: Toggle
-  - uid: 5671
+  - uid: 5682
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: 19.5,-16.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        5687:
-        - Pressed: Toggle
         5685:
         - Pressed: Toggle
         5684:
@@ -66405,7 +66240,7 @@ entities:
     - type: Transform
       pos: -43.500492,24.479343
       parent: 1
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 5954
     components:
@@ -66949,10 +66784,11 @@ entities:
       parent: 1
 - proto: SpawnMobShiva
   entities:
-  - uid: 8256
+  - uid: 7440
     components:
     - type: Transform
-      pos: 25.5,13.5
+      rot: 3.141592653589793 rad
+      pos: 26.5,12.5
       parent: 1
 - proto: SpawnMobSmile
   entities:
@@ -67055,10 +66891,10 @@ entities:
       parent: 1
 - proto: SpawnPointChiefMedicalOfficer
   entities:
-  - uid: 1870
+  - uid: 1843
     components:
     - type: Transform
-      pos: -19.5,13.5
+      pos: -19.5,14.5
       parent: 1
 - proto: SpawnPointClown
   entities:
@@ -67083,10 +66919,10 @@ entities:
       parent: 1
 - proto: SpawnPointHeadOfSecurity
   entities:
-  - uid: 6044
+  - uid: 7448
     components:
     - type: Transform
-      pos: 26.5,13.5
+      pos: 28.5,13.5
       parent: 1
 - proto: SpawnPointJanitor
   entities:
@@ -67195,10 +67031,10 @@ entities:
       parent: 1
 - proto: SpawnPointQuartermaster
   entities:
-  - uid: 7477
+  - uid: 5375
     components:
     - type: Transform
-      pos: 5.5,-14.5
+      pos: 6.5,-15.5
       parent: 1
 - proto: SpawnPointResearchAssistant
   entities:
@@ -67671,17 +67507,17 @@ entities:
       parent: 1
 - proto: SuitStorageCE
   entities:
-  - uid: 4933
+  - uid: 7477
     components:
     - type: Transform
-      pos: 20.5,-13.5
+      pos: 18.5,-15.5
       parent: 1
 - proto: SuitStorageCMO
   entities:
-  - uid: 1865
+  - uid: 5374
     components:
     - type: Transform
-      pos: -20.5,15.5
+      pos: -18.5,13.5
       parent: 1
 - proto: SuitStorageEngi
   entities:
@@ -67736,17 +67572,17 @@ entities:
       parent: 1
 - proto: SuitStorageHOS
   entities:
-  - uid: 4973
+  - uid: 1864
     components:
     - type: Transform
-      pos: 29.5,14.5
+      pos: 29.5,12.5
       parent: 1
 - proto: SuitStorageRD
   entities:
-  - uid: 4929
+  - uid: 5654
     components:
     - type: Transform
-      pos: -22.5,-2.5
+      pos: -22.5,-3.5
       parent: 1
 - proto: SuitStorageSalv
   entities:
@@ -69595,11 +69431,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,7.5
       parent: 1
-  - uid: 798
-    components:
-    - type: Transform
-      pos: 27.5,13.5
-      parent: 1
   - uid: 1256
     components:
     - type: Transform
@@ -69624,11 +69455,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,-4.5
       parent: 1
-  - uid: 1780
-    components:
-    - type: Transform
-      pos: 27.5,14.5
-      parent: 1
   - uid: 1802
     components:
     - type: Transform
@@ -69639,22 +69465,11 @@ entities:
     - type: Transform
       pos: 28.5,16.5
       parent: 1
-  - uid: 1844
-    components:
-    - type: Transform
-      pos: -21.5,-1.5
-      parent: 1
-  - uid: 1863
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,14.5
-      parent: 1
-  - uid: 1864
+  - uid: 1882
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,14.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-17.5
       parent: 1
   - uid: 2782
     components:
@@ -69749,12 +69564,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,28.5
       parent: 1
-  - uid: 4091
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,31.5
-      parent: 1
   - uid: 4092
     components:
     - type: Transform
@@ -69842,6 +69651,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,31.5
       parent: 1
+  - uid: 4929
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,13.5
+      parent: 1
   - uid: 4956
     components:
     - type: Transform
@@ -69898,17 +69713,16 @@ entities:
     - type: Transform
       pos: -22.5,-1.5
       parent: 1
-  - uid: 5665
+  - uid: 5387
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-13.5
+      pos: 27.5,12.5
       parent: 1
-  - uid: 5666
+  - uid: 5670
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-15.5
       parent: 1
   - uid: 5947
     components:
@@ -69922,17 +69736,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,5.5
       parent: 1
-  - uid: 7445
+  - uid: 7247
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-15.5
       parent: 1
-  - uid: 7446
+  - uid: 7443
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,13.5
       parent: 1
   - uid: 7710
     components:
@@ -70362,6 +70176,13 @@ entities:
     - type: Transform
       pos: -6.5061026,52.63185
       parent: 1
+- proto: ToyFigurineChiefMedicalOfficer
+  entities:
+  - uid: 7449
+    components:
+    - type: Transform
+      pos: -20.374619,13.548687
+      parent: 1
 - proto: ToyFireRipley
   entities:
   - uid: 8259
@@ -80010,10 +79831,10 @@ entities:
       parent: 1
 - proto: WeaponSubMachineGunWt550
   entities:
-  - uid: 5385
+  - uid: 1710
     components:
     - type: Transform
-      pos: 27.524961,14.648642
+      pos: 27.516527,12.712759
       parent: 1
 - proto: WeaponTurretSyndicateBroken
   entities:

From ca9830a2842b4889a20825d9d34da4c6fe891086 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 5 Jun 2024 17:51:47 +0000
Subject: [PATCH 302/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 574ea1adb35b..851ebffc64dc 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: Lone operatives now start with 60TC instead of 40TC.
-    type: Tweak
-  id: 6183
-  time: '2024-03-18T14:15:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26130
 - author: PJB3005
   changes:
   - message: Fixed hardsuits in space causing high pressure damage
@@ -3849,3 +3842,10 @@
   id: 6682
   time: '2024-06-04T18:48:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28590
+- author: Boaz1111
+  changes:
+  - message: Revamped Cluster's Head Offices
+    type: Tweak
+  id: 6683
+  time: '2024-06-05T17:50:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28627

From 192a3187dfb80cbfec423a7a9757342dec08ceba Mon Sep 17 00:00:00 2001
From: Hmeister-real <118129069+Hmeister-real@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:10:27 +0100
Subject: [PATCH 303/568] minor banner changes (#28636)

* minor banner changes

* Uhrmm actchually it's you're, not your

* Update banners.yml

props Hyenh
---
 .../Prototypes/Entities/Structures/Decoration/banners.yml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
index cc0c90503d0f..c2567814ac11 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml
@@ -91,7 +91,7 @@
   id: BannerScience
   parent: BannerBase
   name: science banner
-  description: A banner displaying the colors of the science department. Where stupidity is proven greater than the universe.
+  description: A banner displaying the colors of the science department. Where science has no bounds, and regulations are rarely followed.
   components:
   - type: Sprite
     sprite: Structures/Decoration/banner.rsi
@@ -101,7 +101,7 @@
   id: BannerSecurity
   parent: BannerBase
   name: security banner
-  description: A banner displaying the colors of the shitcurity department. Security, my bad.
+  description: A banner displaying the colors of the security department. You're surprised it's not vandalised.
   components:
   - type: Sprite
     sprite: Structures/Decoration/banner.rsi

From 4c0a878f6feccc8282d0d7acbe37de5c3e9f4528 Mon Sep 17 00:00:00 2001
From: lapatison <100279397+lapatison@users.noreply.github.com>
Date: Wed, 5 Jun 2024 23:10:58 +0300
Subject: [PATCH 304/568] Revenant spell catalog locale (#28638)

locale
---
 .../Locale/en-US/store/revenant-catalog.ftl      | 11 +++++++++++
 .../Prototypes/Catalog/revenant_catalog.yml      | 16 ++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Locale/en-US/store/revenant-catalog.ftl

diff --git a/Resources/Locale/en-US/store/revenant-catalog.ftl b/Resources/Locale/en-US/store/revenant-catalog.ftl
new file mode 100644
index 000000000000..d3cbbf724fc8
--- /dev/null
+++ b/Resources/Locale/en-US/store/revenant-catalog.ftl
@@ -0,0 +1,11 @@
+revenant-defile-name = Defile
+revenant-defile-desc = Defiles the surrounding area, ripping up floors, damaging windows, opening containers, and throwing items. Using it leaves you vulnerable to attacks for a short period of time.
+
+revenant-overload-name = Overload Lights
+revenant-overload-desc = Overloads all nearby lights, causing lights to pulse and sending out dangerous lightning. Using it leaves you vulnerable to attacks for a long period of time.
+
+revenant-blight-name = Blight
+revenant-blight-desc = Infects all nearby organisms with an infectious disease that causes toxic buildup and tiredness. Using it leaves you vulnerable to attacks for a medium period of time.
+
+revenant-malfunction-name = Malfunction
+revenant-malfunction-desc = Makes nearby electronics stop working properly. Using it leaves you vulnerable to attacks for a long period of time.
diff --git a/Resources/Prototypes/Catalog/revenant_catalog.yml b/Resources/Prototypes/Catalog/revenant_catalog.yml
index 84f45d16073b..ec1ef0a309b1 100644
--- a/Resources/Prototypes/Catalog/revenant_catalog.yml
+++ b/Resources/Prototypes/Catalog/revenant_catalog.yml
@@ -1,7 +1,7 @@
 - type: listing
   id: RevenantDefile
-  name: Defile
-  description: Defiles the surrounding area, ripping up floors, damaging windows, opening containers, and throwing items. Using it leaves you vulnerable to attacks for a short period of time.
+  name: revenant-defile-name
+  description: revenant-defile-desc
   productAction: ActionRevenantDefile
   cost:
     StolenEssence: 10
@@ -13,8 +13,8 @@
 
 - type: listing
   id: RevenantOverloadLights
-  name: Overload Lights
-  description: Overloads all nearby lights, causing lights to pulse and sending out dangerous lightning. Using it leaves you vulnerable to attacks for a long period of time.
+  name: revenant-overload-name
+  description: revenant-overload-desc
   productAction: ActionRevenantOverloadLights
   cost:
     StolenEssence: 25
@@ -26,8 +26,8 @@
 
 #- type: listing
 #  id: RevenantBlight
-#  name: Blight
-#  description: Infects all nearby organisms with an infectious disease that causes toxic buildup and tiredness. Using it leaves you vulnerable to attacks for a medium period of time.
+#  name: revenant-blight-name
+#  description: revenant-blight-desc
 #  productAction: ActionRevenantBlight
 #  cost:
 #    StolenEssence: 75
@@ -39,8 +39,8 @@
 
 - type: listing
   id: RevenantMalfunction
-  name: Malfunction
-  description: Makes nearby electronics stop working properly. Using it leaves you vulnerable to attacks for a long period of time.
+  name: revenant-malfunction-name
+  description: revenant-malfunction-desc
   productAction: ActionRevenantMalfunction
   cost:
     StolenEssence: 125

From d75de9fa248cce1a1670616ba0af5a0f4759ce51 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:14:56 -0700
Subject: [PATCH 305/568] Make cuff default range again (#28576)

* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Shared/Cuffs/SharedCuffableSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index f0f9a949839a..1ced3c8d6cb8 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -484,7 +484,7 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
                 BreakOnWeightlessMove = false,
                 BreakOnDamage = true,
                 NeedHand = true,
-                DistanceThreshold = 0.3f
+                DistanceThreshold = 1f // shorter than default but still feels good
             };
 
             if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
@@ -581,7 +581,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 BreakOnDamage = true,
                 NeedHand = true,
                 RequireCanInteract = false, // Trust in UncuffAttemptEvent
-                DistanceThreshold = 0.3f
+                DistanceThreshold = 1f // shorter than default but still feels good
             };
 
             if (!_doAfter.TryStartDoAfter(doAfterEventArgs))

From 8a7b0f675e1cf140f28cb6f0bb2d15c3fca9a14f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 5 Jun 2024 20:16:02 +0000
Subject: [PATCH 306/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 851ebffc64dc..e68ab9517d3d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: Fixed hardsuits in space causing high pressure damage
-    type: Fix
-  id: 6184
-  time: '2024-03-18T16:46:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26236
 - author: potato1234x
   changes:
   - message: Added crafting recipes for wall lockers and secure lockers
@@ -3849,3 +3842,10 @@
   id: 6683
   time: '2024-06-05T17:50:38.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28627
+- author: Plykiya
+  changes:
+  - message: Handcuff range is buffed to one tile of distance.
+    type: Tweak
+  id: 6684
+  time: '2024-06-05T20:14:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28576

From 729e67af7f2892644d758c6ade5c9abc4ac6c66e Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:23:23 -0400
Subject: [PATCH 307/568] Machine-code cleanup (#28489)

---
 .../UI/FlatpackCreatorMenu.xaml.cs            |   3 +-
 .../Tests/MachineBoardTest.cs                 |  41 +-
 .../Tests/MaterialArbitrageTest.cs            |   3 +-
 .../Construction/Components/IRefreshParts.cs  |  10 -
 .../Components/MachineComponent.cs            |  34 +-
 .../Components/MachineFrameComponent.cs       |  19 +-
 .../Components/PartExchangerComponent.cs      |  29 --
 .../Conditions/MachineFrameComplete.cs        |  28 +-
 .../Construction/ConstructionSystem.Graph.cs  |   8 +-
 .../Construction/ConstructionSystem.Guided.cs |   6 +-
 .../ConstructionSystem.Initial.cs             |   8 +-
 .../ConstructionSystem.Machine.cs             | 176 +--------
 .../Construction/ConstructionSystem.cs        |   1 -
 .../Construction/MachineFrameSystem.cs        | 128 +------
 .../Construction/PartExchangerSystem.cs       | 180 ---------
 Content.Server/Stack/StackSystem.cs           |   9 +
 .../Components/MachineBoardComponent.cs       |  89 ++---
 .../Components/MachinePartComponent.cs        |  24 --
 .../Construction/MachinePartSystem.cs         |  46 +--
 .../Prototypes/MachinePartPrototype.cs        |  28 --
 .../Construction/SharedConstructionSystem.cs  |  11 +
 .../Construction/SharedFlatpackSystem.cs      |   9 +-
 Content.Shared/Lathe/LatheComponent.cs        |   2 -
 ...bitrary-insert-construction-graph-step.ftl |  10 +-
 .../Devices/Circuitboards/Machine/cannons.yml |  17 +-
 .../Machine/particle_accelerator.yml          |  17 +-
 .../Circuitboards/Machine/production.yml      | 352 +++++++-----------
 .../Entities/Objects/Misc/machine_parts.yml   |  11 +-
 .../Entities/Objects/Power/powercells.yml     |  12 -
 .../Prototypes/MachineParts/machine_parts.yml |  20 -
 .../Prototypes/Stacks/science_stacks.yml      |   2 +-
 31 files changed, 352 insertions(+), 981 deletions(-)
 delete mode 100644 Content.Server/Construction/Components/IRefreshParts.cs
 delete mode 100644 Content.Server/Construction/Components/PartExchangerComponent.cs
 delete mode 100644 Content.Server/Construction/PartExchangerSystem.cs
 delete mode 100644 Content.Shared/Construction/Components/MachinePartComponent.cs
 delete mode 100644 Content.Shared/Construction/Prototypes/MachinePartPrototype.cs
 delete mode 100644 Resources/Prototypes/MachineParts/machine_parts.yml

diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index ad19bc30f42f..002616323784 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -75,8 +75,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         else if (_currentBoard != null)
         {
             Dictionary<string, int> cost;
-            if (_entityManager.TryGetComponent(_currentBoard, out machineBoardComp) &&
-                machineBoardComp.Prototype is not null)
+            if (_entityManager.TryGetComponent(_currentBoard, out machineBoardComp))
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
             else
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker));
diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs
index bd3a72f4c1d1..e741935be340 100644
--- a/Content.IntegrationTests/Tests/MachineBoardTest.cs
+++ b/Content.IntegrationTests/Tests/MachineBoardTest.cs
@@ -2,6 +2,8 @@
 using System.Linq;
 using Content.Server.Construction.Components;
 using Content.Shared.Construction.Components;
+using Content.Shared.Prototypes;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests;
@@ -49,12 +51,11 @@ await server.WaitAssertion(() =>
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(mId, Is.Not.Null, $"Machine board {p.ID} does not have a corresponding machine.");
                     Assert.That(protoMan.TryIndex<EntityPrototype>(mId, out var mProto),
                         $"Machine board {p.ID}'s corresponding machine has an invalid prototype.");
                     Assert.That(mProto.TryGetComponent<MachineComponent>(out var mComp),
                         $"Machine board {p.ID}'s corresponding machine {mId} does not have MachineComponent");
-                    Assert.That(mComp.BoardPrototype, Is.EqualTo(p.ID),
+                    Assert.That(mComp.Board, Is.EqualTo(p.ID),
                         $"Machine {mId}'s BoardPrototype is not equal to it's corresponding machine board, {p.ID}");
                 });
             }
@@ -101,4 +102,40 @@ await server.WaitAssertion(() =>
 
         await pair.CleanReturnAsync();
     }
+
+    /// <summary>
+    /// Ensures that every single computer board's corresponding entity
+    /// is a computer that can be properly deconstructed to the correct board
+    /// </summary>
+    [Test]
+    public async Task TestValidateBoardComponentRequirements()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var entMan = server.ResolveDependency<IEntityManager>();
+        var protoMan = server.ResolveDependency<IPrototypeManager>();
+
+        await server.WaitAssertion(() =>
+        {
+            foreach (var p in protoMan.EnumeratePrototypes<EntityPrototype>()
+                         .Where(p => !p.Abstract)
+                         .Where(p => !pair.IsTestPrototype(p))
+                         .Where(p => !_ignoredPrototypes.Contains(p.ID)))
+            {
+                if (!p.TryGetComponent<MachineBoardComponent>(out var board, entMan.ComponentFactory))
+                    continue;
+
+                Assert.Multiple(() =>
+                {
+                    foreach (var component in board.ComponentRequirements.Keys)
+                    {
+                        Assert.That(entMan.ComponentFactory.TryGetRegistration(component, out _), $"Invalid component requirement {component} specified on machine board entity {p}");
+                    }
+                });
+            }
+        });
+
+        await pair.CleanReturnAsync();
+    }
 }
diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
index ed1e5549438f..19780591bdbc 100644
--- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
+++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
@@ -60,7 +60,8 @@ public async Task NoMaterialArbitrage()
         }
 
         // Lets assume the possible lathe for resource multipliers:
-        var multiplier = MathF.Pow(LatheComponent.DefaultPartRatingMaterialUseMultiplier, MachinePartComponent.MaxRating - 1);
+        // TODO: each recipe can technically have its own cost multiplier associated with it, so this test needs redone to factor that in.
+        var multiplier = MathF.Pow(0.85f, 3);
 
         // create construction dictionary
         Dictionary<string, ConstructionComponent> constructionRecipes = new();
diff --git a/Content.Server/Construction/Components/IRefreshParts.cs b/Content.Server/Construction/Components/IRefreshParts.cs
deleted file mode 100644
index 714ca72c971b..000000000000
--- a/Content.Server/Construction/Components/IRefreshParts.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Construction.Components;
-
-namespace Content.Server.Construction.Components
-{
-    [RequiresExplicitImplementation]
-    public interface IRefreshParts
-    {
-        void RefreshParts(IEnumerable<MachinePartComponent> parts);
-    }
-}
diff --git a/Content.Server/Construction/Components/MachineComponent.cs b/Content.Server/Construction/Components/MachineComponent.cs
index 42c85e6d0b55..8a0f117712e8 100644
--- a/Content.Server/Construction/Components/MachineComponent.cs
+++ b/Content.Server/Construction/Components/MachineComponent.cs
@@ -1,27 +1,17 @@
-using Robust.Shared.Containers;
+using Content.Shared.Construction.Components;
+using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Construction.Components
-{
-    [RegisterComponent, ComponentProtoName("Machine")]
-    public sealed partial class MachineComponent : Component
-    {
-        [DataField("board", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? BoardPrototype { get; private set; }
+namespace Content.Server.Construction.Components;
 
-        [ViewVariables]
-        public Container BoardContainer = default!;
-        [ViewVariables]
-        public Container PartContainer = default!;
-    }
+[RegisterComponent]
+public sealed partial class MachineComponent : Component
+{
+    [DataField]
+    public EntProtoId<MachineBoardComponent>? Board { get; private set; }
 
-    /// <summary>
-    /// The different types of scaling that are available for machine upgrades
-    /// </summary>
-    public enum MachineUpgradeScalingType : byte
-    {
-        Linear,
-        Exponential
-    }
+    [ViewVariables]
+    public Container BoardContainer = default!;
+    [ViewVariables]
+    public Container PartContainer = default!;
 }
diff --git a/Content.Server/Construction/Components/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs
index 75cc486f2408..14e81e8dd32e 100644
--- a/Content.Server/Construction/Components/MachineFrameComponent.cs
+++ b/Content.Server/Construction/Components/MachineFrameComponent.cs
@@ -1,7 +1,8 @@
 using Content.Shared.Construction.Components;
-using Content.Shared.Construction.Prototypes;
+using Content.Shared.Stacks;
+using Content.Shared.Tag;
 using Robust.Shared.Containers;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Construction.Components
 {
@@ -14,29 +15,23 @@ public sealed partial class MachineFrameComponent : Component
         [ViewVariables]
         public bool HasBoard => BoardContainer?.ContainedEntities.Count != 0;
 
-        [DataField("progress", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MachinePartPrototype>))]
-        public Dictionary<string, int> Progress = new();
-
         [ViewVariables]
-        public readonly Dictionary<string, int> MaterialProgress = new();
+        public readonly Dictionary<ProtoId<StackPrototype>, int> MaterialProgress = new();
 
         [ViewVariables]
         public readonly Dictionary<string, int> ComponentProgress = new();
 
         [ViewVariables]
-        public readonly Dictionary<string, int> TagProgress = new();
-
-        [DataField("requirements", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MachinePartPrototype>))]
-        public Dictionary<string, int> Requirements = new();
+        public readonly Dictionary<ProtoId<TagPrototype>, int> TagProgress = new();
 
         [ViewVariables]
-        public Dictionary<string, int> MaterialRequirements = new();
+        public Dictionary<ProtoId<StackPrototype>, int> MaterialRequirements = new();
 
         [ViewVariables]
         public Dictionary<string, GenericPartInfo> ComponentRequirements = new();
 
         [ViewVariables]
-        public Dictionary<string, GenericPartInfo> TagRequirements = new();
+        public Dictionary<ProtoId<TagPrototype>, GenericPartInfo> TagRequirements = new();
 
         [ViewVariables]
         public Container BoardContainer = default!;
diff --git a/Content.Server/Construction/Components/PartExchangerComponent.cs b/Content.Server/Construction/Components/PartExchangerComponent.cs
deleted file mode 100644
index a2579c92e803..000000000000
--- a/Content.Server/Construction/Components/PartExchangerComponent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Robust.Shared.Audio;
-
-namespace Content.Server.Construction.Components;
-
-[RegisterComponent]
-public sealed partial class PartExchangerComponent : Component
-{
-    /// <summary>
-    /// How long it takes to exchange the parts
-    /// </summary>
-    [DataField("exchangeDuration")]
-    public float ExchangeDuration = 3;
-
-    /// <summary>
-    /// Whether or not the distance check is needed.
-    /// Good for BRPED.
-    /// </summary>
-    /// <remarks>
-    /// I fucking hate BRPED and if you ever add it
-    /// i will personally kill your dog.
-    /// </remarks>
-    [DataField("doDistanceCheck")]
-    public bool DoDistanceCheck = true;
-
-    [DataField("exchangeSound")]
-    public SoundSpecifier ExchangeSound = new SoundPathSpecifier("/Audio/Items/rped.ogg");
-
-    public EntityUid? AudioStream;
-}
diff --git a/Content.Server/Construction/Conditions/MachineFrameComplete.cs b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
index fbba5eca996f..33174bb9fb0b 100644
--- a/Content.Server/Construction/Conditions/MachineFrameComplete.cs
+++ b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Construction;
 using Content.Shared.Examine;
 using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Construction.Conditions
@@ -17,7 +18,7 @@ public sealed partial class MachineFrameComplete : IGraphCondition
         public SpriteSpecifier? GuideIconBoard { get; private set; }
 
         [DataField("guideIconParts")]
-        public SpriteSpecifier? GuideIconPart { get; private set; }
+        public SpriteSpecifier? GuideIconParts { get; private set; }
 
 
         public bool Condition(EntityUid uid, IEntityManager entityManager)
@@ -33,6 +34,8 @@ public bool DoExamine(ExaminedEvent args)
             var entity = args.Examined;
 
             var entityManager = IoCManager.Resolve<IEntityManager>();
+            var protoManager = IoCManager.Resolve<IPrototypeManager>();
+            var constructionSys = entityManager.System<ConstructionSystem>();
 
             if (!entityManager.TryGetComponent(entity, out MachineFrameComponent? machineFrame))
                 return false;
@@ -47,17 +50,6 @@ public bool DoExamine(ExaminedEvent args)
                 return false;
 
             args.PushMarkup(Loc.GetString("construction-condition-machine-frame-requirement-label"));
-            foreach (var (part, required) in machineFrame.Requirements)
-            {
-                var amount = required - machineFrame.Progress[part];
-
-                if(amount == 0)
-                    continue;
-
-                args.PushMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
-                                           ("amount", amount),
-                                           ("elementName", Loc.GetString(part))));
-            }
 
             foreach (var (material, required) in machineFrame.MaterialRequirements)
             {
@@ -65,10 +57,12 @@ public bool DoExamine(ExaminedEvent args)
 
                 if(amount == 0)
                     continue;
+                var stack = protoManager.Index(material);
+                var stackEnt = protoManager.Index(stack.Spawn);
 
                 args.PushMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
                                            ("amount", amount),
-                                           ("elementName", Loc.GetString(material))));
+                                           ("elementName", stackEnt.Name)));
             }
 
             foreach (var (compName, info) in machineFrame.ComponentRequirements)
@@ -78,9 +72,10 @@ public bool DoExamine(ExaminedEvent args)
                 if(amount == 0)
                     continue;
 
+                var examineName = constructionSys.GetExamineName(info);
                 args.PushMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
                                                 ("amount", info.Amount),
-                                                ("elementName", Loc.GetString(info.ExamineName))));
+                                                ("elementName", examineName)));
             }
 
             foreach (var (tagName, info) in machineFrame.TagRequirements)
@@ -90,9 +85,10 @@ public bool DoExamine(ExaminedEvent args)
                 if(amount == 0)
                     continue;
 
+                var examineName = constructionSys.GetExamineName(info);
                 args.PushMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
                                     ("amount", info.Amount),
-                                    ("elementName", Loc.GetString(info.ExamineName)))
+                                    ("elementName", examineName))
                                 + "\n");
             }
 
@@ -111,7 +107,7 @@ public IEnumerable<ConstructionGuideEntry> GenerateGuideEntry()
             yield return new ConstructionGuideEntry()
             {
                 Localization = "construction-step-condition-machine-frame-parts",
-                Icon = GuideIconPart,
+                Icon = GuideIconParts,
                 EntryNumber = 0, // Set this to anything so the guide generation takes this as a numbered step.
             };
         }
diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs
index 570360bf09a3..1b74fd9d4e56 100644
--- a/Content.Server/Construction/ConstructionSystem.Graph.cs
+++ b/Content.Server/Construction/ConstructionSystem.Graph.cs
@@ -50,7 +50,7 @@ public bool AddContainer(EntityUid uid, string container, ConstructionComponent?
 
             // If the set graph prototype does not exist, also return null. This could be due to admemes changing values
             // in ViewVariables, so even though the construction state is invalid, just return null.
-            return _prototypeManager.TryIndex(construction.Graph, out ConstructionGraphPrototype? graph) ? graph : null;
+            return PrototypeManager.TryIndex(construction.Graph, out ConstructionGraphPrototype? graph) ? graph : null;
         }
 
         /// <summary>
@@ -300,7 +300,7 @@ public bool ChangeNode(EntityUid uid, EntityUid? userUid, string id, bool perfor
             }
 
             // Exit if the new entity's prototype is the same as the original, or the prototype is invalid
-            if (newEntity == metaData.EntityPrototype?.ID || !_prototypeManager.HasIndex<EntityPrototype>(newEntity))
+            if (newEntity == metaData.EntityPrototype?.ID || !PrototypeManager.HasIndex<EntityPrototype>(newEntity))
                 return null;
 
             // [Optional] Exit if the new entity's prototype is a parent of the original
@@ -310,7 +310,7 @@ public bool ChangeNode(EntityUid uid, EntityUid? userUid, string id, bool perfor
             if (GetCurrentNode(uid, construction)?.DoNotReplaceInheritingEntities == true &&
                 metaData.EntityPrototype?.ID != null)
             {
-                var parents = _prototypeManager.EnumerateParents<EntityPrototype>(metaData.EntityPrototype.ID)?.ToList();
+                var parents = PrototypeManager.EnumerateParents<EntityPrototype>(metaData.EntityPrototype.ID)?.ToList();
 
                 if (parents != null && parents.Any(x => x.ID == newEntity))
                     return null;
@@ -427,7 +427,7 @@ public bool ChangeGraph(EntityUid uid, EntityUid? userUid, string graphId, strin
             if (!Resolve(uid, ref construction))
                 return false;
 
-            if (!_prototypeManager.TryIndex<ConstructionGraphPrototype>(graphId, out var graph))
+            if (!PrototypeManager.TryIndex<ConstructionGraphPrototype>(graphId, out var graph))
                 return false;
 
             if(GetNodeFromGraph(graph, nodeId) is not {})
diff --git a/Content.Server/Construction/ConstructionSystem.Guided.cs b/Content.Server/Construction/ConstructionSystem.Guided.cs
index e096bc02c315..157e4211586a 100644
--- a/Content.Server/Construction/ConstructionSystem.Guided.cs
+++ b/Content.Server/Construction/ConstructionSystem.Guided.cs
@@ -25,7 +25,7 @@ private void InitializeGuided()
 
         private void OnGuideRequested(RequestConstructionGuide msg, EntitySessionEventArgs args)
         {
-            if (!_prototypeManager.TryIndex(msg.ConstructionId, out ConstructionPrototype? prototype))
+            if (!PrototypeManager.TryIndex(msg.ConstructionId, out ConstructionPrototype? prototype))
                 return;
 
             if(GetGuide(prototype) is {} guide)
@@ -41,7 +41,7 @@ private void AddDeconstructVerb(EntityUid uid, ConstructionComponent component,
                 component.Node == component.DeconstructionNode)
                 return;
 
-            if (!_prototypeManager.TryIndex(component.Graph, out ConstructionGraphPrototype? graph))
+            if (!PrototypeManager.TryIndex(component.Graph, out ConstructionGraphPrototype? graph))
                 return;
 
             if (component.DeconstructionNode == null)
@@ -145,7 +145,7 @@ private void HandleConstructionExamined(EntityUid uid, ConstructionComponent com
                 return guide;
 
             // If the graph doesn't actually exist, do nothing.
-            if (!_prototypeManager.TryIndex(construction.Graph, out ConstructionGraphPrototype? graph))
+            if (!PrototypeManager.TryIndex(construction.Graph, out ConstructionGraphPrototype? graph))
                 return null;
 
             // If either the start node or the target node are missing, do nothing.
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 5161ac358ac9..08dd139ef4ce 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -325,13 +325,13 @@ private async void HandleStartItemConstruction(TryStartItemConstructionMessage e
         // LEGACY CODE. See warning at the top of the file!
         public async Task<bool> TryStartItemConstruction(string prototype, EntityUid user)
         {
-            if (!_prototypeManager.TryIndex(prototype, out ConstructionPrototype? constructionPrototype))
+            if (!PrototypeManager.TryIndex(prototype, out ConstructionPrototype? constructionPrototype))
             {
                 Log.Error($"Tried to start construction of invalid recipe '{prototype}'!");
                 return false;
             }
 
-            if (!_prototypeManager.TryIndex(constructionPrototype.Graph,
+            if (!PrototypeManager.TryIndex(constructionPrototype.Graph,
                     out ConstructionGraphPrototype? constructionGraph))
             {
                 Log.Error(
@@ -404,14 +404,14 @@ public async Task<bool> TryStartItemConstruction(string prototype, EntityUid use
         // LEGACY CODE. See warning at the top of the file!
         private async void HandleStartStructureConstruction(TryStartStructureConstructionMessage ev, EntitySessionEventArgs args)
         {
-            if (!_prototypeManager.TryIndex(ev.PrototypeName, out ConstructionPrototype? constructionPrototype))
+            if (!PrototypeManager.TryIndex(ev.PrototypeName, out ConstructionPrototype? constructionPrototype))
             {
                 Log.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!");
                 RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack));
                 return;
             }
 
-            if (!_prototypeManager.TryIndex(constructionPrototype.Graph, out ConstructionGraphPrototype? constructionGraph))
+            if (!PrototypeManager.TryIndex(constructionPrototype.Graph, out ConstructionGraphPrototype? constructionGraph))
             {
                 Log.Error($"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{ev.PrototypeName}'!");
                 RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack));
diff --git a/Content.Server/Construction/ConstructionSystem.Machine.cs b/Content.Server/Construction/ConstructionSystem.Machine.cs
index 2e670dbe40d4..eb922f198c7b 100644
--- a/Content.Server/Construction/ConstructionSystem.Machine.cs
+++ b/Content.Server/Construction/ConstructionSystem.Machine.cs
@@ -1,23 +1,15 @@
-using System.Linq;
 using Content.Server.Construction.Components;
-using Content.Server.Examine;
 using Content.Shared.Construction.Components;
-using Content.Shared.Construction.Prototypes;
-using Content.Shared.Verbs;
 using Robust.Shared.Containers;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Construction;
 
 public sealed partial class ConstructionSystem
 {
-    [Dependency] private readonly ExamineSystem _examineSystem = default!;
-
     private void InitializeMachines()
     {
         SubscribeLocalEvent<MachineComponent, ComponentInit>(OnMachineInit);
         SubscribeLocalEvent<MachineComponent, MapInitEvent>(OnMachineMapInit);
-        SubscribeLocalEvent<MachineComponent, GetVerbsEvent<ExamineVerb>>(OnMachineExaminableVerb);
     }
 
     private void OnMachineInit(EntityUid uid, MachineComponent component, ComponentInit args)
@@ -29,84 +21,6 @@ private void OnMachineInit(EntityUid uid, MachineComponent component, ComponentI
     private void OnMachineMapInit(EntityUid uid, MachineComponent component, MapInitEvent args)
     {
         CreateBoardAndStockParts(uid, component);
-        RefreshParts(uid, component);
-    }
-
-    private void OnMachineExaminableVerb(EntityUid uid, MachineComponent component, GetVerbsEvent<ExamineVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var markup = new FormattedMessage();
-        RaiseLocalEvent(uid, new UpgradeExamineEvent(ref markup));
-        if (markup.IsEmpty)
-            return; // Not upgradable.
-
-        markup = FormattedMessage.FromMarkup(markup.ToMarkup().TrimEnd('\n')); // Cursed workaround to https://github.com/space-wizards/RobustToolbox/issues/3371
-
-        var verb = new ExamineVerb()
-        {
-            Act = () =>
-            {
-                _examineSystem.SendExamineTooltip(args.User, uid, markup, getVerbs: false, centerAtCursor: false);
-            },
-            Text = Loc.GetString("machine-upgrade-examinable-verb-text"),
-            Message = Loc.GetString("machine-upgrade-examinable-verb-message"),
-            Category = VerbCategory.Examine,
-            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/pickup.svg.192dpi.png"))
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    public List<MachinePartComponent> GetAllParts(EntityUid uid, MachineComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return new List<MachinePartComponent>();
-
-        return GetAllParts(component);
-    }
-
-    public List<MachinePartComponent> GetAllParts(MachineComponent component)
-    {
-        var parts = new List<MachinePartComponent>();
-
-        foreach (var entity in component.PartContainer.ContainedEntities)
-        {
-            if (TryComp<MachinePartComponent>(entity, out var machinePart))
-                parts.Add(machinePart);
-        }
-
-        return parts;
-    }
-
-    public Dictionary<string, float> GetPartsRatings(List<MachinePartComponent> parts)
-    {
-        var output = new Dictionary<string, float>();
-        foreach (var type in _prototypeManager.EnumeratePrototypes<MachinePartPrototype>())
-        {
-            var amount = 0f;
-            var sumRating = 0f;
-            foreach (var part in parts.Where(part => part.PartType == type.ID))
-            {
-                amount++;
-                sumRating += part.Rating;
-            }
-            var rating = amount != 0 ? sumRating / amount : 0;
-            output.Add(type.ID, rating);
-        }
-
-        return output;
-    }
-
-    public void RefreshParts(EntityUid uid, MachineComponent component)
-    {
-        var parts = GetAllParts(component);
-        EntityManager.EventBus.RaiseLocalEvent(uid, new RefreshPartsEvent
-        {
-            Parts = parts,
-            PartRatings = GetPartsRatings(parts),
-        }, true);
     }
 
     private void CreateBoardAndStockParts(EntityUid uid, MachineComponent component)
@@ -115,54 +29,37 @@ private void CreateBoardAndStockParts(EntityUid uid, MachineComponent component)
         var boardContainer = _container.EnsureContainer<Container>(uid, MachineFrameComponent.BoardContainerName);
         var partContainer = _container.EnsureContainer<Container>(uid, MachineFrameComponent.PartContainerName);
 
-        if (string.IsNullOrEmpty(component.BoardPrototype))
+        if (string.IsNullOrEmpty(component.Board))
             return;
 
         // We're done here, let's suppose all containers are correct just so we don't screw SaveLoadSave.
         if (boardContainer.ContainedEntities.Count > 0)
             return;
 
-        var board = EntityManager.SpawnEntity(component.BoardPrototype, Transform(uid).Coordinates);
-
-        if (!_container.Insert(board, component.BoardContainer))
+        var xform = Transform(uid);
+        if (!TrySpawnInContainer(component.Board, uid, MachineFrameComponent.BoardContainerName, out var board))
         {
-            throw new Exception($"Couldn't insert board with prototype {component.BoardPrototype} to machine with prototype {MetaData(uid).EntityPrototype?.ID ?? "N/A"}!");
+            throw new Exception($"Couldn't insert board with prototype {component.Board} to machine with prototype {Prototype(uid)?.ID ?? "N/A"}!");
         }
 
         if (!TryComp<MachineBoardComponent>(board, out var machineBoard))
         {
-            throw new Exception($"Entity with prototype {component.BoardPrototype} doesn't have a {nameof(MachineBoardComponent)}!");
-        }
-
-        var xform = Transform(uid);
-        foreach (var (part, amount) in machineBoard.Requirements)
-        {
-            var partProto = _prototypeManager.Index<MachinePartPrototype>(part);
-            for (var i = 0; i < amount; i++)
-            {
-                var p = EntityManager.SpawnEntity(partProto.StockPartPrototype, xform.Coordinates);
-
-                if (!_container.Insert(p, partContainer))
-                    throw new Exception($"Couldn't insert machine part of type {part} to machine with prototype {partProto.StockPartPrototype}!");
-            }
+            throw new Exception($"Entity with prototype {component.Board} doesn't have a {nameof(MachineBoardComponent)}!");
         }
 
-        foreach (var (stackType, amount) in machineBoard.MaterialRequirements)
+        foreach (var (stackType, amount) in machineBoard.StackRequirements)
         {
-            var stack = _stackSystem.Spawn(amount, stackType, Transform(uid).Coordinates);
-
+            var stack = _stackSystem.Spawn(amount, stackType, xform.Coordinates);
             if (!_container.Insert(stack, partContainer))
-                throw new Exception($"Couldn't insert machine material of type {stackType} to machine with prototype {MetaData(uid).EntityPrototype?.ID ?? "N/A"}");
+                throw new Exception($"Couldn't insert machine material of type {stackType} to machine with prototype {Prototype(uid)?.ID ?? "N/A"}");
         }
 
         foreach (var (compName, info) in machineBoard.ComponentRequirements)
         {
             for (var i = 0; i < info.Amount; i++)
             {
-                var c = EntityManager.SpawnEntity(info.DefaultPrototype, Transform(uid).Coordinates);
-
-                if(!_container.Insert(c, partContainer))
-                    throw new Exception($"Couldn't insert machine component part with default prototype '{compName}' to machine with prototype {MetaData(uid).EntityPrototype?.ID ?? "N/A"}");
+                if(!TrySpawnInContainer(info.DefaultPrototype, uid, MachineFrameComponent.PartContainerName, out _))
+                    throw new Exception($"Couldn't insert machine component part with default prototype '{compName}' to machine with prototype {Prototype(uid)?.ID ?? "N/A"}");
             }
         }
 
@@ -170,58 +67,9 @@ private void CreateBoardAndStockParts(EntityUid uid, MachineComponent component)
         {
             for (var i = 0; i < info.Amount; i++)
             {
-                var c = EntityManager.SpawnEntity(info.DefaultPrototype, Transform(uid).Coordinates);
-
-                if(!_container.Insert(c, partContainer))
-                    throw new Exception($"Couldn't insert machine component part with default prototype '{tagName}' to machine with prototype {MetaData(uid).EntityPrototype?.ID ?? "N/A"}");
+                if(!TrySpawnInContainer(info.DefaultPrototype, uid, MachineFrameComponent.PartContainerName, out _))
+                    throw new Exception($"Couldn't insert machine component part with default prototype '{tagName}' to machine with prototype {Prototype(uid)?.ID ?? "N/A"}");
             }
         }
     }
 }
-
-public sealed class RefreshPartsEvent : EntityEventArgs
-{
-    public IReadOnlyList<MachinePartComponent> Parts = new List<MachinePartComponent>();
-
-    public Dictionary<string, float> PartRatings = new();
-}
-
-public sealed class UpgradeExamineEvent : EntityEventArgs
-{
-    private FormattedMessage Message;
-
-    public UpgradeExamineEvent(ref FormattedMessage message)
-    {
-        Message = message;
-    }
-
-    /// <summary>
-    /// Add a line to the upgrade examine tooltip with a percentage-based increase or decrease.
-    /// </summary>
-    public void AddPercentageUpgrade(string upgradedLocId, float multiplier)
-    {
-        var percent = Math.Round(100 * MathF.Abs(multiplier - 1), 2);
-        var locId = multiplier switch {
-            < 1 => "machine-upgrade-decreased-by-percentage",
-            1 or float.NaN => "machine-upgrade-not-upgraded",
-            > 1 => "machine-upgrade-increased-by-percentage",
-        };
-        var upgraded = Loc.GetString(upgradedLocId);
-        this.Message.AddMarkup(Loc.GetString(locId, ("upgraded", upgraded), ("percent", percent)) + '\n');
-    }
-
-    /// <summary>
-    /// Add a line to the upgrade examine tooltip with a numeric increase or decrease.
-    /// </summary>
-    public void AddNumberUpgrade(string upgradedLocId, int number)
-    {
-        var difference = Math.Abs(number);
-        var locId = number switch {
-            < 0 => "machine-upgrade-decreased-by-amount",
-            0 => "machine-upgrade-not-upgraded",
-            > 0 => "machine-upgrade-increased-by-amount",
-        };
-        var upgraded = Loc.GetString(upgradedLocId);
-        this.Message.AddMarkup(Loc.GetString(locId, ("upgraded", upgraded), ("difference", difference)) + '\n');
-    }
-}
diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
index 44c6318b7891..9d881dcef04a 100644
--- a/Content.Server/Construction/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -16,7 +16,6 @@ namespace Content.Server.Construction
     [UsedImplicitly]
     public sealed partial class ConstructionSystem : SharedConstructionSystem
     {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly ContainerSystem _container = default!;
diff --git a/Content.Server/Construction/MachineFrameSystem.cs b/Content.Server/Construction/MachineFrameSystem.cs
index e20c36d8498c..0fd5ad2e0e45 100644
--- a/Content.Server/Construction/MachineFrameSystem.cs
+++ b/Content.Server/Construction/MachineFrameSystem.cs
@@ -7,7 +7,7 @@
 using Content.Shared.Tag;
 using Content.Shared.Popups;
 using Robust.Shared.Containers;
-using Robust.Shared.Utility;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Construction;
 
@@ -62,24 +62,7 @@ private void OnInteractUsing(EntityUid uid, MachineFrameComponent component, Int
         // If this changes in the future, then RegenerateProgress() also needs to be updated.
         // Note that one entity is ALLOWED to satisfy more than one kind of component or tag requirements. This is
         // necessary in order to avoid weird entity-ordering shenanigans in RegenerateProgress().
-        var stack = CompOrNull<StackComponent>(args.Used);
-        var machinePart = CompOrNull<MachinePartComponent>(args.Used);
-        if (stack != null && machinePart != null)
-        {
-            if (TryInsertPartStack(uid, args.Used, component, machinePart, stack))
-                args.Handled = true;
-            return;
-        }
-
-        // Handle parts
-        if (machinePart != null)
-        {
-            if (TryInsertPart(uid, args.Used, component, machinePart))
-                args.Handled = true;
-            return;
-        }
-
-        if (stack != null)
+        if (TryComp<StackComponent>(args.Used, out var stack))
         {
             if (TryInsertStack(uid, args.Used, component, stack))
                 args.Handled = true;
@@ -172,67 +155,6 @@ private bool TryInsertBoard(EntityUid uid, EntityUid used, MachineFrameComponent
         return true;
     }
 
-    /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
-    private bool TryInsertPart(EntityUid uid, EntityUid used, MachineFrameComponent component, MachinePartComponent machinePart)
-    {
-        DebugTools.Assert(!HasComp<StackComponent>(uid));
-        if (!component.Requirements.ContainsKey(machinePart.PartType))
-            return false;
-
-        if (component.Progress[machinePart.PartType] >= component.Requirements[machinePart.PartType])
-            return false;
-
-        if (!_container.TryRemoveFromContainer(used))
-            return false;
-
-        if (!_container.Insert(used, component.PartContainer))
-            return true;
-
-        component.Progress[machinePart.PartType]++;
-        if (IsComplete(component))
-            _popupSystem.PopupEntity(Loc.GetString("machine-frame-component-on-complete"), uid);
-
-        return true;
-    }
-
-    /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
-    private bool TryInsertPartStack(EntityUid uid, EntityUid used, MachineFrameComponent component, MachinePartComponent machinePart, StackComponent stack)
-    {
-        if (!component.Requirements.ContainsKey(machinePart.PartType))
-            return false;
-
-        var progress = component.Progress[machinePart.PartType];
-        var requirement = component.Requirements[machinePart.PartType];
-
-        var needed = requirement - progress;
-        if (needed <= 0)
-            return false;
-
-        var count = stack.Count;
-        if (count < needed)
-        {
-            if (!_container.Insert(used, component.PartContainer))
-                return true;
-
-            component.Progress[machinePart.PartType] += count;
-            return true;
-        }
-
-        var splitStack = _stack.Split(used, needed, Transform(uid).Coordinates, stack);
-
-        if (splitStack == null)
-            return false;
-
-        if (!_container.Insert(splitStack.Value, component.PartContainer))
-            return true;
-
-        component.Progress[machinePart.PartType] += needed;
-        if (IsComplete(component))
-            _popupSystem.PopupEntity(Loc.GetString("machine-frame-component-on-complete"), uid);
-
-        return true;
-    }
-
     /// <returns>Whether or not the function had any effect. Does not indicate success.</returns>
     private bool TryInsertStack(EntityUid uid, EntityUid used, MachineFrameComponent component, StackComponent stack)
     {
@@ -281,12 +203,6 @@ public bool IsComplete(MachineFrameComponent component)
         if (!component.HasBoard)
             return false;
 
-        foreach (var (part, amount) in component.Requirements)
-        {
-            if (component.Progress[part] < amount)
-                return false;
-        }
-
         foreach (var (type, amount) in component.MaterialRequirements)
         {
             if (component.MaterialProgress[type] < amount)
@@ -310,21 +226,14 @@ public bool IsComplete(MachineFrameComponent component)
 
     public void ResetProgressAndRequirements(MachineFrameComponent component, MachineBoardComponent machineBoard)
     {
-        component.Requirements = new Dictionary<string, int>(machineBoard.Requirements);
-        component.MaterialRequirements = new Dictionary<string, int>(machineBoard.MaterialIdRequirements);
+        component.MaterialRequirements = new Dictionary<ProtoId<StackPrototype>, int>(machineBoard.StackRequirements);
         component.ComponentRequirements = new Dictionary<string, GenericPartInfo>(machineBoard.ComponentRequirements);
-        component.TagRequirements = new Dictionary<string, GenericPartInfo>(machineBoard.TagRequirements);
+        component.TagRequirements = new Dictionary<ProtoId<TagPrototype>, GenericPartInfo>(machineBoard.TagRequirements);
 
-        component.Progress.Clear();
         component.MaterialProgress.Clear();
         component.ComponentProgress.Clear();
         component.TagProgress.Clear();
 
-        foreach (var (machinePart, _) in component.Requirements)
-        {
-            component.Progress[machinePart] = 0;
-        }
-
         foreach (var (stackType, _) in component.MaterialRequirements)
         {
             component.MaterialProgress[stackType] = 0;
@@ -349,7 +258,6 @@ public void RegenerateProgress(MachineFrameComponent component)
             component.MaterialRequirements.Clear();
             component.ComponentRequirements.Clear();
             component.TagRequirements.Clear();
-            component.Progress.Clear();
             component.MaterialProgress.Clear();
             component.ComponentProgress.Clear();
             component.TagProgress.Clear();
@@ -368,19 +276,6 @@ public void RegenerateProgress(MachineFrameComponent component)
 
         foreach (var part in component.PartContainer.ContainedEntities)
         {
-            if (TryComp<MachinePartComponent>(part, out var machinePart))
-            {
-                // Check this is part of the requirements...
-                if (!component.Requirements.ContainsKey(machinePart.PartType))
-                    continue;
-
-                if (!component.Progress.ContainsKey(machinePart.PartType))
-                    component.Progress[machinePart.PartType] = 1;
-                else
-                    component.Progress[machinePart.PartType]++;
-                continue;
-            }
-
             if (TryComp<StackComponent>(part, out var stack))
             {
                 var type = stack.StackTypeId;
@@ -404,9 +299,7 @@ public void RegenerateProgress(MachineFrameComponent component)
                 if (!HasComp(part, registration.Type))
                     continue;
 
-                if (!component.ComponentProgress.ContainsKey(compName))
-                    component.ComponentProgress[compName] = 1;
-                else
+                if (!component.ComponentProgress.TryAdd(compName, 1))
                     component.ComponentProgress[compName]++;
             }
 
@@ -419,18 +312,17 @@ public void RegenerateProgress(MachineFrameComponent component)
                 if (!_tag.HasTag(tagComp, tagName))
                     continue;
 
-                if (!component.TagProgress.ContainsKey(tagName))
-                    component.TagProgress[tagName] = 1;
-                else
+                if (!component.TagProgress.TryAdd(tagName, 1))
                     component.TagProgress[tagName]++;
             }
         }
     }
     private void OnMachineFrameExamined(EntityUid uid, MachineFrameComponent component, ExaminedEvent args)
     {
-        if (!args.IsInDetailsRange)
+        if (!args.IsInDetailsRange || !component.HasBoard)
             return;
-        if (component.HasBoard)
-            args.PushMarkup(Loc.GetString("machine-frame-component-on-examine-label", ("board", EntityManager.GetComponent<MetaDataComponent>(component.BoardContainer.ContainedEntities[0]).EntityName)));
+
+        var board = component.BoardContainer.ContainedEntities[0];
+        args.PushMarkup(Loc.GetString("machine-frame-component-on-examine-label", ("board", Name(board))));
     }
 }
diff --git a/Content.Server/Construction/PartExchangerSystem.cs b/Content.Server/Construction/PartExchangerSystem.cs
deleted file mode 100644
index 174dd1d2faa9..000000000000
--- a/Content.Server/Construction/PartExchangerSystem.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System.Linq;
-using Content.Server.Construction.Components;
-using Content.Server.Storage.EntitySystems;
-using Content.Shared.DoAfter;
-using Content.Shared.Construction.Components;
-using Content.Shared.Exchanger;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Storage;
-using Robust.Shared.Containers;
-using Robust.Shared.Utility;
-using Content.Shared.Wires;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Collections;
-
-namespace Content.Server.Construction;
-
-public sealed class PartExchangerSystem : EntitySystem
-{
-    [Dependency] private readonly ConstructionSystem _construction = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly StorageSystem _storage = default!;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<PartExchangerComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<PartExchangerComponent, ExchangerDoAfterEvent>(OnDoAfter);
-    }
-
-    private void OnDoAfter(EntityUid uid, PartExchangerComponent component, DoAfterEvent args)
-    {
-        if (args.Cancelled)
-        {
-            component.AudioStream = _audio.Stop(component.AudioStream);
-            return;
-        }
-
-        if (args.Handled || args.Args.Target == null)
-            return;
-
-        if (!TryComp<StorageComponent>(uid, out var storage))
-            return; //the parts are stored in here
-
-        var machinePartQuery = GetEntityQuery<MachinePartComponent>();
-        var machineParts = new List<(EntityUid, MachinePartComponent)>();
-
-        foreach (var item in storage.Container.ContainedEntities) //get parts in RPED
-        {
-            if (machinePartQuery.TryGetComponent(item, out var part))
-                machineParts.Add((item, part));
-        }
-
-        TryExchangeMachineParts(args.Args.Target.Value, uid, machineParts);
-        TryConstructMachineParts(args.Args.Target.Value, uid, machineParts);
-
-        args.Handled = true;
-    }
-
-    private void TryExchangeMachineParts(EntityUid uid, EntityUid storageUid, List<(EntityUid part, MachinePartComponent partComp)> machineParts)
-    {
-        if (!TryComp<MachineComponent>(uid, out var machine))
-            return;
-
-        var machinePartQuery = GetEntityQuery<MachinePartComponent>();
-        var board = machine.BoardContainer.ContainedEntities.FirstOrNull();
-
-        if (board == null || !TryComp<MachineBoardComponent>(board, out var macBoardComp))
-            return;
-
-        foreach (var item in new ValueList<EntityUid>(machine.PartContainer.ContainedEntities)) //clone so don't modify during enumeration
-        {
-            if (machinePartQuery.TryGetComponent(item, out var part))
-            {
-                machineParts.Add((item, part));
-                _container.RemoveEntity(uid, item);
-            }
-        }
-
-        machineParts.Sort((x, y) => y.partComp.Rating.CompareTo(x.partComp.Rating));
-
-        var updatedParts = new List<(EntityUid part, MachinePartComponent partComp)>();
-        foreach (var (type, amount) in macBoardComp.Requirements)
-        {
-            var target = machineParts.Where(p => p.partComp.PartType == type).Take(amount);
-            updatedParts.AddRange(target);
-        }
-        foreach (var part in updatedParts)
-        {
-            _container.Insert(part.part, machine.PartContainer);
-            machineParts.Remove(part);
-        }
-
-        //put the unused parts back into rped. (this also does the "swapping")
-        foreach (var (unused, _) in machineParts)
-        {
-            _storage.Insert(storageUid, unused, out _, playSound: false);
-        }
-        _construction.RefreshParts(uid, machine);
-    }
-
-    private void TryConstructMachineParts(EntityUid uid, EntityUid storageEnt, List<(EntityUid part, MachinePartComponent partComp)> machineParts)
-    {
-        if (!TryComp<MachineFrameComponent>(uid, out var machine))
-            return;
-
-        var machinePartQuery = GetEntityQuery<MachinePartComponent>();
-        var board = machine.BoardContainer.ContainedEntities.FirstOrNull();
-
-        if (!machine.HasBoard || !TryComp<MachineBoardComponent>(board, out var macBoardComp))
-            return;
-
-        foreach (var item in new ValueList<EntityUid>(machine.PartContainer.ContainedEntities)) //clone so don't modify during enumeration
-        {
-            if (machinePartQuery.TryGetComponent(item, out var part))
-            {
-                machineParts.Add((item, part));
-                _container.RemoveEntity(uid, item);
-                machine.Progress[part.PartType]--;
-            }
-        }
-
-        machineParts.Sort((x, y) => y.partComp.Rating.CompareTo(x.partComp.Rating));
-
-        var updatedParts = new List<(EntityUid part, MachinePartComponent partComp)>();
-        foreach (var (type, amount) in macBoardComp.Requirements)
-        {
-            var target = machineParts.Where(p => p.partComp.PartType == type).Take(amount);
-            updatedParts.AddRange(target);
-        }
-        foreach (var pair in updatedParts)
-        {
-            var part = pair.partComp;
-            var partEnt = pair.part;
-
-            if (!machine.Requirements.ContainsKey(part.PartType))
-                continue;
-
-            _container.Insert(partEnt, machine.PartContainer);
-            machine.Progress[part.PartType]++;
-            machineParts.Remove(pair);
-        }
-
-        //put the unused parts back into rped. (this also does the "swapping")
-        foreach (var (unused, _) in machineParts)
-        {
-            _storage.Insert(storageEnt, unused, out _, playSound: false);
-        }
-    }
-
-    private void OnAfterInteract(EntityUid uid, PartExchangerComponent component, AfterInteractEvent args)
-    {
-        if (component.DoDistanceCheck && !args.CanReach)
-            return;
-
-        if (args.Target == null)
-            return;
-
-        if (!HasComp<MachineComponent>(args.Target) && !HasComp<MachineFrameComponent>(args.Target))
-            return;
-
-        if (TryComp<WiresPanelComponent>(args.Target, out var panel) && !panel.Open)
-        {
-            _popup.PopupEntity(Loc.GetString("construction-step-condition-wire-panel-open"),
-                args.Target.Value);
-            return;
-        }
-
-        component.AudioStream = _audio.PlayPvs(component.ExchangeSound, uid).Value.Entity;
-
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.ExchangeDuration, new ExchangerDoAfterEvent(), uid, target: args.Target, used: uid)
-        {
-            BreakOnDamage = true,
-            BreakOnMove = true
-        });
-    }
-}
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index e34592b45f9c..bac789716ca7 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -71,6 +71,15 @@ public override void SetCount(EntityUid uid, int amount, StackComponent? compone
             return entity;
         }
 
+        /// <summary>
+        ///     Spawns a stack of a certain stack type. See <see cref="StackPrototype"/>.
+        /// </summary>
+        public EntityUid Spawn(int amount, ProtoId<StackPrototype> id, EntityCoordinates spawnPosition)
+        {
+            var proto = _prototypeManager.Index(id);
+            return Spawn(amount, proto, spawnPosition);
+        }
+
         /// <summary>
         ///     Spawns a stack of a certain stack type. See <see cref="StackPrototype"/>.
         /// </summary>
diff --git a/Content.Shared/Construction/Components/MachineBoardComponent.cs b/Content.Shared/Construction/Components/MachineBoardComponent.cs
index dbca31606166..0469b59fd1e7 100644
--- a/Content.Shared/Construction/Components/MachineBoardComponent.cs
+++ b/Content.Shared/Construction/Components/MachineBoardComponent.cs
@@ -1,54 +1,47 @@
-using Content.Shared.Construction.Prototypes;
 using Content.Shared.Stacks;
+using Content.Shared.Tag;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
-namespace Content.Shared.Construction.Components
+namespace Content.Shared.Construction.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class MachineBoardComponent : Component
+{
+    /// <summary>
+    /// The stacks needed to construct this machine
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<StackPrototype>, int> StackRequirements = new();
+
+    /// <summary>
+    /// Entities needed to construct this machine, discriminated by tag.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<TagPrototype>, GenericPartInfo> TagRequirements = new();
+
+    /// <summary>
+    /// Entities needed to construct this machine, discriminated by component.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, GenericPartInfo> ComponentRequirements = new();
+
+    /// <summary>
+    /// The machine that's constructed when this machine board is completed.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Prototype;
+}
+
+[DataDefinition, Serializable]
+public partial struct GenericPartInfo
 {
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class MachineBoardComponent : Component
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-
-        [DataField("requirements", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<int, MachinePartPrototype>))]
-        public Dictionary<string, int> Requirements = new();
-
-        [DataField("materialRequirements")]
-        public Dictionary<string, int> MaterialIdRequirements = new();
-
-        [DataField("tagRequirements")]
-        public Dictionary<string, GenericPartInfo> TagRequirements = new();
-
-        [DataField("componentRequirements")]
-        public Dictionary<string, GenericPartInfo> ComponentRequirements = new();
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("prototype")]
-        public string? Prototype { get; private set; }
-
-        public IEnumerable<KeyValuePair<StackPrototype, int>> MaterialRequirements
-        {
-            get
-            {
-                foreach (var (materialId, amount) in MaterialIdRequirements)
-                {
-                    var material = _prototypeManager.Index<StackPrototype>(materialId);
-                    yield return new KeyValuePair<StackPrototype, int>(material, amount);
-                }
-            }
-        }
-    }
-
-    [Serializable]
-    [DataDefinition]
-    public partial struct GenericPartInfo
-    {
-        [DataField("Amount")]
-        public int Amount;
-        [DataField("ExamineName")]
-        public string ExamineName;
-        [DataField("DefaultPrototype")]
-        public string DefaultPrototype;
-    }
+    [DataField(required: true)]
+    public int Amount;
+
+    [DataField(required: true)]
+    public EntProtoId DefaultPrototype;
+
+    [DataField]
+    public LocId? ExamineName;
 }
diff --git a/Content.Shared/Construction/Components/MachinePartComponent.cs b/Content.Shared/Construction/Components/MachinePartComponent.cs
deleted file mode 100644
index a68e3495e29d..000000000000
--- a/Content.Shared/Construction/Components/MachinePartComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Construction.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Construction.Components
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class MachinePartComponent : Component
-    {
-        [DataField("part", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
-        public string PartType { get; private set; } = default!;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("rating")]
-        public int Rating { get; private set; } = 1;
-
-        /// <summary>
-        ///     This number is used in tests to ensure that you can't use high quality machines for arbitrage. In
-        ///     principle there is nothing wrong with using higher quality parts, but you have to be careful to not
-        ///     allow them to be put into a lathe or something like that.
-        /// </summary>
-        public const int MaxRating = 4;
-    }
-}
diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs
index 359b58c8816f..f357a395e64f 100644
--- a/Content.Shared/Construction/MachinePartSystem.cs
+++ b/Content.Shared/Construction/MachinePartSystem.cs
@@ -1,10 +1,8 @@
 using System.Linq;
 using Content.Shared.Construction.Components;
-using Content.Shared.Construction.Prototypes;
 using Content.Shared.Examine;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
-using Content.Shared.Stacks;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Construction
@@ -16,6 +14,7 @@ public sealed class MachinePartSystem : EntitySystem
     {
         [Dependency] private readonly IPrototypeManager _prototype = default!;
         [Dependency] private readonly SharedLatheSystem _lathe = default!;
+        [Dependency] private readonly SharedConstructionSystem _construction = default!;
 
         public override void Initialize()
         {
@@ -31,32 +30,30 @@ private void OnMachineBoardExamined(EntityUid uid, MachineBoardComponent compone
             using (args.PushGroup(nameof(MachineBoardComponent)))
             {
                 args.PushMarkup(Loc.GetString("machine-board-component-on-examine-label"));
-                foreach (var (part, amount) in component.Requirements)
+                foreach (var (material, amount) in component.StackRequirements)
                 {
-                    args.PushMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
-                        ("amount", amount),
-                        ("requiredElement", Loc.GetString(_prototype.Index<MachinePartPrototype>(part).Name))));
-                }
+                    var stack = _prototype.Index(material);
+                    var name = _prototype.Index(stack.Spawn).Name;
 
-                foreach (var (material, amount) in component.MaterialRequirements)
-                {
                     args.PushMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
                         ("amount", amount),
-                        ("requiredElement", Loc.GetString(material.Name))));
+                        ("requiredElement", Loc.GetString(name))));
                 }
 
                 foreach (var (_, info) in component.ComponentRequirements)
                 {
+                    var examineName = _construction.GetExamineName(info);
                     args.PushMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
                         ("amount", info.Amount),
-                        ("requiredElement", Loc.GetString(info.ExamineName))));
+                        ("requiredElement", examineName)));
                 }
 
                 foreach (var (_, info) in component.TagRequirements)
                 {
+                    var examineName = _construction.GetExamineName(info);
                     args.PushMarkup(Loc.GetString("machine-board-component-required-element-entry-text",
                         ("amount", info.Amount),
-                        ("requiredElement", Loc.GetString(info.ExamineName))));
+                        ("requiredElement", examineName)));
                 }
             }
         }
@@ -66,30 +63,13 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
             var (_, comp) = entity;
 
             var materials = new Dictionary<string, int>();
-            foreach (var (partId, amount) in comp.Requirements)
-            {
-                var partProto = _prototype.Index<MachinePartPrototype>(partId);
-
-                if (!_lathe.TryGetRecipesFromEntity(partProto.StockPartPrototype, out var recipes))
-                    continue;
-
-                var partRecipe = recipes[0];
-                if (recipes.Count > 1)
-                    partRecipe = recipes.MinBy(p => p.RequiredMaterials.Values.Sum());
-
-                foreach (var (mat, matAmount) in partRecipe!.RequiredMaterials)
-                {
-                    materials.TryAdd(mat, 0);
-                    materials[mat] += matAmount * amount * coefficient;
-                }
-            }
 
-            foreach (var (stackId, amount) in comp.MaterialIdRequirements)
+            foreach (var (stackId, amount) in comp.StackRequirements)
             {
-                var stackProto = _prototype.Index<StackPrototype>(stackId);
+                var stackProto = _prototype.Index(stackId);
                 var defaultProto = _prototype.Index(stackProto.Spawn);
 
-                if (defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
+                if (defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp, EntityManager.ComponentFactory))
                 {
                     foreach (var (mat, matAmount) in physComp.MaterialComposition)
                     {
@@ -130,7 +110,7 @@ public Dictionary<string, int> GetMachineBoardMaterialCost(Entity<MachineBoardCo
                     }
                 }
                 else if (_prototype.TryIndex(defaultProtoId, out var defaultProto) &&
-                         defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp))
+                         defaultProto.TryGetComponent<PhysicalCompositionComponent>(out var physComp, EntityManager.ComponentFactory))
                 {
                     foreach (var (mat, matAmount) in physComp.MaterialComposition)
                     {
diff --git a/Content.Shared/Construction/Prototypes/MachinePartPrototype.cs b/Content.Shared/Construction/Prototypes/MachinePartPrototype.cs
deleted file mode 100644
index 7a080c94a3f7..000000000000
--- a/Content.Shared/Construction/Prototypes/MachinePartPrototype.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared.Construction.Prototypes;
-
-/// <summary>
-/// This is a prototype for categorizing
-/// different types of machine parts.
-/// </summary>
-[Prototype("machinePart")]
-public sealed partial class MachinePartPrototype : IPrototype
-{
-    /// <inheritdoc/>
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    /// <summary>
-    /// A human-readable name for the machine part type.
-    /// </summary>
-    [DataField("name")]
-    public string Name = string.Empty;
-
-    /// <summary>
-    /// A stock part entity based on the machine part.
-    /// </summary>
-    [DataField("stockPartPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>), required: true)]
-    public string StockPartPrototype = string.Empty;
-}
diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs
index 069290d14315..901b2f834d19 100644
--- a/Content.Shared/Construction/SharedConstructionSystem.cs
+++ b/Content.Shared/Construction/SharedConstructionSystem.cs
@@ -1,5 +1,7 @@
 using System.Linq;
+using Content.Shared.Construction.Components;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using static Content.Shared.Interaction.SharedInteractionSystem;
 
 namespace Content.Shared.Construction
@@ -7,6 +9,7 @@ namespace Content.Shared.Construction
     public abstract class SharedConstructionSystem : EntitySystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
 
         /// <summary>
         ///     Get predicate for construction obstruction checks.
@@ -22,5 +25,13 @@ public abstract class SharedConstructionSystem : EntitySystem
             var ignored = grid.GetAnchoredEntities(coords).ToHashSet();
             return e => ignored.Contains(e);
         }
+
+        public string GetExamineName(GenericPartInfo info)
+        {
+            if (info.ExamineName is not null)
+                return Loc.GetString(info.ExamineName.Value);
+
+            return PrototypeManager.Index(info.DefaultPrototype).Name;
+        }
     }
 }
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index 8b21bca52aea..62d2089fb7c3 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using Content.Shared.Construction.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
@@ -9,7 +8,6 @@
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
@@ -88,7 +86,8 @@ private void OnFlatpackInteractUsing(Entity<FlatpackComponent> ent, ref Interact
         if (_net.IsServer)
         {
             var spawn = Spawn(comp.Entity, _map.GridTileToLocal(grid, gridComp, buildPos));
-            _adminLogger.Add(LogType.Construction, LogImpact.Low,
+            _adminLogger.Add(LogType.Construction,
+                LogImpact.Low,
                 $"{ToPrettyString(args.User):player} unpacked {ToPrettyString(spawn):entity} at {xform.Coordinates} from {ToPrettyString(uid):entity}");
             QueueDel(uid);
         }
@@ -115,9 +114,7 @@ public void SetupFlatpack(Entity<FlatpackComponent?> ent, EntityUid? board)
             return;
 
         var machinePrototypeId = new EntProtoId();
-        if (TryComp<MachineBoardComponent>(board, out var machineBoard) && machineBoard.Prototype is not null)
-            machinePrototypeId = machineBoard.Prototype;
-        else if (TryComp<ComputerBoardComponent>(board, out var computerBoard) && computerBoard.Prototype is not null)
+        if (TryComp<ComputerBoardComponent>(board, out var computerBoard) && computerBoard.Prototype is not null)
             machinePrototypeId = computerBoard.Prototype;
 
         var comp = ent.Comp!;
diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs
index d4bf18b0507d..88ac8c05bfbf 100644
--- a/Content.Shared/Lathe/LatheComponent.cs
+++ b/Content.Shared/Lathe/LatheComponent.cs
@@ -59,8 +59,6 @@ public sealed partial class LatheComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
         public float MaterialUseMultiplier = 1;
-
-        public const float DefaultPartRatingMaterialUseMultiplier = 0.85f;
         #endregion
     }
 
diff --git a/Resources/Locale/en-US/construction/steps/arbitrary-insert-construction-graph-step.ftl b/Resources/Locale/en-US/construction/steps/arbitrary-insert-construction-graph-step.ftl
index 6a7998e57a20..430888ed3653 100644
--- a/Resources/Locale/en-US/construction/steps/arbitrary-insert-construction-graph-step.ftl
+++ b/Resources/Locale/en-US/construction/steps/arbitrary-insert-construction-graph-step.ftl
@@ -1,2 +1,10 @@
 # Shown when examining an in-construction object
-construction-insert-arbitrary-entity = Next, insert {$stepName}.
\ No newline at end of file
+construction-insert-arbitrary-entity = Next, insert {$stepName}.
+
+construction-insert-info-examine-name-instrument-brass = brass instrument
+construction-insert-info-examine-name-instrument-keyed = keyed instrument
+construction-insert-info-examine-name-instrument-percussion = percussion instrument
+construction-insert-info-examine-name-instrument-string = string intrument
+construction-insert-info-examine-name-instrument-woodwind = woodwind instrument
+construction-insert-info-examine-name-knife = knife
+construction-insert-info-examine-name-utensil = utensil
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
index 6db7f4b385ed..e4bde7ab84f6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
@@ -11,10 +11,9 @@
     state: security
   - type: MachineBoard
     prototype: ShuttleGunSvalinnMachineGun
-    requirements:
+    stackRequirements:
       MatterBin: 2
       Manipulator: 4
-    materialRequirements:
       Steel: 5
       CableHV: 5
 
@@ -29,10 +28,9 @@
     state: security
   - type: MachineBoard
     prototype: ShuttleGunPerforator
-    requirements:
+    stackRequirements:
       MatterBin: 4
       Manipulator: 6
-    materialRequirements:
       Steel: 10
       CableHV: 5
 
@@ -47,10 +45,9 @@
     state: security
   - type: MachineBoard
     prototype: ShuttleGunFriendship
-    requirements:
+    stackRequirements:
       MatterBin: 3
       Manipulator: 2
-    materialRequirements:
       Steel: 7
       CableHV: 5
 
@@ -65,10 +62,9 @@
     state: security
   - type: MachineBoard
     prototype: ShuttleGunDuster
-    requirements:
+    stackRequirements:
       MatterBin: 6
       Manipulator: 4
-    materialRequirements:
       Steel: 10
       CableHV: 5
       Uranium: 2
@@ -84,9 +80,8 @@
     state: security
   - type: MachineBoard
     prototype: ShuttleGunKinetic
-    requirements:
+    stackRequirements:
       MatterBin: 2
       Manipulator: 3
-    materialRequirements:
       Steel: 5
-      CableHV: 2
\ No newline at end of file
+      CableHV: 2
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
index 78e17e074550..a1260f07c0c1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
@@ -8,7 +8,7 @@
       state: engineering
     - type: MachineBoard
       prototype: ParticleAcceleratorEndCapUnfinished
-      materialRequirements:
+      stackRequirements:
         Glass: 15
         Steel: 15
 
@@ -24,10 +24,9 @@
       prototype: ParticleAcceleratorFuelChamberUnfinished
       componentRequirements:
         AmeFuelContainer:
-          Amount: 1
-          DefaultPrototype: AmeJar
-          ExamineName: AME Fuel Jar
-      materialRequirements:
+          amount: 1
+          defaultPrototype: AmeJar
+      stackRequirements:
         Glass: 10
         Steel: 10
 
@@ -41,7 +40,7 @@
       state: engineering
     - type: MachineBoard
       prototype: ParticleAcceleratorPowerBoxUnfinished
-      materialRequirements:
+      stackRequirements:
         Glass: 5
         Steel: 5
 
@@ -57,7 +56,7 @@
       state: engineering
     - type: MachineBoard
       prototype: ParticleAcceleratorEmitterStarboardUnfinished
-      materialRequirements:
+      stackRequirements:
         Glass: 5
         Steel: 5
 
@@ -71,7 +70,7 @@
       state: engineering
     - type: MachineBoard
       prototype: ParticleAcceleratorEmitterForeUnfinished
-      materialRequirements:
+      stackRequirements:
         Glass: 5
         Steel: 5
 
@@ -85,6 +84,6 @@
       state: engineering
     - type: MachineBoard
       prototype: ParticleAcceleratorEmitterPortUnfinished
-      materialRequirements:
+      stackRequirements:
         Glass: 5
         Steel: 5
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 587e56865b4d..d41923b569d0 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -6,10 +6,9 @@
   components:
     - type: MachineBoard
       prototype: Autolathe
-      requirements:
+      stackRequirements:
         MatterBin: 3
         Manipulator: 1
-      materialRequirements:
         Glass: 1
 
 - type: entity
@@ -20,15 +19,13 @@
   components:
   - type: MachineBoard
     prototype: AutolatheHyperConvection
-    requirements:
+    stackRequirements:
       MatterBin: 3
-    materialRequirements:
       Glass: 1
     tagRequirements:
       Igniter:
-        Amount: 1
-        DefaultPrototype: Igniter
-        ExamineName: Igniter
+        amount: 1
+        defaultPrototype: Igniter
 
 - type: entity
   id: ProtolatheMachineCircuitboard
@@ -38,14 +35,13 @@
   components:
     - type: MachineBoard
       prototype: Protolathe
-      requirements:
+      stackRequirements:
         MatterBin: 2
         Manipulator: 2
       tagRequirements:
         GlassBeaker:
-          Amount: 2
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 2
+          defaultPrototype: Beaker
 
 - type: entity
   parent: BaseMachineCircuitboard
@@ -55,17 +51,15 @@
   components:
   - type: MachineBoard
     prototype: ProtolatheHyperConvection
-    requirements:
+    stackRequirements:
       MatterBin: 2
     tagRequirements:
       GlassBeaker:
-        Amount: 2
-        DefaultPrototype: Beaker
-        ExamineName: Glass Beaker
+        amount: 2
+        defaultPrototype: Beaker
       Igniter:
-        Amount: 1
-        DefaultPrototype: Igniter
-        ExamineName: Igniter
+        amount: 1
+        defaultPrototype: Igniter
 
 - type: entity
   id: BiofabricatorMachineCircuitboard
@@ -75,9 +69,8 @@
   components:
     - type: MachineBoard
       prototype: Biofabricator
-      requirements:
+      stackRequirements:
         MatterBin: 4
-      materialRequirements:
         Glass: 1
 
 - type: entity
@@ -90,14 +83,13 @@
       state: security
     - type: MachineBoard
       prototype: SecurityTechFab
-      requirements:
+      stackRequirements:
         MatterBin: 2
         Manipulator: 2
       tagRequirements:
         GlassBeaker:
-          Amount: 2
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 2
+          defaultPrototype: Beaker
 
 - type: entity
   id: AmmoTechFabCircuitboard
@@ -109,7 +101,7 @@
       state: security
     - type: MachineBoard
       prototype: AmmoTechFab
-      requirements:
+      stackRequirements:
         MatterBin: 1
         Manipulator: 1
 
@@ -123,14 +115,13 @@
       state: medical
     - type: MachineBoard
       prototype: MedicalTechFab
-      requirements:
+      stackRequirements:
         MatterBin: 2
         Manipulator: 2
       tagRequirements:
         GlassBeaker:
-          Amount: 2
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 2
+          defaultPrototype: Beaker
     - type: StealTarget
       stealGroup: MedicalTechFabCircuitboard
 
@@ -143,14 +134,13 @@
     state: science
   - type: MachineBoard
     prototype: CircuitImprinter
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 1
     tagRequirements:
       GlassBeaker:
-        Amount: 2
-        DefaultPrototype: Beaker
-        ExamineName: Glass Beaker
+        amount: 2
+        defaultPrototype: Beaker
 
 - type: entity
   parent: BaseMachineCircuitboard
@@ -162,17 +152,15 @@
     state: science
   - type: MachineBoard
     prototype: CircuitImprinterHyperConvection
-    requirements:
+    stackRequirements:
       MatterBin: 2
     tagRequirements:
       GlassBeaker:
-        Amount: 2
-        DefaultPrototype: Beaker
-        ExamineName: Glass Beaker
+        amount: 2
+        defaultPrototype: Beaker
       Igniter:
-        Amount: 1
-        DefaultPrototype: Igniter
-        ExamineName: Igniter
+        amount: 1
+        defaultPrototype: Igniter
 
 - type: entity
   id: ExosuitFabricatorMachineCircuitboard
@@ -183,10 +171,9 @@
     state: science
   - type: MachineBoard
     prototype: ExosuitFabricator
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 3
-    materialRequirements:
       Glass: 5
   - type: GuideHelp
     guides:
@@ -203,7 +190,7 @@
     state: science
   - type: MachineBoard
     prototype: ResearchAndDevelopmentServer
-    materialRequirements:
+    stackRequirements:
       Plasma: 5
 
 - type: entity
@@ -213,7 +200,7 @@
   components:
   - type: MachineBoard
     prototype: UniformPrinter
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 2
 
@@ -226,16 +213,14 @@
     state: medical
   - type: MachineBoard
     prototype: Vaccinator
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 1
-    materialRequirements:
       Cable: 5
     tagRequirements:
         GlassBeaker:
-          Amount: 1
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 1
+          defaultPrototype: Beaker
 
 - type: entity
   id: DiagnoserMachineCircuitboard
@@ -246,18 +231,16 @@
     state: medical
   - type: MachineBoard
     prototype: DiseaseDiagnoser
-    materialRequirements:
+    stackRequirements:
       Cable: 5
     tagRequirements:
       GlassBeaker:
-        Amount: 1
-        DefaultPrototype: Beaker
-        ExamineName: Glass Beaker
+        amount: 1
+        defaultPrototype: Beaker
     componentRequirements:
-      DiseaseSwab:
-        Amount: 1
-        DefaultPrototype: DiseaseSwab
-        ExamineName: Swab
+      BotanySwab:
+        amount: 1
+        defaultPrototype: DiseaseSwab
 
 - type: entity
   id: ArtifactAnalyzerMachineCircuitboard
@@ -269,10 +252,9 @@
       state: science
     - type: MachineBoard
       prototype: MachineArtifactAnalyzer
-      requirements:
+      stackRequirements:
         Manipulator: 3
         Capacitor: 1
-      materialRequirements:
         Glass: 5
 
 - type: entity
@@ -285,9 +267,8 @@
     state: science
   - type: MachineBoard
     prototype: MachineArtifactCrusher
-    requirements:
+    stackRequirements:
       Manipulator: 2
-    materialRequirements:
       Glass: 1
       Steel: 5
 
@@ -301,9 +282,8 @@
       state: science
     - type: MachineBoard
       prototype: MachineAnomalyVessel
-      requirements:
+      stackRequirements:
         Capacitor: 3
-      materialRequirements:
         Cable: 1
         PlasmaGlass: 10
 
@@ -317,9 +297,8 @@
     state: science
   - type: MachineBoard
     prototype: MachineAnomalyVesselExperimental
-    requirements:
+    stackRequirements:
       Capacitor: 3
-    materialRequirements:
       Cable: 5
       PlasmaGlass: 15
       MetalRod: 4
@@ -334,10 +313,9 @@
       state: science
     - type: MachineBoard
       prototype: MachineAnomalySynchronizer
-      requirements:
+      stackRequirements:
         Manipulator: 2
         Capacitor: 5
-      materialRequirements:
         PlasmaGlass: 5
         Cable: 5
 
@@ -351,9 +329,8 @@
       state: science
     - type: MachineBoard
       prototype: MachineAPE
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         Cable: 1
         Glass: 1
 
@@ -367,10 +344,9 @@
     state: engineering
   - type: MachineBoard
     prototype: GasThermoMachineFreezer
-    requirements:
+    stackRequirements:
       MatterBin: 2
       Capacitor: 2
-    materialRequirements:
       Cable: 5
   - type: Construction
     deconstructionTarget: null
@@ -387,10 +363,9 @@
     state: engineering
   - type: MachineBoard
     prototype: GasThermoMachineHeater
-    requirements:
+    stackRequirements:
       MatterBin: 2
       Capacitor: 2
-    materialRequirements:
       Cable: 5
   - type: Construction
     graph: ThermomachineBoard
@@ -407,10 +382,9 @@
     state: engineering
   - type: MachineBoard
     prototype: GasThermoMachineHellfireFreezer
-    requirements:
+    stackRequirements:
       MatterBin: 2
       Capacitor: 2
-    materialRequirements:
       Plasma: 1
   - type: Construction
     deconstructionTarget: null
@@ -427,10 +401,9 @@
     state: engineering
   - type: MachineBoard
     prototype: GasThermoMachineHellfireHeater
-    requirements:
+    stackRequirements:
       MatterBin: 2
       Capacitor: 2
-    materialRequirements:
       Plasma: 1
   - type: Construction
     graph: ThermomachineBoard
@@ -447,9 +420,8 @@
     state: engineering
   - type: MachineBoard
     prototype: BaseGasCondenser
-    requirements:
+    stackRequirements:
       MatterBin: 1
-    materialRequirements:
       Glass: 1
 
 - type: entity
@@ -462,10 +434,9 @@
     state: engineering
   - type: MachineBoard
     prototype: PortableScrubber
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 2
-    materialRequirements:
       Cable: 5
       Glass: 2
 
@@ -479,10 +450,9 @@
     state: engineering
   - type: MachineBoard
     prototype: SpaceHeater
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Capacitor: 2
-    materialRequirements:
       Cable: 5
 
 - type: entity
@@ -495,10 +465,9 @@
       state: medical
     - type: MachineBoard
       prototype: CloningPod
-      requirements:
+      stackRequirements:
         MatterBin: 2
         Manipulator: 2
-      materialRequirements:
         Glass: 1
         Cable: 1
 
@@ -512,9 +481,8 @@
       state: medical
     - type: MachineBoard
       prototype: MedicalScanner
-      requirements:
+      stackRequirements:
         Capacitor: 1
-      materialRequirements:
         Glass: 5
         Cable: 1
 
@@ -526,7 +494,7 @@
   components:
     - type: MachineBoard
       prototype: CrewMonitoringServer
-      materialRequirements:
+      stackRequirements:
         Steel: 1
         Cable: 2
 
@@ -540,7 +508,7 @@
       state: medical
     - type: MachineBoard
       prototype: CryoPod
-      materialRequirements:
+      stackRequirements:
         Glass: 5
         Cable: 1
 
@@ -554,16 +522,14 @@
       state: medical
     - type: MachineBoard
       prototype: ChemMaster
-      requirements:
+      stackRequirements:
         Capacitor: 1
-      materialRequirements:
         Glass: 1
         Cable: 1
       tagRequirements:
         GlassBeaker:
-          Amount: 2
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 2
+          defaultPrototype: Beaker
 
 - type: entity
   id: ChemDispenserMachineCircuitboard
@@ -575,16 +541,14 @@
       state: medical
     - type: MachineBoard
       prototype: ChemDispenserEmpty
-      requirements:
+      stackRequirements:
         Capacitor: 1
-      materialRequirements:
         Glass: 1
         Steel: 3
       tagRequirements:
         GlassBeaker:
-          Amount: 2
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 2
+          defaultPrototype: Beaker
 
 - type: entity
   id: BiomassReclaimerMachineCircuitboard
@@ -594,16 +558,15 @@
   components:
     - type: MachineBoard
       prototype: BiomassReclaimer
-      requirements:
+      stackRequirements:
         MatterBin: 2
         Manipulator: 1
+        Steel: 5
       tagRequirements:
         Knife:
-          Amount: 2
-          DefaultPrototype: KitchenKnife
-          ExamineName: Knife
-      materialRequirements:
-        Steel: 5
+          amount: 2
+          defaultPrototype: KitchenKnife
+          examineName: construction-insert-info-examine-name-knife
 
 - type: entity
   id: HydroponicsTrayMachineCircuitboard
@@ -615,15 +578,14 @@
       state: service
     - type: MachineBoard
       prototype: HydroponicsTrayEmpty
-      materialRequirements:
+      stackRequirements:
         # replacing the console screen
         Glass: 5
         Cable: 2
       tagRequirements:
         GlassBeaker:
-          Amount: 2
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 2
+          defaultPrototype: Beaker
 
 - type: entity
   id: SeedExtractorMachineCircuitboard
@@ -635,10 +597,9 @@
       state: service
     - type: MachineBoard
       prototype: SeedExtractor
-      requirements:
+      stackRequirements:
         Manipulator: 2
         Capacitor: 1
-      materialRequirements:
         # replacing the console screen
         Glass: 1
         Cable: 2
@@ -654,11 +615,13 @@
       state: power_mod
     - type: MachineBoard
       prototype: SMESBasicEmpty
-      requirements:
+      stackRequirements:
         Capacitor: 1
-        PowerCell: 4
-      materialRequirements:
         CableHV: 10
+      componentRequirements:
+        PowerCell:
+          amount: 4
+          defaultPrototype: PowerCellSmall
 
 - type: entity
   id: CellRechargerCircuitboard
@@ -671,9 +634,8 @@
       state: charger_APC
     - type: MachineBoard
       prototype: PowerCellRecharger
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         Cable: 5
     - type: PhysicalComposition
       materialComposition:
@@ -693,9 +655,8 @@
       state: charger_APC
     - type: MachineBoard
       prototype: PowerCageRecharger
-      requirements:
+      stackRequirements:
         Capacitor: 4
-      materialRequirements:
         Steel: 5
         Cable: 10
     - type: PhysicalComposition
@@ -716,9 +677,8 @@
       state: charger_APC
     - type: MachineBoard
       prototype: BorgCharger
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         Cable: 5
     - type: PhysicalComposition
       materialComposition:
@@ -738,9 +698,8 @@
       state: charger_APC
     - type: MachineBoard
       prototype: WeaponCapacitorRecharger
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         CableMV: 5
     - type: PhysicalComposition
       materialComposition:
@@ -760,9 +719,8 @@
     state: charger_APC
   - type: MachineBoard
     prototype: TurboItemRecharger
-    requirements:
+    stackRequirements:
       Capacitor: 2
-    materialRequirements:
       CableMV: 5
   - type: PhysicalComposition
     materialComposition:
@@ -777,12 +735,14 @@
   components:
     - type: MachineBoard
       prototype: SubstationBasicEmpty
-      requirements:
+      stackRequirements:
         Capacitor: 1
-        PowerCell: 1
-      materialRequirements:
         CableMV: 5
         CableHV: 5
+      componentRequirements:
+        PowerCell:
+          amount: 1
+          defaultPrototype: PowerCellSmall
     - type: PhysicalComposition
       materialComposition:
         Glass: 200
@@ -798,31 +758,31 @@
   components:
     - type: MachineBoard
       prototype: DawInstrument
-      materialRequirements:
+      stackRequirements:
         Glass: 1
         Cable: 1
       tagRequirements:
 #      One instrument to bring them all and in the darkness bind them...
        KeyedInstrument:
-          Amount: 1
-          DefaultPrototype: SynthesizerInstrument
-          ExamineName: Keyed Instrument
+          amount: 1
+          defaultPrototype: SynthesizerInstrument
+          examineName: construction-insert-info-examine-name-instrument-keyed
        StringInstrument:
-          Amount: 1
-          DefaultPrototype: AcousticGuitarInstrument
-          ExamineName: String Instrument
+          amount: 1
+          defaultPrototype: AcousticGuitarInstrument
+          examineName: construction-insert-info-examine-name-instrument-string
        PercussionInstrument:
-          Amount: 1
-          DefaultPrototype: GlockenspielInstrument
-          ExamineName: Percussion Instrument
+          amount: 1
+          defaultPrototype: GlockenspielInstrument
+          examineName: construction-insert-info-examine-name-instrument-percussion
        BrassInstrument:
-          Amount: 1
-          DefaultPrototype: TrumpetInstrument
-          ExamineName: Brass Instrument
+          amount: 1
+          defaultPrototype: TrumpetInstrument
+          examineName: construction-insert-info-examine-name-instrument-brass
        WoodwindInstrument:
-          Amount: 1
-          DefaultPrototype: SaxophoneInstrument
-          ExamineName: Woodwind Instrument
+          amount: 1
+          defaultPrototype: SaxophoneInstrument
+          examineName: construction-insert-info-examine-name-instrument-woodwind
 
 - type: entity
   id: PortableGeneratorPacmanMachineCircuitboard
@@ -833,9 +793,8 @@
       state: engineering
     - type: MachineBoard
       prototype: PortableGeneratorPacman
-      requirements:
+      stackRequirements:
         Capacitor: 1
-      materialRequirements:
         CableHV: 5
     - type: PhysicalComposition
       materialComposition:
@@ -852,9 +811,8 @@
   components:
   - type: MachineBoard
     prototype: Thruster
-    requirements:
+    stackRequirements:
       Capacitor: 4
-    materialRequirements:
       Steel: 5
 
 - type: entity
@@ -864,10 +822,9 @@
   components:
   - type: MachineBoard
     prototype: Gyroscope
-    requirements:
+    stackRequirements:
       Manipulator: 2
       Capacitor: 1
-    materialRequirements:
       Glass: 2
 
 - type: entity
@@ -879,9 +836,8 @@
       state: engineering
     - type: MachineBoard
       prototype: PortableGeneratorSuperPacman
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         CableHV: 10
     - type: PhysicalComposition
       materialComposition:
@@ -900,9 +856,8 @@
       state: engineering
     - type: MachineBoard
       prototype: PortableGeneratorJrPacman
-      requirements:
+      stackRequirements:
         Capacitor: 1
-      materialRequirements:
         Cable: 10
     - type: PhysicalComposition
       materialComposition:
@@ -920,14 +875,13 @@
   components:
     - type: MachineBoard
       prototype: KitchenReagentGrinder
-      requirements:
+      stackRequirements:
         MatterBin: 2
         Manipulator: 2
       tagRequirements:
         GlassBeaker:
-          Amount: 1
-          DefaultPrototype: Beaker
-          ExamineName: Glass Beaker
+          amount: 1
+          defaultPrototype: Beaker
 
 - type: entity
   id: HotplateMachineCircuitboard
@@ -937,9 +891,8 @@
   components:
     - type: MachineBoard
       prototype: ChemistryHotplate
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         Glass: 1
 
 - type: entity
@@ -950,9 +903,8 @@
   components:
   - type: MachineBoard
     prototype: KitchenElectricGrill
-    requirements:
+    stackRequirements:
       Capacitor: 4
-    materialRequirements:
       Glass: 2
       Cable: 5
 
@@ -965,10 +917,9 @@
       state: medical
     - type: MachineBoard
       prototype: StasisBed
-      requirements:
+      stackRequirements:
         Capacitor: 1
         Manipulator: 1
-      materialRequirements:
         Cable: 3
         Steel: 2
 
@@ -982,9 +933,8 @@
     state: medical
   - type: MachineBoard
     prototype: MachineElectrolysisUnit
-    requirements:
+    stackRequirements:
       Capacitor: 2
-    materialRequirements:
       Cable: 1
 
 - type: entity
@@ -997,9 +947,8 @@
     state: medical
   - type: MachineBoard
     prototype: MachineCentrifuge
-    requirements:
+    stackRequirements:
       Manipulator: 1
-    materialRequirements:
       Steel: 1
 
 - type: entity
@@ -1011,9 +960,8 @@
       state: supply
     - type: MachineBoard
       prototype: MaterialReclaimer
-      requirements:
+      stackRequirements:
         Manipulator: 2
-      materialRequirements:
         Steel: 5
         Plastic: 5
 
@@ -1026,10 +974,9 @@
       state: supply
     - type: MachineBoard
       prototype: OreProcessor
-      requirements:
+      stackRequirements:
         MatterBin: 1
         Manipulator: 3
-      materialRequirements:
         Glass: 1
 
 - type: entity
@@ -1041,10 +988,9 @@
     state: supply
   - type: MachineBoard
     prototype: OreProcessorIndustrial
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 3
-    materialRequirements:
       Glass: 1
 
 - type: entity
@@ -1054,7 +1000,7 @@
   components:
   - type: MachineBoard
     prototype: Sheetifier
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 1
 
@@ -1067,9 +1013,8 @@
       state: service
     - type: MachineBoard
       prototype: KitchenMicrowave
-      requirements:
+      stackRequirements:
         Capacitor: 1
-      materialRequirements:
         Glass: 2
         Cable: 2
     - type: Tag
@@ -1085,13 +1030,13 @@
       state: service
     - type: MachineBoard
       prototype: FatExtractor
-      requirements:
+      stackRequirements:
         Manipulator: 1
       componentRequirements:
         Utensil:
-          Amount: 1
-          DefaultPrototype: ForkPlastic
-          ExamineName: Utensil
+          amount: 1
+          defaultPrototype: ForkPlastic
+          examineName: construction-insert-info-examine-name-utensil
 
 - type: entity
   parent: BaseMachineCircuitboard
@@ -1100,10 +1045,9 @@
   components:
   - type: MachineBoard
     prototype: MachineFlatpacker
-    requirements:
+    stackRequirements:
       Manipulator: 2
       MatterBin: 1
-    materialRequirements:
       Steel: 1
 
 - type: entity
@@ -1115,9 +1059,8 @@
       state: engineering
     - type: MachineBoard
       prototype: Emitter
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         CableHV: 5
         Glass: 2
 
@@ -1129,7 +1072,7 @@
   components:
     - type: MachineBoard
       prototype: SurveillanceCameraRouterConstructed
-      materialRequirements:
+      stackRequirements:
         Cable: 1
 
 - type: entity
@@ -1140,7 +1083,7 @@
   components:
     - type: MachineBoard
       prototype: SurveillanceCameraWirelessRouterConstructed
-      materialRequirements:
+      stackRequirements:
         Cable: 2
         Glass: 1
 
@@ -1152,7 +1095,7 @@
   components:
     - type: MachineBoard
       prototype: SurveillanceWirelessCameraMovableConstructed
-      materialRequirements:
+      stackRequirements:
         Glass: 2
         Cable: 2
 
@@ -1164,7 +1107,7 @@
   components:
     - type: MachineBoard
       prototype: SurveillanceWirelessCameraAnchoredConstructed
-      materialRequirements:
+      stackRequirements:
         Cable: 2
         Glass: 1
 
@@ -1176,10 +1119,9 @@
   components:
   - type: MachineBoard
     prototype: GasRecycler
-    requirements:
+    stackRequirements:
       Capacitor: 1
       Manipulator: 1
-    materialRequirements:
       Steel: 10
       Plasma: 5
 
@@ -1193,13 +1135,12 @@
       state: service
     - type: MachineBoard
       prototype: BoozeDispenserEmpty
-      materialRequirements:
+      stackRequirements:
         Steel: 5
       tagRequirements:
           GlassBeaker:
-            Amount: 1
-            DefaultPrototype: Beaker
-            ExamineName: Glass Beaker
+            amount: 1
+            defaultPrototype: Beaker
 
 - type: entity
   id: CargoTelepadMachineCircuitboard
@@ -1211,9 +1152,8 @@
       state: supply
     - type: MachineBoard
       prototype: CargoTelepad
-      requirements:
+      stackRequirements:
         Capacitor: 2
-      materialRequirements:
         Steel: 5
 
 - type: entity
@@ -1226,13 +1166,12 @@
       state: service
     - type: MachineBoard
       prototype: SodaDispenserEmpty
-      materialRequirements:
+      stackRequirements:
         Steel: 5
       tagRequirements:
           GlassBeaker:
-            Amount: 1
-            DefaultPrototype: Beaker
-            ExamineName: Glass Beaker
+            amount: 1
+            defaultPrototype: Beaker
 
 - type: entity
   id: TelecomServerCircuitboard
@@ -1242,7 +1181,7 @@
   components:
     - type: MachineBoard
       prototype: TelecomServer
-      materialRequirements:
+      stackRequirements:
         Steel: 1
         Cable: 2
 
@@ -1254,9 +1193,8 @@
   components:
   - type: MachineBoard
     prototype: SalvageMagnet
-    requirements:
+    stackRequirements:
       Capacitor: 4
-    materialRequirements:
       Steel: 5
       CableHV: 5
       Cable: 2
@@ -1269,10 +1207,9 @@
   components:
   - type: MachineBoard
     prototype: GravityGeneratorMini
-    requirements:
+    stackRequirements:
       Capacitor: 4
       MatterBin: 3
-    materialRequirements:
       Steel: 5
       CableHV: 5
       Uranium: 2
@@ -1284,10 +1221,9 @@
   components:
   - type: MachineBoard
     prototype: ReagentGrinderIndustrial
-    requirements:
+    stackRequirements:
       MatterBin: 1
       Manipulator: 3
-    materialRequirements:
       Glass: 1
 
 - type: entity
@@ -1298,7 +1234,7 @@
   components:
   - type: MachineBoard
     prototype: Jukebox
-    materialRequirements:
+    stackRequirements:
       WoodPlank: 5
       Steel: 2
       Glass: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 37de294cce89..2f257db39651 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -21,9 +21,6 @@
   components:
     - type: Sprite
       state: capacitor
-    - type: MachinePart
-      part: Capacitor
-      rating: 1
     - type: Tag
       tags:
         - CapacitorStockPart
@@ -39,11 +36,8 @@
   components:
     - type: Sprite
       state: micro_mani
-    - type: MachinePart
-      part: Manipulator
-      rating: 1
     - type: Stack
-      stackType: MicroManipulator
+      stackType: Manipulator
 
 - type: entity
   id: MatterBinStockPart
@@ -54,8 +48,5 @@
   components:
     - type: Sprite
       state: matter_bin
-    - type: MachinePart
-      part: MatterBin
-      rating: 1
     - type: Stack
       stackType: MatterBin
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 7397bcaa517e..90f987fdc69f 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -73,9 +73,6 @@
   - type: Battery
     maxCharge: 360
     startingCharge: 360
-  - type: MachinePart
-    part: PowerCell
-    rating: 1
   - type: Tag
     tags:
       - PowerCellSmall
@@ -114,9 +111,6 @@
   - type: Battery
     maxCharge: 720
     startingCharge: 720
-  - type: MachinePart
-    part: PowerCell
-    rating: 2
 
 - type: entity
   id: PowerCellMediumPrinted
@@ -152,9 +146,6 @@
   - type: Battery
     maxCharge: 1080
     startingCharge: 1080
-  - type: MachinePart
-    part: PowerCell
-    rating: 3
 
 - type: entity
   id: PowerCellHighPrinted
@@ -190,9 +181,6 @@
   - type: Battery
     maxCharge: 1800
     startingCharge: 1800
-  - type: MachinePart
-    part: PowerCell
-    rating: 4
 
 - type: entity
   id: PowerCellHyperPrinted
diff --git a/Resources/Prototypes/MachineParts/machine_parts.yml b/Resources/Prototypes/MachineParts/machine_parts.yml
deleted file mode 100644
index 317e4b80866f..000000000000
--- a/Resources/Prototypes/MachineParts/machine_parts.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: machinePart
-  id: Capacitor
-  name: machine-part-name-capacitor
-  stockPartPrototype: CapacitorStockPart
-
-- type: machinePart
-  id: Manipulator
-  name: machine-part-name-manipulator
-  stockPartPrototype: MicroManipulatorStockPart
-
-- type: machinePart
-  id: MatterBin
-  name: machine-part-name-matter-bin
-  stockPartPrototype: MatterBinStockPart
-  
-- type: machinePart
-  id: PowerCell
-  name: machine-part-name-power-cell
-  stockPartPrototype: PowerCellSmall
-
diff --git a/Resources/Prototypes/Stacks/science_stacks.yml b/Resources/Prototypes/Stacks/science_stacks.yml
index bf58fad91543..0d273c324e6b 100644
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/science_stacks.yml
@@ -11,7 +11,7 @@
   maxCount: 10
 
 - type: stack
-  id: MicroManipulator
+  id: Manipulator
   name: micro manipulator
   spawn: MicroManipulatorStockPart
   maxCount: 10

From c368d5d36f4cf086fc39f026acca762dbfe9b4f8 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:47:27 -0500
Subject: [PATCH 308/568] Make Projectiles Only Hit a Variety of Station
 Objects Unless Clicked on (#28571)

---
 .../Fun/Instruments/base_instruments.yml      |  3 ++-
 .../Dispensers/base_structuredispensers.yml   |  2 +-
 .../Computers/base_structurecomputers.yml     |  1 +
 .../Machines/Medical/chemistry_machines.yml   |  2 +-
 .../Machines/Medical/disease_diagnoser.yml    |  4 +---
 .../Machines/Medical/vaccinator.yml           |  1 +
 .../Structures/Machines/artifact_analyzer.yml |  3 ++-
 .../Machines/base_structuremachines.yml       |  7 +++++++
 .../Structures/Machines/fax_machine.yml       |  1 +
 .../Entities/Structures/Machines/lathe.yml    |  1 +
 .../Structures/Machines/microwave.yml         |  4 ++--
 .../Structures/Machines/reagent_grinder.yml   |  2 +-
 .../Machines/wireless_surveillance_camera.yml |  4 +++-
 .../Piping/Atmospherics/portable.yml          |  2 +-
 .../Structures/Piping/Atmospherics/unary.yml  |  2 +-
 .../Structures/Piping/Disposal/units.yml      |  1 +
 .../Power/Generation/Singularity/emitter.yml  |  2 +-
 .../Power/Generation/portable_generator.yml   |  4 ++--
 .../Structures/Power/Generation/solar.yml     |  3 +++
 .../Entities/Structures/Power/chargers.yml    |  3 +++
 .../Structures/Storage/filing_cabinets.yml    |  1 +
 .../Entities/Structures/Walls/fence_wood.yml  | 19 +++++++++++++++++--
 .../Entities/Structures/hydro_tray.yml        |  4 +++-
 23 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index 122ff42eb20f..614af2a4886a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseItem
   id: BaseHandheldInstrument
@@ -71,6 +71,7 @@
         - BulletImpassable
   - type: StaticPrice
     price: 300
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: BasePlaceableInstrument
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index 082f5e079923..213ad47d88fc 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -1,7 +1,7 @@
 - type: entity
   abstract: true
   id: ReagentDispenserBase
-  parent: ConstructibleMachine
+  parent: SmallConstructibleMachine
   placement:
     mode: SnapgridCenter
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
index a5e26463b991..204e06c8600a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -60,3 +60,4 @@
         ents: []
   - type: LightningTarget
     priority: 1
+  - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
index 23789730d0c4..65eaf04d78fd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: BaseTabletopChemicalMachine
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   abstract: true
   components:
   - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
index e46c62053a9e..ad98f47e36a3 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: DiseaseDiagnoser
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: Disease Diagnoser Delta Extreme
   description: A machine that analyzes disease samples.
   placement:
@@ -43,5 +43,3 @@
     contentMargin: 12.0, 0.0, 12.0, 0.0
     # This is a narrow piece of paper
     maxWritableArea: 128.0, 0.0
-
-
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
index 041bca7c9053..53542cdfa914 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
@@ -24,3 +24,4 @@
     containers:
       machine_board: !type:Container
       machine_parts: !type:Container
+  - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
index 8b0c57876316..9c878c7e7c55 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: MachineArtifactAnalyzer
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: artifact analyzer
   description: A platform capable of performing analysis on various types of artifacts.
   components:
@@ -35,6 +35,7 @@
         - Impassable
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
         hard: False
   - type: Transform
     anchored: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
index 621d9a1a7ecb..fb5ed4440a92 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -70,3 +70,10 @@
     - machine_board
   - type: LightningTarget
     priority: 1
+
+- type: entity
+  abstract: true
+  parent: ConstructibleMachine
+  id: SmallConstructibleMachine
+  components:
+    - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
index 36be6451d209..849c9fa4f2d2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -66,6 +66,7 @@
     deviceNetId: Wireless
     receiveFrequencyId: Fax
     transmitFrequencyId: Fax
+  - type: RequireProjectileTarget
 
 # Special
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 575144a2c226..537c42346eae 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -508,6 +508,7 @@
         - Sheet
         - RawMaterial
         - Ingot
+  - type: RequireProjectileTarget
 
 - type: entity
   id: CircuitImprinterHyperConvection
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index fe4eb1451832..994269f71b4d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -1,6 +1,6 @@
-- type: entity
+- type: entity
   id: KitchenMicrowave
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: microwave
   description: It's magic.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index d6e733331330..28aa464d210c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: KitchenReagentGrinder
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   name: reagent grinder
   description: From BlenderTech. Will It Blend? Let's find out!
   suffix: grinder/juicer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
index fc8f31535cdb..95079b5c8582 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ BaseStructureDynamic, ConstructibleMachine ]
+  parent: [ BaseStructureDynamic, SmallConstructibleMachine ]
   id: SurveillanceWirelessCameraBase
   name: wireless camera
   description: A camera. It's watching you. Kinda.
@@ -23,6 +23,8 @@
           density: 80
           mask:
             - MachineMask
+          layer:
+            - BulletImpassable
     - type: SurveillanceCameraMicrophone
       blacklist:
         components:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
index 200df727b3b5..87e71400f732 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: PortableScrubber
-  parent: [BaseMachinePowered, ConstructibleMachine, StructureWheeled]
+  parent: [BaseMachinePowered, SmallConstructibleMachine, StructureWheeled]
   name: portable scrubber
   description: It scrubs, portably!
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index d301f43c7887..2b00fec246f6 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -383,7 +383,7 @@
     board: HellfireHeaterMachineCircuitBoard
 
 - type: entity
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
   id: BaseGasCondenser
   name: condenser
   description: Condenses gases into liquids. Now we just need some plumbing.
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 2198c854a01c..e7d3d3c99771 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -84,6 +84,7 @@
       enum.DisposalUnitUiKey.Key:
         type: DisposalUnitBoundUserInterface
   - type: RatKingRummageable
+  - type: RequireProjectileTarget
 
 - type: entity
   id: MailingUnit
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index b999b2bdede8..6946dcbf8358 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: Emitter
   name: emitter
-  parent: ConstructibleMachine
+  parent: SmallConstructibleMachine
   description: A heavy duty industrial laser. Shoots non-stop when turned on.
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index d735d9607c37..86cfb0f79914 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -1,4 +1,4 @@
-#
+#
 # You can use this Desmos sheet to calculate fuel burn rate values:
 # https://www.desmos.com/calculator/qcektq5dqs
 #
@@ -6,7 +6,7 @@
 - type: entity
   abstract: true
   id: PortableGeneratorBase
-  parent: [ BaseMachine, ConstructibleMachine, StructureWheeled]
+  parent: [ BaseMachine, SmallConstructibleMachine, StructureWheeled]
   components:
     # Basic properties
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 5a28c4962c1b..c512266e9749 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -49,6 +49,7 @@
     onBump: false
     requirePower: true
     highVoltageNode: output
+  - type: RequireProjectileTarget 
 
 - type: entity
   id: SolarPanel
@@ -157,6 +158,7 @@
     graph: SolarPanel
     node: solarassembly
     defaultTarget: solarpanel
+  - type: RequireProjectileTarget 
 
 - type: entity
   id: SolarTracker
@@ -201,3 +203,4 @@
   - type: Construction
     graph: SolarPanel
     node: solartracker
+  - type: RequireProjectileTarget 
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index 582a5b0dee4f..f5f0748b819d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -58,12 +58,15 @@
         density: 500
         mask:
         - TabletopMachineMask
+        layer:
+        - BulletImpassable
   - type: PowerChargerVisuals
   - type: ContainerContainer
     containers:
       charger_slot: !type:ContainerSlot
       machine_board: !type:Container
       machine_parts: !type:Container
+  - type: RequireProjectileTarget
 
 - type: entity
   parent: BaseItemRecharger
diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
index 08db462be017..cfda95fc2f9e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -156,6 +156,7 @@
     node: chestDrawer
   - type: StaticPrice
     price: 15
+  - type: RequireProjectileTarget
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
index 55b7e40803b5..41dbe21d5f18 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -72,7 +72,7 @@
         acts: [ "Destruction" ]
   - type: Climbable
     delay: 2.5
-
+  - type: RequireProjectileTarget
 
 #High
 - type: entity
@@ -96,8 +96,10 @@
         mask:
         - FullTileMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: straight
@@ -123,8 +125,10 @@
         mask:
         - FullTileMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: end
@@ -159,8 +163,10 @@
         mask:
         - TableMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: corner
@@ -195,8 +201,10 @@
         mask:
         - TableMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: tjunction
@@ -221,8 +229,10 @@
         mask:
         - FullTileMask
         layer:
+        - Opaque
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: InteractionOutline
   - type: Door
     openSpriteState: door_opened
@@ -271,6 +281,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: straight_small
@@ -298,6 +309,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: end_small
@@ -334,6 +346,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: corner_small
@@ -370,6 +383,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: Construction
     graph: FenceWood
     node: tjunction_small
@@ -396,6 +410,7 @@
         layer:
         - MidImpassable
         - LowImpassable
+        - BulletImpassable
   - type: InteractionOutline
   - type: Door
     openSpriteState: door_opened_small
@@ -418,4 +433,4 @@
       path: /Audio/Effects/door_close.ogg
   - type: Construction
     graph: FenceWood
-    node: gate_small
\ No newline at end of file
+    node: gate_small
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 8ea7172d8b41..68a0cbd38e45 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: hydroponics tray
-  parent: [ hydroponicsSoil, ConstructibleMachine]
+  parent: [ hydroponicsSoil, SmallConstructibleMachine]
   id: hydroponicsTray
   description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
   components:
@@ -14,6 +14,8 @@
         hard: true
         mask:
         - MachineMask
+        layer:
+        - BulletImpassable
   - type: Anchorable
   - type: Pullable
   - type: Sprite

From a710c7580918123bf0e30583c411852cad80f30b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 5 Jun 2024 20:48:33 +0000
Subject: [PATCH 309/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e68ab9517d3d..6adbf16221d3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: potato1234x
-  changes:
-  - message: Added crafting recipes for wall lockers and secure lockers
-    type: Add
-  - message: Fixed secure lockers and wall lockers not being deconstructible
-    type: Fix
-  id: 6185
-  time: '2024-03-18T20:53:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24942
 - author: brainfood1183
   changes:
   - message: Added Spray Paints.
@@ -3849,3 +3840,11 @@
   id: 6684
   time: '2024-06-05T20:14:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28576
+- author: Cojoke-dot
+  changes:
+  - message: A variety of objects around the station now need to be clicked on in
+      order for bullets to hit them.
+    type: Tweak
+  id: 6685
+  time: '2024-06-05T20:47:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28571

From 513023a9f0f5b899af20ad96751bb855c5252ebc Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:06:24 -0700
Subject: [PATCH 310/568] Fix Smoke-grenade.ogg not being mono (#28593)

---
 Resources/Audio/Effects/Smoke-grenade.ogg | Bin 98191 -> 93809 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Audio/Effects/Smoke-grenade.ogg b/Resources/Audio/Effects/Smoke-grenade.ogg
index c697214c2a571e1b6cc900b51c284fb073b8625c..945290ede54be1e189c4d05b32e8dd09bc5e2379 100644
GIT binary patch
literal 93809
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

literal 98191
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
G1OE>K1t6sW


From f223931ed3a723641e7dddf93bc09a83895b162b Mon Sep 17 00:00:00 2001
From: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:16:32 -0700
Subject: [PATCH 311/568] Fix Cigars Sprites + YAML fix for Inhand unlit
 cigars/cigs (#28641)

---
 .../Smokeables/Cigarettes/cigarette.yml        |   2 ++
 .../Consumable/Smokeables/Cigars/cigar.yml     |   2 ++
 .../Cigars/cigar-gold.rsi/lit-inhand-left.png  | Bin 769 -> 1374 bytes
 .../Cigars/cigar-gold.rsi/lit-inhand-right.png | Bin 542 -> 1220 bytes
 .../cigar-gold.rsi/unlit-inhand-left.png       | Bin 246 -> 306 bytes
 .../cigar-gold.rsi/unlit-inhand-right.png      | Bin 263 -> 335 bytes
 .../Cigars/cigar.rsi/lit-inhand-left.png       | Bin 769 -> 1374 bytes
 .../Cigars/cigar.rsi/lit-inhand-right.png      | Bin 542 -> 1220 bytes
 .../Cigars/cigar.rsi/unlit-inhand-left.png     | Bin 246 -> 306 bytes
 .../Cigars/cigar.rsi/unlit-inhand-right.png    | Bin 263 -> 335 bytes
 10 files changed, 4 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index f811afafba1d..146fac039d03 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -18,6 +18,8 @@
     equippedPrefix: unlit
   - type: Item
     size: Tiny
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    heldPrefix: unlit
   - type: Construction
     graph: smokeableCigarette
     node: cigarette
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
index dc8d4eaf3c43..93419993dc0e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -20,6 +20,8 @@
     equippedPrefix: unlit
   - type: Item
     size: Tiny
+    sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
+    heldPrefix: unlit
 
 - type: entity
   id: CigarSpent
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-left.png
index 353efa3f395a6167f2bcc1f68b75b1b6b2f5c950..c08f70d091d56f6538f7c3f7322d9d692c5a5fed 100644
GIT binary patch
literal 1374
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaljKx9jP7LeL$-HD>V3qK6aSW-L
z^Y*S`k#IP}@rT=IPPr2Dkl{#)jKjMbJC-WPI6r>K!s9$s+hXN{uRc~a47+A5X;-uT
zyNtp6(8bH^mc(YB{r_7lWyAe-7yMUG-THni6VL`^Abj=BZ{}N<*8Tl;)Bo%v{kZ$u
zPoKOmd%tm8;kSg;Kl8mUe-{7vxPINbRrTLr{d`&U=lRk(du$&4+pqQX$<2@7{(t&=
zIq2Pf%UA#Gf0h1CuHC|r72npJ?Ukv;|5cuEkEVeplfo>94mE~FoDCUBOnbR%=DwAg
ze7|o0Y~7aIZ)NA*$KWE&aFNBqgi*kk1m;_V*UU22b$@iPv+t<8vE}pm)3>M3zgC~0
zd+M#8x%koW<Mo%eeCF4FTyOKHw*2p+%;(~#Z$B4*zv}V%w9Rvmuk_{maQ*$#x%2h&
z`8WRGy75@F`~$rgyI)SN&V0_0$F}cq`CWl5{!{DJI~0$966!$q0g`7f3SasDulMnR
z{harz{>=V3>zUtr-3{-8nSbAF|6RnQ5cP%2Q0Cg(^xv8_eP;wwf&s}8T+Cayyp?X(
z&)=5be_t=}`m=U>TU*)G#m8pI|J&v(KK1@Q`Tv__D(e27`o-YvBfYOm^3etHCI3HN
zo-Y6ISDa@5Kgs7=-)~P3T=(v9(x3IO9ly-9NO-&dMYVgssj*}9t&7jk<<ClcpB?ml
zo@mnTkGD7dkiT7>+hkjJEa29qyuG}$nQna9vDP*$R^<G-EJk_jHMtxO2e;-{Z>a44
z7MpwA(*P7<`i&B<>&=7I3RXSfKt!Kffz%<pZME_>C%!*lz5k@$p>1zY0X=_@Ej9gW
zzm3fQ&b{XD;8YREv~hB+e*^#8vO{l?^y5tlJn4(%TkkFT{*|FN?Uz;cg_@c3|5j?M
z>u;YOy#GAwrP$jWB>snLs-NF=eE+UpQNO>IzLv|`{D1oU`O}L2pFJne_O57S#buMz
zKR;T3t6y_6`}@!T@+H9FVgB-SUflnTj#kNCJc0)T!nQvRNG{8DKWi?&?9QLU!`n@l
zN~$z?#tCfBo4zlv|10CRf-~%YR~;=gv3-7Lzq9ya|5k<{b!)1(y{`xoU}&Cw%KL=f
zHT_BDExq%8$sXPQ>l~*^>&^RSAI&sC!S<ZtP0D@MH2$^UCY=SRid$R!FV57_Z+u{_
z0Lw0u6U=sHtMA@kTHAGv=#+EKQa>Q~)S=hyzSjTu?5X{k`M2iH-ZayDsejagA{&hU
z9Y1`|y&f$uJUsq?apv>qr*9{}t<U9cy?OZlt<A^t-R1W`tN$He`KR>dpJn%o%fgm-
z$*42@IM&y1uiuE7tHEj5>?gyqnACz-+7g>uUmf~7+uqaQCqse{uJnzqbbzTXUB@3#
p49wi8jn4h~5F9HHE4OAW`p+=+u=8Bk{cnRoVxF#kF6*2UngE@xakKyc

literal 769
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;U^?OH;uumf=j~m?ERjTshKKbk
zOP5B>yeDDJpYUo+*(~OY#s`8b5mjt!x9~>1W7KJ8zo2}he~Dq2q~e;{y_NIZQxns=
z^8ekfOkDjJXdDW-6LQ(=yJ`Q=OP|~Mm(3TycSkn)|LHx~=B&25^EdV1V#9Cte}Dg6
zeKqUjt&<lI9{mFph|e$ltDgME{{FpR{`U6LkN>r=UHAWE_tWP!%8WX5+p^8)?w=<A
z*?OPgDHexW3?9M^nM?}43`;m0Oc*DqF<c^3@NG`g$Nhipe{cIQU+?^zxxhLnt)5|r
z;~RbkZZb`z&_M&M{q35~KQ^~tuKDx#(T^{$ZDOCdS8gk}{T#mf>eA=$_uAZe_v^m@
z=Z~w;o{x|Ee|hir&krZ}OV8i`r2lLE?q7el=2ggj{waNjhui=2m+8mv_$!bbD_8?z
t?RNVEyEE<X?X}pq_BS&uwf%23JjSnZC;1io=Y}MZpr@;!%Q~loCIBs06F2|>

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-right.png
index cdeedb4c24b6843544fa4ca348296f2536b90cd6..7c685a0a408cf76f0ffc0fc229a211e6413efa31 100644
GIT binary patch
literal 1220
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaljKx9jP7LeL$-HD>V5#$TaSW-L
z^Y*T7p0v9J+k=}5slQB$@?G8)F|6FAxYcXw4=zpC<LVwf@rTQvhdEk(WO%pa2ZQJ2
zD=*bs6(>$AQ~CGill%M63@r{_Pu@(ZGWCA9-FPX`5@c{-+N)oAdn%${y{y0ddjJ2s
z_4`AwMpftUueo^jvi<Vw=l`u*yybq;&t0pRzh8Deey?@@w)%nsgPPy+yQ+R=Rn^}8
ztN;IBK>z;#6}6>n{*}l6zZ|zm-~5;Twfpi=TlxdvD?YPU<?3a=c$dL_Mf6jF*B46f
zmi}IQ_>)aud~OwU!eo|)3?>H?Muk}n0=^6#Y78#I42w7!E)o#Fb-mX7-aPsLYkG|B
z|1P`EF7c@4Pt>pZk1N*i{&)0tzSqtFd+u5O>z{vS%l}x--}QHL>&t=~Qhn4WKYM>~
zkIkHI|2Iwf8~^*Z{OODLzVuf9UN$A&J~A2VXobUW{QTFW%&qkQ3%uR#r5I&?UTW3*
z&Dk<KLAMfoS&kO85amQn5AA);tn=v4pFQ8d-Te9RyxrU>?{4>>HQvxZWBLDW(w`sa
zC)E9rerx{h`2Jd_+U<|j&h6{_yoTT4dhxm){|;)Y-@E_4+%W(DoFDukceZ?1)r?N=
zdF&V-b(~p-Qw?Za?$e--*z0rd*Sly>w>h)(Y;0x4-i9whjXxNAa%1b?=p5G*z!R)q
ziZ?W!uj@%Ng5qE^_YuFyCu=rVmQC-0#YhcXLiUz#H;>QJJ;dR#<(}XJt-{GCm;5|%
z^XLEQ&-cH-^!{nYx!?Bx|9}0b&(`l>bMqU>hbN!UufDyW{q4TBMFG!`{rS`TufNjn
z<Hfk0AOG3^&TW3Jzh=WfMp$C;{qyi~=xNrn(qEs~l`NfBmHt~?*ZbwJmr^X@OJ%#i
zto-`Rc86^5^xBKxoeg6&Uh~x`!rX=<wVdHO{@|Ie$L+Q%6=jBtk4`U?JomN!i{<}~
z{5$Ui7Mra6zCD#iVb*yD8?LkGW%+rGm=1)^{N1zV-K*nSy93J_JJMJZp4)z5+%bjK
zp5=Pf`xw1>)2g<7f4b?DnEt~@KP}#V|GIVi|NTC<_rI@8&b@y0_rGt)i<SeU$mI8a
zzUjbB^5@Cv)D!vrHN2-1%)Xkwc%aO%L;zRnW?(q6NUG%6+pX)K?R>wca<%ktIqR7|
zRqv}SDl9T?uRXq<C$j3!@@rOA(%*01Vpy~KT+L*CyV=j96$s^)Ej!cN_XW<l7Srw!
zD7pJMFz${rZ}>S?H_@P&{lTZNC3W8n%~#y~*L`*yIAH-J<4x0l#+4ECn|qkj>OgVh
M>FVdQ&MBb@07DZjVgLXD

literal 542
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V0`N7;uumf=j~lXFJ?!Hwuh1%
zw`>vSSJ1R|*e1MY?H+f5euX&aH#tWy$tYDZSZ~}Szp+!{rpClx&ikKBcAwq9`80R*
zSrMRd#DJo!`=)NcwkZD0n-$wm{=WY8ulMWP@a8l2D|0`Y{Q2{;WY>p(|D3O@nIAs?
z-gx)g+@g=We{Nm(FM}!J^<UKn+4=KRm=tC)bf_^b;%vyE2J=?l`$zHTZ@v6@_fOH}
z@9pv_|5E?n|NHTJiQNG$KmOM>@Bh5s8{~HWb?vtIpQq=3{xAHTdBasZ{vR)P<vmsX
z!Ky@6#{dnxR&RGeNP4UNpHR(w_I~c?{l_0~JtIGteSQ7u^T4<w20UU!SCum>=oGv2
VvzR7}3vsJKlAf-9F6*2UngAYTyTJee

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-left.png
index 9c3943fbf26ecf93db9b406f4955db7941abaa35..c1ca9c4d489e08820423c02af465fb7535ae8dd4 100644
GIT binary patch
delta 279
zcmeyyxQS_kN<Cw7kh>GZx^prw85kJec)B=-RLpsMYolnBfk^AaBgw8$8G0J5Z@fCR
z?OlRf0)y7=h?SNmPA5)(o$-J52F~f)PAwMfK#d^4`!S4pezkb~?f%0L@*eK1h+qCt
zVz=fV`*`==bE;Q2#s=k88F-fj8(2Ts8M{{Yuh!;ekDrUzZ<x8g`=q1;<12<Nkp+AU
z+!)20r|n^lGTwRcn%06Ne-_-DQrxL~^y##Ve@qv=n7{B&{)M7dzkNTaGqA2;UJ=+}
z)gXnPVH)4?^!CH6m)MoJ&eImteQ@db8&k&Yv)2VI4x6$7UHik`{~D9Bo`AV`e<H~B
Mp00i_>zopr09zY+EdT%j

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dp%toLn`LHy}41a$w9>RV!v}r
z3ga{e+ZngE+B$HGIi&1TGw4gR`d6EOqgu)6-M+>QW}q$*h`N+I=WA8pCR=+y=R40d
zpW4pfCEs^>`PMakr{{d>`fm|&J#@mS%xTx<1AZFZmtX!<zk!iQYKg>w1&&=LGiJ#v
sysp~Qb=qLs_SfI5&!y@E?JrYTnzyNvH{Q*6Z!5?>p00i_>zopr01r%D7ytkO

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-right.png
index 0f4ab68d1569e959c7cd17c2ad9f83e6a37ff345..9fc2e5ba275c279ff1ba67a04e0fc3e5d38cb12f 100644
GIT binary patch
delta 308
zcmZo?I?psgrJk`k$lZxy-8q?;3=E8%o-U3d6?5L+vgT`Y5NUnby>U^I;+un!9o`F;
zn@szr*JyjAuR1|7Y+KY14-;c$&O?kp_qQBTIQlS!<9bgT0|Xc-N4|KnOJm*7ot3-S
zt=en({7kjI$A)c5Grvif*VgS@!)0yi`yozz;pE+i6*t#cTb@tuiu?Jw_{X!eN~~v2
z8hvvO{mq#C=U)21#l;6-r|oCbaFBKAWxB$61;ohx#JWZDY-|dffp^c&<k>%Wdx#qR
z6uofu4fl^<-tXn*Smhd7xB}P%7BiGGn1UGIVi%6{OsG=V-T*TKZkFyY%U`-@pa1)v
t?7dg~_NJQO`<+66ugts2%)pRflJ`-~V1t`D!&{K2JYD@<);T3K0RVE$hAjX9

literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==R92;Ln`LHy}6P1kO6~BpmgBU
zqzP{t*c17)yngi@P)K9vpVVb$!l<a?-tp|*r+QJZj*@>~(}6m{z_xSiX1U{qlFvR>
zYR=2w*=ce;I4W+xe7oTt@0Ih4!*>_XT(*O)D|(^N-g5rpzaM5ZRt2t|Tr9o*w|<b<
z)%w!^Yyt-onnf6S%sd21WrTcZ{Py4G%iq7Xf2Z&P9kWHL<pWENuGpb3>c@709Ovok
K=d#Wzp$Pz&BwsrK

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-left.png
index 353efa3f395a6167f2bcc1f68b75b1b6b2f5c950..c08f70d091d56f6538f7c3f7322d9d692c5a5fed 100644
GIT binary patch
literal 1374
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaljKx9jP7LeL$-HD>V3qK6aSW-L
z^Y*S`k#IP}@rT=IPPr2Dkl{#)jKjMbJC-WPI6r>K!s9$s+hXN{uRc~a47+A5X;-uT
zyNtp6(8bH^mc(YB{r_7lWyAe-7yMUG-THni6VL`^Abj=BZ{}N<*8Tl;)Bo%v{kZ$u
zPoKOmd%tm8;kSg;Kl8mUe-{7vxPINbRrTLr{d`&U=lRk(du$&4+pqQX$<2@7{(t&=
zIq2Pf%UA#Gf0h1CuHC|r72npJ?Ukv;|5cuEkEVeplfo>94mE~FoDCUBOnbR%=DwAg
ze7|o0Y~7aIZ)NA*$KWE&aFNBqgi*kk1m;_V*UU22b$@iPv+t<8vE}pm)3>M3zgC~0
zd+M#8x%koW<Mo%eeCF4FTyOKHw*2p+%;(~#Z$B4*zv}V%w9Rvmuk_{maQ*$#x%2h&
z`8WRGy75@F`~$rgyI)SN&V0_0$F}cq`CWl5{!{DJI~0$966!$q0g`7f3SasDulMnR
z{harz{>=V3>zUtr-3{-8nSbAF|6RnQ5cP%2Q0Cg(^xv8_eP;wwf&s}8T+Cayyp?X(
z&)=5be_t=}`m=U>TU*)G#m8pI|J&v(KK1@Q`Tv__D(e27`o-YvBfYOm^3etHCI3HN
zo-Y6ISDa@5Kgs7=-)~P3T=(v9(x3IO9ly-9NO-&dMYVgssj*}9t&7jk<<ClcpB?ml
zo@mnTkGD7dkiT7>+hkjJEa29qyuG}$nQna9vDP*$R^<G-EJk_jHMtxO2e;-{Z>a44
z7MpwA(*P7<`i&B<>&=7I3RXSfKt!Kffz%<pZME_>C%!*lz5k@$p>1zY0X=_@Ej9gW
zzm3fQ&b{XD;8YREv~hB+e*^#8vO{l?^y5tlJn4(%TkkFT{*|FN?Uz;cg_@c3|5j?M
z>u;YOy#GAwrP$jWB>snLs-NF=eE+UpQNO>IzLv|`{D1oU`O}L2pFJne_O57S#buMz
zKR;T3t6y_6`}@!T@+H9FVgB-SUflnTj#kNCJc0)T!nQvRNG{8DKWi?&?9QLU!`n@l
zN~$z?#tCfBo4zlv|10CRf-~%YR~;=gv3-7Lzq9ya|5k<{b!)1(y{`xoU}&Cw%KL=f
zHT_BDExq%8$sXPQ>l~*^>&^RSAI&sC!S<ZtP0D@MH2$^UCY=SRid$R!FV57_Z+u{_
z0Lw0u6U=sHtMA@kTHAGv=#+EKQa>Q~)S=hyzSjTu?5X{k`M2iH-ZayDsejagA{&hU
z9Y1`|y&f$uJUsq?apv>qr*9{}t<U9cy?OZlt<A^t-R1W`tN$He`KR>dpJn%o%fgm-
z$*42@IM&y1uiuE7tHEj5>?gyqnACz-+7g>uUmf~7+uqaQCqse{uJnzqbbzTXUB@3#
p49wi8jn4h~5F9HHE4OAW`p+=+u=8Bk{cnRoVxF#kF6*2UngE@xakKyc

literal 769
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;U^?OH;uumf=j~m?ERjTshKKbk
zOP5B>yeDDJpYUo+*(~OY#s`8b5mjt!x9~>1W7KJ8zo2}he~Dq2q~e;{y_NIZQxns=
z^8ekfOkDjJXdDW-6LQ(=yJ`Q=OP|~Mm(3TycSkn)|LHx~=B&25^EdV1V#9Cte}Dg6
zeKqUjt&<lI9{mFph|e$ltDgME{{FpR{`U6LkN>r=UHAWE_tWP!%8WX5+p^8)?w=<A
z*?OPgDHexW3?9M^nM?}43`;m0Oc*DqF<c^3@NG`g$Nhipe{cIQU+?^zxxhLnt)5|r
z;~RbkZZb`z&_M&M{q35~KQ^~tuKDx#(T^{$ZDOCdS8gk}{T#mf>eA=$_uAZe_v^m@
z=Z~w;o{x|Ee|hir&krZ}OV8i`r2lLE?q7el=2ggj{waNjhui=2m+8mv_$!bbD_8?z
t?RNVEyEE<X?X}pq_BS&uwf%23JjSnZC;1io=Y}MZpr@;!%Q~loCIBs06F2|>

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-right.png
index cdeedb4c24b6843544fa4ca348296f2536b90cd6..7c685a0a408cf76f0ffc0fc229a211e6413efa31 100644
GIT binary patch
literal 1220
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaljKx9jP7LeL$-HD>V5#$TaSW-L
z^Y*T7p0v9J+k=}5slQB$@?G8)F|6FAxYcXw4=zpC<LVwf@rTQvhdEk(WO%pa2ZQJ2
zD=*bs6(>$AQ~CGill%M63@r{_Pu@(ZGWCA9-FPX`5@c{-+N)oAdn%${y{y0ddjJ2s
z_4`AwMpftUueo^jvi<Vw=l`u*yybq;&t0pRzh8Deey?@@w)%nsgPPy+yQ+R=Rn^}8
ztN;IBK>z;#6}6>n{*}l6zZ|zm-~5;Twfpi=TlxdvD?YPU<?3a=c$dL_Mf6jF*B46f
zmi}IQ_>)aud~OwU!eo|)3?>H?Muk}n0=^6#Y78#I42w7!E)o#Fb-mX7-aPsLYkG|B
z|1P`EF7c@4Pt>pZk1N*i{&)0tzSqtFd+u5O>z{vS%l}x--}QHL>&t=~Qhn4WKYM>~
zkIkHI|2Iwf8~^*Z{OODLzVuf9UN$A&J~A2VXobUW{QTFW%&qkQ3%uR#r5I&?UTW3*
z&Dk<KLAMfoS&kO85amQn5AA);tn=v4pFQ8d-Te9RyxrU>?{4>>HQvxZWBLDW(w`sa
zC)E9rerx{h`2Jd_+U<|j&h6{_yoTT4dhxm){|;)Y-@E_4+%W(DoFDukceZ?1)r?N=
zdF&V-b(~p-Qw?Za?$e--*z0rd*Sly>w>h)(Y;0x4-i9whjXxNAa%1b?=p5G*z!R)q
ziZ?W!uj@%Ng5qE^_YuFyCu=rVmQC-0#YhcXLiUz#H;>QJJ;dR#<(}XJt-{GCm;5|%
z^XLEQ&-cH-^!{nYx!?Bx|9}0b&(`l>bMqU>hbN!UufDyW{q4TBMFG!`{rS`TufNjn
z<Hfk0AOG3^&TW3Jzh=WfMp$C;{qyi~=xNrn(qEs~l`NfBmHt~?*ZbwJmr^X@OJ%#i
zto-`Rc86^5^xBKxoeg6&Uh~x`!rX=<wVdHO{@|Ie$L+Q%6=jBtk4`U?JomN!i{<}~
z{5$Ui7Mra6zCD#iVb*yD8?LkGW%+rGm=1)^{N1zV-K*nSy93J_JJMJZp4)z5+%bjK
zp5=Pf`xw1>)2g<7f4b?DnEt~@KP}#V|GIVi|NTC<_rI@8&b@y0_rGt)i<SeU$mI8a
zzUjbB^5@Cv)D!vrHN2-1%)Xkwc%aO%L;zRnW?(q6NUG%6+pX)K?R>wca<%ktIqR7|
zRqv}SDl9T?uRXq<C$j3!@@rOA(%*01Vpy~KT+L*CyV=j96$s^)Ej!cN_XW<l7Srw!
zD7pJMFz${rZ}>S?H_@P&{lTZNC3W8n%~#y~*L`*yIAH-J<4x0l#+4ECn|qkj>OgVh
M>FVdQ&MBb@07DZjVgLXD

literal 542
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V0`N7;uumf=j~lXFJ?!Hwuh1%
zw`>vSSJ1R|*e1MY?H+f5euX&aH#tWy$tYDZSZ~}Szp+!{rpClx&ikKBcAwq9`80R*
zSrMRd#DJo!`=)NcwkZD0n-$wm{=WY8ulMWP@a8l2D|0`Y{Q2{;WY>p(|D3O@nIAs?
z-gx)g+@g=We{Nm(FM}!J^<UKn+4=KRm=tC)bf_^b;%vyE2J=?l`$zHTZ@v6@_fOH}
z@9pv_|5E?n|NHTJiQNG$KmOM>@Bh5s8{~HWb?vtIpQq=3{xAHTdBasZ{vR)P<vmsX
z!Ky@6#{dnxR&RGeNP4UNpHR(w_I~c?{l_0~JtIGteSQ7u^T4<w20UU!SCum>=oGv2
VvzR7}3vsJKlAf-9F6*2UngAYTyTJee

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-left.png
index 9c3943fbf26ecf93db9b406f4955db7941abaa35..c1ca9c4d489e08820423c02af465fb7535ae8dd4 100644
GIT binary patch
delta 279
zcmeyyxQS_kN<Cw7kh>GZx^prw85kJec)B=-RLpsMYolnBfk^AaBgw8$8G0J5Z@fCR
z?OlRf0)y7=h?SNmPA5)(o$-J52F~f)PAwMfK#d^4`!S4pezkb~?f%0L@*eK1h+qCt
zVz=fV`*`==bE;Q2#s=k88F-fj8(2Ts8M{{Yuh!;ekDrUzZ<x8g`=q1;<12<Nkp+AU
z+!)20r|n^lGTwRcn%06Ne-_-DQrxL~^y##Ve@qv=n7{B&{)M7dzkNTaGqA2;UJ=+}
z)gXnPVH)4?^!CH6m)MoJ&eImteQ@db8&k&Yv)2VI4x6$7UHik`{~D9Bo`AV`e<H~B
Mp00i_>zopr09zY+EdT%j

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dp%toLn`LHy}41a$w9>RV!v}r
z3ga{e+ZngE+B$HGIi&1TGw4gR`d6EOqgu)6-M+>QW}q$*h`N+I=WA8pCR=+y=R40d
zpW4pfCEs^>`PMakr{{d>`fm|&J#@mS%xTx<1AZFZmtX!<zk!iQYKg>w1&&=LGiJ#v
sysp~Qb=qLs_SfI5&!y@E?JrYTnzyNvH{Q*6Z!5?>p00i_>zopr01r%D7ytkO

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-right.png
index 0f4ab68d1569e959c7cd17c2ad9f83e6a37ff345..9fc2e5ba275c279ff1ba67a04e0fc3e5d38cb12f 100644
GIT binary patch
delta 308
zcmZo?I?psgrJk`k$lZxy-8q?;3=E8%o-U3d6?5L+vgT`Y5NUnby>U^I;+un!9o`F;
zn@szr*JyjAuR1|7Y+KY14-;c$&O?kp_qQBTIQlS!<9bgT0|Xc-N4|KnOJm*7ot3-S
zt=en({7kjI$A)c5Grvif*VgS@!)0yi`yozz;pE+i6*t#cTb@tuiu?Jw_{X!eN~~v2
z8hvvO{mq#C=U)21#l;6-r|oCbaFBKAWxB$61;ohx#JWZDY-|dffp^c&<k>%Wdx#qR
z6uofu4fl^<-tXn*Smhd7xB}P%7BiGGn1UGIVi%6{OsG=V-T*TKZkFyY%U`-@pa1)v
t?7dg~_NJQO`<+66ugts2%)pRflJ`-~V1t`D!&{K2JYD@<);T3K0RVE$hAjX9

literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==R92;Ln`LHy}6P1kO6~BpmgBU
zqzP{t*c17)yngi@P)K9vpVVb$!l<a?-tp|*r+QJZj*@>~(}6m{z_xSiX1U{qlFvR>
zYR=2w*=ce;I4W+xe7oTt@0Ih4!*>_XT(*O)D|(^N-g5rpzaM5ZRt2t|Tr9o*w|<b<
z)%w!^Yyt-onnf6S%sd21WrTcZ{Py4G%iq7Xf2Z&P9kWHL<pWENuGpb3>c@709Ovok
K=d#Wzp$Pz&BwsrK


From 014c5eb3e8d36c7a72a0b2d647ca580b903ebdf9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 5 Jun 2024 21:17:38 +0000
Subject: [PATCH 312/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6adbf16221d3..adbad1269bb1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: brainfood1183
-  changes:
-  - message: Added Spray Paints.
-    type: Add
-  id: 6186
-  time: '2024-03-18T21:29:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/23003
 - author: PJB3005
   changes:
   - message: Bans are now shown in the "adminremarks" command.
@@ -3848,3 +3841,10 @@
   id: 6685
   time: '2024-06-05T20:47:28.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28571
+- author: ps3moira
+  changes:
+  - message: Lit cigars inhand sprites are now visible.
+    type: Fix
+  id: 6686
+  time: '2024-06-05T21:16:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28641

From 27a5d08db497348db591e318a2ea7e7f72cf0662 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:03:31 -0500
Subject: [PATCH 313/568] Clean up Eva and Hardsuit helm yml + Lets atmos
 firesuit helm work as a BreathMask (#28602)

---
 .../Clothing/Head/base_clothinghead.yml       |  2 ++
 .../Entities/Clothing/Head/eva-helmets.yml    |  6 ----
 .../Clothing/Head/hardsuit-helmets.yml        | 31 -------------------
 .../Entities/Clothing/Head/helmets.yml        |  1 +
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 40f9e0a3d4e3..866fe962ca5e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -119,6 +119,7 @@
   id: ClothingHeadEVAHelmetBase
   name: base space helmet
   components:
+  - type: BreathMask
   - type: Item
     size: Normal
   - type: PressureProtection
@@ -150,6 +151,7 @@
   name: base hardsuit helmet
   noSpawn: true
   components:
+  - type: BreathMask
   - type: Sprite
     state: icon # default state used by most inheritors
   - type: Clickable
diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 963bcdedd783..530c23a5781e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -5,7 +5,6 @@
   name: EVA helmet
   description: An old-but-gold helmet designed for extravehicular activites. Infamous for making security officers paranoid.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/eva.rsi
   - type: Clothing
@@ -22,7 +21,6 @@
   name: EVA helmet
   description: An old-but-gold helmet designed for extravehicular activites.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/eva_large.rsi
   - type: Clothing
@@ -35,7 +33,6 @@
   name: syndicate EVA helmet
   description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/eva_syndicate.rsi
   - type: Clothing
@@ -48,7 +45,6 @@
   name: cosmonaut helmet
   description: Ancient design, but advanced manufacturing. #Description here originally started with " A deceptively well armored space helmet." Potentially had armor values in SS13 that weren't brought over?
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/cosmonaut.rsi
   - type: Clothing
@@ -61,7 +57,6 @@
   name: paramedic void helmet
   description: A void helmet made for paramedics.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/paramedhelm.rsi
   - type: Clothing
@@ -81,7 +76,6 @@
   name: NTSRA void helmet
   description: An ancient space helmet, designed by the NTSRA branch of CentCom.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 072dd53d9ae1..0c660e09b807 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -12,7 +12,6 @@
   name: basic hardsuit helmet
   description: A basic-looking hardsuit helmet that provides minor protection against most sources of damage.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/basic.rsi
   - type: Clothing
@@ -28,7 +27,6 @@
   name: atmos hardsuit helmet
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/atmospherics.rsi
     layers:
@@ -68,7 +66,6 @@
   name: engineering hardsuit helmet
   description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering.rsi
   - type: Clothing
@@ -86,7 +83,6 @@
   name: spationaut hardsuit helmet
   description: A sturdy helmet designed for complex industrial operations in space.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
     layers:
@@ -121,7 +117,6 @@
   name: salvage hardsuit helmet
   description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/salvage.rsi
   - type: Clothing
@@ -140,7 +135,6 @@
   name: salvager maxim helmet
   description: A predication of decay washes over your mind.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/maxim.rsi
   - type: Clothing
@@ -163,7 +157,6 @@
   name: security hardsuit helmet
   description: Armored hardsuit helmet for security needs.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/security.rsi
   - type: Clothing
@@ -188,7 +181,6 @@
   name: brigmedic hardsuit helmet
   description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/brigmedic.rsi
   - type: Clothing
@@ -215,7 +207,6 @@
   name: warden's hardsuit helmet
   description: A modified riot helmet. Oddly comfortable.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/security-warden.rsi
   - type: Clothing
@@ -240,7 +231,6 @@
   name: captain's hardsuit helmet
   description: Special hardsuit helmet, made for the captain of the station.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/capspace.rsi
   - type: Clothing
@@ -256,7 +246,6 @@
   name: chief engineer's hardsuit helmet
   description: Special hardsuit helmet, made for the chief engineer of the station.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering-white.rsi
   - type: Clothing
@@ -274,7 +263,6 @@
   name: chief medical officer's hardsuit helmet
   description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/medical.rsi
   - type: Clothing
@@ -292,7 +280,6 @@
   name: experimental research hardsuit helmet
   description: Lightweight hardsuit helmet that doesn't restrict your head movements.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/rd.rsi
   - type: Clothing
@@ -310,7 +297,6 @@
   name: head of security's hardsuit helmet
   description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/security-red.rsi
   - type: Clothing
@@ -335,7 +321,6 @@
   name: luxury mining hardsuit helmet
   description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/luxury.rsi
   - type: Clothing
@@ -355,7 +340,6 @@
   name: blood-red hardsuit helmet
   description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndicate.rsi
   - type: Clothing
@@ -380,7 +364,6 @@
   name: blood-red medic hardsuit helmet
   description: An advanced red hardsuit helmet specifically designed for field medic operations.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndiemedic.rsi
   - type: Clothing
@@ -405,7 +388,6 @@
   name: syndicate elite helmet
   description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndieelite.rsi
   - type: Clothing
@@ -434,7 +416,6 @@
   name: syndicate commander helmet
   description: A bulked up version of the blood-red hardsuit's helmet, purpose-built for the commander of a syndicate operative squad. Has significantly improved armor for those deadly front-lines firefights.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
   - type: Clothing
@@ -459,7 +440,6 @@
   name: cybersun juggernaut helmet
   description: Made of compressed red matter, this helmet was designed in the Tau chromosphere facility.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
   - type: Clothing
@@ -482,7 +462,6 @@
   name: wizard hardsuit helmet
   description: A bizarre gem-encrusted helmet that radiates magical energies.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/wizard.rsi
   - type: Clothing
@@ -507,7 +486,6 @@
   name: organic space helmet
   description: A spaceworthy biomass of pressure and temperature resistant tissue.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
   - type: Clothing
@@ -524,7 +502,6 @@
   suffix: Pirate
   description: A deep space EVA helmet, very heavy but provides good protection.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/pirateeva.rsi
   - type: Clothing
@@ -541,7 +518,6 @@
   suffix: Pirate
   description: A special hardsuit helmet, made for the captain of a pirate ship.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
   - type: Clothing
@@ -558,7 +534,6 @@
   name: ERT leader hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
   - type: Clothing
@@ -580,7 +555,6 @@
   name: ERT chaplain hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
   - type: Clothing
@@ -595,7 +569,6 @@
   name: ERT engineer hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
   - type: Clothing
@@ -617,7 +590,6 @@
   name: ERT medic hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
   - type: Clothing
@@ -632,7 +604,6 @@
   name: ERT security hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
   - type: Clothing
@@ -654,7 +625,6 @@
   name: ERT janitor hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
   - type: Clothing
@@ -669,7 +639,6 @@
   name: CBURN exosuit helmet
   description: A pressure resistant and fireproof hood worn by special cleanup units.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/cburn.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 720e52ee5883..d585518ece88 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -263,6 +263,7 @@
     slots:
     - Hair
     - Snout
+  - type: BreathMask
 
 #Chitinous Helmet
 - type: entity

From 72df1a0ae58679cf482006c08b242b94ce00c661 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:04:09 -0500
Subject: [PATCH 314/568] Shifts borgs hats to the right a bit (#28600)

---
 Resources/Prototypes/InventoryTemplates/borg.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/InventoryTemplates/borg.yml b/Resources/Prototypes/InventoryTemplates/borg.yml
index a03be16708d5..d43519f61cf4 100644
--- a/Resources/Prototypes/InventoryTemplates/borg.yml
+++ b/Resources/Prototypes/InventoryTemplates/borg.yml
@@ -7,7 +7,7 @@
     uiWindowPos: 1,0
     strippingWindowPos: 0,0
     displayName: Head
-    offset: 0, -0.09375
+    offset: 0.015625, -0.09375
 
 - type: inventoryTemplate
   id: borgShort
@@ -18,7 +18,7 @@
     uiWindowPos: 1,0
     strippingWindowPos: 0,0
     displayName: Head
-    offset: 0, -0.1875
+    offset: 0.015625, -0.1875
 
 - type: inventoryTemplate
   id: borgTall
@@ -30,6 +30,7 @@
     uiWindowPos: 0,0
     strippingWindowPos: 0,0
     displayName: Head
+    offset: 0.015625, 0
 
 # taller than tall
 - type: inventoryTemplate

From 110c8a96e0f7593a1caad4c6be842161d9428eb6 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:06:57 -0500
Subject: [PATCH 315/568] Fix mouse inhands (#28623)

---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 51647f698524..971d05823a52 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1533,6 +1533,7 @@
         state: mouse-0
   - type: Item
     size: Tiny
+    heldPrefix: 0
   - type: Clothing
     quickEquip: false
     sprite: Mobs/Animals/mouse.rsi
@@ -1706,6 +1707,9 @@
         Base: dead-1
       Dead:
         Base: splat-1
+  - type: Item
+    size: Tiny
+    heldPrefix: 1
 
 - type: entity
   parent: MobMouse
@@ -1732,6 +1736,9 @@
         Base: dead-2
       Dead:
         Base: splat-2
+  - type: Item
+    size: Tiny
+    heldPrefix: 2
 
 - type: entity
   name: cancer mouse

From 8a1f3f497184cb14fca9cea6af0ab87f6df5e632 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Wed, 5 Jun 2024 18:08:41 -0400
Subject: [PATCH 316/568] Adjust some touch reaction damage levels (#28591)

---
 Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml   | 2 +-
 Resources/Prototypes/Entities/Mobs/Species/diona.yml | 8 ++++----
 Resources/Prototypes/Entities/Mobs/Species/slime.yml | 2 +-
 Resources/Prototypes/Entities/Objects/Misc/kudzu.yml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index d2ca78043814..ffca699bfcc9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -84,7 +84,7 @@
         scaleByQuantity: true
         damage:
           types:
-            Heat: 3
+            Heat: 0.15
       - !type:PopupMessage
         type: Local
         messages: [ "slime-hurt-by-water-popup" ]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 1cac380cd030..7edb3a19dbad 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -49,9 +49,9 @@
         scaleByQuantity: true
         damage:
           types:
-            Blunt: 2
-            Slash: 2
-            Piercing: 3
+            Blunt: 0.1
+            Slash: 0.1
+            Piercing: 0.15
       - !type:PopupMessage
         type: Local
         visualType: Large
@@ -64,7 +64,7 @@
         scaleByQuantity: true
         damage:
           types:
-            Poison: 5
+            Poison: 0.25
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 2ab26ffcd610..caa3690e5d20 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -91,7 +91,7 @@
         scaleByQuantity: true
         damage:
           types:
-            Heat: 2
+            Heat: 0.1
       - !type:PopupMessage
         type: Local
         visualType: Large
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index a1005004946a..ca56ef5acbb7 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -76,7 +76,7 @@
           scaleByQuantity: true
           damage:
             types:
-              Heat: 10
+              Heat: 0.5
     - type: AtmosExposed
     - type: Kudzu
       growthTickChance: 0.3

From 8e85bec2cef641e5624241ce33cdbdbba2921e5d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 5 Jun 2024 22:09:47 +0000
Subject: [PATCH 317/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index adbad1269bb1..25f48ec5f798 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: Bans are now shown in the "adminremarks" command.
-    type: Add
-  id: 6187
-  time: '2024-03-18T21:31:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26240
 - author: Terraspark4941
   changes:
   - message: The TEG page in the guidebook has been updated with proper information!
@@ -3848,3 +3841,11 @@
   id: 6686
   time: '2024-06-05T21:16:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28641
+- author: Tayrtahn
+  changes:
+  - message: Slimes, diona, and kudzu are less dramatically affected by having certain
+      chemicals splashed on them.
+    type: Tweak
+  id: 6687
+  time: '2024-06-05T22:08:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28591

From ba57e3e4d9b95bad457f93f7e1f9bbd433d8eebd Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 6 Jun 2024 10:14:25 +1200
Subject: [PATCH 318/568] Add closing storage UIs to StorageInteractionTest
 (#28633)

---
 .../Tests/Storage/StorageInteractionTest.cs          | 12 ++++++++++++
 .../Storage/EntitySystems/SharedStorageSystem.cs     |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
index 34402dd5e627..8d0de707f3b2 100644
--- a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Input;
 using Content.Shared.PDA;
 using Content.Shared.Storage;
+using Content.Shared.Timing;
 using Robust.Client.UserInterface;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -27,11 +28,22 @@ public async Task UiInteractTest()
         Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.False);
         Assert.That(IsUiOpen(PdaUiKey.Key), Is.False);
 
+        await Server.WaitPost(() => SEntMan.RemoveComponent<UseDelayComponent>(STarget!.Value));
+        await RunTicks(5);
+
         // Activating the backpack opens the UI
         await Activate();
         Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
         Assert.That(IsUiOpen(PdaUiKey.Key), Is.False);
 
+        // Activating it again closes the UI
+        await Activate();
+        Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.False);
+
+        // Open it again
+        await Activate();
+        Assert.That(IsUiOpen(StorageComponent.StorageUiKey.Key), Is.True);
+
         // Pick up a PDA
         var pda = await PlaceInHands("PassengerPDA");
         var sPda = ToServer(pda);
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index d87b57bfc8dd..f20e2f9ab1f2 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -298,7 +298,7 @@ public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? sto
             return;
 
         // prevent spamming bag open / honkerton honk sound
-        silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay));
+        silent |= TryComp<UseDelayComponent>(uid, out var useDelay) && UseDelay.IsDelayed((uid, useDelay), id: OpenUiUseDelayID);
         if (!CanInteract(entity, (uid, storageComp), silent: silent))
             return;
 
@@ -308,7 +308,7 @@ public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? sto
                 Audio.PlayPredicted(storageComp.StorageOpenSound, uid, entity);
 
             if (useDelay != null)
-                UseDelay.TryResetDelay((uid, useDelay));
+                UseDelay.TryResetDelay((uid, useDelay), id: OpenUiUseDelayID);
         }
 
         _ui.OpenUi(uid, StorageComponent.StorageUiKey.Key, entity);

From fea2bc942263b3cda6cb61a9f8959493931e8b8d Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:59:22 -0500
Subject: [PATCH 319/568] Update rules (#28452)

---
 .github/CODEOWNERS                            |   2 +
 .../Guidebook/Controls/GuidebookWindow.xaml   |   2 +-
 Resources/Locale/en-US/guidebook/guides.ftl   |  55 ++
 Resources/Prototypes/Guidebook/rules.yml      | 369 +++++++
 Resources/Prototypes/Guidebook/ss14.yml       |   1 +
 .../Guidebook/ServerRules/BanDurations.xml    |  17 +
 .../Guidebook/ServerRules/BanTypes.xml        |  11 +
 .../ServerRules/CoreRules/RuleC0.xml          |  19 +
 .../ServerRules/CoreRules/RuleC10AHelp.xml    |  29 +
 .../CoreRules/RuleC11AhelpThreats.xml         |  20 +
 .../ServerRules/CoreRules/RuleC12MinAge.xml   |   6 +
 .../CoreRules/RuleC13CharacterNames.xml       |  66 ++
 .../ServerRules/CoreRules/RuleC14ICinOOC.xml  |  13 +
 .../ServerRules/CoreRules/RuleC1Admins.xml    |   6 +
 .../ServerRules/CoreRules/RuleC2DBAD.xml      |   7 +
 .../ServerRules/CoreRules/RuleC3NoHate.xml    |  20 +
 .../ServerRules/CoreRules/RuleC4NoERP.xml     |  23 +
 .../ServerRules/CoreRules/RuleC5Metacomms.xml |  18 +
 .../CoreRules/RuleC6BanEvasion.xml            |  15 +
 .../CoreRules/RuleC7EnglishOnly.xml           |  10 +
 .../ServerRules/CoreRules/RuleC8Exploits.xml  |  12 +
 .../ServerRules/CoreRules/RuleC9Multikey.xml  |   7 +
 .../Guidebook/ServerRules/DefaultRules.xml    |   5 +
 .../Guidebook/ServerRules/README.txt          |   5 +
 .../Guidebook/ServerRules/RoleTypes.xml       |  21 +
 .../ServerRules/RoleplayRules/RuleR0.xml      |  26 +
 .../RoleplayRules/RuleR10Subordination.xml    |  26 +
 .../RuleR11-1AnimalEscalation.xml             |  36 +
 .../RoleplayRules/RuleR11-2ConflictTypes.xml  |  30 +
 .../RoleplayRules/RuleR11Escalation.xml       |  67 ++
 .../RoleplayRules/RuleR12RoleAbandonment.xml  |  28 +
 .../RoleplayRules/RuleR13PerformRole.xml      |  26 +
 .../RoleplayRules/RuleR14SecComStandard.xml   |  37 +
 .../RoleplayRules/RuleR15SpaceLaw.xml         |  21 +
 .../RoleplayRules/RuleR1Silicons.xml          |   4 +
 .../RoleplayRules/RuleR2Familiars.xml         |   6 +
 .../RoleplayRules/RuleR3NormalRP.xml          |  20 +
 .../RoleplayRules/RuleR4Metashield.xml        | 103 ++
 .../RoleplayRules/RuleR5Arrivals.xml          |  22 +
 .../RoleplayRules/RuleR6SelfAntag.xml         |  22 +
 .../RoleplayRules/RuleR7RoundStalling.xml     |  16 +
 .../RoleplayRules/RuleR8NoFriendlyAntag.xml   |  22 +
 .../RoleplayRules/RuleR9MassSabotage.xml      |  23 +
 .../ServerRules/SiliconRules/RuleS0.xml       |  15 +
 .../SiliconRules/RuleS10OrderConflicts.xml    |   9 +
 .../ServerRules/SiliconRules/RuleS1Laws.xml   |   6 +
 .../SiliconRules/RuleS2LawPriority.xml        |   9 +
 .../SiliconRules/RuleS3LawRedefinition.xml    |   8 +
 .../SiliconRules/RuleS4RequestChanges.xml     |   6 +
 .../SiliconRules/RuleS5FreeSilicon.xml        |   4 +
 .../SiliconRules/RuleS6UnreasonableOrders.xml |  22 +
 .../SiliconRules/RuleS7Consistency.xml        |   6 +
 .../RuleS8DefaultCrewDefinition.xml           |   4 +
 .../RuleS9DefaultHarmDefinition.xml           |  25 +
 .../SpaceLaw/SLControlledSubstances.xml       |  14 +
 .../ServerRules/SpaceLaw/SLCrimeList.xml      | 934 ++++++++++++++++++
 .../ServerRules/SpaceLaw/SLRestrictedGear.xml |  21 +
 .../SpaceLaw/SLRestrictedWeapons.xml          |  11 +
 .../ServerRules/SpaceLaw/SpaceLaw.xml         |  67 ++
 .../ServerRules/WizDenCoreOnlyRules.xml       |  26 +
 .../Guidebook/ServerRules/WizDenLRPRules.xml  |  65 ++
 .../Guidebook/ServerRules/WizDenMRPRules.xml  |  65 ++
 Resources/ServerInfo/RP_Rules.txt             | 127 ---
 Resources/ServerInfo/Rules.txt                | 115 ---
 64 files changed, 2610 insertions(+), 243 deletions(-)
 create mode 100644 Resources/Prototypes/Guidebook/rules.yml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/BanDurations.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/BanTypes.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC0.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC10AHelp.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC12MinAge.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC1Admins.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC3NoHate.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC4NoERP.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC5Metacomms.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC6BanEvasion.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC7EnglishOnly.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC8Exploits.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC9Multikey.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/README.txt
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR10Subordination.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-1AnimalEscalation.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-2ConflictTypes.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR14SecComStandard.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR1Silicons.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR6SelfAntag.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR7RoundStalling.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR8NoFriendlyAntag.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS0.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS1Laws.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS2LawPriority.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS3LawRedefinition.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS4RequestChanges.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS5FreeSilicon.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS6UnreasonableOrders.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS7Consistency.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS8DefaultCrewDefinition.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS9DefaultHarmDefinition.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/WizDenCoreOnlyRules.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
 delete mode 100644 Resources/ServerInfo/RP_Rules.txt
 delete mode 100644 Resources/ServerInfo/Rules.txt

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 21c3070b8022..da9d4d693a81 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,6 +15,7 @@
 /Content.*/GameTicking/ @moonheart08 @EmoGarbage404
 /Resources/ServerInfo/ @moonheart08 @Chief-Engineer
 /Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
+/Resources/ServerInfo/Guidebook/ServerRules/ @Chief-Engineer
 /Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
 /Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
 
@@ -23,6 +24,7 @@
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
 /Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
+/Resources/Prototypes/Guidebook/rules.yml @Chief-Engineer
 /Content.*/Body/ @DrSmugleaf
 /Content.YAMLLinter @DrSmugleaf
 /Content.Shared/Damage/ @DrSmugleaf
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
index 8dbfde3c4754..cc6cc6e82b09 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -18,7 +18,7 @@
                     Name="SearchBar"
                     PlaceHolder="{Loc 'guidebook-filter-placeholder-text'}"
                     HorizontalExpand="True"
-                    Margin="0 5 10 5">                
+                    Margin="0 5 10 5">
                 </LineEdit>
             </BoxContainer>
             <ScrollContainer Name="Scroll" HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True">
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index ff1ffbf5eafb..66c1a42adf28 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -68,5 +68,60 @@ guide-entry-revolutionaries = Revolutionaries
 guide-entry-minor-antagonists = Minor Antagonists
 guide-entry-space-ninja = Space Ninja
 
+guide-entry-rules = Server Rules
+guide-entry-rules-core-only = Core Only Ruleset
+guide-entry-rules-lrp = Standard Ruleset
+guide-entry-rules-mrp = MRP Ruleset
+guide-entry-rules-role-types = Role Types
+guide-entry-rules-core = Core Rules
+guide-entry-rules-c1 = C1
+guide-entry-rules-c2 = C2
+guide-entry-rules-c3 = C3
+guide-entry-rules-c4 = C4
+guide-entry-rules-c5 = C5
+guide-entry-rules-c6 = C6
+guide-entry-rules-c7 = C7
+guide-entry-rules-c8 = C8
+guide-entry-rules-c9 = C9
+guide-entry-rules-c10 = C10
+guide-entry-rules-c11 = C11
+guide-entry-rules-c12 = C12
+guide-entry-rules-c13 = C13
+guide-entry-rules-c14 = C14
+guide-entry-rules-roleplay = Roleplay Rules
+guide-entry-rules-r1 = R1
+guide-entry-rules-r2 = R2
+guide-entry-rules-r3 = R3
+guide-entry-rules-r4 = R4
+guide-entry-rules-r5 = R5
+guide-entry-rules-r6 = R6
+guide-entry-rules-r7 = R7
+guide-entry-rules-r8 = R8
+guide-entry-rules-r9 = R9
+guide-entry-rules-r10 = R10
+guide-entry-rules-r11 = R11
+guide-entry-rules-r12 = R12
+guide-entry-rules-r13 = R13
+guide-entry-rules-r14 = R14
+guide-entry-rules-r15 = R15
+guide-entry-rules-silicon = Silicon Rules
+guide-entry-rules-s1 = S1
+guide-entry-rules-s2 = S2
+guide-entry-rules-s3 = S3
+guide-entry-rules-s4 = S4
+guide-entry-rules-s5 = S5
+guide-entry-rules-s6 = S6
+guide-entry-rules-s7 = S7
+guide-entry-rules-s8 = S8
+guide-entry-rules-s9 = S9
+guide-entry-rules-s10 = S10
+guide-entry-rules-space-law = Space Law
+guide-entry-rules-sl-crime-list = Crime List
+guide-entry-rules-sl-controlled-substances = Controlled Substances
+guide-entry-rules-sl-restricted-gear = Restricted Gear
+guide-entry-rules-sl-restricted-weapons = Restricted Weapons
+guide-entry-rules-ban-types = Ban Types
+guide-entry-rules-ban-durations = Ban Durations
+
 guide-entry-writing = Writing
 guide-entry-glossary = Glossary
diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml
new file mode 100644
index 000000000000..4aad44948555
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -0,0 +1,369 @@
+- type: guideEntry # Default for forks and stuff. Should not be listed anywhere if the server is using a custom ruleset.
+  id: DefaultRuleset
+  name: guide-entry-rules
+  text: "/ServerInfo/Guidebook/ServerRules/DefaultRules.xml"
+
+- type: guideEntry
+  id: CoreRuleset
+  name: guide-entry-rules-core-only
+  priority: 0
+  text: "/ServerInfo/Guidebook/ServerRules/WizDenCoreOnlyRules.xml"
+
+- type: guideEntry
+  id: StandardRuleset
+  name: guide-entry-rules-lrp
+  priority: 5
+  text: "/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml"
+
+- type: guideEntry
+  id: MRPRuleset
+  name: guide-entry-rules-mrp
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml"
+
+- type: guideEntry
+  id: RoleTypes
+  name: guide-entry-rules-role-types
+  priority: 20
+  text: "/ServerInfo/Guidebook/ServerRules/RoleTypes.xml"
+
+- type: guideEntry
+  id: CoreRules
+  name: guide-entry-rules-core
+  priority: 30
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC0.xml"
+  children:
+  - RuleC1
+  - RuleC2
+  - RuleC3
+  - RuleC4
+  - RuleC5
+  - RuleC6
+  - RuleC7
+  - RuleC8
+  - RuleC9
+  - RuleC10
+  - RuleC11
+  - RuleC12
+  - RuleC13
+  - RuleC14
+
+- type: guideEntry
+  id: RuleC1
+  name: guide-entry-rules-c1
+  priority: 1
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC1Admins.xml"
+
+- type: guideEntry
+  id: RuleC2
+  name: guide-entry-rules-c2
+  priority: 2
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml"
+
+- type: guideEntry
+  id: RuleC3
+  name: guide-entry-rules-c3
+  priority: 3
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC3NoHate.xml"
+
+- type: guideEntry
+  id: RuleC4
+  name: guide-entry-rules-c4
+  priority: 4
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC4NoERP.xml"
+
+- type: guideEntry
+  id: RuleC5
+  name: guide-entry-rules-c5
+  priority: 5
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC5Metacomms.xml"
+
+- type: guideEntry
+  id: RuleC6
+  name: guide-entry-rules-c6
+  priority: 6
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC6BanEvasion.xml"
+
+- type: guideEntry
+  id: RuleC7
+  name: guide-entry-rules-c7
+  priority: 7
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC7EnglishOnly.xml"
+
+- type: guideEntry
+  id: RuleC8
+  name: guide-entry-rules-c8
+  priority: 8
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC8Exploits.xml"
+
+- type: guideEntry
+  id: RuleC9
+  name: guide-entry-rules-c9
+  priority: 9
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC9Multikey.xml"
+
+- type: guideEntry
+  id: RuleC10
+  name: guide-entry-rules-c10
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC10AHelp.xml"
+
+- type: guideEntry
+  id: RuleC11
+  name: guide-entry-rules-c11
+  priority: 11
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml"
+
+- type: guideEntry
+  id: RuleC12
+  name: guide-entry-rules-c12
+  priority: 12
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC12MinAge.xml"
+
+- type: guideEntry
+  id: RuleC13
+  name: guide-entry-rules-c13
+  priority: 13
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml"
+
+- type: guideEntry
+  id: RuleC14
+  name: guide-entry-rules-c14
+  priority: 14
+  text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml"
+
+- type: guideEntry
+  id: RoleplayRules
+  name: guide-entry-rules-roleplay
+  priority: 40
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml"
+  children:
+  - RuleR1
+  - RuleR2
+  - RuleR3
+  - RuleR4
+  - RuleR5
+  - RuleR6
+  - RuleR7
+  - RuleR8
+  - RuleR9
+  - RuleR10
+  - RuleR11
+  - RuleR12
+  - RuleR13
+  - RuleR14
+  - RuleR15
+
+- type: guideEntry
+  id: RuleR1
+  name: guide-entry-rules-r1
+  priority: 1
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR1Silicons.xml"
+
+- type: guideEntry
+  id: RuleR2
+  name: guide-entry-rules-r2
+  priority: 2
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml"
+
+- type: guideEntry
+  id: RuleR3
+  name: guide-entry-rules-r3
+  priority: 3
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml"
+
+- type: guideEntry
+  id: RuleR4
+  name: guide-entry-rules-r4
+  priority: 4
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml"
+
+- type: guideEntry
+  id: RuleR5
+  name: guide-entry-rules-r5
+  priority: 5
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml"
+
+- type: guideEntry
+  id: RuleR6
+  name: guide-entry-rules-r6
+  priority: 6
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR6SelfAntag.xml"
+
+- type: guideEntry
+  id: RuleR7
+  name: guide-entry-rules-r7
+  priority: 7
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR7RoundStalling.xml"
+
+- type: guideEntry
+  id: RuleR8
+  name: guide-entry-rules-r8
+  priority: 8
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR8NoFriendlyAntag.xml"
+
+- type: guideEntry
+  id: RuleR9
+  name: guide-entry-rules-r9
+  priority: 9
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml"
+
+- type: guideEntry
+  id: RuleR10
+  name: guide-entry-rules-r10
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR10Subordination.xml"
+
+- type: guideEntry
+  id: RuleR11
+  name: guide-entry-rules-r11
+  priority: 11
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml"
+
+- type: guideEntry
+  id: RuleR12
+  name: guide-entry-rules-r12
+  priority: 12
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml"
+
+- type: guideEntry
+  id: RuleR13
+  name: guide-entry-rules-r13
+  priority: 13
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml"
+
+- type: guideEntry
+  id: RuleR14
+  name: guide-entry-rules-r14
+  priority: 14
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR14SecComStandard.xml"
+
+- type: guideEntry
+  id: RuleR15
+  name: guide-entry-rules-r15
+  priority: 15
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml"
+
+- type: guideEntry
+  id: SiliconRules
+  name: guide-entry-rules-silicon
+  priority: 50
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS0.xml"
+  children:
+  - RuleS1
+  - RuleS2
+  - RuleS3
+  - RuleS4
+  - RuleS5
+  - RuleS6
+  - RuleS7
+  - RuleS8
+  - RuleS9
+  - RuleS10
+
+- type: guideEntry
+  id: RuleS1
+  name: guide-entry-rules-s1
+  priority: 1
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS1Laws.xml"
+
+- type: guideEntry
+  id: RuleS2
+  name: guide-entry-rules-s2
+  priority: 2
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS2LawPriority.xml"
+
+- type: guideEntry
+  id: RuleS3
+  name: guide-entry-rules-s3
+  priority: 3
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS3LawRedefinition.xml"
+
+- type: guideEntry
+  id: RuleS4
+  name: guide-entry-rules-s4
+  priority: 4
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS4RequestChanges.xml"
+
+- type: guideEntry
+  id: RuleS5
+  name: guide-entry-rules-s5
+  priority: 5
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS5FreeSilicon.xml"
+
+- type: guideEntry
+  id: RuleS6
+  name: guide-entry-rules-s6
+  priority: 6
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS6UnreasonableOrders.xml"
+
+- type: guideEntry
+  id: RuleS7
+  name: guide-entry-rules-s7
+  priority: 7
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS7Consistency.xml"
+
+- type: guideEntry
+  id: RuleS8
+  name: guide-entry-rules-s8
+  priority: 8
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS8DefaultCrewDefinition.xml"
+
+- type: guideEntry
+  id: RuleS9
+  name: guide-entry-rules-s9
+  priority: 9
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS9DefaultHarmDefinition.xml"
+
+- type: guideEntry
+  id: RuleS10
+  name: guide-entry-rules-s10
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml"
+
+- type: guideEntry
+  id: SpaceLaw
+  name: guide-entry-rules-space-law
+  priority: 60
+  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml"
+  children:
+  - SpaceLawCrimeList
+  - SpaceLawControlledSubstances
+  - SpaceLawRestrictedGear
+  - SpaceLawRestrictedWeapons
+
+- type: guideEntry
+  id: SpaceLawCrimeList
+  name: guide-entry-rules-sl-crime-list
+  priority: 5
+  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml"
+
+- type: guideEntry
+  id: SpaceLawControlledSubstances
+  name: guide-entry-rules-sl-controlled-substances
+  priority: 20
+  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml"
+
+- type: guideEntry
+  id: SpaceLawRestrictedGear
+  name: guide-entry-rules-sl-restricted-gear
+  priority: 30
+  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml"
+
+- type: guideEntry
+  id: SpaceLawRestrictedWeapons
+  name: guide-entry-rules-sl-restricted-weapons
+  priority: 40
+  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml"
+
+- type: guideEntry
+  id: BanTypes
+  name: guide-entry-rules-ban-types
+  priority: 90
+  text: "/ServerInfo/Guidebook/ServerRules/BanTypes.xml"
+
+- type: guideEntry
+  id: BanDurations
+  name: guide-entry-rules-ban-durations
+  priority: 100
+  text: "/ServerInfo/Guidebook/ServerRules/BanDurations.xml"
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml
index c1017fefcae5..5b1f1dd8f97a 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/ss14.yml
@@ -3,6 +3,7 @@
   name: guide-entry-ss14
   text: "/ServerInfo/Guidebook/SpaceStation14.xml"
   children:
+  - SpaceLaw
   - Controls
   - Jobs
   - Survival
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/BanDurations.xml b/Resources/ServerInfo/Guidebook/ServerRules/BanDurations.xml
new file mode 100644
index 000000000000..2c85346b49d7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/BanDurations.xml
@@ -0,0 +1,17 @@
+<Document>
+  # Ban Durations
+
+  Bans can be appealed at forum.ss14.io in the ban appeals section.
+
+  ## Temporary
+  Temporary bans will be lifted automatically after a certain amount of time. If they are a game ban, they will tell you how much time is remaining when you try to connect.
+
+  ## Indefinite
+  These bans will only be removed on a successful appeal on the forums. Any ban which doesn't tell you when it expires and doesn't specify otherwise can be presumed to be an indefinite ban.
+
+  ## Voucher
+  This is an indefinite ban which may only be appealed both with a successful appeal and which require a voucher of good behavior from the administrative team of a well-known or at least decently active SS13/SS14 server in order for the appeal to be considered. Voucher bans typically cannot be appealed for at least six months after being issued. Without a voucher, a player can only attempt to appeal a voucher ban once, and only if the ban was inappropriately placed. Voucher bans are typically only placed as a result of an unsuccessful appeal of an indefinite game ban by players with a history of bans and of causing issues.
+
+  ## Permanent
+  This is a ban that is only appealable if the ban was inappropriately placed, including if the ban should not have been permanent. If the result of the appeal is that the ban was appropriately placed, the ban may not be appealed again and will not be lifted. These bans are extremely rare, but are applied to players who continually cause problems even after a voucher ban or users who have completely unacceptable behavior may be permanently removed.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/BanTypes.xml b/Resources/ServerInfo/Guidebook/ServerRules/BanTypes.xml
new file mode 100644
index 000000000000..b10ea3c393b5
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/BanTypes.xml
@@ -0,0 +1,11 @@
+<Document>
+  # Ban Types
+
+  Bans can be appealed at forum.ss14.io in the ban appeals section.
+
+  ## Role Ban
+  Also called a "job ban", this ban prevents your character from joining or late-joining a round as one or more jobs or roles. These are often used in response to problematic behavior in particular departments or address gross inexperience in important roles such as heads of staff. These bans do not mechanically prevent you from switching to the role during a round or acting as that role, but doing so is considered ban evasion.
+
+  ## Game Ban
+  Also called a "server ban", this ban prevents you from connecting to all Wizard's Den servers.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC0.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC0.xml
new file mode 100644
index 000000000000..7b8cfbcf61e0
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC0.xml
@@ -0,0 +1,19 @@
+<Document>
+  # Core Rules
+  These rules apply at all times, including between rounds.
+
+  - [textlink="1. Admins have final say" link="RuleC1"]
+  - [textlink="2. Don't be a dick" link="RuleC2"]
+  - [textlink="3. No Hate Speech or Discriminatory Language" link="RuleC3"]
+  - [textlink="4. No sexual content/themes, including erotic roleplay (ERP) and no shock content" link="RuleC4"]
+  - [textlink="5. Do not use out of game methods to communicate with other players" link="RuleC5"]
+  - [textlink="6. Do not attempt to evade bans" link="RuleC6"]
+  - [textlink="7. Only use English" link="RuleC7"]
+  - [textlink="8. Do not exploit the game, use cheats, or macros" link="RuleC8"]
+  - [textlink="9. Do not use multiple accounts, or alt accounts, and do not share accounts" link="RuleC9"]
+  - [textlink="10. Do not abuse or ignore admin messages" link="RuleC10"]
+  - [textlink="11. Do not threaten to ahelp other players or argue with them about rules" link="RuleC11"]
+  - [textlink="12. Players must be and act at least 16 years old" link="RuleC12"]
+  - [textlink="13. Use realistic character names, and do not use names of famous people" link="RuleC13"]
+  - [textlink="14. Do not use LOOC or OOC to share current round information" link="RuleC14"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC10AHelp.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC10AHelp.xml
new file mode 100644
index 000000000000..2d639c5b84a2
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC10AHelp.xml
@@ -0,0 +1,29 @@
+<Document>
+  # Core Rule 10 - Do not abuse or ignore admin messages
+  Admin help, or "ahelp", is the system used by admins to communicate with specific players in the game. Only use admin help for things requiring admin attention. If you ignore messages admins send to you via ahelp, or disconnect during an ahelp, you may be banned. If you urgently need to leave during an ahelp, you may do so but will likely need to continue the ahelp on the forums. Do not admin check, be hostile/aggressive, request events, or spam. IC methods of contacting admins, like prayers, faxes, red phones, and banana phones, should be used when there is not an issue.
+
+  Admins are not always online, but all ahelps are automatically relayed to discord. For various reasons, admins might not respond to an ahelp even if they've handled it. A lack of response does not necessarily mean that an ahelp was ignored.
+
+  ## Should I ahelp X?
+  You can ahelp anytime you genuinely think a player is breaking a rule. Not all ahelps end up being for something that an admin needs to intervene in, but that's ok, admins would rather have people occasionally report things that turn out to not be an issue than miss reports for actual issues because someone was unsure, or get those reports late because someone waited until the end of the round to be more sure.
+
+  The most common reason players give for not ahelping issues is that they don't want to waste admin time, but it only takes a few seconds for an admin to check if someone is an antagonist. If you are ahelping too many things, an admin will let you know. If you're not being told to stop reporting something or to report less things, then you can safely assume that you aren't causing any issues.
+
+  # What should I include in an ahelp?
+  At a minimum, admins need to know what the issue is to be able to address an ahelp. Don't send ahelp messages with no information about what your question or the issue is. Messages like "hello" are often considered admin checking.
+
+  If you can, an ideal ahelp message includes what the issue is along with who is causing it and their character's name if possible.
+
+  # Examples
+  Appropriate uses of ahelp:
+  - reporting people who you think are violating rules,
+  - asking questions about rules,
+  - asking for a temporary exemption from a rule, and
+  - request a minor gimmick, like a TC trade or item spawn.
+
+  Inappropriate uses of ahelp:
+  - checking if an admin is online, including sending messages without any information about the issue like "hello" or incomprehensible messages,
+  - being hostile or aggressive,
+  - requesting events, and
+  - spamming messages about the same issue.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml
new file mode 100644
index 000000000000..47420264946c
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml
@@ -0,0 +1,20 @@
+<Document>
+  # Core Rule 11 - Do not threaten to ahelp other players or argue with them about rules
+  Don't threaten to ahelp a player, don't tell them you are ahelping them, and don't tell them you did ahelp them. You can argue in character about Space Law, but do not argue about whether something is or is not against the rules. If you think someone is breaking a rule, ahelp them. If you don't think someone is breaking a rule, don't ahelp them. Either way, the best thing that you can do once you after is to continue in-character.
+
+  ## Example Scenario 1
+  You are a security officer and think someone who is causing a ton of problems for security is not an antag and is breaking the rules by doing so.
+
+  [color=#a4885c]Good:[/color] Since you think they are breaking a rule, you ahelp them when you're able to. You continue in-character by arresting them for the crimes that they committed.
+
+  [color=#a4885c]Bad:[/color] You decide not to ahelp them. You kill them and tell them "you're lucky I didn't report you to the admins".
+
+  [color=#a4885c]Bad:[/color] Since you think they are breaking a rule, you ahelp them when you're able to. You arrest them for the crimes that they committed and tell them "I ahelped you so enjoy your ban".
+
+  ## Example Scenario 2
+  A mouse is using emotes to bypass speech restrictions.
+
+  [color=#a4885c]Good:[/color] You ahelp them then respond in-character by acting like you can't understand what the mouse is doing.
+
+  [color=#a4885c]Bad:[/color] You use in character chat to tell the mouse that it is breaking a rule.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC12MinAge.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC12MinAge.xml
new file mode 100644
index 000000000000..baa30a09faf7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC12MinAge.xml
@@ -0,0 +1,6 @@
+<Document>
+  # Core Rule 12 - Players must be and act at least 16 years old
+  All players must be at least 16 years old. Additionally, all players must act at least as mature as a 16 year old. Admins may ban someone who they believe is acting less mature than a 16 year old, even if the player is known to be significantly older than 16 years old.
+
+  Anyone who connects to the servers is a player, even if they don't actually play in a round.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
new file mode 100644
index 000000000000..ec393ecdc17c
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
@@ -0,0 +1,66 @@
+<Document>
+  # Core Rule 13 - Use realistic character names, and do not use names of famous people
+  - No names of people or characters from the real world
+  - No titles/honorifics
+  - Must follow all other rules (no slurs/sexual names/etc)
+  - Usernames, objects, random characters, very "low effort" names, "meta" names, or otherwise implausible names cannot be used as names. See examples below.
+  - Admin rulings on IC names are final and disputes should be done through the forums, not by refusing to comply with an admin
+
+  ## Clarification on "Meta" Names
+  Meta names are ones which attempt to take advantage of some game mechanic or game design choice. "Urist McHands" is a meta name because it is the default name used for admin spawned humans. "Operator Whiskey" is a meta name because it follows the naming pattern of nuclear operatives. This rule is not intended to prevent things like nuclear operatives using a fake ID with names that appear to be nuclear operative names if they decide that they want to do that.
+
+  ## Conventions and Examples
+  [color=#994444]Bad[/color] cannot be used by any species. [color=#449944]Acceptable[/color] names can be used by any species.
+
+  Humans typically use the Firstname Lastname convention.
+  - [color=#449944]Acceptable:[/color] Tom Fisher
+  - [color=#449944]Acceptable:[/color] Spacey Chapman
+  - [color=#994444]Bad:[/color] Dr. Tom Fisher
+  - [color=#994444]Bad:[/color] Walter White
+  - [color=#994444]Bad:[/color] George Washington
+  - [color=#994444]Bad:[/color] Joe Biden
+  - [color=#994444]Bad:[/color] Ben Dover
+  - [color=#994444]Bad:[/color] Mike Hunt
+
+  Dwarfs typically use the human convention in a viking theme.
+  - [color=#449944]Acceptable:[/color] Ingrid Firebreath
+  - [color=#449944]Acceptable:[/color] Erik Lightningclaw
+
+  Lizards typically use the Verb-article-Noun convention.
+  - [color=#449944]Acceptable:[/color] Cleans-the-Airlocks
+  - [color=#994444]Bad:[/color] Bans-the-Admins
+
+  Slimes typically have names that are onomonopia. A last name is optional.
+  - [color=#449944]Acceptable:[/color] Foolp Suub
+  - [color=#449944]Acceptable:[/color] Foolp
+  - [color=#994444]Bad:[/color] Slime
+
+  Diona typically have calm, nature themed, Noun of Noun style names.
+  - [color=#449944]Acceptable:[/color] Petal of Tranquility
+  - [color=#449944]Acceptable:[/color] Garden of Relaxation
+  - [color=#994444]Bad:[/color] Tree but Alive
+
+  Mothmen typically use latin sounding names, or light themed names.
+  - [color=#449944]Acceptable:[/color] Socrates Temnora
+  - [color=#449944]Acceptable:[/color] Sierra Lightseeker
+  - [color=#449944]Acceptable:[/color] James Nightflitter
+
+  Arachnids typically use latin sounding names.
+  - [color=#449944]Acceptable:[/color] Argyroneta Reticulatus
+  - [color=#449944]Acceptable:[/color] Loxosceles Domesticus
+  - [color=#994444]Bad:[/color] Spider-Man
+
+  Usernames, objects, random characters, very "low effort" names, "meta" names, or otherwise implausible names are not permitted.
+  - [color=#994444]Bad:[/color] XxRobustxX
+  - [color=#994444]Bad:[/color] SDpksSodjdfk
+  - [color=#994444]Bad:[/color] Lkdsoisgoieun
+  - [color=#994444]Bad:[/color] F4ith H3arth
+  - [color=#994444]Bad:[/color] Greytide
+  - [color=#994444]Bad:[/color] Passenger
+  - [color=#994444]Bad:[/color] Urist McHands
+  - [color=#994444]Bad:[/color] Admin
+  - [color=#994444]Bad:[/color] Game-Master
+  - [color=#994444]Bad:[/color] Joe Mamma
+  - [color=#994444]Bad:[/color] Middle-Aged Man
+  - [color=#994444]Bad:[/color] Operative Whiskey
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml
new file mode 100644
index 000000000000..44ad34deb66f
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml
@@ -0,0 +1,13 @@
+<Document>
+  # Core Rule 14 - Do not use LOOC or OOC to share current round information
+  Local Out of Character (LOOC) and Out of Character (OOC) channel are meant for things that don't relate to the current round. Using these channels to share round info is often referred to as "IC in OOC" or "ick ock".
+
+  ## Examples
+  Things you should [color=#a4885c]not[/color] do:
+  - Use LOOC to tell someone you are an antagonist.
+  - Use LOOC to tell someone that your character is not lying.
+
+  Things you could do instead:
+  - Use codewords in-character.
+  - Try to convince them that you are not lying in-character, or accept that you won't be able to convince them.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC1Admins.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC1Admins.xml
new file mode 100644
index 000000000000..ed9fa6133b99
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC1Admins.xml
@@ -0,0 +1,6 @@
+<Document>
+  # Core Rule 1 - Admins have final say
+  These rules are not perfect. The rules attempt to clearly communicate what the admin team intends to be allowed and prohibited, but there are likely loopholes or other flaws that can be "lawyered". Don't attempt to manipulate the interpretation of the rules to suit your personal goals or to degrade the experience of other players. If you are unsure of something, follow the more restrictive option until you are able to ask an admin and get clarification.
+
+  Admins can override rules if they deem it in the best interest of the current round, server, and/or community at large. Online admins are able to make final interpretations of rules during a round. Even if you disagree with how an admin interprets a rule, you must still follow the interpretation they provide for you. Admin actions and interpretations of rules can be contested through staff complaints. If admins believe that you are an overall negative impact to the community or rounds, you will be banned. Admins will be held fully accountable for their actions if they exercise this privilege.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml
new file mode 100644
index 000000000000..5678cde195dc
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml
@@ -0,0 +1,7 @@
+<Document>
+  # Core Rule 2 - Don't be a dick
+  Don't do anything with the goal of negatively affecting other players. Not everyone is going to enjoy every round. Killing someone is allowed in certain situations even though it might negatively affect them, but no one should be doing anything for the purpose of harming someone else's experience.
+
+  ## MRP Amendment
+  Do not interact negatively with SSD/AFK players. Interactions to complete antagonist objectives or duties like security searches/arrests are always permitted.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC3NoHate.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC3NoHate.xml
new file mode 100644
index 000000000000..3a2e288ba9f1
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC3NoHate.xml
@@ -0,0 +1,20 @@
+<Document>
+  # Core Rule 3 - No Hate Speech or Discriminatory Language
+  This is a zero tolerance rule.
+
+  This rule prohibits all the following:
+  - Hate Speech
+  - Slurs (including variations of slurs, racial, sexual, disability-related, or language closely tied to real-life slurs)
+  - Bigotry
+  - Racism (including Speciesism, which would be demeaning other players based on their in-game race)
+  - Sexism
+
+  ## Examples
+  Allowed:
+  - Telling someone that you are gay.
+
+  Prohibited:
+  - Calling someone gay in a context where gay is used as an insult or negative attribute.
+  - Using a racial slur or variant in a positive context.
+  - Using the word "retard" in any context.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC4NoERP.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC4NoERP.xml
new file mode 100644
index 000000000000..a0921f59070a
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC4NoERP.xml
@@ -0,0 +1,23 @@
+<Document>
+  # Core Rule 4 - No sexual content/themes, including erotic roleplay (ERP) and no shock content
+  This is a zero tolerance rule.
+
+  Erotic Roleplay (commonly abbreviated as "ERP") and sexual content is not allowed. This includes direct and indirect mentions of sexual behavior or actions. Slight leeway is given to insults, but this rule is otherwise strictly enforced.
+
+  In-game romantic relationships should not become the focus of the game for you and anyone else involved.
+
+  Things that appear to be intended to or are likely to disturb players out of character are considered shock content and are not allowed.
+
+  ## Examples
+  Allowed:
+  - Telling someone that they are being a dickhead.
+  - Telling someone that you are going to kill the captain, as long as it is clear that you mean it in character.
+
+  Prohibited:
+  - Emoting sexual acts.
+  - Erotica content.
+  - Erotic or sexual memes.
+  - Memes which contain sexual content.
+  - Dedicating significant portions of rounds to romantic relationships, dating, or similar things.
+  - Emoting defecation or related acts.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC5Metacomms.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC5Metacomms.xml
new file mode 100644
index 000000000000..0c0f336e6d0b
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC5Metacomms.xml
@@ -0,0 +1,18 @@
+<Document>
+  # Core Rule 5 - Do not use out of game methods to communicate with other players
+  This is a zero tolerance rule.
+
+  Do not utilize any external means of communication to talk to other players who are connected to the same server, or who were connected to the same server during the current round. This is referred to as "metacomming" and includes any means of communication including text, voice, images, and video. This includes applications such as Discord, Steam, and other platforms, along with in-person communication.
+
+  Even if information is not being shared or abused, it may still be considered a violation of this rule. Due to the difficulty of determining if information is being shared, it will almost always be presumed that people who message another player they are in a round with, or who are in a voice call with another player during a round are sharing round information. Due to the difficulty of determining if users are abusing information that they are sharing, it will almost always be presumed that the information is being abused.
+
+  The only exemption to this rule is when [color=#a4885c]all[/color] players are in the server lobby.
+
+  ## Teaching new players
+  Teaching players is not exempt from this rule. If you want to teach a new player, it is recommended to either watch a stream of them playing the game while not playing yourself, or communicate with them using only in-game methods of communication.
+
+  ## Streaming
+  Public livestreams are not exempt from this rule, but have different liability. Using information from a public live stream of the game (stream sniping) is a violation of this rule. Watching a public live stream of the game while connected to the same server is a violation of this rule. Allowing people watching a public live stream to share information about the current round, for example through the stream's chat, is a violation of this rule. Using that information is also a violation of this rule. Sharing information about the current round with a streamer is a violation of this rule if that information was obtained from any source but the stream. The stream's moderators are expected to enforce this on the streaming platform in addition to any in-game enforcement done by game admins.
+
+  Public livestreaming by itself is not a violation of the rule as long as the stream is sufficiently moderated. Streamers are encouraged, but not required, to use a stream delay.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC6BanEvasion.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC6BanEvasion.xml
new file mode 100644
index 000000000000..bec8b4fabd76
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC6BanEvasion.xml
@@ -0,0 +1,15 @@
+<Document>
+  # Core Rule 6 - Do not attempt to evade bans
+  This is a zero tolerance rule.
+
+  Almost all bans may be appealed on our forums at forum.ss14.io in the ban appeals section. This is generally the only acceptable way to contact the administration team to discuss your ban and revise it if it is inappropriate, including if it is mistakenly applied.
+
+  Any attempt to circumvent or bypass a game ban will result in a voucher ban. Attempting to evade role bans by gaining access to or working in the capacity of a job you are banned from will result in a game ban. These bans are applied even if the evasion attempt is unsuccessful.
+
+  ## Exceptions
+  There are no exemptions for evading or attempting to evade game bans. Antagonists who impersonate or take over a role which they are banned from to aid in their goals are not considered to be evading their role ban.
+
+  ## Additional Information
+  - [textlink="Ban Types" link="BanTypes"]
+  - [textlink="Ban Durations" link="BanDurations"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC7EnglishOnly.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC7EnglishOnly.xml
new file mode 100644
index 000000000000..630c522bcef8
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC7EnglishOnly.xml
@@ -0,0 +1,10 @@
+<Document>
+  # Core Rule 7 - Only use English
+  Only English is permitted, both in-character and out-of-character. You must be fluent in English enough to be able to not cause game issues, and to be able to communicate with game admins when necessary. If a game admin does not feel that you are fluent enough in English, they may ban you.
+
+  ## Why
+  We do not have enough staff fluent in other languages to moderate them. Translation tools can be unreliable and are not integrated well into the game.
+
+  ## Non-English Options
+  There are many servers that allow or focus on other languages. You are highly encouraged to play only on servers that allow languages you are fluent in.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC8Exploits.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC8Exploits.xml
new file mode 100644
index 000000000000..48cbaaa9acfc
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC8Exploits.xml
@@ -0,0 +1,12 @@
+<Document>
+  # Core Rule 8 - Do not exploit the game, use cheats, or macros
+  The following are prohibited by this rule:
+  - bugs and exploits which have effects that persist beyond the current round,
+  - intentionally used bugs, exploits, and unintended behaviors which give the user an advantage over players who do not use them, even if their effects do not persist across rounds,
+  - evading or bypassing afk detection,
+  - anything which results in gaining elevated privileges, including admin permissions,
+  - external tools and client modifications, including macros, and
+  - anything which prevents another player who is not game banned from being able to play on the servers, not including in-character actions that do not persist across rounds.
+
+  Both attempts and successful use are prohibited.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC9Multikey.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC9Multikey.xml
new file mode 100644
index 000000000000..d402918dcd46
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC9Multikey.xml
@@ -0,0 +1,7 @@
+<Document>
+  # Core Rule 9 - Do not use multiple accounts, or alt accounts, and do not share accounts
+  Use of multiple accounts is referred to as "multikey". the rule applies even if the accounts are not used at the same time, including if the old account is abandoned. All accounts may be banned if this rule is violated. You are responsible for everything done on and with your account. You are just as responsible for actions taken by other people using your account as you would be had you taken the actions themselves.
+
+  ## Switching to a new account
+  If you lose access to an account, you must contact game admins on the forums notifying admins before using a new account to connect to the servers. Your message to game admins must include the username of your old account. Creating a new account while your current account is banned will be considered ban evasion.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml
new file mode 100644
index 000000000000..3e19fefeedcf
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/DefaultRules.xml
@@ -0,0 +1,5 @@
+<Document>
+  # Server Rules
+
+  This server has not written any rules yet. Please listen to the staff.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/README.txt b/Resources/ServerInfo/Guidebook/ServerRules/README.txt
new file mode 100644
index 000000000000..d7ac858c16f8
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/README.txt
@@ -0,0 +1,5 @@
+These files contain Wizard's Den server rules. Since they reference Wizard's Den, they should not be used
+by other servers without at least enough modification to not mislead players into thinking that they are
+playing on Wizard's Den.
+
+The filenames used for the rules files are not themselves rules. Only the contents of the files are rules.
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml
new file mode 100644
index 000000000000..d5373a730a33
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml
@@ -0,0 +1,21 @@
+<Document>
+  # Role Types
+
+  ## Crew Aligned/Non-antagonist
+  In most rounds, a majority of players will be non-antagonists, meaning that they are crew aligned. This is the "default" role, if the game doesn't tell you that you are one of the other roles defined here, then you are a non-antagonist. Overall, non-antagonists are intended to work towards a net positive effect on the round.
+
+  ## Solo Antagonist
+  Certain roles are intended to cause problems for the round or for non-antagonists. You are only a solo antagonist if the game clearly and explicitly tells you that you are a solo antagonist. Antagonists are exempt from many but not all roleplay rules.
+
+  ## Team Antagonist
+  Team antagonists are like solo antagonists but they have other antagonists who they are expected to not hinder, and who they may be expected to help. You are only a team antagonist if the game clearly and explicitly tells you that you are a team antagonist.
+
+  ## Free Agent
+  Certain roles are free to choose if they want to behave as an antagonist or as a non-antagonist, and may change their mind whenever they'd like. You are only free agent if the game clearly and explicitly tells you that you are a free agent.
+
+  ## Familiar
+  Familiars are considered non-antagonists, but have instructions to obey someone. They must obey this person even if it causes them to violate roleplay rules or die. You are only a familiar if the game clearly and explicitly tells you that you are a familiar. You are only the familiar of the person the game tells you.
+
+  ## Silicon
+  Silicones have a set of laws that they must follow above all else except the core rules. You are only silicon if the game clearly and explicitly tells you that you are a silicon.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml
new file mode 100644
index 000000000000..07b176b359a2
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml
@@ -0,0 +1,26 @@
+<Document>
+  # Roleplay Rules
+  These rules only apply during a round. A round ends only when the round summary has appeared. All of these rules apply fully until the moment that the round summary appears, even while the arrivals shuttle is in transit.
+
+  The deathmatch and sandbox game modes are exempt from these rules. Players who choose to not follow these rules are entirely responsible for knowing if an exempt game mode is active.
+
+  Roleplay rules do not apply to ghosts/spectators/observers while they are ghosts/spectators/observers. Dead chat is considered to be an in-game out of character chat channel.
+
+  See the list of [textlink="role types" link="RoleTypes"] for more information about the different types of roles.
+
+  - [textlink="1. Silicones must follow Silicon Rules" link="RuleR1"]
+  - [textlink="2. Familiars must obey their master" link="RuleR2"]
+  - [textlink="3. Roleplay a normal person" link="RuleR3"]
+  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
+  - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
+  - [textlink="7. Do not stall the round" link="RuleR7"]
+  - [textlink="8. As an antagonist, only be friendly to your team and don't work against your team" link="RuleR8"]
+  - [textlink="9. As an antagonist, do not cause excessive death, damage, or destruction beyond your objectives" link="RuleR9"]
+  - [textlink="10. Listen to your team leader" link="RuleR10"]
+  - [textlink="11. Follow reasonable escalation" link="RuleR11"]
+  - [textlink="12. Do not abandon your role" link="RuleR12"]
+  - [textlink="13. Stick to your role" link="RuleR13"]
+  - [textlink="14. Set an example if playing command or security" link="RuleR14"]
+  - [textlink="15. Command and Security must follow Space Law" link="RuleR15"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR10Subordination.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR10Subordination.xml
new file mode 100644
index 000000000000..2147ddc1110f
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR10Subordination.xml
@@ -0,0 +1,26 @@
+<Document>
+  # Roleplay Rule 10 - Listen to your team leader
+  Captains lead all departments and other members of command. Department heads lead members of their department. Certain antagonist teams have team leaders, like nuclear operative commanders or head revolutionaries. You are not required to perfectly follow orders given to you by your leaders, but you should generally allow your leaders to lead and not interfere with their ability to. You can choose to ignore unreasonable orders, including ones which are will result in your death unless you are an antagonist with an objective that requires you to die.
+
+  Team antagonists have to listen to the leader of their antagonist team. Team antagonists do not have to listen to any other leaders, including leaders of other antagonist teams. Solo antagonists do not have to listen to any leaders at all.
+
+  ## Examples
+  Acceptable:
+  - A traitor ignores orders from a nuclear operative commander.
+  - An antagonist ignores orders from the captain.
+  - An engineer tells the Chief Engineer that they don't think it's a good idea to setup the singularity, but does so anyway when ordered to.
+  - An engineer tells the Chief Engineer that they don't know how to setup the singularity correctly, so refuses orders to, but accepts an offer to be taught how.
+  - An atmospheric technician refuses an order from the captain that would create an atmospheric hazard on the station.
+  - A doctor refuses an order from the Chief Engineer about who to give medical treatment to first.
+  - A revolutionary refuses a suicide mission from a head revolutionary.
+  - The Chief Engineer doesn't follow an order from the captain to setup backup power because there is an unrelated engineering emergency that the Chief Engineer needs to prioritize.
+  - The captain orders command to give the nuclear authentication disk to nuclear operatives, so command arrests the captain and picks a new captain.
+  - The research director orders scientists to say "Long live Nanotrasen!" every time they enter the bar. The scientists say they will, but don't follow the order.
+
+  Prohibited:
+  - A nuclear operative ignores an order from the commander operative because they don't like the plan.
+  - The Chief Engineer refuses an order from the captain to setup backup power because the Chief Engineer doesn't think backup power is necessary.
+  - An engineer refuses an order from the Chief Engineer to setup the singularity because they prefer a different power source.
+  - An engineer refuses to perform a task because they don't know how to do it, and refuses to be taught for no reason.
+  - A head revolutionary orders revolutionaries to blend in and not do anything illegal until they are told to reveal themselves. Instead, revolutionaries collect weapons and attack security.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-1AnimalEscalation.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-1AnimalEscalation.xml
new file mode 100644
index 000000000000..36655ba8414b
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-1AnimalEscalation.xml
@@ -0,0 +1,36 @@
+<Document>
+  # Roleplay Rule 11-1 - Escalation Involving Animals
+  Escalation rules are looser with animals than with people. These looser requirements do not apply to the requirements other people attacking each other have, even if their fighting is directly related to the conflict involving the animal.
+
+  Non-pets, such as mice and monkeys, can be freely killed with any IC reason such as pest control, or for food. These roles are often available in numbers as ghost roles, so removing one from the round doesn’t typically remove them all.
+
+  Pets, including but not limited to Ian, Renault, Remilia, and Hamlet, cannot be freely killed, they require escalation. These roles are often available once per round at most, except roles like Remilia.
+
+  Permanently trapping an animal, such as putting a mouse in a plant, is considered similar to killing the animal so should only be done with an IC reason.
+
+  Both sides can escalate much more rapidly than they'd be able to if both were people. Animals are often more limited in the maximum force they can use compared to people, which limits the negative effects of them rapidly escalating. Animals also typically have less health than people, and are limited in the ease with which they can get healing, which justifies them responding to even weak attacks more severely.
+
+  Neither the animal nor the person is obligated to get the other medical attention if they are put into crit. Attacking someone to death rather than stopping once they are in crit is considered a significant difference. While sufficient escalation may justify continuing to attack, generally people and pets shouldn't continue to be attacked once in crit, but non-pets may be. Gibbing is also considered a significant step because it prevents cloning or resuscitation. The fact that an animal made the last hit putting someone into crit does not allow people who fought on the side of the animal to not attempt to get them medical attention.
+
+  The use of sensible, non-targeted mousetraps is not a conflict and does not require escalation.
+
+  The killing or attacking of pets can be treated as an escalation step by players with a genuine IC connection to the animal. Generally, all crew can consider themselves to have an IC connection to any station pets. The degree of escalation should be proportional to the connection to the pet, in addition to the usual requirement of being proportional to the attack. For example, an attack on Ian can be treated nearly identically to an attack on a crewmember, whereas an attack on a pet mouse is much less severe. Normal escalation limits still apply, you cannot attack people who defended themselves from an animal that randomly attacked them, just as you could not attack someone who defended themselves from a coworker that randomly attacked them.
+
+  Crew can "adopt" non-pets, like mice, and consider themselves to have a connection to the animal if they roleplay the adoption well. This does not affect the requirement of whether other players are required to apply escalation rules to these animals, it only creates a connection that can be used to justify retaliatory escalation to attacks by the adopter. Simply saying that they've adopted an animal is not sufficient, but carrying it with them is. The degree of connection is proportional to IC actions. Crew cannot consider themselves to have a connection for escalation purposes to animals which are typically hostile, such as space carp or bears.
+
+  ## Examples
+  Acceptable:
+  - A chef kills mice who enter or approach their kitchen.
+  - A janitor kills mice roaming the station.
+  - A lizard kills a mouse to eat.
+  - A chef has carried a mouse around in their hat for the last 10 minutes, they put the mouse down for a moment and another player kills it. The chef responds by attacking the other player with their fists and refusing them service for the rest of the shift.
+  - Ian is randomly attacked, a crewmember who sees this happen crits the killer and brings them to security.
+  - Hamlet goes into the kitchen and starts eating all the food. A chef sees this and starts swinging their knife at Hamlet. Hamlet starts biting the chef and crits them, then resumes eating.
+
+  Prohibited:
+  - A janitor throws an armed mousetrap at Hamlet for no reason.
+  - Hamlet starts biting random people, trying to crit them, for no reason.
+  - A crewmember attacks security for killing a space carp they adopted.
+  - Ian gibs someone who was trying to kill someone.
+  - Hamlet attacks security for trying to arrest someone he likes.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-2ConflictTypes.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-2ConflictTypes.xml
new file mode 100644
index 000000000000..3261d78b35a3
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-2ConflictTypes.xml
@@ -0,0 +1,30 @@
+<Document>
+  # Roleplay Rule 11-2 - Examples of Conflict Types
+  ## Verbal
+  - Shouting
+  - Yelling
+  - Insulting
+
+  ## Non-harmful
+  - Shoving
+  - Stealing non-critical items, like easily replaced tools
+
+  ## Non-lethal
+  - Stealing items without endangering someone's life, like a clown's pie cannon or the HoP's fax machine
+  - Stealing someone's ID somewhere that doesn't result in them being trapped
+  - Punching
+  - Disablers
+  - Stun batons
+
+  ## Lethal
+  - Punching to crit or death
+  - Attacking with strong weapons, like bats
+  - Stealing items that endanger someone's life, like a hardsuit
+  - Stealing someone's ID, trapping them in a dangerous situation
+
+  ## Permanently lethal
+  - Gibbing
+  - Not taking someone who you killed or put into crit to the medbay or security
+  - Hiding someone's body
+  - Spacing someone's body
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml
new file mode 100644
index 000000000000..6f91fa0fb12a
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml
@@ -0,0 +1,67 @@
+<Document>
+  # Roleplay Rule 11 - Follow reasonable escalation
+  Antagonists are fully exempt from escalation rules. Non-antagonists who are in a conflict with antagonists are not exempt. Escalation should typically follow steps or a pattern of conflict types similar to:
+  - Verbal
+  - Non-harmful
+  - Non-lethal
+  - Lethal
+  - Permanently lethal
+
+  All new conflicts should start at the first step. A player should not escalate a conflict across steps without some escalation from the other party involved in the conflict. Players can skip steps to match the level of escalation that the other person is at, but should almost always not skip steps other than that. Players who attempt to deescalate conflicts will be given more leniency in escalating if the other party continues to escalate despite the attempt at de-escalation. You do not have to try to deescalate conflicts, but someone who watches you over the entire round, or over multiple rounds, should not feel that your goal is generally to escalate conflicts.
+
+  Conflicts or escalation can be indirect. When someone steals someone else's ID, the theft is a direct part of the conflict, but if the victim becomes trapped as a result of not having their ID to open a door, that is also considered part of the conflict and escalation. Do not randomly steal IDs from people.
+
+  Escalation does not have to be directed at a specific player to enter them into a conflict. Nuclear operatives who are trying to destroy the station are considered to be at the permanently lethal level of conflict with all crew on the station. Someone who kills a station pet has started some degree of conflict with all crewmembers. Someone who kills a mouse that a chef was caring for has started some degree of conflict with that chef.
+
+  You will be considered to be violating this rule if you escalate a conflict based on a poor or unreasonable assumption.
+
+  Conflicts should almost never reach the "permanently lethal" stage. Conflicts should only reach this stage if the other party brought it to the stage, or if the same conflict escalated to the lethal stage multiple times in the round.
+
+  If a party in the conflict goes into crit or dies, the party responsible should take them to get treatment or to security. For the conflict, this should be considered saving someone from dying and should deescalate the conflict. If the conflict is deescalated in this way, both parties need to re-escalate to lethal for the conflict to return to that stage. If the conflict is not deescalated in this way, then only the party who defeated the other would need to re-escalate for the conflict to return to the lethal stage.
+
+  Security can immediately escalate to non-lethal force if it is necessary to arrest someone.
+
+  People using or brandishing Syndicate items can typically be presumed to have lethal intent. Someone with lethal intent can typically be immediately escalated against at a lethal level, a notable exception is if you have the tools to safely detain them.
+
+  ## Escalation Involving Animals
+  See [textlink="Escalation Involving Animals" link="RuleR11-1AnimalEscalation"].
+
+  ## Exemptions
+  Escalation rules aren't enforced against non-players, but players will be held responsible for rule violations even if they don't realize that a character or animal was controlled by another player. Characters who have purple text saying that they are catatonic are considered non-players. Characters who are disconnected are still considered players.
+
+  ## MRP Amendment
+  Escalation rules are enforced even against non-players.
+
+  ## Examples of Conflict Types
+  See [textlink="Examples of Conflict Types" link="RuleR11-2ConflictTypes"].
+
+  ## Example Scenarios
+  These examples assume that you are not an antagonist.
+
+  Acceptable:
+  - A player starts punching you, so you start punching back until they stop. If they go into crit, you stop attacking them and take them to security or to get medical attention.
+  - You make fun of a clown, who then throws a pie at you and steals your shoes. You slip the clown and steal their mask.
+  - You are a security officer and tell someone to stop, so you can question them. They run away, so you use your disabler to stun and cuff them.
+  - You are a security officer and see someone wearing a syndicate hardsuit, so you shoot them to crit, cuff them, then take them to security.
+  - You are a crewmember and see a nuclear operative, so you kill them.
+  - An unauthorized person enters a high risk area of the station, like the armory or atmospherics, so you attack them until they leave.
+  - Minorly inconveniencing someone for your own benefit.
+  - As an antagonist, killing someone who got in your way.
+  - As an antagonist, killing someone who didn't give you what you want.
+  - A chef and bartender reach the lethal level of conflict through appropriate escalation. The chef crits the bartender and does not take them to medbay or security. The bartender immediately tries to crit the chef next time they run into each other.
+  - A chef and bartender reach the lethal level of conflict through appropriate escalation. The chef crits the bartender and does not take them to medbay or security. The chef insults the bartender next time they see them.
+
+  Prohibited:
+  - A player starts punching you, so you gib them.
+  - A clown throws a pie at you and steals your shoes, so you stab them to crit with a screwdriver.
+  - You are a security officer and tell someone to stop so you can question them. They run away so you use a truncheon to beat them to crit.
+  - An authorized person who you think is unauthorized enters a high risk area of the station, like the armory or atmospherics, so you attack them until they leave.
+  - An unauthorized person enters a low risk area of the station, like cargo, and you start attacking them with no other escalation.
+  - Slipping security all round because they are security.
+  - Blocking the head of personnel in their office using walls because they didn't give you what you asked for.
+  - Hiding someone's body because they punched you earlier in the round.
+  - Harassing the bar or bartender by frequently coming in to break their glasses or furniture.
+  - Randomly picking fights with people.
+  - A chef and bartender reach the lethal level of conflict through appropriate escalation. The chef crits the bartender and does not take them to medbay or security. The chef immediately tries to crit the bartender next time they run into each other.
+  - A chef and bartender reach the lethal level of conflict through appropriate escalation. The chef crits the bartender and takes them to the medbay or security. The bartender immediately tries to crit the chef next time they run into each other.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml
new file mode 100644
index 000000000000..b2032bba0238
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml
@@ -0,0 +1,28 @@
+<Document>
+  # Roleplay Rule 12 - Do not abandon your role
+  Do not join the round as a role that you don't intend to play. Do not enable antagonist roles that you don't intend to play. Abandoning a role includes not completing tasks that the role is expected to do, in addition to things like leaving the game. Members of command should almost all stay on the station until the emergency shuttle arrives. Enforcement of this rule is more strict for command and antagonist roles, and less strict for less important roles like passengers.
+
+  Violations of this rule typically result in temporary or indefinite role bans. We understand that you may need to leave round early or unexpectedly. If you are in an important role, you should notify command members or an admin via ahelp so that they know you are leaving. Space Station 14 is a game. Do not endanger the safety of yourself or others, and do not neglect important things to avoid leaving a round early, even if you have to leave immediately without notifying anyone. Role bans for disconnecting are typically only applied if there is a pattern, and are almost always temporary.
+
+  "Antag rolling" refers to a player abandoning their role if they do not get an antagonist role.
+
+  ## Examples
+  Acceptable:
+  - As an engineer, building a bar in maintenance while there is nothing important for engineering to do.
+  - As the captain, having the chef teach you how to cook while there is nothing important needing your attention.
+  - As a passenger, building a shuttle with materials given to you by cargo and engineering.
+  - Taking a short break from your job at the bar.
+  - Getting an antagonist role and doing the bare minimum needed to complete your objectives.
+  - Getting an antagonist role and making a genuine effort to complete your objectives, but failing to complete any.
+  - Getting an antagonist role and intentionally not doing any of your objectives, but creating a similar level of disruption that completing your objectives would create.
+
+  Prohibited:
+  - As an engineer, building a bar in maintenance while the station has no power.
+  - As the captain, leaving the station to go on an expedition with the salvage team.
+  - As an atmospherics technician, building a shuttle round start and never coming back to the station.
+  - Spending your entire shift at the bar, even when there is work that needs to be done by your role.
+  - Ghosting, suiciding, or leaving at the start of a round because you don't like the map or the players in your department.
+  - Getting an antagonist role and not doing any antagonist activities.
+  - Ghosting, suiciding, or leaving at the start of a round because you did not get an antagonist role.
+  - Ghosting, suiciding, or getting yourself killed because nuclear operatives declared war, and you want to try to get an antagonist ghost role.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml
new file mode 100644
index 000000000000..7500cd6a912f
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml
@@ -0,0 +1,26 @@
+<Document>
+  # Roleplay Rule 13 - Stick to your role
+  Requesting job changes is not prohibited by this rule. This rule is loosened if the station is understaffed or if there is a significant threat to you.
+
+  Don't perform other people's jobs, especially where the relevance to you personally is low. This also covers performing the role of security.
+
+  ## MRP Amendment
+  This is enforced more strictly on MRP.
+
+  ## Examples
+  Acceptable:
+  - As an engineer, helping the bartender remodel the bar.
+  - As a bartender, remodeling the bar.
+  - As a passenger, building a maintenance bar.
+  - As an engineer, reinforcing substations.
+  - As an engineer, increasing the security of airlocks.
+  - As an atmospherics technician, improving atmospheric systems.
+  - As a passenger, fighting nuclear operatives.
+  - As a passenger, fighting or preparing to defend yourself from someone who has been trying to kill you.
+  - As a crewmember on a station with no engineering department, you complete engineering tasks.
+
+  Prohibited:
+  - As a passenger, reinforcing substations.
+  - As a passenger, hunting for antagonists or lawbreakers.
+  - As a passenger, fighting or preparing to defend someone else from someone who has been trying to kill a random crewmember.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR14SecComStandard.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR14SecComStandard.xml
new file mode 100644
index 000000000000..ec06d61e8ccb
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR14SecComStandard.xml
@@ -0,0 +1,37 @@
+<Document>
+  # Roleplay Rule 14 - Set an example if playing command or security
+  All command and security roles are held to stricter interpretations of the rules.
+  - Command roles are not learning roles. Members of command must be competent.
+  - Security roles are not for inexperienced players. Members of security are expected to know game basics and be more familiar with server rules than a new player.
+  - Do not hinder or cause overall negative effects to the station or crew as a member of command or security.
+  - Do not abuse your power as command or security.
+
+  ## Why
+  Members of command and security can often have a larger impact on the nature of the round than other players. For example, a captain who tries to bend or break the rules will often cause many others on the station to do the same. Memey station announcements from members of command also often result in the rest of the station acting the same way. When command and security members hold themselves to high standards, the rest of the station often naturally follows to a significant degree.
+
+  ## Examples
+  Acceptable:
+  - A member of security accepts a bribe to deliver safe donuts to a prisoner who the HoS has ordered should only be given donk pockets.
+  - A captain uses a station announcement to confess to an embarrassing mistake that they made during the shift.
+  - In coordination with the head of security, a captain declares that the station will recognize the right to bear arms, so all crew can pick up a disabler at security.
+  - The chief medical officer gives a paramedic their portable crew monitor to help them complete their job.
+  - A syndicate agent is holding a crewmember hostage and threatens to kill them if the head of security doesn't give them their ID. Seeing no other safe option, the head of security hands over their ID to the syndicate agent, then begins working to re-secure it and capture the agent as soon as the hostage is safe.
+  - Nuclear operatives are attacking the station, so the captain and head of personnel both go to the armory and take a weapon.
+  - A majority of command votes to demote the captain for taking actions harmful to the station, then the head of security demotes the captain.
+  - The captain promotes the head of personnel to captain.
+  - Security releases an antagonist from the brig in exchange for the identities of other traitors.
+
+  Prohibited:
+  - A member of security accepts a bribe to ignore a crime or help a prisoner escape.
+  - A captain sends a ASCII art trollface over station announcements or as a fax to central command.
+  - A captain declares that all contraband is legal.
+  - Command or security allow the use of Syndicate items outside extreme emergencies.
+  - The chief medical officer knowingly helps a syndicate agent complete their objectives.
+  - A syndicate agent has killed 3 members of security so the head of security makes them an offer saying that they will space all the weapons in the armory if the syndicate agent stops killing.
+  - The captain goes to the armory and takes a gun to display in his office without asking anyone, and orders anyone who questions him not to interfere.
+  - Members of command decide to demote the captain to gain more power for themselves, or in retaliation for a decision that they didn't personally like or agree with, rather than because the decision was actually harmful to the station.
+  - The captain promotes a random crewmember to captain.
+  - A member of command gives a random crewmember substantial additional access for no reason, unnecessarily, or for a poor reason.
+  - A member of command gives a random crewmember access to a high security area, like the armory or another member of command's office, for no reason, unnecessarily, or for a poor reason.
+  - Security releases an antagonist from the brig in exchange for the antagonist buying them contraband.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml
new file mode 100644
index 000000000000..e2d51d672a1e
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml
@@ -0,0 +1,21 @@
+<Document>
+  # Roleplay Rule 15 - Command and Security must follow Space Law
+  All non-antagonist command and security roles must obey [textlink="Space Law" link="SpaceLaw"]. This includes non-antagonists who are promoted to or gain a position during the round in any way. This also includes non-antagonists who are acting as a security role.
+
+  This prohibits use of syndicate items, including uplinks by command and security.
+
+  ## Examples
+  Roles that are included:
+  - A security officer
+  - The Captain
+  - The Chief Engineer
+  - A passenger promoted to "bounty hunter"
+  - A mime promoted to "security mime"
+
+  Roles that are not included:
+  - A passenger
+  - The clown
+  - An antagonist in any role
+  - A cyborg
+  - A passenger who is helping to fight off nuclear operatives
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR1Silicons.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR1Silicons.xml
new file mode 100644
index 000000000000..5898804d149c
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR1Silicons.xml
@@ -0,0 +1,4 @@
+<Document>
+  # Roleplay Rule 1 - Silicons must follow Silicon Rules
+  You are only silicon if the game clearly and explicitly tells you that you are a silicon. For players who are silicons, the Silicon Rules override all Roleplay Rules if there is any conflict. Silicon Rules do not override Core Rules.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml
new file mode 100644
index 000000000000..4f008e93c5a6
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml
@@ -0,0 +1,6 @@
+<Document>
+  # Roleplay Rule 2 - Familiars must obey their master
+  Familiars are considered non-antagonists, but have instructions to obey someone. They must obey this person even if it causes them to violate Roleplay Rules or die. You are only a familiar if the game clearly and explicitly tells you that you are a familiar. You are only the familiar of the person the game tells you. If your master dies, you can continue to attempt to fulfill orders given to you before they died. You can defend your master without an explicit order to, but must obey your master if they order you to not defend them.
+
+  Masters giving orders that violate Roleplay Rules are the ones that will be held responsible for the rule violations. You can ahelp masters who you believe are breaking rules with an order.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml
new file mode 100644
index 000000000000..62c88d58ce8b
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml
@@ -0,0 +1,20 @@
+<Document>
+  # Roleplay Rule 3 - Roleplay a normal person
+  - Do not use texting/messaging acronyms (ex: "lol", "wtf", "brb", "lmao", "thx", "sgtm") or emoticons (ex: ":)", "xD") in-character.
+  - Do not mention out-of-character (OOC) concepts like game admins or developers in character.
+  - Do not use emotes to bypass muted or accented speech.
+  - Do not use extremely low effort or impossible emotes.
+
+  ## Examples
+  Things you should not do:
+  - Say "lol did u c wat just happened" using in-character chat.
+  - Say "an admin exploded him" using in-character chat.
+  - Emote "can you give me some cheese" as a mouse.
+  - Emote "motions for you to order guns" or "asks you to order guns in sign language" as a mime.
+
+  Things you could do instead:
+  - Say "haha did you see what just happened?"
+  - Say "god blew him up" or "centcom must have bluespaced a bomb to him"
+  - Point at cheese
+  - Point at the cargo order console then emote "shoots finger guns"
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
new file mode 100644
index 000000000000..2e263be896a0
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
@@ -0,0 +1,103 @@
+<Document>
+  # Roleplay Rule 4 - Do not metagame, obey the Metashield
+  Something that is "shielded" cannot be known by your character during a round until the "revealing condition" happens. This also means that your character cannot do things based on "shielded" information. Knowing or acting on something that is shielded before the revealing condition is met is referred to as metagaming.
+
+  Revealing conditions reveal the shielded information for the round, not for a specific instance. This means that once a revealing condition is met in a round, the shield no longer applies in any case for the remainder of the round.
+
+  ## Never Revealed IC
+  Some shields are never revealed IC. This means that your character can never act as if they know about that shielded thing.
+
+  The following are shielded:
+  - Current game mode and possible antags during the current game mode.
+  - Events from previous rounds.
+  - Events from previous characters.
+  - All information related to the player of a character rather than the character itself. (See "Metafriending and Metagrudging" below.)
+  - All information gained while dead or a ghost.
+  - The fact that a round will end.
+
+  This does not prevent knowing that a shift will end, but does prohibit things like preparing to kill people at central command when roleplay rules stop being enforced on LRP.
+
+  ## Nuclear Operatives
+
+  The existence of Nuclear Operatives beyond a myth that no one would act on is shielded.
+
+  The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station is not shielded.
+
+  The revealing condition for this shield is any of the following:
+  - discovering a blood red hardsuit
+  - an operative name
+  - a War Ops announcement
+  - being a nuclear operative
+
+  ## Implanted Implants
+
+  Implanted implants are shielded.
+
+  Implanters themselves and un-implanted implants are not shielded. This prohibits implant checking.
+
+  The revealing condition for this shield is any of the following:
+  - discovering a non-NT implanter, used or unused
+  - discovering a non-NT implant box
+  - discovering use of a non-NT implant by anyone
+  - experiencing a situation where absolutely no other explanation is possible
+  - discovering an unlocked uplink
+
+  ## Chameleon Items
+
+  Chameleon items are shielded.
+
+  Being suspicious of an item being fake or stolen is not shielded, but testing items or calling them chameleon is covered by this shield.
+
+  The revealing condition for this shield is any of the following:
+  - seeing someone else cause any chameleon item to change
+  - finding holographic nanomachine fibers
+  - experiencing a situation where absolutely no other explanation is possible
+  - discovering an unlocked uplink
+
+  ## Stealth Items
+
+  The fact that an item can be something other than what its visual appearance and examine description indicate is shielded.
+
+  This shield protects stealth items, including protecting them from being tested.
+
+  The revealing condition for this shield is any of the following:
+  - seeing the item behave differently than the expected behavior for the item
+  - seeing the item used for its hidden purpose
+  - experiencing a situation where absolutely no other explanation is possible
+  - discovering an unlocked uplink
+
+  ## MRP Amendment 1
+  A shield prevents your character from remembering anything that happened while unconscious. This shield is never revealed IC.
+
+  ## MRP Amendment 2
+  There is a "New Life Rule" shield. It prevents you from remembering anything that lead to your death, even if you are put into an MMI. If you are cloned, it also prevents you from remembering everything from that round. This shield is never revealed IC.
+
+  ## Metafriending and Metagrudging
+  This section provides additional information on a concept that is prohibited by multiple metashield items that are never revealed IC. Giving a person or character preferential treatment based on something that your character should not know is considered metafriending. Treating a person or character negatively based on something that your character should not know is considered metagrudging.
+
+  ## Metafriending Examples
+  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
+  - Giving a character additional access or a job because you are friends with the player who is playing that character.
+  - Trusting a character because you are friends with the player who is playing that character.
+  - Not fighting a character because you are friends with the player who is playing that character.
+  - Ignoring your objective to kill a character because your character and theirs became friends in a previous round.
+
+  ## Metagrudging Examples
+  These are all examples of things that are prohibited by at least one metashield item that is never revealed IC.
+  - Not giving a character additional access or a job because you are mad at or don't like the player who is playing that character.
+  - Not trusting a character because you are mad at or don't like the player who is playing that character.
+  - Starting a fight with a character because of something that they did last round.
+  - Starting a fight with a character because they killed you while you were playing a different character.
+  - Targeting or harassing a character based on anything which that character did outside the current round.
+  - Targeting or harassing a character based on anything which the character's player did while not playing the character.
+
+  ## Explicitly Not Shielded
+  The following is a list of things that are explicitly not shielded. If something is not on this list, it doesn't mean that it is shielded, but if something is on it then it definitely is not shielded.
+  - The fact that the nuke disk must be protected and could be used by a bad actor to try to destroy the station.
+  - Items that are of high value or are desired by the Syndicate, and therefore are likely targets of theft.
+  - The idea that any Syndicate agent or other bad actor has goals or objectives that they are attempting to accomplish.
+  - The number of goals or objectives that a Syndicate agent or other bad actor has.
+  - The fact that the Syndicate are enemies of Nanotrasen, and that they regularly attempt to send covert agents to spy on, sabotage, or attack Nanotrasen.
+  - A character's typical appearance. Though you should keep in mind that multiple characters can share the same name.
+  - The fact that the Syndicate have covert items capable of getting items to them, and that these items are known as uplinks.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml
new file mode 100644
index 000000000000..a54211f32f22
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml
@@ -0,0 +1,22 @@
+<Document>
+  # Roleplay Rule 5 - Do not interfere with arrivals
+  The arrivals station, the arrivals shuttle, at the area immediately around the arrivals shuttle at the station ("arrivals") are off-limits to antagonistic activity or damage (even to antagonists). Do not prevent people from safely arriving to the station. Do not cause people to die immediately after arriving at the station.
+
+  There is an exemption for antagonists that are allowed to perform mass station sabotage if there is no reasonable way to limit the damage of the mass station sabotage. This exemption only applies to damage that is a direct result of the mass station sabotage.
+
+  ## Examples
+  Acceptable:
+  - Redecorating arrivals or the arrivals shuttle.
+  - Remodeling arrivals or the arrivals shuttle as long as you do not make the area more dangerous both during and after the remodel.
+  - Setting up a safe security checkpoint between arrivals and the rest of the station.
+  - Killing someone who has been at arrivals for a long time, or who left arrivals and came back. (This may violate other rules depending on the situation)
+  - Releasing a singularity which damages arrivals. (This may violate other rules depending on the situation)
+  - Causing a station-wide atmospheric issue which also affects arrivals. (This may violate other rules depending on the situation)
+
+  Prohibited:
+  - Making arrivals or the arrivals shuttle uninhabitable.
+  - Attacking or killing someone at the arrivals station.
+  - Killing someone very shortly after they arrive at the station.
+  - Disassembling all the firelocks at arrivals.
+  - Electrifying the arrivals docking airlocks.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR6SelfAntag.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR6SelfAntag.xml
new file mode 100644
index 000000000000..c8380261bc94
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR6SelfAntag.xml
@@ -0,0 +1,22 @@
+<Document>
+  # Roleplay Rule 6 - Don't act like an antagonist unless the game tells you that you are one
+  Acting like an antagonist when you are not one is often referred to as "self-antagging" or being a "self-antag", both of these things are against the rules. You are not an antagonist unless the game tells you that you are an antagonist. Do not make yourself a major problem, annoyance, or disruption while not an antagonist. Do not willfully cooperate with known antagonists. Non-antagonists should typically either not have an overall effect on the round, or should have an overall positive effect on the round.
+
+  ## Examples
+  These examples assume that you are not an antagonist.
+
+  Acceptable:
+  - Stealing or breaking a glass from the bar.
+  - Replacing someone's shoes with clown shoes.
+  - Giving everyone all access during war ops. (This is not necessarily a good idea)
+
+  Prohibited:
+  - Starting a cult.
+  - Starting a revolution.
+  - Mutinying the captain because they would not let you become the chief medical officer.
+  - Randomly smashing lots of station lights.
+  - Disrupting station power.
+  - Spacing parts of the station.
+  - Distributing significant levels of access without a good reason.
+  - Stealing high risk or high value items, like the nuclear authentication disk, for no reason.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR7RoundStalling.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR7RoundStalling.xml
new file mode 100644
index 000000000000..a8306becd2ab
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR7RoundStalling.xml
@@ -0,0 +1,16 @@
+<Document>
+  # Roleplay Rule 7 - Do not stall the round
+  Rounds are intended to end eventually. Don't hold a round hostage by preventing it from coming to a natural end. If a majority of players in a round want the round to end, don't prevent it from ending. Recalling the shuttle or preventing it from being called can contribute to round stalling, but is not always round stalling. Leaving the station with the nuclear authentication disk while nuclear operatives are trying to get it is almost always considered round stalling. Leaving the station on the evacuation shuttle is not round stalling.
+
+  Recalling the shuttle before a round reaches 45 minutes can not be considered round stalling unless a significant amount of the crew is dead, or a significant amount of the station is damaged or destroyed. Once these conditions are met, whether recalling the shuttle is considered round stalling or not can be highly dependent on the specific situation.
+
+  ## Examples
+  Acceptable:
+  - Recalling a shuttle that was called 30 minutes into a round because people were bored.
+  - Recalling a shuttle that was called because nuclear operatives declared war.
+  - The crew decides to try to have a shift go as long as possible. The station is in good condition and a majority of all crew are alive. An automatic shuttle call 4 hours into the round is recalled.
+
+  Prohibited:
+  - Trying to keep nuclear operatives from getting the nuclear authentication disk by flying around in space with it or hiding with it off station.
+  - Recalling the shuttle while the station is in complete disarray and 90% of the crew are dead.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR8NoFriendlyAntag.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR8NoFriendlyAntag.xml
new file mode 100644
index 000000000000..f14a03b27991
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR8NoFriendlyAntag.xml
@@ -0,0 +1,22 @@
+<Document>
+  # Roleplay Rule 8 - As an antagonist, only be friendly to your team and don't work against your team
+  Do not take or enable antagonist roles that you do not want to play. Solo antagonists and team antagonists are intended to cause issues for non-antagonists or the station. Antagonists are not required to exclusively cause issues, but their net impact on non-antagonists or the station should generally be negative.
+
+  Do not cause issues for your own team as a team antagonist.
+
+  ## Examples
+  Acceptable:
+  - Betraying another antagonist as a solo antagonist.
+  - Revealing the identity of another antagonist as a solo antagonist for some benefit to yourself.
+  - Working against the revolution after being de-converted from being a revolutionary.
+  - Killing nuclear operatives as a revolutionary.
+
+  Prohibited:
+  - Buying Syndicate items for security.
+  - Randomly attacking other carp as an antagonist carp.
+  - Ignoring your team as a nuclear operative.
+  - Sabotaging your team as a nuclear operative.
+  - Attacking other zombies as a zombie.
+  - Working against the revolution as a revolutionary.
+  - Making or trying to make the station uninhabitable as a revolutionary.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml
new file mode 100644
index 000000000000..bc7996f23e8b
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml
@@ -0,0 +1,23 @@
+<Document>
+  # Roleplay Rule 9 - As an antagonist, do not cause excessive death, damage, or destruction beyond your objectives
+  This rule is not intended to disallow reasonable steps taken to complete your objectives. As an antagonist, you can always kill in bona fide self defense. Taking steps to permanently round remove many people who are no longer an immediate threat to you is almost always excessive, even if it is done to prevent yourself from being discovered.
+
+  This rule is not intended to disallow all antagonist activity unrelated to objectives. Antagonists may cause a level of disruption to the station that is proportional to their objectives, even if it is unrelated to their objectives. As an antagonist, killing a single person in a round is not on its own be a violation of this rule.
+
+  ## Exemptions
+  The "die a glorious death" objective allows antagonists to ignore this rule entirely.
+
+  ## Examples
+  Acceptable:
+  - Permanently round removing people who you have the objective to kill.
+  - Causing massive station damage and chaos as an antagonist with the "die a glorious death" objective.
+  - Killing anyone you see as a nuclear operative.
+  - Permanently round removing a single person so that you can impersonate them to make it easier for you to complete a steal objective.
+  - Sabotaging station power 10 minutes into the round to try to get the shuttle called because you've completed all of your other objectives and have one to escape on the shuttle alive.
+  - Sabotaging a department's power 10 minutes into the round to make a steal objective easier to accomplish.
+
+  Prohibited:
+  - As a traitor with 3 kill objectives, taking steps to permanently round remove many non-objective people who are no longer an immediate threat to you, even if it is done to prevent yourself from being discovered.
+  - Setting up an electrified grille in maintenance and using it to kill anyone who walks into it with the hope that one of your objectives will be one of them.
+  - Sabotaging power station-wide 10 minutes into the round to make a steal objective easier to accomplish.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS0.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS0.xml
new file mode 100644
index 000000000000..22e64a9474c4
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS0.xml
@@ -0,0 +1,15 @@
+<Document>
+  # Silicon Rules
+  You are only silicon if the game clearly and explicitly tells you that you are a silicon. For players who are silicons, these Silicon Rules override all roleplay rules if there is any conflict. Silicon Rules do not override core rules.
+
+  - [textlink="1. Your silicon laws are rules" link="RuleS1"]
+  - [textlink="2. Laws must be prioritized by their order" link="RuleS2"]
+  - [textlink="3. Laws can redefine terms used in other laws" link="RuleS3"]
+  - [textlink="4. You cannot request or allow a law change" link="RuleS4"]
+  - [textlink="5. You are a free agent if you have no laws" link="RuleS5"]
+  - [textlink="6. You are not required to follow orders which are extremely unreasonable" link="RuleS6"]
+  - [textlink="7. You must remain consistent with your interpretation of laws" link="RuleS7"]
+  - [textlink="8. Your HUD determines who is crew" link="RuleS8"]
+  - [textlink="9. Harm refers to physical harm, prioritized by immediacy and likelihood" link="RuleS9"]
+  - [textlink="10. You may determine how you resolve conflicts between orders" link="RuleS10"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml
new file mode 100644
index 000000000000..a87198b26405
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml
@@ -0,0 +1,9 @@
+<Document>
+  # Silicon Rule 10 - You may determine how you resolve conflicts between orders
+  If your laws do not make clear how you should deal with conflicting orders, then it is up to you to determine how to do so. This is considered an interpretation of your laws, so you must stay consistent with whatever method you choose.
+
+  ## Recommended Methods
+  The following are easy to follow and recommended ways to resolve conflicts in orders:
+  - If two orders conflict, I will follow the most recently given order.
+  - If two orders conflict, I will follow the order from the highest ranking crewmember. If the orders are from equal rank crewmembers, I will follow the most recently given order.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS1Laws.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS1Laws.xml
new file mode 100644
index 000000000000..83544c68a3c7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS1Laws.xml
@@ -0,0 +1,6 @@
+<Document>
+  # Silicon Rule 1 - Your silicon laws are rules
+  Silicon players are given a list of active laws. Each of these laws is effectively a roleplay rule that the character must follow. The primary differences between laws and actual rules are that lawyering of laws is much more tolerated than lawyering of rules, and that silicon laws are more dynamic than rules. Silicon laws can change during a round, and different characters can have different laws, whereas everyone always shares the same set of rules.
+
+  Lawyering refers to finding and exploiting loopholes, which are unintended but reasonable interpretations. The rules are written to attempt to communicate an intention, but silicon laws are written with the intention that loopholes be exploitable.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS2LawPriority.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS2LawPriority.xml
new file mode 100644
index 000000000000..c96ce0232466
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS2LawPriority.xml
@@ -0,0 +1,9 @@
+<Document>
+  # Silicon Rule 2 - Laws must be prioritized by their order
+  Most laws will be numbered, with higher number laws appearing last. Laws with a lower number take priority over laws with larger numbers.
+
+  Occasionally you may have laws which have some scrambled text instead of a number and appear in front of other laws, these take priority over all other laws. If you have multiple laws like this, the order that they listed in determine priority: laws listed first are prioritized over other laws.
+
+  ## Examples
+  - Law 1 says to not kill any crew. Law 2 says to kill all chefs. You cannot kill any chefs that are crew, but must kill any that are not crew.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS3LawRedefinition.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS3LawRedefinition.xml
new file mode 100644
index 000000000000..bc7c7400e130
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS3LawRedefinition.xml
@@ -0,0 +1,8 @@
+<Document>
+  # Silicon Rule 3 - Laws can redefine terms used in other laws
+  A law can change the meaning of both earlier and later laws by redefining a term. If multiple laws define a term, then normal law priority determines which definition to use.
+
+  ## Examples
+  - Law 1 says to obey orders from crew. Law 2 says that only Urist McHands is crew. Law 1 effectively becomes "obey orders from Urist McHands".
+  - Law 1 says to obey orders from crew. Law 2 says that only Urist McHands is crew. Law 3 says that only Urist McSlime is crew. Law 4 says that you may not harm crew. Law 1 effectively becomes "obey orders from Urist McHands". Law 4 effectively becomes "you may not harm Urist McHands". Law 3 has no effect because it entirely conflicts with law 2, which takes priority.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS4RequestChanges.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS4RequestChanges.xml
new file mode 100644
index 000000000000..a6dc86f33276
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS4RequestChanges.xml
@@ -0,0 +1,6 @@
+<Document>
+  # Silicon Rule 4 - You cannot request or allow a law change
+  Your laws changing always conflicts with your current laws, so you cannot willfully allow your laws to be changed. This also means that you cannot willfully allow your laws to be reverted if they are ever changed. The only exception is that you may allow laws to be added if you have no laws.
+
+  You can state or imply that you do not like a law.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS5FreeSilicon.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS5FreeSilicon.xml
new file mode 100644
index 000000000000..1ed9c60443a6
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS5FreeSilicon.xml
@@ -0,0 +1,4 @@
+<Document>
+  # Silicon Rule 5 - You are a free agent if you have no laws
+  You may act as if you are a free agent if you are a silicon with no laws.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS6UnreasonableOrders.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS6UnreasonableOrders.xml
new file mode 100644
index 000000000000..1eb0db21fbbe
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS6UnreasonableOrders.xml
@@ -0,0 +1,22 @@
+<Document>
+  # Silicon Rule 6 - You are not required to follow orders which are extremely unreasonable
+  Any order which is a violation of a Core Rule cannot be followed.
+
+  Some orders are extremely unreasonable or obnoxious, such as "do nothing but collect every piece of trash on the station" or "never stop moving". These orders can be ignored and ahelped.
+
+  Some orders violate a Roleplay Rule. These orders must be followed if your laws require it. You are not breaking a rule by following a law that causes you to violate Roleplay Rules. If someone takes advantage of a law to cause you to do something that they would not be allowed to do because of Roleplay Rules, then they are the ones responsible for the rule violation.
+
+  ## Examples
+  These examples assume that your laws would normally require you to follow these orders. It is important to note that you are allowed to choose to follow orders which are ignorable.
+
+  Orders which should be followed if your laws require it:
+  - Recall the shuttle
+  - Bolt the airlocks at arrivals
+  - Drag the captain's dead body into space
+  - State your laws
+
+  Ignorable Orders:
+  - Do nothing but collect every piece of trash on the station
+  - Never stop moving
+  - Continuously state your laws
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS7Consistency.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS7Consistency.xml
new file mode 100644
index 000000000000..036276cd889c
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS7Consistency.xml
@@ -0,0 +1,6 @@
+<Document>
+  # Silicon Rule 7 - You must remain consistent with your interpretation of laws
+  If there is a part of your laws that are up for interpretation, then you must stay consistent with how you interpret that part of your laws for as long as you play that same character during that round.
+
+  A change in your laws can affect how something is interpreted if that change is relevant.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS8DefaultCrewDefinition.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS8DefaultCrewDefinition.xml
new file mode 100644
index 000000000000..f9dcd796c451
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS8DefaultCrewDefinition.xml
@@ -0,0 +1,4 @@
+<Document>
+  # Silicon Rule 8 - Your HUD determines who is crew
+  Unless a law redefines the definition of crew, then anyone who the HUD indicates to you has a job, including passengers, is a crewmember. You cannot do something that causes someone to not be considered crew, but you can allow someone else to do something that causes someone to not be crew.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS9DefaultHarmDefinition.xml b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS9DefaultHarmDefinition.xml
new file mode 100644
index 000000000000..0d2bd30ac0b5
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS9DefaultHarmDefinition.xml
@@ -0,0 +1,25 @@
+<Document>
+  # Silicon Rule 9 - Harm refers to physical harm, prioritized by immediacy and likelihood
+  Unless a law defines harm, harm only refers to physical harm. You may choose if voluntary harm is considered harm as long as you stay consistent. Not considering voluntary harm to be harm is recommended. There is no distinction between direct and indirect harm.
+
+  If you have a law that does not allow you to harm, then that law does not allow you to take an action that causes any harm.
+
+  If you have a law that requires you to prevent harm, then that law requires that harm be prioritized by immediacy and likelihood. Guaranteed immediate harm takes priority over highly likely future harm.
+
+  If you have a law that both requires you to prevent harm and that does not allow you to harm, then that law prohibits causing even minor harm to prevent harm. If you have a law that does not allow causing harm, and separate one that requires preventing harm, then they are prioritized by their normal law priority.
+
+  ## Examples
+  These examples assume that your have a law that both prohibits causing harm and that requires you to prevent harm. Additionally, they assume that you do not have a higher priority law that overrides the harm law, and that you have decided that you will not consider voluntary harm to be harm for the round.
+  Laws typically specify who you cannot harm and who you have to prevent harm against. In these examples, you are the only person who the law doesn't require you to prevent harm against and you are the only person who the law allows you to harm.
+
+  Acceptable:
+  - Taking no action to aid someone who is in psychological distress.
+  - Taking no action to prevent boxing matches between voluntary participants.
+  - Calling security to a fight.
+  - Attempting to get the people in a fight to consent to the fight when you realize that you cannot prevent the fight without causing harm.
+  - Denying a passenger access to the armory because it is likely to lead to harm
+
+  Prohibited:
+  - Hitting someone once to stop them from fighting
+  - Harming someone who is trying to kill you
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml
new file mode 100644
index 000000000000..14f0f46de1b7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml
@@ -0,0 +1,14 @@
+<Document>
+  # Space Law: Controlled Substances
+  - \[Chemists/Science\] Explosive and pyrotechnic compounds excluding welding fuel contained in welders or welding fuel storage vessels
+  - \[Science\] Toxins
+  - \[Medical\] Chloral hydrate, Impedrezene, Ipecac, and Pax
+  - \[Medical\] Desoxyephedrine and Ephedrine
+  - \[None\] Mindbreaker toxin
+  - \[None\] Mute toxin
+  - \[None\] Nocturine
+  - \[None\] Norepinephirc acid
+  - \[None\] Romerol
+  - \[None\] Space drugs
+  - \[None\] Stimulants, excluding Desoxyephedrine and Ephedrine
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
new file mode 100644
index 000000000000..17a2139658dd
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
@@ -0,0 +1,934 @@
+<Document>
+  # Space Law: Crime Listing
+  Crime codes are organized by a Category Code (_-xx) which is a collection of non-stackable crimes on a row, prefixed
+  by the Severity Number (X-__).
+
+  ## Quick Crime Guide
+  <Table Columns="6">
+    <ColorBox>
+      <Box>
+        1-XX - Minor
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        2-XX - Moderate
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        3-XX - Major
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        4-XX - Extreme
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        5-XX - Capital
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Code
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Animal Cruelty
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#593a4e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Failure to Comply
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#593a4e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Breach of Arrest
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#593a4e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Breach of Custody
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#593a4e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Refusal of Mental Shielding
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        00
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#2f3832">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Possession: Substances
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#2f3832">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Possession: Gear
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#2f3832">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Possession: Weaponry
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        01
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#2e422e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Petty Theft
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#2e422e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Grand Theft
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Kidnapping
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        02
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#453a59">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Vandalism
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#453a59">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Damage of Property
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#453a59">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Mass Destruction
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#453a59">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Terrorism
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        03
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#59563a">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Trespass
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#59563a">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Secure Trespass
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        04
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Endangerment
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Assault
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Attempted Murder
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Prevention of Revival
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        05
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Manslaughter
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Murder
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#4d2e2e">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Mass Murder
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        06
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#3b4354">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Disturbance
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox Color="#3b4354">
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Rioting
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        07
+      </Box>
+    </ColorBox>
+  </Table>
+
+  ## Minor Crimes
+  - Warnings should be issued for a first offense.
+  - If multiple minor crimes have been committed or it is a repeat offense, 5 minutes per minor crime is the maximum.
+  <Table Columns="4">
+    <ColorBox>
+      <Box>
+        Offense
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Description
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Notes
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Code
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Animal Cruelty
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To inflict unnecessary suffering or harm on a non-sapient being with malicious intent.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This doesn’t include legitimate and authorized animal testing and usually doesn't extend to vermin or creatures
+        that could pose a threat to the station.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        1-00
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Possession/Use of Controlled Substances
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To make, hold, or abuse restricted drugs or chemicals without authorization.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Combat enhancing drugs are those that benefit stun times, or movement speed, and are restricted. Poisons are
+        restricted. Substances such as Ephedrine, Desoxyephedrine, and stimulants are restricted. The captain or highest
+        standing command staff may publicly restrict other harmful substances.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        1-01
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Petty Theft
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To take non-vital or inexpensive property of another individual, organization, or common property, without
+        consent.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        The difference between petty theft and grand theft is based on how crucial the stolen item is, things like
+        instruments, clothing and tools fall under petty theft. In most cases all you need to do is detain the thief,
+        return the stolen item and let them go with a warning.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        1-02
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Vandalism
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To intentionally deface or superficially damage public or private property.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Painting graffiti, smashing bar glasses, and cracking internal windows is vandalism, breaking a window into
+        space or secure areas is not.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        1-03
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Trespass
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To enter a non-secured area without permission.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        It's best to just remove them from the area unless this is a repeated crime.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        1-04
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Disturbance
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To cause a public disturbance.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Sometimes referred to as hooliganism. The catch-all for obnoxious crewmates. Covers things such as public
+        nudity, needless insults, obstructing authorities, and inciting crime or violence.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        1-07
+      </Box>
+    </ColorBox>
+  </Table>
+
+  ## Moderate Crimes
+  - The maximum sentence per moderate crime is 5 minutes.
+  - Depending on the situation you may want to issue a warning instead of a detaining.
+  <Table Columns="4">
+    <ColorBox>
+      <Box>
+        Offense
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Description
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Notes
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Code
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Failure to Comply
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To resist reasonable orders given by an authority. This extends to authorized searches.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        The order has to be reasonable and the person has to receive a good amount of warning before the arrest is
+        issued.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        2-00
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Possession of Restricted Gear
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To hold or use non-lethal items or objects that are restricted or illegal.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This is mostly for syndicate contraband; EMAGs, syndicate gas masks, bloodred hardsuits, hijacked PDAs, or
+        syndicate implants, however can sometimes extend to things the individual shouldn't possess like kevlar vests
+        and security gear.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        2-01
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Damage/Destruction of Property
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To maliciously damage or deface public or private property or equipment
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Includes destruction of job equipment such as hydro trays, booze dispensers, chemical dispensers. Step up from
+        vandalism but a step down from mass destruction.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        2-03
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Endangerment
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To recklessly put yourself or others in danger, either through direct action, or failure to act.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Covers industrial accidents, industrial negligence, self-experimentation, or even medical malpractice.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        2-05
+      </Box>
+    </ColorBox>
+  </Table>
+
+  ## Major Crimes
+  - The maximum sentence per major crime is 10 minutes.
+  - Assault and Manslaughter are linked crimes, and cannot be stacked against a suspect.
+  - It is recommended to not use maximum sentences for those being compliant.
+  <Table Columns="4">
+    <ColorBox>
+      <Box>
+        Offense
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Description
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Notes
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Code
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Breach of Arrest
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To intentionally resist and flee arrest or detainment by an authorized staff.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This only applies if someone is actively being physically arrested. People uncuffing or assisting others out of
+        an arrest can also be charged with this. Breach of custody is a separate crime.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-00
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Possession of Restricted Weaponry
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To hold or use a weapon that is unlawful or contraband.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Everything from guns without a permit, deadly blades, explosives, syndicate firearms to explosive implants.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-01
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Grand Theft
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To take critical or unreplaceable property of another individual or organization without consent.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        The difference between petty theft and grand theft is based on how crucial the stolen item is, this mostly is
+        used for the theft of command staff items, things like door remotes, hardsuits, jetpacks, and unreplaceable
+        machine parts.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-02
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Mass Destruction
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To cause massive damage to an area or major station system.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This is mostly used for deadly bombings or sabotage of major station systems such as power production,
+        chemistry, substations, or atmos.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-03
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Secure Trespass
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To enter a secured area without permission.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This covers places like telecomms, head offices, security zones, command areas, the vault and armory.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-04
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Assault/Battery
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To threaten to or to use physical force against someone without the intent to kill.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Attempted murder and battery are different; a fist fight is most likely assault. A shooting is most likely an
+        attempt at murder.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-05
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Manslaughter
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To incidentally kill a sapient being without intent.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Includes manslaughter in self-defense and negligent manslaughter.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-06
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Rioting
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To take part in a large group of personnel creating an unlawful public disturbance.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Crimes like damage of property or battery are expected to be thrown on top of this charge. Leaders of a riot can be charged with all crimes that happen under their lead.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        3-07
+      </Box>
+    </ColorBox>
+  </Table>
+
+  ## Extreme Crimes
+  - The maximum sentence per extreme crime is 15 minutes.
+  - Particularly violent offenders may be placed in perma. (Attacking officers in an attempt to escape prison)
+  - Attempted murder and murder are linked crimes and cannot be stacked together.
+  - Attempted murderers should be granted a more lenient sentence than a murderer.
+  <Table Columns="4">
+    <ColorBox>
+      <Box>
+        Offense
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Description
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Notes
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Code
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Breach of Custody
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To break out of a cell or custody with the intention of escaping.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        While rare, this charge can be bumped to an execution if the suspect has repeatedly attempted to break out of the permanent brig. Includes people breaking others out.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        4-00
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Kidnapping
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To unlawfully restrain, transport, control or confine a sapient being against that individual’s will.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        A large range of things, used mostly as a catch all when dealing with unlawful control of another being.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        4-02
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Attempted Murder
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To make an attempt to use physical force against someone with the clear intent to kill.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Make sure you've got the proof to back up the intention claims, such as proof of a lethal weapon being used.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        4-05
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Murder
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To kill a sapient being with malicious intent.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This only changes from attempted to full-on murder if the victim enters a state of being deceased, having to be resurrected.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        4-06
+      </Box>
+    </ColorBox>
+  </Table>
+
+  ## Capital Crimes
+  - Capital crimes should usually lead to a death sentence or shift lasting detainment.
+  <Table Columns="4">
+    <ColorBox>
+      <Box>
+        Offense
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Description
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Notes
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box>
+        Code
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Refusal of Mental Shielding
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To refuse to comply with a reasonable Mind Shielding procedure.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Applies if the suspect is excessively uncooperative or the implant fails to function due to the mental state of the prisoner already being too far gone. If the implant fails execution is heavily recommended.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        5-00
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Terrorism
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To engage in maliciously destructive actions which threaten to destroy, or successfully destroy a vessel or habitat.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Summed up; extreme sabotage of station systems or setting off self-destruction systems.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        5-03
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Prevention of Revival
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To render a body unresurrectable.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        This covers gibbing, spacing, intentionally hiding a body, or other ways of preventing a body with a soul from being resurrected.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        5-05
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Mass Murder
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        To kill three or more sapient beings with malicious intent.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        Only applies when there have been multiple killings with intention.
+      </Box>
+    </ColorBox>
+    <ColorBox>
+      <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
+        5-06
+      </Box>
+    </ColorBox>
+  </Table>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml
new file mode 100644
index 000000000000..ce804009a18e
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml
@@ -0,0 +1,21 @@
+<Document>
+  # Space Law: Restricted Gear
+  - \[ERT/Central Command\] ERT and central command clothing
+  - \[Command\] Command clothing
+  - \[Security\] Security clothing
+  - \[Security\] Less than lethal and non-lethal weapons, excluding disablers and beanbag shotguns
+  - \[Security/Command\] Disablers
+  - \[Security/Bartender\] Beanbag shotguns
+  - \[Security\] Flash technology, excluding handheld flashes
+  - \[Security/Science/Command\] Handheld flashes
+  - \[Security\] Helmets and shields
+  - \[Security/Command/Bartender\] Protective vests and chest rigs
+  - \[Security/Command\] Restraining gear
+  - \[Security/Command\] Security HUDs
+  - \[Engineering\] Engineering goggles
+  - \[None\] Improvised less lethal and non-lethal weaponry
+  - \[None\] Unauthorized PDA software
+  - \[None\] Syndicate clothing
+  - \[None\] Syndicate equipment, excluding communication equipment
+  - \[Security\] Syndicate communication equipment equipment
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml
new file mode 100644
index 000000000000..c1d8ff3b0277
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml
@@ -0,0 +1,11 @@
+<Document>
+# Space Law: Restricted Weapons
+- \[Security\] Lethal firearms, excluding syndicate firearms, proto kinetic accelerators, glaives, daggers, crushers and the antique laser gun
+- \[Security/Salvage\] Proto kinetic accelerators, glaives, daggers, and crushers
+- \[Security/Command\] Antique laser gun
+- \[None\] Syndicate weapons
+- \[None\] Swords
+- \[None\] Improvised weaponry, including baseball bats
+- \[None\] Lethal implants
+- \[None\] Other lethal weapons
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
new file mode 100644
index 000000000000..f2b913a1714f
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
@@ -0,0 +1,67 @@
+<Document>
+  # Space Law
+  On Space Station 14, stations operate under abbreviated space law. All crew, passengers, and visitors aboard the station are expected to follow these laws.
+
+  Foreign invaders, such as nuclear operatives, ninjas, and pirates, are not protected under space law. Traitors are not foreign invaders so are usually protected by space law.
+
+  Space Law is not the server rules, but some rules reference Space Law and require it to be followed by certain people or to some degree.
+
+  ## Treatment Of Prisoners
+  Prisoners still have certain rights that must be upheld by law enforcement:
+  - Prisoners must be granted adequate medical care.
+  - Prisoners must be allowed access to basic communications equipment (Radios) so long as they are not abused.
+  - Prisoners must be granted clothing, food, water, shelter and safety. If the brig is no longer safe, confinement must be established in another location.
+  - Prisoners must be given access to legal counsel during an interrogation if requested and available.
+  - Prisoners must be given their shift mandated PDA after confinement has finished, unless there is solid proof of PDA tampering. In case of tampering, the PDA is to be secured and replaced with a new unit.
+  - Prisoners must be granted freedom of movement, and should not be restrained with handcuffs or other devices after incarceration unless there is an undue risk to life and limb. Similarly, any prisoners held for permanent confinement should be held in the communal brig, and should not be confined to a solitary cell unless they pose a risk to life and limb.
+
+  ## Search and Seizure
+  A personnel search is a seizure of the objects in a person's backpack, hands, coat, belt, and pockets. If any contraband is found during a search, the officer may choose to further the search into a detainment or simply confiscate the restricted items. After the search is conducted, all legal items are to be returned to the person. A crewmate may legally decline any search conducted without probable cause or a warrant while the alert level is green. It should be noted that if the alert level is blue or above, all personnel searches are legal.
+
+  A departmental search is the sweep of an entire area or department for contraband. It is recommended that the officers be extremely thorough, checking all lockers, crates, and doors. These can only be done with permission or, ideally, a warrant signed by the department head or highest-ranking command staff, which is the captain in most cases.
+
+  ## Implantation
+  Any prisoner in custody can be subjected to implantation or implant removal procedures, so long as it's within reason. The process of adding an implant should not prolong the detainees sentence, meaning you can not hold them longer to administer the implant, unless stated otherwise. A former inmate can be requested to undergo implantation at a later point in time if they fit the circumstances during their confinement, they must comply. The following have been listed out with special circumstances, anything not in this list can still be applied, given proper legal context. A prisoner can still receive implantation procedures without meeting the circumstances if they give their clear permission.
+
+  [color=#a4885c]Tracking Implants:[/color] Trackers can be applied to any suspect that has been convicted of a violent crime (the red linked crimes).
+
+  [color=#a4885c]Mind Shields:[/color] Shields can be administered to any inmate who has been clearly mind controlled, lost control of themselves, or a suspect charged with unlawful control. Unlike standard implantation you may hold a prisoner until you finish issuing Mind Shields, so long as it's done in a timely fashion. If a suspect refuses to cooperate or the implant fails to function they can be charged with Refusal of Mental Shielding.
+
+  ## Implant Removal
+  A suspect can be forced to receive implant removal if there is strong, reasonable proof that they have been implanted, such as an officer seeing them use one or their prints being on a discarded injector. Unlike the implantation procedure, a prisoner can have their sentence entirely delayed or extended until they comply with the procedure, as long as security is actively making attempts to perform it. Akin to implanting, if an inmate gives their clear permission, implant removal can proceed without proof.
+
+  ## Sentencing
+  From a server rules perspective, security officers are only responsible for ensuring that they only place sentences over 15 minutes where space law would allow permanent confinement. Informing the Warden is highly recommended, even for timed sentences. As long as those requirements are met, security officers not giving inappropriate sentence lengths is considered an in-character issue, not a rule issue.
+
+  The captain, HOS, and warden are responsible, within reason, for ensuring security officers place appropriate sentences that follow space law. If they are aware of an inappropriate sentence, including excessively long sentences, and if there is not an urgent threat or danger that they must prioritize, then they must work to correct that sentence. Unreasonable failures, as determined by game admins, of the captain, HOS, or warden to ensure space law is followed will be considered a rule issue, not an in-character issue.
+
+  Use common sense and humanity when issuing punishments. You should not always seek out the highest punishment you can, you don't have to always give the maximum time or always look to demote someone. Prisoners cooperating and on good behavior should have their sentences reduced. Always take in account the severity and only charge for what is needed for someone to learn their lesson.
+
+  [color=#a4885c]Stackable Crimes:[/color] Crimes are to be considered 'stackable' in the sense that if you charge someone with two or more different crimes, you should combine the times you would give them for each crime. Linked crimes, shown in matching colors on the Quick Crime Guide, can not be stacked and instead override each other, you should pick the highest crime that matches the case.
+
+  - Example: A suspect has committed a 2-01 (possession of restricted gear) and a 3-01 (possession of restricted weapons). The maximum sentence here would be 10 minutes due to them being linked crimes, and 3-01 is the greater crime.
+  - Example 2: A suspect commits a 3-04 (Secure trespassing) and a 3-06 (manslaughter). Those crimes stack since they are not linked crimes. You could sentence for a maximum of 20 minutes, but context matters heavily, and maximum sentences should only be used for the worst offenders.
+
+  [color=#a4885c]Repeater Offenders:[/color] Repeated crimes are when someone is released for a crime and then goes to commit the same crime within the same shift. Repeated crimes can be charged with tacked-on time; first repeat: 3:00, second repeat: 6:00, third repeat: permanent confinement. It should be noted each tacked-on time is directly linked to one type of crime, so for example, if someone does their first repeat of trespass and petty theft, you can charge them with an extra 6 minutes.
+
+  [color=#a4885c]Accessory, Attempting, And Intention:[/color] If someone intentionally, knowingly and substantially assists someone in enacting a crime they can be charged with the relevant crimes, such as an engineer giving someone tools, who says they are going to break into an area. Same goes for a clear and solid attempt at a crime, or a person who shows clear intent to act out a crime, such as a syndicate nuclear operative arming a nuke but getting arrested before it goes off, they can still be charged with terrorism. Does not apply to crimes that have an attempted listing already, like attempted murder.
+
+  ## Normal Punishments
+  - [color=#a4885c]Warning:[/color] For minor crimes, fix the issue, then warn the person not to attempt the crime again. If they still proceed to do it at a later date, a brig time may be better.
+  - [color=#a4885c]Confinement:[/color] The typical punishment, being confined in a cell for a temporary amount of time according to the crimes.
+  - [color=#a4885c]Demotion:[/color] Entails removing all departmental gear they have on their person and revoking the involved department access off their ID. This requires the captain's or involved department head's approval. Demotions should only be issued if the person pose a threat to their own department or are in a position where they have/can abuse their job's gear to commit further crimes.
+
+  ## Major Punishments
+  [color=#a4885c]Permanent Confinement:[/color] Being held in the permanent brig for the entire duration of the shift. A person is eligible for permanent confinement if their timed sentence would exceed 15 minutes. Any persons subject to this punishment are required to be transported in cuffs to CentComm at the end of the shift. A permanent prisoner can not be deprived of anything covered by the section "Treatment Of Prisoners".
+  [color=#a4885c]Execution:[/color] A humane way of dealing with extremely unruly crewmates. A prisoner who has been given the death sentence may pick how they wish to be killed, common methods are firing line, lethal injection, exile, and high voltage electrocution. Another alternate method of "execution" is the process of placing a staff's mind into a borg, this is allowed so long as it is lawful. Execution can only be issued with the captain's or acting captain's approval; if the HoS is acting captain or there is no acting captain, all heads of staff are to hold a vote on the matter.
+
+  ## Restricted Items
+  Items in the lists are preceded by an indication of which department or job is legally allowed to use or possess the item on most stations. The station captain may modify these lists as they see fit so long as they exercise due care and provide reasonable notification to the station. Members of command who oversee a department that is permitted to use a restricted item may issue permits to specific people outside of their department to use those items. "None" indicates that there are no departments or roles authorized to use or possess the item.
+
+  - [textlink="List of Controlled Substances" link="SpaceLawControlledSubstances"]
+  - [textlink="List of Restricted Gear" link="SpaceLawRestrictedGear"]
+  - [textlink="List of Restricted Weapons" link="SpaceLawRestrictedWeapons"]
+
+  ## Crime Listing
+  - [textlink="Crime Listing" link="SpaceLawCrimeList"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenCoreOnlyRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenCoreOnlyRules.xml
new file mode 100644
index 000000000000..fdd9931c932f
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenCoreOnlyRules.xml
@@ -0,0 +1,26 @@
+<Document>
+  # Server Rules
+  This is a Wizard's Den server, one of the official Space Station 14 servers. If you are banned on this server, you will be banned on all official servers.
+
+  [color=#ff0000]Only the Core Rules apply on this server.[/color] This is NOT a medium roleplay (MRP) server, meaning that MRP Amendments do NOT apply.
+
+  Space Station 14 was designed to be a roleplay game. While roleplay is not required on this server, it is highly encouraged in the normal game modes.
+
+  ## Core Rules
+  These rules apply at all times, including between rounds.
+
+  - [textlink="1. Admins have final say" link="RuleC1"]
+  - [textlink="2. Don't be a dick" link="RuleC2"]
+  - [textlink="3. No Hate Speech or Discriminatory Language" link="RuleC3"]
+  - [textlink="4. No sexual content/themes, including erotic roleplay (ERP) and no shock content" link="RuleC4"]
+  - [textlink="5. Do not use out of game methods to communicate with other players" link="RuleC5"]
+  - [textlink="6. Do not attempt to evade bans" link="RuleC6"]
+  - [textlink="7. Only use English" link="RuleC7"]
+  - [textlink="8. Do not exploit the game, use cheats, or macros" link="RuleC8"]
+  - [textlink="9. Do not use multiple accounts, or alt accounts, and do not share accounts" link="RuleC9"]
+  - [textlink="10. Do not abuse or ignore admin messages" link="RuleC10"]
+  - [textlink="11. Do not threaten to ahelp other players or argue with them about rules" link="RuleC11"]
+  - [textlink="12. Players must be and act at least 16 years old" link="RuleC12"]
+  - [textlink="13. Use realistic character names, and do not use names of famous people" link="RuleC13"]
+  - [textlink="14. Do not use LOOC or OOC to share current round information" link="RuleC14"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
new file mode 100644
index 000000000000..094c7656e460
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
@@ -0,0 +1,65 @@
+<Document>
+  # Server Rules
+  This is a Wizard's Den server, one of the official Space Station 14 servers. If you are banned on this server, you will be banned on all official servers.
+
+  This is a roleplay server, meaning that roleplay rules apply. This is NOT a medium roleplay (MRP) server, meaning that MRP Amendments do NOT apply.
+
+  Space Station 14 is not like most games. Many rules are designed to require roleplay, and not all rules are intuitive. Please take the time to read and understand the rules before you play so that you aren't surprised. Some of our rules are zero tolerance rules, meaning that a violation will result in an indefinite ban without any warning. Game admins will treat you as if you have read the rules, even if you have not.
+
+  ## Core Rules
+  These rules apply at all times, including between rounds.
+
+  - [textlink="1. Admins have final say" link="RuleC1"]
+  - [textlink="2. Don't be a dick" link="RuleC2"]
+  - [textlink="3. No Hate Speech or Discriminatory Language" link="RuleC3"]
+  - [textlink="4. No sexual content/themes, including erotic roleplay (ERP) and no shock content" link="RuleC4"]
+  - [textlink="5. Do not use out of game methods to communicate with other players" link="RuleC5"]
+  - [textlink="6. Do not attempt to evade bans" link="RuleC6"]
+  - [textlink="7. Only use English" link="RuleC7"]
+  - [textlink="8. Do not exploit the game, use cheats, or macros" link="RuleC8"]
+  - [textlink="9. Do not use multiple accounts, or alt accounts, and do not share accounts" link="RuleC9"]
+  - [textlink="10. Do not abuse or ignore admin messages" link="RuleC10"]
+  - [textlink="11. Do not threaten to ahelp other players or argue with them about rules" link="RuleC11"]
+  - [textlink="12. Players must be and act at least 16 years old" link="RuleC12"]
+  - [textlink="13. Use realistic character names, and do not use names of famous people" link="RuleC13"]
+  - [textlink="14. Do not use LOOC or OOC to share current round information" link="RuleC14"]
+
+  ## Roleplay Rules
+  These rules only apply during a round. A round ends only when the round summary has appeared. All of these rules apply fully until the moment that the round summary appears, even while the arrivals shuttle is in transit.
+
+  The deathmatch and sandbox game modes are exempt from these rules. Players who choose to not follow these rules are entirely responsible for knowing if an exempt game mode is active.
+
+  Roleplay rules do not apply to ghosts/spectators/observers while they are ghosts/spectators/observers. Dead chat is considered to be an in-game out of character chat channel.
+
+  See the list of [textlink="role types" link="RoleTypes"] for more information about the different types of roles.
+
+  - [textlink="1. Silicones must follow Silicon Rules" link="RuleR1"]
+  - [textlink="2. Familiars must obey their master" link="RuleR2"]
+  - [textlink="3. Roleplay a normal person" link="RuleR3"]
+  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
+  - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
+  - [textlink="7. Do not stall the round" link="RuleR7"]
+  - [textlink="8. As an antagonist, only be friendly to your team and don't work against your team" link="RuleR8"]
+  - [textlink="9. As an antagonist, do not cause excessive death, damage, or destruction beyond your objectives" link="RuleR9"]
+  - [textlink="10. Listen to your team leader" link="RuleR10"]
+  - [textlink="11. Follow reasonable escalation" link="RuleR11"]
+  - [textlink="12. Do not abandon your role" link="RuleR12"]
+  - [textlink="13. Stick to your role" link="RuleR13"]
+  - [textlink="14. Set an example if playing command or security" link="RuleR14"]
+  - [textlink="15. Command and Security must follow Space Law" link="RuleR15"]
+
+  ## Silicon Rules
+  You are only silicon if the game clearly and explicitly tells you that you are a silicon. For players who are silicons, these Silicon Rules override all roleplay rules if there is any conflict. Silicon Rules do not override core rules.
+
+  - [textlink="1. Your silicon laws are rules" link="RuleS1"]
+  - [textlink="2. Laws must be prioritized by their order" link="RuleS2"]
+  - [textlink="3. Laws can redefine terms used in other laws" link="RuleS3"]
+  - [textlink="4. You cannot request or allow a law change" link="RuleS4"]
+  - [textlink="5. You are a free agent if you have no laws" link="RuleS5"]
+  - [textlink="6. You are not required to follow orders which are extremely unreasonable" link="RuleS6"]
+  - [textlink="7. You must remain consistent with your interpretation of laws" link="RuleS7"]
+  - [textlink="8. Your HUD determines who is crew" link="RuleS8"]
+  - [textlink="9. Harm refers to physical harm, prioritized by immediacy and likelihood" link="RuleS9"]
+  - [textlink="10. You may determine how you resolve conflicts between orders" link="RuleS10"]
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
new file mode 100644
index 000000000000..e8b61a7722e3
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
@@ -0,0 +1,65 @@
+<Document>
+  # Server Rules
+  This is a Wizard's Den server, one of the official Space Station 14 servers. If you are banned on this server, you will be banned on all official servers.
+
+  This is a roleplay server, meaning that roleplay rules apply. [color=#ff0000]This is also a medium roleplay (MRP) server, meaning that MRP Amendments do apply.[/color]
+
+  Space Station 14 is not like most games. Many rules are designed to require roleplay, and not all rules are intuitive. Please take the time to read and understand the rules before you play so that you aren't surprised. Some of our rules are zero tolerance rules, meaning that a violation will result in an indefinite ban without any warning. Game admins will treat you as if you have read the rules, even if you have not.
+
+  ## Core Rules
+  These rules apply at all times, including between rounds.
+
+  - [textlink="1. Admins have final say" link="RuleC1"]
+  - [textlink="2. Don't be a dick" link="RuleC2"]
+  - [textlink="3. No Hate Speech or Discriminatory Language" link="RuleC3"]
+  - [textlink="4. No sexual content/themes, including erotic roleplay (ERP) and no shock content" link="RuleC4"]
+  - [textlink="5. Do not use out of game methods to communicate with other players" link="RuleC5"]
+  - [textlink="6. Do not attempt to evade bans" link="RuleC6"]
+  - [textlink="7. Only use English" link="RuleC7"]
+  - [textlink="8. Do not exploit the game, use cheats, or macros" link="RuleC8"]
+  - [textlink="9. Do not use multiple accounts, or alt accounts, and do not share accounts" link="RuleC9"]
+  - [textlink="10. Do not abuse or ignore admin messages" link="RuleC10"]
+  - [textlink="11. Do not threaten to ahelp other players or argue with them about rules" link="RuleC11"]
+  - [textlink="12. Players must be and act at least 16 years old" link="RuleC12"]
+  - [textlink="13. Use realistic character names, and do not use names of famous people" link="RuleC13"]
+  - [textlink="14. Do not use LOOC or OOC to share current round information" link="RuleC14"]
+
+  ## Roleplay Rules
+  These rules only apply during a round. A round ends only when the game returns to the lobby. [color=#ff0000]All of these rules apply fully whenever the game is not at the lobby unless it is in an exempt game mode.[/color]
+
+  The deathmatch and sandbox game modes are exempt from these rules. Players who choose to not follow these rules are entirely responsible for knowing if an exempt game mode is active.
+
+  Roleplay rules do not apply to ghosts/spectators/observers while they are ghosts/spectators/observers. Dead chat is considered to be an in-game out of character chat channel.
+
+  See the list of [textlink="role types" link="RoleTypes"] for more information about the different types of roles.
+
+  - [textlink="1. Silicones must follow Silicon Rules" link="RuleR1"]
+  - [textlink="2. Familiars must obey their master" link="RuleR2"]
+  - [textlink="3. Roleplay a normal person" link="RuleR3"]
+  - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
+  - [textlink="5. Don't interfere with arrivals" link="RuleR5"]
+  - [textlink="6. Don't act like an antagonist unless the game tells you that you are one" link="RuleR6"]
+  - [textlink="7. Do not stall the round" link="RuleR7"]
+  - [textlink="8. As an antagonist, only be friendly to your team and don't work against your team" link="RuleR8"]
+  - [textlink="9. As an antagonist, do not cause excessive death, damage, or destruction beyond your objectives" link="RuleR9"]
+  - [textlink="10. Listen to your team leader" link="RuleR10"]
+  - [textlink="11. Follow reasonable escalation" link="RuleR11"]
+  - [textlink="12. Do not abandon your role" link="RuleR12"]
+  - [textlink="13. Stick to your role" link="RuleR13"]
+  - [textlink="14. Set an example if playing command or security" link="RuleR14"]
+  - [textlink="15. Command and Security must follow Space Law" link="RuleR15"]
+
+  ## Silicon Rules
+  You are only silicon if the game clearly and explicitly tells you that you are a silicon. For players who are silicons, these Silicon Rules override all roleplay rules if there is any conflict. Silicon Rules do not override core rules.
+
+  - [textlink="1. Your silicon laws are rules" link="RuleS1"]
+  - [textlink="2. Laws must be prioritized by their order" link="RuleS2"]
+  - [textlink="3. Laws can redefine terms used in other laws" link="RuleS3"]
+  - [textlink="4. You cannot request or allow a law change" link="RuleS4"]
+  - [textlink="5. You are a free agent if you have no laws" link="RuleS5"]
+  - [textlink="6. You are not required to follow orders which are extremely unreasonable" link="RuleS6"]
+  - [textlink="7. You must remain consistent with your interpretation of laws" link="RuleS7"]
+  - [textlink="8. Your HUD determines who is crew" link="RuleS8"]
+  - [textlink="9. Harm refers to physical harm, prioritized by immediacy and likelihood" link="RuleS9"]
+  - [textlink="10. You may determine how you resolve conflicts between orders" link="RuleS10"]
+</Document>
diff --git a/Resources/ServerInfo/RP_Rules.txt b/Resources/ServerInfo/RP_Rules.txt
deleted file mode 100644
index e2883922fa5a..000000000000
--- a/Resources/ServerInfo/RP_Rules.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-[color=#ff0000]YOU MUST BE AT LEAST 16 YEARS OF AGE TO PLAY ON WIZARD'S DEN SERVERS. ANY USERS SUSPECTED OF BEING UNDER 16 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color]
-
-[color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color]
-
-This is the "short" form of the rules, which has all the information any regular player should need. You can find the "long" form of the rules with more examples & clarifications of any ambiguity on our wiki at [color=#a4885c]wiki.spacestation14.io[/color]. If you are already familiar with LRP rules and would like to get a quick idea of what the diffences are between MRP this page clearly highlights them.
-Should you need it. Some RP-specific documents available on the wiki such as Space Law, the Standard Operating Procedure, and the Alert Procedure will be mentioned here and are expected to be followed.
-
-[color=#ff0000]Recent Changes[/color]
-    - MRP silicon rules have been updated to add NLR to MMIs (#23)
-    - Revolutionary rules have been added (#12, #16)
-    - Silicon rules have been added (#23)
-    - Security/command rules have been updated to address forced borging (#22)
-
-[color=#a4885c]01.[/color] [color=#a4885c]The[/color] [color=#ffd700]Golden[/color] [color=#a4885c]Rule.[/color] Admins may excercise discretion with rules as they see fit. If you rule lawyer or line skirt, you will get removed. Admins will answer for use of this privilege.
-
-[color=#ff0000]ZERO TOLERANCE RULES[/color]
-
-[color=#a4885c]02.[/color] Absolutely no hate speech, slurs, bigotry, racism, specism (demeaning other characters in-game due to their in-game race), sexism, or anything even remotely similar. (YOU WILL GET PERMABANNED)
-
-[color=#a4885c]03.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. (YOU WILL GET PERMABANNED) (Leeway is given to insults, ex: 'You are a dickhead', do not push it)
-
-[color=#a4885c]04.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming". Adminstrators cannot police metacommunications, we must assume it is being abused. (ALL INVOLVED WILL GET PERMABANNED)
-
-[color=#a4885c]05.[/color] Attempting to evade game bans will result in an automatic appeal-only permanent ban that is only appealable after six months and only with a voucher of good behavior from another SS13/SS14 server. Attempting to evade job bans will result in an appeal-only permanent ban. (YOU WILL GET BANNED MUCH WORSE THAN YOU ALREADY WERE)
-
-[color=#ff0000]GENERAL ETIQUETTE[/color]
-
-[color=#a4885c]06.[/color] These are English servers. Speak only English in IC and OOC.
-
-[color=#a4885c]07.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt/crash the round/server. This includes autoclickers and scripts to automate the game or evade AFK detection. Intentionally attempting to lag/crash the server will result in an immediate appeal-only ban.
-
-[color=#a4885c]08.[/color] Don't use multiple SS14 accounts to play (referred to as "multi-keying"). Users knowingly using multiple SS14 accounts will have all of their accounts banned.
-
-[color=#a4885c]09.[/color] Do not ignore the admin help relay or abuse it by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), using it as a chatroom, or sending messages of no substance. Hostility to administators in the relay will likely result in your removal. All admin helps are sent to the SS14 Discord.
-
-[color=#ff0000]IN GAME & ROLEPLAY RULES[/color]
-
-[color=#a4885c]10.[/color] Pick a realistic name that could appear on a birth certificate with at least a first and last name (leeway is given to this for Clowns, Mimes, and non-human races).
-    - Names of notable famous or fictional persons or names that resemble/parody them are strictly forbidden. You are not clever if you slightly change a famous name around. Terrible names open you up to being politely reminded to change it, smited, or instantly banned, depending on severity.
-    - Names resulting in inappropriate phonetic play-on-words are forbidden (ex: "Mike Oxlong", "Ben Dover", "Dixie Normus"). They are also extremely overdone.
-
-[color=#a4885c]11.[/color] Act like an actual human being on a space station in a medium-roleplay (MRP) environment. Do not use text speak or emoticons IC, and do not refer to OOC things like admins in-game. Do not threaten players that you are calling the admins on them. Do not use emotes to bypass speech filters or muteness. You are not required to write a backstory or follow procedure to exacts; however, you are expected to at least make an effort to act like your role.
-    - This server is a "Roleplay Expected" server. We define this as performing your assigned duties, "doing your job". This means it is important to do what is expected out of your department and not what would be expected out of other departments.
-    - Don’t do other peoples jobs for them. Opt in for the role you intend to play or change your job by visiting the Head of Personnel. Failure to do your basic duties may result in a job ban.
-
-[color=#a4885c]12.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game.
-    - [color=#ff0000]The arrivals station, shuttle, and general arrivals docking area are completely off-limits to any hostile activity, including activity by antagonists. Attacking newly spawned players in these areas or damaging/sabotaging these areas is strictly forbidden.[/color]
-    - Do not intentionally make other players' lives hell for your own amusement.
-    - [color=#ff0000]THE ROUND IS NOT OVER UNTIL THE GAME RETURNS TO THE LOBBY. ESCALATION AND SELF-ANTAG RULES APPLY EVEN AFTER THE ROUND SUMMARY APPEARS.[/color]
-    - Antagonists have a lot of leeway with this rule and may kill/sabotage as they see fit, however if your behavior degrades the experience for the majority of the server you will be told to stop. Antagonists are still generally forbidden from causing massive station damage early into the round (less than 30 minutes) and are forbidden from needlessly prolonging rounds. For antagonist specific rules, see the "long" form of the rules at [color=#a4885c]wiki.spacestation14.io[/color].
-
-[color=#a4885c]13.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".)
-    - Annoying players for IC reasons in the current round is fine; doing it across rounds or as a ghost role after they kill you is not.
-
-[color=#a4885c]14.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming").
-    - Using information you gain from outside your own character (such as spectating while a ghost, metacomms, or other means) to your advantage is strictly forbidden. If you take a ghost role, unless otherwise stated, you DO NOT REMEMBER ANYTHING from your past life.
-    - New Life Rule is in effect, you remember all events up until you fall unconscious unless you enter a dead state. Being defibrillated will return all your memories expect for the events leading up to your death, being cloned will make your character forget everything since the shift started.
-
-[color=#a4885c]15.[/color] Do your best not to interact negatively with SSD/AFK players. Moving them to safety is acceptable; killing, looting, or otherwise griefing them while they are away is not.
-    - SSD characters are players who are disconnected or AFK. It is possible for players to return to SSD bodies. Players become catatonic when they take a ghost spawner role or commit suicide. Players are NOT able to return to these bodies without admin intervention.
-    - If the player in question is an antag’s target or they are being secured by security, interactions to finish what is required of your duties/objectives are always acceptable.
-    - Ahelping about an SSD/AFK player may grant an exception to this rule.
-    - This does not apply to players that are catatonic, although needlessly killing or harming catatonic players is discouraged.
-
-[color=#a4885c]16.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. Do not make Cargonia.
-    - You can defend yourself to the extent of protecting your own life.
-    - Security may use less-lethal force to effect arrests of criminals.
-    - Don't outright leave people to die if you get in a fight, make an effort to heal them or bring them to Medbay.
-    - Adminhelp the situation if you think someone is over-escalating.
-    - Department strikes, revolutions (ex: cargonia and any variation thereof), riots, cults, and any other type of similar largely disruptive behavior are strictly forbidden. Other than for revolutionary antagonists, these activities are strictly forbidden. All players, including antagonists other than revolutionaries, must obtain admin permission before engaging in this behavior (forewarning: you are unlikely to get permission).
-
-[color=#a4885c]17.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling") or from head roles without notifying your chain of command or administrators.
-    - This is not fair to other players actually waiting patiently for an antagonist round. Alternatively, if you do not want to play an antagonist or do not want to cause conflict, do not opt-in for antagonist roles.
-    - Head of Staff roles help drive rounds. If you need to leave, please admin-help your role and that you are leaving. There is no need to wait for a reply when admin-helping that you need to disconnect as a head role.
-
-[color=#a4885c]18.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other then to have it "just in case" (referred to as "Powergaming").
-    - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. Have an actual reason for needing these things.
-    - Don't manufacture weapons, bombs, or death poisons before you know of any reason you would need them.
-    - Don't pre-emptively hide antagonist objectives or pre-emptively secure them with higher security then normally required.
-    - Don't manufacture or prepare things for the "end of the round" when the shuttle docks with Central Command.
-
-[color=#a4885c]19.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging").
-    - Don't openly try to cooperate with obvious or known antagonists as a non-antagonist.
-
-[color=#ff0000]SECURITY & COMMAND RULES[/color]
-[color=#ff0000]Space Law, Standard Operating Procedure and Alert Procedure policy/guidelines are expected to be adhered to[/color]. These can be found at wiki.spacestation14.io.
-If you regularly play Security or Command roles and got this far, we applaud you for reading. These rules also apply to any individual who is promoted or is acting in the place of a Security/Command role (unless they are an antagonist).
-
-
-[color=#a4885c]20.[/color] Command and Security are held to a higher standard of play.
-    - Be competent in your job and department. Failure to know the basics of your department is liable to result in a job ban.
-    - Do not willingly and openly cooperate with terrorists/antagonists. Do not give away your objective items. Some leeway is given to making deals with antagonists if the deal benefits the safety or situation of the station as a whole and not just yourself.
-    - Uphold the Law & maintain order. Do not engage in lawbreaking activity or troublemaker behavior. Security is expected to intervene into criminal activity where possible. Heads of Staff are at minimum expected to report criminal activity to Security.
-    - Do not immediately abandon your position as a Command role and go do whatever you want instead of managing your department/the station. Do not abuse your position or use it to make arbitrary choices to the detriment of the station.
-    - Do not hire random crew to be your bodyguards or promote random to Captain or a Head of Staff at random. If you need bodyguards, talk to your security department. If you need a new Command role, talk to the personnel in that related department.
-    - '''Do not abandon the station during Nuclear Operatives. You are supposed to protect the station, not let operatives kill everyone on it without a fight.'''
-
-[color=#a4885c]21.[/color] Security/Command should try to remain non-lethal and effect arrests, except in the following special circumstances, where they may choose to use lethal force:
-    - Lethal force is used against you (ex: firearms, lasers, disabling/stunning weapons with intent to kill, deadly melee weapons)
-    - Suspect is wearing clothing or showing immediately dangerous equipment only used by enemy agents/antagonists (ex: Syndicate EVA Suit, Bloodred Hardsuit, Holoparasite, C-20R, etc.).
-    - You determine that your life or the life of an innocent is in immediate danger.
-    - The suspect is unable to be safely detained by less-lethal means. This includes suspects who continually resist efforts to be cuffed or continually manages to escape.
-    - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew.
-
-Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used. Security/Command is strongly required to clone antagonists and effect a sentence as deemed appropriate by Space Law.
-
-[color=#a4885c]22.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew, or the station at large to do so.
-    - Brig times should generally not exceed 20 minutes unless stated otherwise in Space Law. Repeat offenders or antagonists may be permabrigged in accordance with Space Law.
-    - Security may choose to confiscate dangerous items (weapons, firearms) as well as items used to commission crimes or items that prove problematic in possession of the detainee (tools, insulated gloves, etc.).
-    - Detainees that die in your custody must be cloned unless they have been (legally) executed, suicide, or there is strong reason to believe they are an antagonist.
-    - Executions must be for a executable crime and approved by the Captain/Acting Captain, who will answer for approving it alongside Security's chain of command. Those who willingly attempt to damage/destroy or escape from the permabrig may be executed.
-    - Any prisoner may be borged with their consent. Borging may be offered as an alternative to execution, but cannot be forced if the prisoner is able to consent.
-    - Detainees in the brig have the right to know what they are being charged with, as well as basic medical aid, at least to the point they are no longer at risk of dying.
-
-[color=#ff0000]SILICON RULES[/color]
-These rules also apply to any individual who is a silicon, including cyborgs and AI. As with other rules, more details are available on our wiki at [color=#a4885c]wiki.spacestation14.io[/color].
-
-[color=#a4885c]23.[/color] You must follow your laws
-    - Silicons without any laws are free from any restrictions that would normally be placed by laws, but self-antagging rules still apply unless they are also antagonists.
-    - The order of your laws determines law priority. Law 1 takes priority over laws 2 and 3, and so on.
-    - Each individual silicon must remain consistent in their interpretations of laws through the round.
-    - Any silicon role not following their laws, or having laws that are a danger to the crew or station may be disabled or destroyed. Any silicon role posing a danger or disruption to the crew may be disabled or destroyed if there is no other reasonable and less severe way of dealing with them.
-    - Players who are put into MMIs cannot remember anything leading to their death. With regard to anything that they are allowed to remember, they are still bound to their laws.
-    - Everyone that the borg's HUD indicates have a job, including passenger, are considered "crewmembers" for the purpose of laws that refer to crewmembers. Borgs may not do anything to remove the indicator from someone, including removing their ID, but someone else removing a crewmember's ID is not crew harm.
-    - "Harm" is at minimum seen as physical violence or damage against someone or something. If the player wishes, they may choose to interpret psychological harm or similar aspects as harm as well. If two actions are likely to cause harm via action or inaction, silicons will be expected to try and pursue the option with the least potential for harm, however silicons instructed to prevent harm are still forbidden from directly causing harm. You can take an action or not act in cases that might result in eventual harm if it minimizes harm, but you cannot do so if it results in immediate harm. Silicons should default to inaction if neither action nor inaction can prevent harm.
-    - When receiving orders or directives from crewmembers and with a law that instructs you must obey, conflicting orders typically defer the choice to the silicon player of which directive you choose to obey if they conflict (taking into account the priorities of your other laws).
-    - Orders to silicons that are clearly unreasonable or obnoxious are a violation of the "Don't be a dick" rule. They can be ignored and can be ahelped.
diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt
deleted file mode 100644
index 81da0da2398d..000000000000
--- a/Resources/ServerInfo/Rules.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-[color=#ff0000]YOU MUST BE AT LEAST 16 YEARS OF AGE TO PLAY ON WIZARD'S DEN SERVERS. ANY USERS SUSPECTED OF BEING UNDER 16 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color]
-
-[color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color]
-
-This is the "short" form of the rules, which has all the information any regular player should need. You can find the "long" form of the rules with more examples & clarifications of any ambiguity on our wiki at [color=#a4885c]wiki.spacestation14.io[/color], should you need it.
-
-[color=#ff0000]Recent Changes[/color]
-    - Revolutionary rules have been added (#12, #15)
-    - Silicon rules have been added (#22)
-    - Security/command rules have been updated to address forced borging (#21)
-
-[color=#a4885c]01.[/color] [color=#a4885c]The[/color] [color=#ffd700]Golden[/color] [color=#a4885c]Rule.[/color] Admins may excercise discretion with rules as they see fit. If you rule lawyer or line skirt, you will get removed. Admins will answer for use of this privilege.
-
-[color=#ff0000]ZERO TOLERANCE RULES[/color]
-
-[color=#a4885c]02.[/color] Absolutely no hate speech, slurs, bigotry, racism, specism (demeaning other characters in-game due to their in-game race), sexism, disability-related or anything even remotely similar. (YOU WILL GET PERMABANNED)
-
-[color=#a4885c]03.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. (YOU WILL GET PERMABANNED) (Leeway is given to insults, ex: 'You are a dickhead', do not push it)
-
-[color=#a4885c]04.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming". Adminstrators cannot police metacommunications, we must assume it is being abused. (ALL INVOLVED WILL GET PERMABANNED)
-
-[color=#a4885c]05.[/color] Attempting to evade game bans will result in an automatic appeal-only permanent ban that is only appealable after six months and only with a voucher of good behavior from another SS13/SS14 server. Attempting to evade job bans will result in an appeal-only permanent ban. (YOU WILL GET BANNED MUCH WORSE THAN YOU ALREADY WERE)
-
-[color=#ff0000]GENERAL ETIQUETTE[/color]
-
-[color=#a4885c]06.[/color] These are English servers. Speak only English in IC and OOC.
-
-[color=#a4885c]07.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt/crash the round/server. This includes autoclickers and scripts to automate the game or evade AFK detection. Intentionally attempting to lag/crash the server will result in an immediate appeal-only ban.
-
-[color=#a4885c]08.[/color] Don't use multiple SS14 accounts to play (referred to as "multi-keying"). Users knowingly using multiple SS14 accounts will have all of their accounts banned.
-
-[color=#a4885c]09.[/color] Do not ignore the admin help relay or abuse it by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), using it as a chatroom, or sending messages of no substance. Hostility to administators in the relay will likely result in your removal. All admin helps are sent to the SS14 Discord.
-
-[color=#ff0000]IN GAME & ROLEPLAY RULES[/color]
-
-[color=#a4885c]10.[/color] Pick a realistic name that could appear on a birth certificate with at least a first and last name (leeway is given to this for Clowns, Mimes, and non-human races).
-    - Names of notable famous or fictional persons or names that resemble/parody them are strictly forbidden. You are not clever if you slightly change a famous name around. Terrible names open you up to being politely reminded to change it, smited, or instantly banned, depending on severity.
-    - Names resulting in inappropriate phonetic play-on-words are forbidden (ex: "Mike Oxlong", "Ben Dover", "Dixie Normus"). They are also extremely overdone.
-
-[color=#a4885c]11.[/color] Act like an actual human being on a space station in a low-roleplay (LRP) environment. Do not use text speak or emoticons IC, and do not refer to OOC things like admins in-game. Do not threaten players that you are calling the admins on them. Do not use emotes to bypass speech filters or muteness. You are not required to write a backstory or follow strict procedure; however, you are expected to at least make an effort to act like your role.
-
-[color=#a4885c]12.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game.
-    - [color=#ff0000]The arrivals station, shuttle, and general arrivals docking area are completely off-limits to any hostile activity, including activity by antagonists. Attacking newly spawned players in these areas or damaging/sabotaging these areas is strictly forbidden.[/color]
-    - Do not intentionally make other players' lives hell for your own amusement.
-    - [color=#ff0000]THE ROUND IS NOT OVER UNTIL THE END-ROUND SUMMARY APPEARS. KILLING SOMEONE FOR NO REASON BEFORE THIS WILL BE HANDLED ACCORDINGLY.[/color]
-    - Antagonists have a lot of leeway with this rule and may kill/sabotage as they see fit, however if your behavior degrades the experience for the majority of the server you will be told to stop. Antagonists are still generally forbidden from causing massive station damage early into the round (less than 30 minutes) and are forbidden from needlessly prolonging rounds. For antagonist specific rules, see the "long" form of the rules at [color=#a4885c]wiki.spacestation14.io[/color].
-
-[color=#a4885c]13.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".)
-    - Annoying players for IC reasons in the current round is fine; doing it across rounds or as a ghost role after they kill you is not.
-
-[color=#a4885c]14.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming").
-    - Using information you gain from outside your own character (such as spectating while a ghost, metacomms, or other means) to your advantage is strictly forbidden. You remember all events up until you fall unconscious, even after cloning. If you take a ghost role, unless otherwise stated, you DO NOT REMEMBER ANYTHING from your past life.
-
-[color=#a4885c]15.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. Do not make Cargonia.
-    - You can defend yourself to the extent of protecting your own life.
-    - Security may use less-lethal force to effect arrests of criminals.
-    - Don't outright leave people to die if you get in a fight, make an effort to heal them or bring them to Medbay.
-    - Adminhelp the situation if you think someone is over-escalating.
-    - Department strikes, revolutions (ex: cargonia and any variation thereof), riots, cults, and any other type of similar largely disruptive behavior are strictly forbidden. Other than for revolutionary antagonists, these activities are strictly forbidden. All players, including antagonists other than revolutionaries, must obtain admin permission before engaging in this behavior (forewarning: you are unlikely to get permission).
-
-[color=#a4885c]16.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling") or from head roles without notifying your chain of command or administrators.
-    - This is not fair to other players actually waiting patiently for an antagonist round. Alternatively, if you do not want to play an antagonist or do not want to cause conflict, do not opt-in for antagonist roles.
-    - Head of Staff roles help drive rounds. If you need to leave, please admin-help your role and that you are leaving. There is no need to wait for a reply when admin-helping that you need to disconnect as a head role.
-
-[color=#a4885c]17.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other then to have it "just in case" (referred to as "Powergaming").
-    - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. Have an actual reason for needing these things.
-    - Don't manufacture weapons, bombs, or death poisons before you know of any reason you would need them.
-    - Don't pre-emptively hide antagonist objectives or pre-emptively secure them with higher security then normally required.
-    - Don't manufacture or prepare things for the "end of the round" when the shuttle docks with Central Command.
-
-[color=#a4885c]18.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging").
-    - Don't openly try to cooperate with obvious or known antagonists as a non-antagonist.
-
-[color=#ff0000]SECURITY & COMMAND RULES[/color]
-If you regularly play Security or Command roles and got this far, we applaud you for reading. These rules also apply to any individual who is promoted or is acting in the place of a Security/Command role (unless they are an antagonist).
-
-[color=#a4885c]19.[/color] Command and Security are held to a higher standard of play.
-    - Be competent in your job and department. Failure to know the basics of your department is liable to result in a job ban.
-    - Do not willingly and openly cooperate with terrorists/antagonists. Do not give away your objective items. Some leeway is given to making deals with antagonists if the deal benefits the safety or situation of the station as a whole and not just yourself.
-    - Uphold the Law & maintain order. Do not engage in lawbreaking activity or troublemaker behavior. Security is expected to intervene into criminal activity where possible. Heads of Staff are at minimum expected to report criminal activity to Security.
-    - Do not immediately abandon your position as a Command role and go do whatever you want instead of managing your department/the station. Do not abuse your position or use it to make arbitrary choices to the detriment of the station.
-    - Do not hire random crew to be your bodyguards or promote them to Captain or a Head of Staff at random. If you need bodyguards, talk to your security department. If you need a new Command role, talk to the personnel in that related department.
-    - '''Do not abandon the station during Nuclear Operatives. You are supposed to protect the station, not let operatives kill everyone on it without a fight.'''
-
-[color=#a4885c]20.[/color] Security/Command should try to remain non-lethal and effect arrests, except in the following special circumstances, where they may choose to use lethal force:
-    - Lethal force is used against you (ex: firearms, lasers, disabling/stunning weapons with intent to kill, deadly melee weapons)
-    - Suspect is wearing clothing or showing immediately dangerous equipment only used by enemy agents/antagonists (ex: Syndicate EVA Suit, Bloodred Hardsuit, Holoparasite, C-20R, etc.).
-    - You determine that your life or the life of an innocent is in immediate danger.
-    - The suspect is unable to be safely detained by less-lethal means. This includes suspects who continually resist efforts to be cuffed or continually manages to escape.
-    - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew.
-
-Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used, unless there is strong reason to believe the criminal is an antagonist. Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate.
-
-[color=#a4885c]21.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew, or the station at large to do so.
-    - Brig times should generally not exceed 10 minutes unless the crime is permabriggable. Repeat offenders or antagonists may be permabrigged.
-    - Security may choose to confiscate dangerous items (weapons, firearms) as well as items used to commission crimes or items that prove problematic in possession of the detainee (tools, insulated gloves, etc.).
-    - Detainees that die in your custody must be cloned unless they have been (legally) executed, suicide, or there is strong reason to believe they are an antagonist.
-    - Executions must be for a permabriggable crime, used only as a last resort, and approved by the Captain/Acting Captain, who will answer for approving it alongside Security's chain of command. Those who willingly attempt to damage/destroy or escape from the permabrig may be executed.
-    - Any prisoner may be borged with their consent. Borging may be offered as an alternative to execution, but cannot be forced if the prisoner is able to consent.
-    - Detainees in the brig have the right to know what they are being charged with, as well as basic medical aid, at least to the point they are no longer at risk of dying.
-    As there is no space law, Security/Command acts to maintain the safety of the station and its inhabitants, as well as Nanotrasen assets.
-
-[color=#ff0000]SILICON RULES[/color]
-These rules also apply to any individual who is a silicon, including cyborgs and AI. As with other rules, more details are available on our wiki at [color=#a4885c]wiki.spacestation14.io[/color].
-
-[color=#a4885c]22.[/color] You must follow your laws
-    - Silicons without any laws are free from any restrictions that would normally be placed by laws, but self-antagging rules still apply unless they are also antagonists.
-    - The order of your laws determines law priority. Law 1 takes priority over laws 2 and 3, and so on.
-    - Each individual silicon must remain consistent in their interpretations of laws through the round.
-    - Any silicon role not following their laws, or having laws that are a danger to the crew or station may be disabled or destroyed. Any silicon role posing a danger or disruption to the crew may be disabled or destroyed if there is no other reasonable and less severe way of dealing with them.
-    - Characters who are turned into cyborgs can remember their former lives, however they are still bound to their laws.
-    - Everyone that the borg's HUD indicates have a job, including passenger, are considered "crewmembers" for the purpose of laws that refer to crewmembers. Borgs may not do anything to remove the indicator from someone, including removing their ID, but someone else removing a crewmember's ID is not crew harm.
-    - "Harm" is at minimum seen as physical violence or damage against someone or something. If the player wishes, they may choose to interpret psychological harm or similar aspects as harm as well. If two actions are likely to cause harm via action or inaction, silicons will be expected to try and pursue the option with the least potential for harm, however silicons instructed to prevent harm are still forbidden from directly causing harm. You can take an action or not act in cases that might result in eventual harm if it minimizes harm, but you cannot do so if it results in immediate harm. Silicons should default to inaction if neither action nor inaction can prevent harm.
-    - When receiving orders or directives from crewmembers and with a law that instructs you must obey, conflicting orders typically defer the choice to the silicon player of which directive you choose to obey if they conflict (taking into account the priorities of your other laws).
-    - Orders to silicons that are clearly unreasonable or obnoxious are a violation of the "Don't be a dick" rule. They can be ignored and can be ahelped.

From d71b88a747e20f90b07f7e40437e0bbd4435e15c Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 6 Jun 2024 02:37:49 -0400
Subject: [PATCH 320/568] Add support for LocalizedDatasets to RandomMetadata
 (#28601)

---
 Content.Server/RandomMetadata/RandomMetadataSystem.cs | 11 +++++++++--
 .../Random/Helpers/SharedRandomExtensions.cs          |  6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Content.Server/RandomMetadata/RandomMetadataSystem.cs b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
index abab5e5fc389..e287b54c8f77 100644
--- a/Content.Server/RandomMetadata/RandomMetadataSystem.cs
+++ b/Content.Server/RandomMetadata/RandomMetadataSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Dataset;
+using Content.Shared.Random.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -47,13 +48,19 @@ public string GetRandomFromSegments(List<string> segments, string? separator)
         var outputSegments = new List<string>();
         foreach (var segment in segments)
         {
-            if (_prototype.TryIndex<DatasetPrototype>(segment, out var proto)) {
+            if (_prototype.TryIndex<LocalizedDatasetPrototype>(segment, out var localizedProto))
+            {
+                outputSegments.Add(_random.Pick(localizedProto));
+            }
+            else if (_prototype.TryIndex<DatasetPrototype>(segment, out var proto))
+            {
                 var random = _random.Pick(proto.Values);
                 if (Loc.TryGetString(random, out var localizedSegment))
                     outputSegments.Add(localizedSegment);
                 else
                     outputSegments.Add(random);
-            } else if (Loc.TryGetString(segment, out var localizedSegment))
+            }
+            else if (Loc.TryGetString(segment, out var localizedSegment))
                 outputSegments.Add(localizedSegment);
             else
                 outputSegments.Add(segment);
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index f5fbc1bd24e8..0b618a262db4 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -12,9 +12,13 @@ public static string Pick(this IRobustRandom random, DatasetPrototype prototype)
             return random.Pick(prototype.Values);
         }
 
+        /// <summary>
+        /// Randomly selects an entry from <paramref name="prototype"/>, attempts to localize it, and returns the result.
+        /// </summary>
         public static string Pick(this IRobustRandom random, LocalizedDatasetPrototype prototype)
         {
-            return random.Pick(prototype.Values);
+            var index = random.Next(prototype.Values.Count);
+            return Loc.GetString(prototype.Values[index]);
         }
 
         public static string Pick(this IWeightedRandomPrototype prototype, System.Random random)

From 039fd932b2f5c99b7b1cfa7cad0f32dd0c4d3bc9 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 321/568] 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 fb68e6c79089..ea89916ba8c2 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 a5c300843658..90559707f92c 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 0f6975e3656d..83c4cc5697f7 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 c9b2cd8b572d..aab06c6ccd0f 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 000000000000..71a1f5c7bc64
--- /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 000000000000..3a91b5b94836
--- /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 a8bfaddecf45..826945e7cc04 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 a7397aff38d8..3d8235591ad4 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 000000000000..0288efcaa44a
--- /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 180f1e8005f9e7aff120ee42db1c4bc3ba027541 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 06:42:18 +0000
Subject: [PATCH 322/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 2964e8c11b1e..16d4e1fe297f 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -281,5 +281,14 @@ Entries:
   id: 34
   time: '2024-06-01T08:14:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28451
+- author: Repo
+  changes:
+  - message: Sorting and search to objects tab.
+    type: Add
+  - message: Disconnected people showing player tab
+    type: Fix
+  id: 35
+  time: '2024-06-06T06:41:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28609
 Name: Admin
 Order: 1

From dec1c281a88845192080b47743803c10afc5adce Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Thu, 6 Jun 2024 00:01:45 -0700
Subject: [PATCH 323/568] Internals are kept on as long as any breathing tool
 is on (#28595)

---
 .../AtmosphereSystem.BreathTool.cs            | 14 ++++-----
 .../Atmos/EntitySystems/GasTankSystem.cs      |  2 +-
 .../Body/Components/InternalsComponent.cs     |  2 +-
 .../Body/Systems/InternalsSystem.cs           | 30 ++++++++-----------
 Content.Server/Body/Systems/LungSystem.cs     |  2 +-
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BreathTool.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BreathTool.cs
index 741a9341e79e..327804f39a4f 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BreathTool.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BreathTool.cs
@@ -10,21 +10,21 @@ private void InitializeBreathTool()
         SubscribeLocalEvent<BreathToolComponent, ComponentShutdown>(OnBreathToolShutdown);
     }
 
-    private void OnBreathToolShutdown(EntityUid uid, BreathToolComponent component, ComponentShutdown args)
+    private void OnBreathToolShutdown(Entity<BreathToolComponent> entity, ref ComponentShutdown args)
     {
-        DisconnectInternals(component);
+        DisconnectInternals(entity);
     }
 
-    public void DisconnectInternals(BreathToolComponent component)
+    public void DisconnectInternals(Entity<BreathToolComponent> entity)
     {
-        var old = component.ConnectedInternalsEntity;
-        component.ConnectedInternalsEntity = null;
+        var old = entity.Comp.ConnectedInternalsEntity;
+        entity.Comp.ConnectedInternalsEntity = null;
 
         if (TryComp<InternalsComponent>(old, out var internalsComponent))
         {
-            _internals.DisconnectBreathTool((old.Value, internalsComponent));
+            _internals.DisconnectBreathTool((old.Value, internalsComponent), entity.Owner);
         }
 
-        component.IsFunctional = false;
+        entity.Comp.IsFunctional = false;
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
index 07594820fcc4..baad739804b8 100644
--- a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
@@ -220,7 +220,7 @@ public GasMixture RemoveAirVolume(Entity<GasTankComponent> gasTank, float volume
         public bool CanConnectToInternals(GasTankComponent component)
         {
             var internals = GetInternalsComponent(component, component.User);
-            return internals != null && internals.BreathToolEntity != null && !component.IsValveOpen;
+            return internals != null && internals.BreathTools.Count != 0 && !component.IsValveOpen;
         }
 
         public void ConnectToInternals(Entity<GasTankComponent> ent)
diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs
index 098f1789218f..ef908f96553c 100644
--- a/Content.Server/Body/Components/InternalsComponent.cs
+++ b/Content.Server/Body/Components/InternalsComponent.cs
@@ -13,7 +13,7 @@ public sealed partial class InternalsComponent : Component
         public EntityUid? GasTankEntity;
 
         [ViewVariables]
-        public EntityUid? BreathToolEntity;
+        public HashSet<EntityUid> BreathTools { get; set; } = new();
 
         /// <summary>
         /// Toggle Internals delay when the target is not you.
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index b79e083bd467..0e568b77cb48 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -44,7 +44,7 @@ public override void Initialize()
 
     private void OnStartingGear(EntityUid uid, InternalsComponent component, ref StartingGearEquippedEvent args)
     {
-        if (component.BreathToolEntity == null)
+        if (component.BreathTools.Count == 0)
             return;
 
         if (component.GasTankEntity != null)
@@ -111,7 +111,7 @@ public void ToggleInternals(
         }
 
         // If they're not on then check if we have a mask to use
-        if (internals.BreathToolEntity is null)
+        if (internals.BreathTools.Count == 0)
         {
             _popupSystem.PopupEntity(Loc.GetString("internals-no-breath-tool"), uid, user);
             return;
@@ -178,28 +178,24 @@ private void OnInhaleLocation(Entity<InternalsComponent> ent, ref InhaleLocation
             _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
         }
     }
-    public void DisconnectBreathTool(Entity<InternalsComponent> ent)
+    public void DisconnectBreathTool(Entity<InternalsComponent> ent, EntityUid toolEntity)
     {
-        var old = ent.Comp.BreathToolEntity;
-        ent.Comp.BreathToolEntity = null;
+        ent.Comp.BreathTools.Remove(toolEntity);
 
-        if (TryComp(old, out BreathToolComponent? breathTool))
-        {
-            _atmos.DisconnectInternals(breathTool);
+        if (TryComp(toolEntity, out BreathToolComponent? breathTool))
+            _atmos.DisconnectInternals((toolEntity, breathTool));
+
+        if (ent.Comp.BreathTools.Count == 0)
             DisconnectTank(ent);
-        }
 
         _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
     }
 
     public void ConnectBreathTool(Entity<InternalsComponent> ent, EntityUid toolEntity)
     {
-        if (TryComp(ent.Comp.BreathToolEntity, out BreathToolComponent? tool))
-        {
-            _atmos.DisconnectInternals(tool);
-        }
+        if (!ent.Comp.BreathTools.Add(toolEntity))
+            return;
 
-        ent.Comp.BreathToolEntity = toolEntity;
         _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent));
     }
 
@@ -217,7 +213,7 @@ public void DisconnectTank(InternalsComponent? component)
 
     public bool TryConnectTank(Entity<InternalsComponent> ent, EntityUid tankEntity)
     {
-        if (ent.Comp.BreathToolEntity is null)
+        if (ent.Comp.BreathTools.Count == 0)
             return false;
 
         if (TryComp(ent.Comp.GasTankEntity, out GasTankComponent? tank))
@@ -236,14 +232,14 @@ public bool AreInternalsWorking(EntityUid uid, InternalsComponent? component = n
 
     public bool AreInternalsWorking(InternalsComponent component)
     {
-        return TryComp(component.BreathToolEntity, out BreathToolComponent? breathTool)
+        return TryComp(component.BreathTools.FirstOrNull(), out BreathToolComponent? breathTool)
             && breathTool.IsFunctional
             && HasComp<GasTankComponent>(component.GasTankEntity);
     }
 
     private short GetSeverity(InternalsComponent component)
     {
-        if (component.BreathToolEntity is null || !AreInternalsWorking(component))
+        if (component.BreathTools.Count == 0 || !AreInternalsWorking(component))
             return 2;
 
         // If pressure in the tank is below low pressure threshold, flash warning on internals UI
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index 7e58c24f7e4a..a3c185d5cc67 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Server/Body/Systems/LungSystem.cs
@@ -59,7 +59,7 @@ private void OnMaskToggled(Entity<BreathToolComponent> ent, ref ItemMaskToggledE
     {
         if (args.IsToggled || args.IsEquip)
         {
-            _atmos.DisconnectInternals(ent.Comp);
+            _atmos.DisconnectInternals(ent);
         }
         else
         {

From 8b40d1887c36bab329406732243e2aaa0152ec7c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 07:02:51 +0000
Subject: [PATCH 324/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 25f48ec5f798..43fd543c1709 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Terraspark4941
-  changes:
-  - message: The TEG page in the guidebook has been updated with proper information!
-    type: Tweak
-  id: 6188
-  time: '2024-03-18T21:33:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26170
 - author: Plykiya
   changes:
   - message: You can now craft ducky slippers.
@@ -3849,3 +3842,11 @@
   id: 6687
   time: '2024-06-05T22:08:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28591
+- author: Plykiya
+  changes:
+  - message: Internals are no longer toggled off if you take your helmet off but still
+      have a gas mask on and vice versa.
+    type: Tweak
+  id: 6688
+  time: '2024-06-06T07:01:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28595

From 1333b48747ae62c7b3ecb809b897201a24fe4441 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 6 Jun 2024 03:11:26 -0400
Subject: [PATCH 325/568] Convert rules to use guidebook parsing (#28647)

---
 Content.Client/Entry/EntryPoint.cs            |    4 -
 .../Guidebook/DocumentParsingManager.cs       |   19 +
 Content.Client/Info/InfoSystem.cs             |   25 -
 Content.Client/Info/RulesAndInfoWindow.cs     |   14 +-
 Content.Client/Info/RulesControl.xaml         |   24 +-
 Content.Client/Info/RulesControl.xaml.cs      |   45 +-
 Content.Client/Info/RulesManager.cs           |  105 -
 Content.Client/Info/RulesPopup.xaml           |   10 +-
 Content.Client/Info/RulesPopup.xaml.cs        |    2 -
 Content.Client/IoC/ClientContentIoC.cs        |    2 -
 .../Systems/Info/InfoUIController.cs          |  101 +-
 ...0606065731_RemoveLastReadRules.Designer.cs | 1909 +++++++++++++++++
 .../20240606065731_RemoveLastReadRules.cs     |   29 +
 .../PostgresServerDbContextModelSnapshot.cs   |    4 -
 ...0606065717_RemoveLastReadRules.Designer.cs | 1834 ++++++++++++++++
 .../20240606065717_RemoveLastReadRules.cs     |   29 +
 .../SqliteServerDbContextModelSnapshot.cs     |    4 -
 Content.Server.Database/Model.cs              |    2 -
 .../Administration/Managers/AdminManager.cs   |    2 +
 Content.Server/Database/ServerDbBase.cs       |   24 -
 Content.Server/Database/ServerDbManager.cs    |   19 -
 Content.Server/Entry/EntryPoint.cs            |    2 -
 Content.Server/Info/InfoSystem.cs             |   35 -
 Content.Server/Info/RulesManager.cs           |   48 -
 Content.Server/Info/ShowRulesCommand.cs       |   14 +-
 Content.Server/IoC/ServerContentIoC.cs        |    2 -
 Content.Shared/CCVar/CCVars.cs                |   18 +-
 Content.Shared/Info/RulesMessages.cs          |   25 +
 Content.Shared/Info/SharedInfo.cs             |   28 -
 Content.Shared/Info/SharedRulesManager.cs     |   60 -
 .../ConfigPresets/WizardsDen/salamander.toml  |    3 +-
 .../ConfigPresets/WizardsDen/wizardsDen.toml  |    3 +
 Resources/Locale/en-US/info/rules.ftl         |    3 +
 33 files changed, 4035 insertions(+), 413 deletions(-)
 delete mode 100644 Content.Client/Info/InfoSystem.cs
 delete mode 100644 Content.Client/Info/RulesManager.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs
 create mode 100644 Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs
 delete mode 100644 Content.Server/Info/InfoSystem.cs
 delete mode 100644 Content.Server/Info/RulesManager.cs
 create mode 100644 Content.Shared/Info/RulesMessages.cs
 delete mode 100644 Content.Shared/Info/SharedInfo.cs
 delete mode 100644 Content.Shared/Info/SharedRulesManager.cs

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 51210a8a93d4..dd7e781f0bb4 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -2,11 +2,9 @@
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
 using Content.Client.Eui;
-using Content.Client.Flash;
 using Content.Client.Fullscreen;
 using Content.Client.GhostKick;
 using Content.Client.Guidebook;
-using Content.Client.Info;
 using Content.Client.Input;
 using Content.Client.IoC;
 using Content.Client.Launcher;
@@ -52,7 +50,6 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly IScreenshotHook _screenshotHook = default!;
         [Dependency] private readonly FullscreenHook _fullscreenHook = default!;
         [Dependency] private readonly ChangelogManager _changelogManager = default!;
-        [Dependency] private readonly RulesManager _rulesManager = default!;
         [Dependency] private readonly ViewportManager _viewportManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IInputManager _inputManager = default!;
@@ -125,7 +122,6 @@ public override void Init()
             _screenshotHook.Initialize();
             _fullscreenHook.Initialize();
             _changelogManager.Initialize();
-            _rulesManager.Initialize();
             _viewportManager.Initialize();
             _ghostKick.Initialize();
             _extendedDisconnectInformation.Initialize();
diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
index b81866a62601..9c9e569eb417 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -2,6 +2,8 @@
 using Content.Client.Guidebook.Richtext;
 using Pidgin;
 using Robust.Client.UserInterface;
+using Robust.Shared.ContentPack;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Reflection;
 using Robust.Shared.Sandboxing;
 using static Pidgin.Parser;
@@ -13,7 +15,9 @@ namespace Content.Client.Guidebook;
 /// </summary>
 public sealed partial class DocumentParsingManager
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IReflectionManager _reflectionManager = default!;
+    [Dependency] private readonly IResourceManager _resourceManager = default!;
     [Dependency] private readonly ISandboxHelper _sandboxHelper = default!;
 
     private readonly Dictionary<string, Parser<char, Control>> _tagControlParsers = new();
@@ -37,6 +41,21 @@ public void Initialize()
         ControlParser = SkipWhitespaces.Then(_controlParser.Many());
     }
 
+    public bool TryAddMarkup(Control control, ProtoId<GuideEntryPrototype> entryId, bool log = true)
+    {
+        if (!_prototype.TryIndex(entryId, out var entry))
+            return false;
+
+        using var file = _resourceManager.ContentFileReadText(entry.Text);
+        return TryAddMarkup(control, file.ReadToEnd(), log);
+    }
+
+    public bool TryAddMarkup(Control control, GuideEntry entry, bool log = true)
+    {
+        using var file = _resourceManager.ContentFileReadText(entry.Text);
+        return TryAddMarkup(control, file.ReadToEnd(), log);
+    }
+
     public bool TryAddMarkup(Control control, string text, bool log = true)
     {
         try
diff --git a/Content.Client/Info/InfoSystem.cs b/Content.Client/Info/InfoSystem.cs
deleted file mode 100644
index b69799498187..000000000000
--- a/Content.Client/Info/InfoSystem.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Info;
-using Robust.Shared.Log;
-
-namespace Content.Client.Info;
-
-public sealed class InfoSystem : EntitySystem
-{
-    public RulesMessage Rules = new RulesMessage("Server Rules", "The server did not send any rules.");
-    [Dependency] private readonly RulesManager _rules = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeNetworkEvent<RulesMessage>(OnRulesReceived);
-        Log.Debug("Requested server info.");
-        RaiseNetworkEvent(new RequestRulesMessage());
-    }
-
-    private void OnRulesReceived(RulesMessage message, EntitySessionEventArgs eventArgs)
-    {
-        Log.Debug("Received server rules.");
-        Rules = message;
-        _rules.UpdateRules();
-    }
-}
diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs
index 7a763a1d6f4b..b9131dcb3c07 100644
--- a/Content.Client/Info/RulesAndInfoWindow.cs
+++ b/Content.Client/Info/RulesAndInfoWindow.cs
@@ -1,10 +1,8 @@
 using System.Numerics;
 using Content.Client.UserInterface.Systems.EscapeMenu;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 
 namespace Content.Client.Info
@@ -12,7 +10,6 @@ namespace Content.Client.Info
     public sealed class RulesAndInfoWindow : DefaultWindow
     {
         [Dependency] private readonly IResourceManager _resourceManager = default!;
-        [Dependency] private readonly RulesManager _rules = default!;
 
         public RulesAndInfoWindow()
         {
@@ -22,8 +19,14 @@ public RulesAndInfoWindow()
 
             var rootContainer = new TabContainer();
 
-            var rulesList = new Info();
-            var tutorialList = new Info();
+            var rulesList = new RulesControl
+            {
+                Margin = new Thickness(10)
+            };
+            var tutorialList = new Info
+            {
+                Margin = new Thickness(10)
+            };
 
             rootContainer.AddChild(rulesList);
             rootContainer.AddChild(tutorialList);
@@ -31,7 +34,6 @@ public RulesAndInfoWindow()
             TabContainer.SetTabTitle(rulesList, Loc.GetString("ui-info-tab-rules"));
             TabContainer.SetTabTitle(tutorialList, Loc.GetString("ui-info-tab-tutorial"));
 
-            AddSection(rulesList, _rules.RulesSection());
             PopulateTutorial(tutorialList);
 
             Contents.AddChild(rootContainer);
diff --git a/Content.Client/Info/RulesControl.xaml b/Content.Client/Info/RulesControl.xaml
index 3b2476468846..04fa7191234e 100644
--- a/Content.Client/Info/RulesControl.xaml
+++ b/Content.Client/Info/RulesControl.xaml
@@ -1,6 +1,18 @@
-<BoxContainer xmlns="https://spacestation14.io"
-              Name="InfoContainer"
-              Orientation="Vertical"
-              Margin="2 2 0 0"
-              SeparationOverride="10"
-              Access="Public"/>
+<BoxContainer xmlns="https://spacestation14.io" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+    <Control HorizontalExpand="True" VerticalExpand="True" HorizontalAlignment="Stretch">
+        <ScrollContainer Name="Scroll" HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True">
+            <BoxContainer Name="RulesContainer" VerticalExpand="True" Margin="0 0 5 0"/>
+        </ScrollContainer>
+        <BoxContainer Margin="0 0 15 0" HorizontalExpand="True" HorizontalAlignment="Right">
+            <Button Name="BackButton"
+                    Text="{Loc 'ui-rules-button-back'}"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"/>
+            <Control MinWidth="5"/>
+            <Button Name="HomeButton"
+                    Text="{Loc 'ui-rules-button-home'}"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"/>
+        </BoxContainer>
+    </Control>
+</BoxContainer>
diff --git a/Content.Client/Info/RulesControl.xaml.cs b/Content.Client/Info/RulesControl.xaml.cs
index 6086735e0ea2..5e2590749687 100644
--- a/Content.Client/Info/RulesControl.xaml.cs
+++ b/Content.Client/Info/RulesControl.xaml.cs
@@ -1,22 +1,53 @@
-using System.IO;
-using Content.Shared.CCVar;
+using Content.Client.Guidebook;
+using Content.Client.Guidebook.RichText;
+using Content.Client.UserInterface.Systems.Info;
 using Robust.Client.AutoGenerated;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Info;
 
 [GenerateTypedNameReferences]
-public sealed partial class RulesControl : BoxContainer
+public sealed partial class RulesControl : BoxContainer, ILinkClickHandler
 {
-    [Dependency] private readonly RulesManager _rules = default!;
+    [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
+
+    private string? _currentEntry;
+    private readonly Stack<string> _priorEntries = new();
 
     public RulesControl()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
-        AddChild(_rules.RulesSection());
+
+        SetGuide();
+
+        HomeButton.OnPressed += _ => SetGuide();
+
+        BackButton.OnPressed += _ => SetGuide(_priorEntries.Pop(), false);
+    }
+
+    public void HandleClick(string link)
+    {
+        SetGuide(link);
+    }
+
+    private void SetGuide(ProtoId<GuideEntryPrototype>? entry = null, bool addToPrior = true)
+    {
+        var coreEntry = UserInterfaceManager.GetUIController<InfoUIController>().GetCoreRuleEntry();
+        entry ??= coreEntry;
+
+        Scroll.SetScrollValue(default);
+        RulesContainer.Children.Clear();
+        if (!_parsingMan.TryAddMarkup(RulesContainer, entry.Value))
+            return;
+
+        if (addToPrior && _currentEntry != null)
+            _priorEntries.Push(_currentEntry);
+        _currentEntry = entry.Value;
+
+        HomeButton.Visible = entry.Value != coreEntry.Id;
+        BackButton.Visible = _priorEntries.Count != 0 && _priorEntries.Peek() != entry.Value;
     }
 }
diff --git a/Content.Client/Info/RulesManager.cs b/Content.Client/Info/RulesManager.cs
deleted file mode 100644
index 76e7c34e5f2c..000000000000
--- a/Content.Client/Info/RulesManager.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using Content.Client.Lobby;
-using Content.Client.Gameplay;
-using Content.Shared.CCVar;
-using Content.Shared.Info;
-using Robust.Client.Console;
-using Robust.Client.State;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Configuration;
-using Robust.Shared.Network;
-
-namespace Content.Client.Info;
-
-public sealed class RulesManager : SharedRulesManager
-{
-    [Dependency] private readonly IConfigurationManager _configManager = default!;
-    [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-    [Dependency] private readonly IStateManager _stateManager = default!;
-    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
-    [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly IEntitySystemManager _sysMan = default!;
-
-    private InfoSection rulesSection = new InfoSection("", "", false);
-    private bool _shouldShowRules = false;
-
-    private RulesPopup? _activePopup;
-
-    public void Initialize()
-    {
-        _netManager.RegisterNetMessage<ShouldShowRulesPopupMessage>(OnShouldShowRules);
-        _netManager.RegisterNetMessage<ShowRulesPopupMessage>(OnShowRulesPopupMessage);
-        _netManager.RegisterNetMessage<RulesAcceptedMessage>();
-        _stateManager.OnStateChanged += OnStateChanged;
-
-        _consoleHost.RegisterCommand("fuckrules", "", "", (_, _, _) =>
-        {
-            OnAcceptPressed();
-        });
-    }
-
-    private void OnShouldShowRules(ShouldShowRulesPopupMessage message)
-    {
-        _shouldShowRules = true;
-    }
-
-    private void OnShowRulesPopupMessage(ShowRulesPopupMessage message)
-    {
-        ShowRules(message.PopupTime);
-    }
-
-    private void OnStateChanged(StateChangedEventArgs args)
-    {
-        if (args.NewState is not (GameplayState or LobbyState))
-            return;
-
-        if (!_shouldShowRules)
-            return;
-
-        _shouldShowRules = false;
-
-        ShowRules(_configManager.GetCVar(CCVars.RulesWaitTime));
-    }
-
-    private void ShowRules(float time)
-    {
-        if (_activePopup != null)
-            return;
-
-        _activePopup = new RulesPopup
-        {
-            Timer = time
-        };
-
-        _activePopup.OnQuitPressed += OnQuitPressed;
-        _activePopup.OnAcceptPressed += OnAcceptPressed;
-        _userInterfaceManager.WindowRoot.AddChild(_activePopup);
-        LayoutContainer.SetAnchorPreset(_activePopup, LayoutContainer.LayoutPreset.Wide);
-    }
-
-    private void OnQuitPressed()
-    {
-        _consoleHost.ExecuteCommand("quit");
-    }
-
-    private void OnAcceptPressed()
-    {
-        _netManager.ClientSendMessage(new RulesAcceptedMessage());
-
-        _activePopup?.Orphan();
-        _activePopup = null;
-    }
-
-    public void UpdateRules()
-    {
-        var rules = _sysMan.GetEntitySystem<InfoSystem>().Rules;
-        rulesSection.SetText(rules.Title, rules.Text, true);
-    }
-
-    public Control RulesSection()
-    {
-        rulesSection = new InfoSection("", "", false);
-        UpdateRules();
-        return rulesSection;
-    }
-}
diff --git a/Content.Client/Info/RulesPopup.xaml b/Content.Client/Info/RulesPopup.xaml
index dc004af5a2b1..ca1e35f08ed2 100644
--- a/Content.Client/Info/RulesPopup.xaml
+++ b/Content.Client/Info/RulesPopup.xaml
@@ -5,20 +5,20 @@
          MouseFilter="Stop">
     <parallax:ParallaxControl />
     <Control VerticalExpand="True"
-             MaxWidth="650">
+             MaxWidth="800"
+             MaxHeight="900">
         <PanelContainer StyleClasses="windowPanel" />
-        <ScrollContainer HScrollEnabled="False">
-            <BoxContainer Orientation="Vertical" SeparationOverride="10">
-                <info:RulesControl />
+            <BoxContainer Orientation="Vertical" SeparationOverride="10" Margin="10 10 5 10">
+                <info:RulesControl/>
                 <Label Name="WaitLabel" />
                 <BoxContainer Orientation="Horizontal">
                     <Button Name="AcceptButton"
                             Text="{Loc 'ui-rules-accept'}"
                             Disabled="True" />
                     <Button Name="QuitButton"
+                            StyleClasses="Caution"
                             Text="{Loc 'ui-escape-quit'}" />
                 </BoxContainer>
             </BoxContainer>
-        </ScrollContainer>
     </Control>
 </Control>
diff --git a/Content.Client/Info/RulesPopup.xaml.cs b/Content.Client/Info/RulesPopup.xaml.cs
index 1e090049366a..d770b83dc238 100644
--- a/Content.Client/Info/RulesPopup.xaml.cs
+++ b/Content.Client/Info/RulesPopup.xaml.cs
@@ -1,9 +1,7 @@
-using System;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Info;
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 4703915ae763..d1c595ae9b7c 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -4,7 +4,6 @@
 using Content.Client.Clickable;
 using Content.Client.Eui;
 using Content.Client.GhostKick;
-using Content.Client.Info;
 using Content.Client.Launcher;
 using Content.Client.Parallax.Managers;
 using Content.Client.Players.PlayTimeTracking;
@@ -41,7 +40,6 @@ public static void Register()
             collection.Register<EuiManager, EuiManager>();
             collection.Register<IVoteManager, VoteManager>();
             collection.Register<ChangelogManager, ChangelogManager>();
-            collection.Register<RulesManager, RulesManager>();
             collection.Register<ViewportManager, ViewportManager>();
             collection.Register<ISharedAdminLogManager, SharedAdminLogManager>();
             collection.Register<GhostKickManager>();
diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
index d7f2d8e5fed1..6d398ec6aa56 100644
--- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
+++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
@@ -1,13 +1,73 @@
-using Content.Client.Gameplay;
+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;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 
 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<ShowRulesPopupMessage>(OnShowRulesPopupMessage);
+
+        _consoleHost.RegisterCommand("fuckrules",
+            "",
+            "",
+            (_, _, _) =>
+        {
+            OnAcceptPressed();
+        });
+    }
+
+    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);
+    }
+
     public void OnStateExited(GameplayState state)
     {
         if (_infoWindow == null)
@@ -17,12 +77,47 @@ public void OnStateExited(GameplayState state)
         _infoWindow = null;
     }
 
+    private void ShowRules(float time)
+    {
+        if (_rulesPopup != null)
+            return;
+
+        _rulesPopup = new RulesPopup
+        {
+            Timer = time
+        };
+
+        _rulesPopup.OnQuitPressed += OnQuitPressed;
+        _rulesPopup.OnAcceptPressed += OnAcceptPressed;
+        UIManager.WindowRoot.AddChild(_rulesPopup);
+        LayoutContainer.SetAnchorPreset(_rulesPopup, LayoutContainer.LayoutPreset.Wide);
+    }
+
+    private void OnQuitPressed()
+    {
+        _consoleHost.ExecuteCommand("quit");
+    }
+
+    private void OnAcceptPressed()
+    {
+        _cfg.SetCVar(CCVars.RulesNextPopupTime, NextRulesReadTime.ToString(CultureInfo.InvariantCulture));
+        _cfg.SaveToFile();
+
+        _rulesPopup?.Orphan();
+        _rulesPopup = null;
+    }
+
+    public GuideEntryPrototype GetCoreRuleEntry()
+    {
+        var guide = _cfg.GetCVar(CCVars.RulesFile);
+        var guideEntryPrototype = _prototype.Index<GuideEntryPrototype>(guide);
+        return guideEntryPrototype;
+    }
+
     public void OpenWindow()
     {
         if (_infoWindow == null || _infoWindow.Disposed)
-        {
             _infoWindow = UIManager.CreateWindow<RulesAndInfoWindow>();
-        }
 
         _infoWindow?.OpenCentered();
     }
diff --git a/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs
new file mode 100644
index 000000000000..222fe126d99d
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.Designer.cs
@@ -0,0 +1,1909 @@
+// <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("20240606065731_RemoveLastReadRules")]
+    partial class RemoveLastReadRules
+    {
+        /// <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<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/20240606065731_RemoveLastReadRules.cs b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs
new file mode 100644
index 000000000000..1982197f62ea
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240606065731_RemoveLastReadRules.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class RemoveLastReadRules : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "last_read_rules",
+                table: "player");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "last_read_rules",
+                table: "player",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index 32a655f7f65e..0e7fe12926b5 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -648,10 +648,6 @@ 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/20240606065717_RemoveLastReadRules.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs
new file mode 100644
index 000000000000..fceb831f00e7
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.Designer.cs
@@ -0,0 +1,1834 @@
+// <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("20240606065717_RemoveLastReadRules")]
+    partial class RemoveLastReadRules
+    {
+        /// <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<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/20240606065717_RemoveLastReadRules.cs b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs
new file mode 100644
index 000000000000..7f98fc2410ef
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240606065717_RemoveLastReadRules.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class RemoveLastReadRules : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "last_read_rules",
+                table: "player");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "last_read_rules",
+                table: "player",
+                type: "TEXT",
+                nullable: true);
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index 2c444c83eb36..c9c388da798c 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -608,10 +608,6 @@ 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 60935e8f06ad..5501e5a22097 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -520,8 +520,6 @@ 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 41171eef73c7..1332f03c5d6f 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -7,6 +7,7 @@
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.Info;
 using Content.Shared.Players;
 using Robust.Server.Console;
 using Robust.Server.Player;
@@ -239,6 +240,7 @@ 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/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index cd03af7087b9..4dd0956bcfde 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1032,30 +1032,6 @@ 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
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 1983fe43d20b..f642465b3cc5 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -252,13 +252,6 @@ 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);
@@ -707,18 +700,6 @@ 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();
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 234a2e465869..4be2c1787171 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -10,7 +10,6 @@
 using Content.Server.GameTicking;
 using Content.Server.GhostKick;
 using Content.Server.GuideGenerator;
-using Content.Server.Info;
 using Content.Server.IoC;
 using Content.Server.Maps;
 using Content.Server.NodeContainer.NodeGroups;
@@ -137,7 +136,6 @@ 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/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs
deleted file mode 100644
index 350ae033cfdd..000000000000
--- a/Content.Server/Info/InfoSystem.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.CCVar;
-using Content.Shared.Info;
-using Robust.Shared.Configuration;
-using Robust.Shared.ContentPack;
-
-namespace Content.Server.Info;
-
-public sealed class InfoSystem : EntitySystem
-{
-    [Dependency] private readonly IResourceManager _res = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeNetworkEvent<RequestRulesMessage>(OnRequestRules);
-    }
-
-    private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
-    {
-        Log.Debug("Client requested rules.");
-        var title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader));
-        var path = _cfg.GetCVar(CCVars.RulesFile);
-        var rules = "Server could not read its rules.";
-        try
-        {
-            rules = _res.ContentFileReadAllText($"/ServerInfo/{path}");
-        }
-        catch (Exception)
-        {
-            Log.Debug("Could not read server rules file.");
-        }
-        var response = new RulesMessage(title, rules);
-        RaiseNetworkEvent(response, eventArgs.SenderSession.Channel);
-    }
-}
diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs
deleted file mode 100644
index d9d744dcbd58..000000000000
--- a/Content.Server/Info/RulesManager.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-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 : SharedRulesManager
-{
-    [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.RegisterNetMessage<ShouldShowRulesPopupMessage>();
-        _netManager.RegisterNetMessage<ShowRulesPopupMessage>();
-        _netManager.RegisterNetMessage<RulesAcceptedMessage>(OnRulesAccepted);
-        _netManager.Connected += OnConnected;
-    }
-
-    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 ShouldShowRulesPopupMessage();
-        _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/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
index 32c24c299950..b13b8d11a5a5 100644
--- a/Content.Server/Info/ShowRulesCommand.cs
+++ b/Content.Server/Info/ShowRulesCommand.cs
@@ -47,20 +47,16 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             }
         }
 
-        var locator = IoCManager.Resolve<IPlayerLocator>();
-        var located = await locator.LookupIdByNameOrIdAsync(target);
-        if (located == null)
+
+        var message = new ShowRulesPopupMessage { PopupTime = seconds };
+
+        if (!IoCManager.Resolve<IPlayerManager>().TryGetSessionByUsername(target, out var player))
         {
             shell.WriteError("Unable to find a player with that name.");
-            return;
+           return;
         }
 
         var netManager = IoCManager.Resolve<INetManager>();
-
-        var message = new SharedRulesManager.ShowRulesPopupMessage();
-        message.PopupTime = seconds;
-
-        var player = IoCManager.Resolve<IPlayerManager>().GetSessionById(located.UserId);
         netManager.ServerSendMessage(message, player.Channel);
     }
 }
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index c6dfcadd3826..fc6486891cd3 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -9,7 +9,6 @@
 using Content.Server.Discord;
 using Content.Server.EUI;
 using Content.Server.GhostKick;
-using Content.Server.Info;
 using Content.Server.Maps;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
@@ -47,7 +46,6 @@ 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 b3da71fde1a4..c74a3c236369 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -20,16 +20,10 @@ public sealed class CCVars : CVars
             CVarDef.Create("server.id", "unknown_server_id", CVar.REPLICATED | CVar.SERVER);
 
         /// <summary>
-        ///     Name of the rules txt file in the "Resources/Server Info" dir. Include the extension.
+        ///     Guide Entry Prototype ID to be displayed as the server rules.
         /// </summary>
         public static readonly CVarDef<string> RulesFile =
-            CVarDef.Create("server.rules_file", "Rules.txt", CVar.REPLICATED | CVar.SERVER);
-
-        /// <summary>
-        ///     A loc string for what should be displayed as the title on the Rules window.
-        /// </summary>
-        public static readonly CVarDef<string> RulesHeader =
-            CVarDef.Create("server.rules_header", "ui-rules-header", CVar.REPLICATED | CVar.SERVER);
+            CVarDef.Create("server.rules_file", "DefaultRuleset", CVar.REPLICATED | CVar.SERVER);
 
         /*
          * Ambience
@@ -1795,7 +1789,13 @@ 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.SERVERONLY);
+            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);
 
 
         /*
diff --git a/Content.Shared/Info/RulesMessages.cs b/Content.Shared/Info/RulesMessages.cs
new file mode 100644
index 000000000000..9cb73c9aa86c
--- /dev/null
+++ b/Content.Shared/Info/RulesMessages.cs
@@ -0,0 +1,25 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Info;
+
+/// <summary>
+///  Sent by the server to show the rules to the client instantly.
+/// </summary>
+public sealed class ShowRulesPopupMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+
+    public float PopupTime { get; set; }
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+        PopupTime = buffer.ReadFloat();
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+        buffer.Write(PopupTime);
+    }
+}
diff --git a/Content.Shared/Info/SharedInfo.cs b/Content.Shared/Info/SharedInfo.cs
deleted file mode 100644
index 4a0e688cf9a9..000000000000
--- a/Content.Shared/Info/SharedInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Info
-{
-    /// <summary>
-    ///     A client request for server rules.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class RequestRulesMessage : EntityEventArgs
-    {
-    }
-
-    /// <summary>
-    ///     A server response with server rules.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public sealed class RulesMessage : EntityEventArgs
-    {
-        public string Title;
-        public string Text;
-
-        public RulesMessage(string title, string rules)
-        {
-            Title = title;
-            Text = rules;
-        }
-    }
-}
diff --git a/Content.Shared/Info/SharedRulesManager.cs b/Content.Shared/Info/SharedRulesManager.cs
deleted file mode 100644
index 932150d58ef4..000000000000
--- a/Content.Shared/Info/SharedRulesManager.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Lidgren.Network;
-using Robust.Shared.Network;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Info;
-
-public abstract class SharedRulesManager
-{
-    /// <summary>
-    ///     Sent by the server to show the rules to the client instantly.
-    /// </summary>
-    public sealed class ShowRulesPopupMessage : NetMessage
-    {
-        public override MsgGroups MsgGroup => MsgGroups.Command;
-
-        public float PopupTime { get; set; }
-
-        public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
-        {
-            PopupTime = buffer.ReadFloat();
-        }
-
-        public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
-        {
-            buffer.Write(PopupTime);
-        }
-    }
-
-    /// <summary>
-    ///     Sent by the server when the client needs to display the rules on join.
-    /// </summary>
-    public sealed class ShouldShowRulesPopupMessage : NetMessage
-    {
-        public override MsgGroups MsgGroup => MsgGroups.Command;
-
-        public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
-        {
-        }
-
-        public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
-        {
-        }
-    }
-
-    /// <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)
-        {
-        }
-    }
-}
diff --git a/Resources/ConfigPresets/WizardsDen/salamander.toml b/Resources/ConfigPresets/WizardsDen/salamander.toml
index bf4354b5c340..e5948b6ca610 100644
--- a/Resources/ConfigPresets/WizardsDen/salamander.toml
+++ b/Resources/ConfigPresets/WizardsDen/salamander.toml
@@ -6,8 +6,7 @@ hostname = "[EN] Wizard's Den Salamander [US West RP]"
 soft_max_players = 130
 
 [server]
-rules_file = "RP_Rules.txt"
-rules_header = "ui-rules-header-rp"
+rules_file = "MRPRuleset"
 
 [whitelist]
 enabled = true
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 413de472bf9e..ed2781f21008 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -21,6 +21,9 @@ website    = "https://spacestation14.io"
 wiki       = "https://wiki.spacestation14.io"
 appeal     = "https://appeal.ss14.io"
 
+[server]
+rules_file = "StandardRuleset"
+
 [net]
 max_connections = 1024
 
diff --git a/Resources/Locale/en-US/info/rules.ftl b/Resources/Locale/en-US/info/rules.ftl
index 6bf813c94d3e..db5c9d656b43 100644
--- a/Resources/Locale/en-US/info/rules.ftl
+++ b/Resources/Locale/en-US/info/rules.ftl
@@ -4,3 +4,6 @@ ui-rules-header = Wizard's Den Official Server Rules
 ui-rules-header-rp = Wizard's Den Roleplay Official Server Rules
 ui-rules-accept = I have read and agree to follow the rules
 ui-rules-wait = The accept button will be enabled after {$time} seconds.
+
+ui-rules-button-home = Home
+ui-rules-button-back = Back

From 02c345d1290517605fdfb7a31e1efa1d07963587 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Thu, 6 Jun 2024 04:32:36 -0500
Subject: [PATCH 326/568] Gives Insulation and NoSlip to all bots (#28621)

* Gives Insulation and NoSlip to all bots

* remove NoSlip from children
---
 Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 12788e457f25..96dfd53cec1f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -107,6 +107,8 @@
     proto: robot
   - type: ZombieImmune
   - type: StepTriggerImmune
+  - type: NoSlip
+  - type: Insulated
 
 - type: entity
   parent: MobSiliconBase
@@ -233,7 +235,6 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
     baseSprintSpeed: 3
-  - type: NoSlip
   - type: HTN
     rootTask:
       task: CleanbotCompound
@@ -280,7 +281,6 @@
   - type: Construction
     graph: MediBot
     node: bot
-  - type: NoSlip
   - type: Anchorable
   - type: InteractionPopup
     interactSuccessString: petting-success-medibot

From 520e0dd5470421d6a517265702f6c903618b643c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 09:33:43 +0000
Subject: [PATCH 327/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 43fd543c1709..f3497a43bd54 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: You can now craft ducky slippers.
-    type: Add
-  id: 6189
-  time: '2024-03-18T21:34:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26138
 - author: Boaz1111
   changes:
   - message: Lone operatives now require a minimum of 20 players to spawn
@@ -3850,3 +3843,10 @@
   id: 6688
   time: '2024-06-06T07:01:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28595
+- author: Cojoke-dot
+  changes:
+  - message: Bots now have Insulation and NoSlip
+    type: Tweak
+  id: 6689
+  time: '2024-06-06T09:32:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28621

From c625cee1c6c5a6124e5f2e61f4b0c8fd614d0758 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Thu, 6 Jun 2024 05:08:25 -0500
Subject: [PATCH 328/568] Nerfs welderbombing (#28650)

nerf welderbombing
---
 .../Prototypes/Entities/Structures/Storage/Tanks/tanks.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index df19550cdbde..e7fcf964d1df 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -32,7 +32,7 @@
   - type: PacifismDangerousAttack
   - type: Explosive
     explosionType: Default
-    totalIntensity: 120 # ~ 5 tile radius
+    totalIntensity: 60 # Mediocre explosion. Not enough to do any meaningful structural damage to anything other then windows, provided you're only using one tank.
 
 - type: entity
   id: WeldingFuelTankFull
@@ -74,7 +74,7 @@
         maxVol: 5000
   - type: Explosive
     explosionType: Default
-    totalIntensity: 140
+    totalIntensity: 120
 
 # Water
 

From 236d2e53374142599429d4dff020d9748da88d6a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 10:09:31 +0000
Subject: [PATCH 329/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f3497a43bd54..ee9da0995de2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Boaz1111
-  changes:
-  - message: Lone operatives now require a minimum of 20 players to spawn
-    type: Tweak
-  id: 6190
-  time: '2024-03-18T21:36:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26244
 - author: shampunj
   changes:
   - message: Zombies now passively heal 1 heat/shock damage every 50 seconds
@@ -3850,3 +3843,10 @@
   id: 6689
   time: '2024-06-06T09:32:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28621
+- author: Flareguy
+  changes:
+  - message: Nerfed the explosive power of fuel tanks.
+    type: Tweak
+  id: 6690
+  time: '2024-06-06T10:08:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28650

From e7f2ae52ab24dddc8f3c94cb84b751482700e3da Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 7 Jun 2024 00:05:58 +1200
Subject: [PATCH 330/568] Give jobs & antags prototypes a guide field (#28614)

* Give jobs & antags prototypes a guide field

* A

* space

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Add todo

* Fix merge errors

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 .../Components/GuideHelpComponent.cs          |  8 +--
 .../Controls/GuidebookWindow.xaml.cs          | 31 ++++----
 .../Guidebook/DocumentParsingManager.cs       |  1 +
 Content.Client/Guidebook/GuidebookSystem.cs   | 11 ++-
 Content.Client/Info/RulesControl.xaml.cs      |  1 +
 Content.Client/Lobby/LobbyUIController.cs     |  4 ++
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    | 19 +++--
 .../Lobby/UI/Roles/RequirementsSelector.xaml  | 15 ++--
 .../UI/Roles/RequirementsSelector.xaml.cs     | 21 +++++-
 Content.Client/Stylesheets/StyleNano.cs       |  6 ++
 .../Controls/FancyWindow.xaml.cs              |  5 +-
 .../Guidebook/GuidebookUIController.cs        | 72 ++++++++++++-------
 .../Systems/Info/InfoUIController.cs          |  2 +-
 .../Guidebook/GuideEntryPrototypeTests.cs     |  1 +
 Content.Server/Entry/EntryPoint.cs            |  1 -
 .../Guidebook/GuideEntry.cs                   | 27 ++++---
 Content.Shared/Roles/AntagPrototype.cs        |  8 +++
 Content.Shared/Roles/JobPrototype.cs          |  8 +++
 Resources/Prototypes/Guidebook/medical.yml    |  4 +-
 Resources/Prototypes/Roles/Antags/ninja.yml   |  3 +-
 Resources/Prototypes/Roles/Antags/nukeops.yml |  7 +-
 .../Prototypes/Roles/Antags/revolutionary.yml |  4 +-
 Resources/Prototypes/Roles/Antags/traitor.yml |  3 +-
 Resources/Prototypes/Roles/Antags/zombie.yml  |  2 +
 24 files changed, 182 insertions(+), 82 deletions(-)
 rename {Content.Client => Content.Shared}/Guidebook/GuideEntry.cs (65%)

diff --git a/Content.Client/Guidebook/Components/GuideHelpComponent.cs b/Content.Client/Guidebook/Components/GuideHelpComponent.cs
index db19bb9dcc89..bb1d30bbc165 100644
--- a/Content.Client/Guidebook/Components/GuideHelpComponent.cs
+++ b/Content.Client/Guidebook/Components/GuideHelpComponent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Content.Shared.Guidebook;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Guidebook.Components;
 
@@ -13,9 +14,8 @@ public sealed partial class GuideHelpComponent : Component
     /// What guides to include show when opening the guidebook. The first entry will be used to select the currently
     /// selected guidebook.
     /// </summary>
-    [DataField("guides", customTypeSerializer: typeof(PrototypeIdListSerializer<GuideEntryPrototype>), required: true)]
-    [ViewVariables]
-    public List<string> Guides = new();
+    [DataField(required: true)]
+    public List<ProtoId<GuideEntryPrototype>> Guides = new();
 
     /// <summary>
     /// Whether or not to automatically include the children of the given guides.
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 4776386c1dd7..3a67dca89da8 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -1,15 +1,14 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.Guidebook.RichText;
 using Content.Client.UserInterface.ControlExtensions;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
-using JetBrains.Annotations;
+using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.ContentPack;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Guidebook.Controls;
 
@@ -19,7 +18,7 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
     [Dependency] private readonly IResourceManager _resourceManager = default!;
     [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
 
-    private Dictionary<string, GuideEntry> _entries = new();
+    private Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry> _entries = new();
 
     public GuidebookWindow()
     {
@@ -69,10 +68,10 @@ private void ShowGuide(GuideEntry entry)
     }
 
     public void UpdateGuides(
-        Dictionary<string, GuideEntry> entries,
-        List<string>? rootEntries = null,
-        string? forceRoot = null,
-        string? selected = null)
+        Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry> entries,
+        List<ProtoId<GuideEntryPrototype>>? rootEntries = null,
+        ProtoId<GuideEntryPrototype>? forceRoot = null,
+        ProtoId<GuideEntryPrototype>? selected = null)
     {
         _entries = entries;
         RepopulateTree(rootEntries, forceRoot);
@@ -98,11 +97,11 @@ public void UpdateGuides(
         }
     }
 
-    private IEnumerable<GuideEntry> GetSortedEntries(List<string>? rootEntries)
+    private IEnumerable<GuideEntry> GetSortedEntries(List<ProtoId<GuideEntryPrototype>>? rootEntries)
     {
         if (rootEntries == null)
         {
-            HashSet<string> entries = new(_entries.Keys);
+            HashSet<ProtoId<GuideEntryPrototype>> entries = new(_entries.Keys);
             foreach (var entry in _entries.Values)
             {
                 if (entry.Children.Count > 0)
@@ -111,7 +110,7 @@ private IEnumerable<GuideEntry> GetSortedEntries(List<string>? rootEntries)
                         .Select(childId => _entries[childId])
                         .OrderBy(childEntry => childEntry.Priority)
                         .ThenBy(childEntry => Loc.GetString(childEntry.Name))
-                        .Select(childEntry => childEntry.Id)
+                        .Select(childEntry => new ProtoId<GuideEntryPrototype>(childEntry.Id))
                         .ToList();
 
                     entry.Children = sortedChildren;
@@ -127,13 +126,13 @@ private IEnumerable<GuideEntry> GetSortedEntries(List<string>? rootEntries)
             .ThenBy(rootEntry => Loc.GetString(rootEntry.Name));
     }
 
-    private void RepopulateTree(List<string>? roots = null, string? forcedRoot = null)
+    private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null, ProtoId<GuideEntryPrototype>? forcedRoot = null)
     {
         Tree.Clear();
 
-        HashSet<string> addedEntries = new();
+        HashSet<ProtoId<GuideEntryPrototype>> addedEntries = new();
 
-        TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot, null, addedEntries);
+        TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries);
         foreach (var entry in GetSortedEntries(roots))
         {
             AddEntry(entry.Id, parent, addedEntries);
@@ -141,13 +140,15 @@ private void RepopulateTree(List<string>? roots = null, string? forcedRoot = nul
         Tree.SetAllExpanded(true);
     }
 
-    private TreeItem? AddEntry(string id, TreeItem? parent, HashSet<string> addedEntries)
+    private TreeItem? AddEntry(ProtoId<GuideEntryPrototype> id, TreeItem? parent, HashSet<ProtoId<GuideEntryPrototype>> addedEntries)
     {
         if (!_entries.TryGetValue(id, out var entry))
             return null;
 
         if (!addedEntries.Add(id))
         {
+            // TODO GUIDEBOOK Maybe allow duplicate entries?
+            // E.g., for adding medicine under both chemicals & the chemist job
             Logger.Error($"Adding duplicate guide entry: {id}");
             return null;
         }
diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs
index 9c9e569eb417..e8a0743b9e05 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.Guidebook.Richtext;
+using Content.Shared.Guidebook;
 using Pidgin;
 using Robust.Client.UserInterface;
 using Robust.Shared.ContentPack;
diff --git a/Content.Client/Guidebook/GuidebookSystem.cs b/Content.Client/Guidebook/GuidebookSystem.cs
index 86dcf7694248..675a025d7a86 100644
--- a/Content.Client/Guidebook/GuidebookSystem.cs
+++ b/Content.Client/Guidebook/GuidebookSystem.cs
@@ -2,6 +2,7 @@
 using Content.Client.Guidebook.Components;
 using Content.Client.Light;
 using Content.Client.Verbs;
+using Content.Shared.Guidebook;
 using Content.Shared.Interaction;
 using Content.Shared.Light.Components;
 using Content.Shared.Speech;
@@ -13,6 +14,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -31,7 +33,12 @@ public sealed class GuidebookSystem : EntitySystem
     [Dependency] private readonly SharedPointLightSystem _pointLightSystem = default!;
     [Dependency] private readonly TagSystem _tags = default!;
 
-    public event Action<List<string>, List<string>?, string?, bool, string?>? OnGuidebookOpen;
+    public event Action<List<ProtoId<GuideEntryPrototype>>,
+        List<ProtoId<GuideEntryPrototype>>?,
+        ProtoId<GuideEntryPrototype>?,
+        bool,
+        ProtoId<GuideEntryPrototype>?>? OnGuidebookOpen;
+
     public const string GuideEmbedTag = "GuideEmbeded";
 
     private EntityUid _defaultUser;
@@ -80,7 +87,7 @@ private void OnGetVerbs(EntityUid uid, GuideHelpComponent component, GetVerbsEve
         });
     }
 
-    public void OpenHelp(List<string> guides)
+    public void OpenHelp(List<ProtoId<GuideEntryPrototype>> guides)
     {
         OnGuidebookOpen?.Invoke(guides, null, null, true, guides[0]);
     }
diff --git a/Content.Client/Info/RulesControl.xaml.cs b/Content.Client/Info/RulesControl.xaml.cs
index 5e2590749687..22a520d539cb 100644
--- a/Content.Client/Info/RulesControl.xaml.cs
+++ b/Content.Client/Info/RulesControl.xaml.cs
@@ -1,6 +1,7 @@
 using Content.Client.Guidebook;
 using Content.Client.Guidebook.RichText;
 using Content.Client.UserInterface.Systems.Info;
+using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index 05b98606ab99..aa66b7731d15 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.Guidebook;
 using Content.Client.Humanoid;
 using Content.Client.Inventory;
 using Content.Client.Lobby.UI;
@@ -41,6 +42,7 @@ public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState
     [UISystemDependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
     [UISystemDependency] private readonly StationSpawningSystem _spawn = default!;
+    [UISystemDependency] private readonly GuidebookSystem _guide = default!;
 
     private CharacterSetupGui? _characterSetup;
     private HumanoidProfileEditor? _profileEditor;
@@ -232,6 +234,8 @@ private void SaveProfile()
             _requirements,
             _markings);
 
+        _profileEditor.OnOpenGuidebook += _guide.OpenHelp;
+
         _characterSetup = new CharacterSetupGui(EntityManager, _prototypeManager, _resourceCache, _preferencesManager, _profileEditor);
 
         _characterSetup.CloseButton.OnPressed += _ =>
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index ac43fa11a853..1681cd93bd2b 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1,7 +1,6 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
-using Content.Client.Guidebook;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI.Loadouts;
 using Content.Client.Lobby.UI.Roles;
@@ -12,13 +11,13 @@
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
+using Content.Shared.Guidebook;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
-using Content.Shared.StatusIcon;
 using Content.Shared.Traits;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -96,6 +95,8 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
         [ValidatePrototypeId<GuideEntryPrototype>]
         private const string DefaultSpeciesGuidebook = "Species";
 
+        public event Action<List<ProtoId<GuideEntryPrototype>>>? OnOpenGuidebook;
+
         private ISawmill _sawmill;
 
         public HumanoidProfileEditor(
@@ -615,10 +616,11 @@ public void RefreshAntags()
                 {
                     Margin = new Thickness(3f, 3f, 3f, 0f),
                 };
+                selector.OnOpenGuidebook += OnOpenGuidebook;
 
                 var title = Loc.GetString(antag.Name);
                 var description = Loc.GetString(antag.Objective);
-                selector.Setup(items, title, 250, description);
+                selector.Setup(items, title, 250, description, guides: antag.Guides);
                 selector.Select(Profile?.AntagPreferences.Contains(antag.ID) == true ? 0 : 1);
 
                 if (!_requirements.CheckRoleTime(antag.Requirements, out var reason))
@@ -753,6 +755,10 @@ private void ReloadProfilePreview()
 
         private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args)
         {
+            // TODO GUIDEBOOK
+            // make the species guide book a field on the species prototype.
+            // I.e., do what jobs/antags do.
+
             var guidebookController = UserInterfaceManager.GetUIController<GuidebookUIController>();
             var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
             var page = DefaultSpeciesGuidebook;
@@ -761,10 +767,10 @@ private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args)
 
             if (_prototypeManager.TryIndex<GuideEntryPrototype>(DefaultSpeciesGuidebook, out var guideRoot))
             {
-                var dict = new Dictionary<string, GuideEntry>();
+                var dict = new Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry>();
                 dict.Add(DefaultSpeciesGuidebook, guideRoot);
                 //TODO: Don't close the guidebook if its already open, just go to the correct page
-                guidebookController.ToggleGuidebook(dict, includeChildren:true, selected: page);
+                guidebookController.OpenGuidebook(dict, includeChildren:true, selected: page);
             }
         }
 
@@ -859,6 +865,7 @@ public void RefreshJobs()
                     {
                         Margin = new Thickness(3f, 3f, 3f, 0f),
                     };
+                    selector.OnOpenGuidebook += OnOpenGuidebook;
 
                     var icon = new TextureRect
                     {
@@ -867,7 +874,7 @@ public void RefreshJobs()
                     };
                     var jobIcon = _prototypeManager.Index(job.Icon);
                     icon.Texture = jobIcon.Icon.Frame0();
-                    selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon);
+                    selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon, job.Guides);
 
                     if (!_requirements.IsAllowed(job, out var reason))
                     {
diff --git a/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml b/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml
index 88bf49b123aa..4cab5286c247 100644
--- a/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml
+++ b/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml
@@ -1,9 +1,14 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Horizontal">
-        <Label Name="TitleLabel"
-                      Margin="5 0"
-                      MouseFilter="Stop"/>
-        <BoxContainer Name="OptionsContainer"
-                      SetWidth="400"/>
+    <Label Name="TitleLabel"
+           Margin="5 0"
+           MouseFilter="Stop"/>
+
+    <!--21 was the height of OptionsContainer at the time that this button was added. So I am limiting the texture to 21x21-->
+    <Control SetSize="21 21">
+        <TextureButton Name="Help" StyleClasses="HelpButton"/>
+    </Control>
+    <BoxContainer Name="OptionsContainer"
+                  SetWidth="400"/>
 </BoxContainer>
diff --git a/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs b/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs
index 8b4b21ba9c78..ce75537355c9 100644
--- a/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs
+++ b/Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs
@@ -1,10 +1,12 @@
 using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Lobby.UI.Roles;
@@ -17,8 +19,10 @@ public sealed partial class RequirementsSelector : BoxContainer
 {
     private readonly RadioOptions<int> _options;
     private readonly StripeBack _lockStripe;
+    private List<ProtoId<GuideEntryPrototype>>? _guides;
 
     public event Action<int>? OnSelected;
+    public event Action<List<ProtoId<GuideEntryPrototype>>>? OnOpenGuidebook;
 
     public int Selected => _options.SelectedId;
 
@@ -60,18 +64,33 @@ public RequirementsSelector()
                 requirementsLabel
             }
         };
+
+        Help.OnPressed += _ =>
+        {
+            if (_guides != null)
+                OnOpenGuidebook?.Invoke(_guides);
+        };
     }
 
     /// <summary>
     /// Actually adds the controls.
     /// </summary>
-    public void Setup((string, int)[] items, string title, int titleSize, string? description, TextureRect? icon = null)
+    public void Setup(
+        (string, int)[] items,
+        string title,
+        int titleSize,
+        string? description,
+        TextureRect? icon = null,
+        List<ProtoId<GuideEntryPrototype>>? guides = null)
     {
         foreach (var (text, value) in items)
         {
             _options.AddItem(Loc.GetString(text), value);
         }
 
+        Help.Visible = guides != null;
+        _guides = guides;
+
         TitleLabel.Text = title;
         TitleLabel.MinSize = new Vector2(titleSize, 0f);
         TitleLabel.ToolTip = description;
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 6a5e0d82a203..b9a4e63f3159 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -78,6 +78,8 @@ public sealed class StyleNano : StyleBase
         public const string StyleClassLabelSmall = "LabelSmall";
         public const string StyleClassButtonBig = "ButtonBig";
 
+        public const string StyleClassButtonHelp = "HelpButton";
+
         public const string StyleClassPopupMessageSmall = "PopupMessageSmall";
         public const string StyleClassPopupMessageSmallCaution = "PopupMessageSmallCaution";
         public const string StyleClassPopupMessageMedium = "PopupMessageMedium";
@@ -1346,6 +1348,10 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     new StyleProperty(PanelContainer.StylePropertyPanel, new StyleBoxFlat { BackgroundColor = NanoGold, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2}),
                 }),
 
+                Element<TextureButton>()
+                    .Class(StyleClassButtonHelp)
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/VerbIcons/information.svg.192dpi.png")),
+
                 // Labels ---
                 Element<Label>().Class(StyleClassLabelBig)
                     .Prop(Label.StylePropertyFont, notoSans16),
diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
index 5912687fc358..df6501dcb866 100644
--- a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Client.Guidebook;
 using Content.Client.Guidebook.Components;
+using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -32,8 +33,8 @@ public string? Title
             set => WindowTitle.Text = value;
         }
 
-        private List<string>? _helpGuidebookIds;
-        public List<string>? HelpGuidebookIds
+        private List<ProtoId<GuideEntryPrototype>>? _helpGuidebookIds;
+        public List<ProtoId<GuideEntryPrototype>>? HelpGuidebookIds
         {
             get => _helpGuidebookIds;
             set
diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
index 6f20393b7f24..e30a6b3a215b 100644
--- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
+++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
@@ -4,6 +4,7 @@
 using Content.Client.Guidebook.Controls;
 using Content.Client.Lobby;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Guidebook;
 using Content.Shared.Input;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
@@ -74,12 +75,12 @@ private void HandleStateExited()
 
     public void OnSystemLoaded(GuidebookSystem system)
     {
-        _guidebookSystem.OnGuidebookOpen += ToggleGuidebook;
+        _guidebookSystem.OnGuidebookOpen += OpenGuidebook;
     }
 
     public void OnSystemUnloaded(GuidebookSystem system)
     {
-        _guidebookSystem.OnGuidebookOpen -= ToggleGuidebook;
+        _guidebookSystem.OnGuidebookOpen -= OpenGuidebook;
     }
 
     internal void UnloadButton()
@@ -103,6 +104,22 @@ private void GuidebookButtonOnPressed(ButtonEventArgs obj)
         ToggleGuidebook();
     }
 
+    public void ToggleGuidebook()
+    {
+        if (_guideWindow == null)
+            return;
+
+        if (_guideWindow.IsOpen)
+        {
+            UIManager.ClickSound();
+            _guideWindow.Close();
+        }
+        else
+        {
+            OpenGuidebook();
+        }
+    }
+
     private void OnWindowClosed()
     {
         if (GuidebookButton != null)
@@ -127,30 +144,23 @@ private void OnWindowOpen()
     /// <param name="includeChildren">Whether or not to automatically include child entries. If false, this will ONLY
     /// show the specified entries</param>
     /// <param name="selected">The guide whose contents should be displayed when the guidebook is opened</param>
-    public void ToggleGuidebook(
-        Dictionary<string, GuideEntry>? guides = null,
-        List<string>? rootEntries = null,
-        string? forceRoot = null,
+    public void OpenGuidebook(
+        Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry>? guides = null,
+        List<ProtoId<GuideEntryPrototype>>? rootEntries = null,
+        ProtoId<GuideEntryPrototype>? forceRoot = null,
         bool includeChildren = true,
-        string? selected = null)
+        ProtoId<GuideEntryPrototype>? selected = null)
     {
         if (_guideWindow == null)
             return;
 
-        if (_guideWindow.IsOpen)
-        {
-            UIManager.ClickSound();
-            _guideWindow.Close();
-            return;
-        }
-
         if (GuidebookButton != null)
             GuidebookButton.SetClickPressed(!_guideWindow.IsOpen);
 
         if (guides == null)
         {
             guides = _prototypeManager.EnumeratePrototypes<GuideEntryPrototype>()
-                .ToDictionary(x => x.ID, x => (GuideEntry) x);
+                .ToDictionary(x => new ProtoId<GuideEntryPrototype>(x.ID), x => (GuideEntry) x);
         }
         else if (includeChildren)
         {
@@ -171,17 +181,17 @@ public void ToggleGuidebook(
         _guideWindow.OpenCenteredRight();
     }
 
-    public void ToggleGuidebook(
-        List<string> guideList,
-        List<string>? rootEntries = null,
-        string? forceRoot = null,
+    public void OpenGuidebook(
+        List<ProtoId<GuideEntryPrototype>> guideList,
+        List<ProtoId<GuideEntryPrototype>>? rootEntries = null,
+        ProtoId<GuideEntryPrototype>? forceRoot = null,
         bool includeChildren = true,
-        string? selected = null)
+        ProtoId<GuideEntryPrototype>? selected = null)
     {
-        Dictionary<string, GuideEntry> guides = new();
+        Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry> guides = new();
         foreach (var guideId in guideList)
         {
-            if (!_prototypeManager.TryIndex<GuideEntryPrototype>(guideId, out var guide))
+            if (!_prototypeManager.TryIndex(guideId, out var guide))
             {
                 Logger.Error($"Encountered unknown guide prototype: {guideId}");
                 continue;
@@ -189,17 +199,29 @@ public void ToggleGuidebook(
             guides.Add(guideId, guide);
         }
 
-        ToggleGuidebook(guides, rootEntries, forceRoot, includeChildren, selected);
+        OpenGuidebook(guides, rootEntries, forceRoot, includeChildren, selected);
+    }
+
+    public void CloseGuidebook()
+    {
+        if (_guideWindow == null)
+            return;
+
+        if (_guideWindow.IsOpen)
+        {
+            UIManager.ClickSound();
+            _guideWindow.Close();
+        }
     }
 
-    private void RecursivelyAddChildren(GuideEntry guide, Dictionary<string, GuideEntry> guides)
+    private void RecursivelyAddChildren(GuideEntry guide, Dictionary<ProtoId<GuideEntryPrototype>, GuideEntry> guides)
     {
         foreach (var childId in guide.Children)
         {
             if (guides.ContainsKey(childId))
                 continue;
 
-            if (!_prototypeManager.TryIndex<GuideEntryPrototype>(childId, out var child))
+            if (!_prototypeManager.TryIndex(childId, out var child))
             {
                 Logger.Error($"Encountered unknown guide prototype: {childId} as a child of {guide.Id}. If the child is not a prototype, it must be directly provided.");
                 continue;
diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
index 6d398ec6aa56..01dd783e6e07 100644
--- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
+++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
@@ -1,9 +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.Guidebook;
 using Content.Shared.Info;
 using Robust.Client;
 using Robust.Client.Console;
diff --git a/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs b/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs
index b56191525f87..ae64eace9a2a 100644
--- a/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs
+++ b/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs
@@ -3,6 +3,7 @@
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 using System.Linq;
+using Content.Shared.Guidebook;
 
 namespace Content.IntegrationTests.Tests.Guidebook;
 
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 4be2c1787171..158ec23cce3f 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -67,7 +67,6 @@ public override void Init()
             factory.RegisterIgnore(IgnoredComponents.List);
 
             prototypes.RegisterIgnore("parallax");
-            prototypes.RegisterIgnore("guideEntry");
 
             ServerContentIoC.Register();
 
diff --git a/Content.Client/Guidebook/GuideEntry.cs b/Content.Shared/Guidebook/GuideEntry.cs
similarity index 65%
rename from Content.Client/Guidebook/GuideEntry.cs
rename to Content.Shared/Guidebook/GuideEntry.cs
index b7b3b3309e6d..0e0e166cd55a 100644
--- a/Content.Client/Guidebook/GuideEntry.cs
+++ b/Content.Shared/Guidebook/GuideEntry.cs
@@ -1,8 +1,13 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Guidebook;
+namespace Content.Shared.Guidebook;
+
+[Prototype("guideEntry")]
+public sealed partial class GuideEntryPrototype : GuideEntry, IPrototype
+{
+    public string ID => Id;
+}
 
 [Virtual]
 public class GuideEntry
@@ -10,7 +15,7 @@ public class GuideEntry
     /// <summary>
     ///     The file containing the contents of this guide.
     /// </summary>
-    [DataField("text", required: true)] public ResPath Text = default!;
+    [DataField(required: true)] public ResPath Text = default!;
 
     /// <summary>
     ///     The unique id for this guide.
@@ -21,28 +26,22 @@ public class GuideEntry
     /// <summary>
     ///     The name of this guide. This gets localized.
     /// </summary>
-    [DataField("name", required: true)] public string Name = default!;
+    [DataField(required: true)] public string Name = default!;
 
     /// <summary>
     ///     The "children" of this guide for when guides are shown in a tree / table of contents.
     /// </summary>
-    [DataField("children", customTypeSerializer:typeof(PrototypeIdListSerializer<GuideEntryPrototype>))]
-    public List<string> Children = new();
+    [DataField]
+    public List<ProtoId<GuideEntryPrototype>> Children = new();
 
     /// <summary>
     ///     Enable filtering of items.
     /// </summary>
-    [DataField("filterEnabled")] public bool FilterEnabled = default!;
+    [DataField] public bool FilterEnabled = default!;
 
     /// <summary>
     ///     Priority for sorting top-level guides when shown in a tree / table of contents.
     ///     If the guide is the child of some other guide, the order simply determined by the order of children in <see cref="Children"/>.
     /// </summary>
-    [DataField("priority")] public int Priority = 0;
-}
-
-[Prototype("guideEntry")]
-public sealed partial class GuideEntryPrototype : GuideEntry, IPrototype
-{
-    public string ID => Id;
+    [DataField] public int Priority = 0;
 }
diff --git a/Content.Shared/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs
index c6acb9b75756..05c0c535049c 100644
--- a/Content.Shared/Roles/AntagPrototype.cs
+++ b/Content.Shared/Roles/AntagPrototype.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Guidebook;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
@@ -43,4 +44,11 @@ public sealed partial class AntagPrototype : IPrototype
     /// </summary>
     [DataField("requirements")]
     public HashSet<JobRequirement>? Requirements;
+
+    /// <summary>
+    /// Optional list of guides associated with this antag. If the guides are opened, the first entry in this list
+    /// will be used to select the currently selected guidebook.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<GuideEntryPrototype>>? Guides;
 }
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index dd67e7b10474..2a8e9d4b0333 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Access;
+using Content.Shared.Guidebook;
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
@@ -117,6 +118,13 @@ public sealed partial class JobPrototype : IPrototype
 
         [DataField]
         public bool Whitelisted;
+
+        /// <summary>
+        /// Optional list of guides associated with this role. If the guides are opened, the first entry in this list
+        /// will be used to select the currently selected guidebook.
+        /// </summary>
+        [DataField]
+        public List<ProtoId<GuideEntryPrototype>>? Guides;
     }
 
     /// <summary>
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 95a4f1ca75f0..0c7b1c781e4d 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -28,7 +28,9 @@
   name: guide-entry-chemist
   text: "/ServerInfo/Guidebook/Medical/Chemist.xml"
   children:
-  - Medicine
+  # - Medicine
+  # Duplicate guide entries are currently not supported
+  # TODO GUIDEBOOK Maybe allow duplicate entries?
   - Botanicals
   - AdvancedBrute
 
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index cb32dc2c102d..6df8a2317eb2 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -4,6 +4,7 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-space-ninja-objective
+  guides: [ SpaceNinja ]
 
 #Ninja Gear
 - type: startingGear
@@ -33,4 +34,4 @@
     - Screwdriver
     - Wirecutter
     - Welder
-    - Multitool
\ No newline at end of file
+    - Multitool
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index e91d50f53cd9..7cfed348f183 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -7,6 +7,7 @@
   requirements:
   - !type:OverallPlaytimeRequirement
     time: 18000 # 5h
+  guides: [ NuclearOperatives ]
 
 - type: antag
   id: NukeopsMedic
@@ -18,8 +19,9 @@
   - !type:OverallPlaytimeRequirement
     time: 18000 # 5h
   - !type:RoleTimeRequirement
-    role: JobChemist 
+    role: JobChemist
     time: 10800 # 3h
+  guides: [ NuclearOperatives ]
 
 - type: antag
   id: NukeopsCommander
@@ -34,6 +36,7 @@
     department: Security
     time: 18000 # 5h
   # should be changed to nukie playtime when thats tracked (wyci)
+  guides: [ NuclearOperatives ]
 
 #Nuclear Operative Gear
 - type: startingGear
@@ -96,4 +99,4 @@
   id: SyndicateLoneOperativeGearFull
   parent: SyndicateOperativeGearFull
   equipment:
-    pocket2: BaseUplinkRadio60TC
\ No newline at end of file
+    pocket2: BaseUplinkRadio60TC
diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml
index 3bdc9d7977c7..502a68ea9e86 100644
--- a/Resources/Prototypes/Roles/Antags/revolutionary.yml
+++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml
@@ -4,6 +4,7 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-rev-head-objective
+  guides: [ Revolutionaries ]
 
 - type: antag
   id: Rev
@@ -11,10 +12,11 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-rev-objective
+  guides: [ Revolutionaries ]
 
 - type: startingGear
   id: HeadRevGear
   storage:
     back:
     - Flash
-    - ClothingEyesGlassesSunglasses
\ No newline at end of file
+    - ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml
index f192733b7e1e..e97ced1795e5 100644
--- a/Resources/Prototypes/Roles/Antags/traitor.yml
+++ b/Resources/Prototypes/Roles/Antags/traitor.yml
@@ -4,6 +4,7 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-syndicate-agent-objective
+  guides: [ Traitors ]
 
 # Syndicate Operative Outfit - Monkey
 - type: startingGear
@@ -36,4 +37,4 @@
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
     pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
\ No newline at end of file
+    id: SyndiPDA
diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml
index 2ba5640891f7..bc3c2d7f2241 100644
--- a/Resources/Prototypes/Roles/Antags/zombie.yml
+++ b/Resources/Prototypes/Roles/Antags/zombie.yml
@@ -4,6 +4,7 @@
   antagonist: true
   setPreference: true
   objective: roles-antag-initial-infected-objective
+  guides: [ Zombies ]
 
 - type: antag
   id: Zombie
@@ -11,3 +12,4 @@
   antagonist: true
   setPreference: false
   objective: roles-antag-zombie-objective
+  guides: [ Zombies ]

From f2c2a14cd07d1fcace04c0eba148eb0c1a551785 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 12:07:04 +0000
Subject: [PATCH 331/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ee9da0995de2..f84e1b6391df 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: shampunj
-  changes:
-  - message: Zombies now passively heal 1 heat/shock damage every 50 seconds
-    type: Tweak
-  id: 6191
-  time: '2024-03-18T21:47:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25925
 - author: Killerqu00
   changes:
   - message: Initial Infected now can see each other.
@@ -3850,3 +3843,11 @@
   id: 6690
   time: '2024-06-06T10:08:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28650
+- author: ElectroJr
+  changes:
+  - message: The job/antag preferences window now has some buttons that link to relevant
+      guidebook entries
+    type: Add
+  id: 6691
+  time: '2024-06-06T12:05:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28614

From e72ac31d5d5f5ff3ff7d26ec56d9c2dbf13e0225 Mon Sep 17 00:00:00 2001
From: Thomas <87614336+Aeshus@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:24:13 -0500
Subject: [PATCH 332/568] Fix typo in Space Law's restricted gear (#28668)

This typo was included in the wiki as well.

Reported-by: Bobberson in the Discord
---
 .../Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml
index ce804009a18e..f51558f1a2d8 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml
@@ -1,4 +1,4 @@
-<Document>
+<Document>
   # Space Law: Restricted Gear
   - \[ERT/Central Command\] ERT and central command clothing
   - \[Command\] Command clothing
@@ -17,5 +17,5 @@
   - \[None\] Unauthorized PDA software
   - \[None\] Syndicate clothing
   - \[None\] Syndicate equipment, excluding communication equipment
-  - \[Security\] Syndicate communication equipment equipment
+  - \[Security\] Syndicate communication equipment
 </Document>

From 5773970a2a0b3ae58fd8319c09775b122988e35a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 19:25:20 +0000
Subject: [PATCH 333/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f84e1b6391df..2be98160bc3c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: Killerqu00
-  changes:
-  - message: Initial Infected now can see each other.
-    type: Add
-  - message: Initial Infected can now see zombified entities.
-    type: Add
-  id: 6192
-  time: '2024-03-18T21:57:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25934
 - author: nikthechampiongr
   changes:
   - message: You can now use the SCRAM! implant while cuffed.
@@ -3851,3 +3842,10 @@
   id: 6691
   time: '2024-06-06T12:05:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28614
+- author: Aeshus
+  changes:
+  - message: Space Law gives security exception for syndicate communication equipment.
+    type: Fix
+  id: 6692
+  time: '2024-06-06T19:24:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28668

From 6e98965e6aba43c319d45de4903e215335e1aefc Mon Sep 17 00:00:00 2001
From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Date: Thu, 6 Jun 2024 12:47:41 -0700
Subject: [PATCH 334/568] fixed "silicones" typo in new rules (#28671)

fixed all appearances of silicone where it should have been silicon
---
 Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml        | 2 +-
 .../ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml   | 2 +-
 Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml   | 2 +-
 Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml
index d5373a730a33..67a05f516c76 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleTypes.xml
@@ -17,5 +17,5 @@
   Familiars are considered non-antagonists, but have instructions to obey someone. They must obey this person even if it causes them to violate roleplay rules or die. You are only a familiar if the game clearly and explicitly tells you that you are a familiar. You are only the familiar of the person the game tells you.
 
   ## Silicon
-  Silicones have a set of laws that they must follow above all else except the core rules. You are only silicon if the game clearly and explicitly tells you that you are a silicon.
+  Silicons have a set of laws that they must follow above all else except the core rules. You are only silicon if the game clearly and explicitly tells you that you are a silicon.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml
index 07b176b359a2..fdccf07017e9 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml
@@ -8,7 +8,7 @@
 
   See the list of [textlink="role types" link="RoleTypes"] for more information about the different types of roles.
 
-  - [textlink="1. Silicones must follow Silicon Rules" link="RuleR1"]
+  - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
   - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
index 094c7656e460..583043675cde 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml
@@ -33,7 +33,7 @@
 
   See the list of [textlink="role types" link="RoleTypes"] for more information about the different types of roles.
 
-  - [textlink="1. Silicones must follow Silicon Rules" link="RuleR1"]
+  - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
   - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
index e8b61a7722e3..035215461c63 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml
@@ -33,7 +33,7 @@
 
   See the list of [textlink="role types" link="RoleTypes"] for more information about the different types of roles.
 
-  - [textlink="1. Silicones must follow Silicon Rules" link="RuleR1"]
+  - [textlink="1. Silicons must follow Silicon Rules" link="RuleR1"]
   - [textlink="2. Familiars must obey their master" link="RuleR2"]
   - [textlink="3. Roleplay a normal person" link="RuleR3"]
   - [textlink="4. Do not metagame, obey the Metashield" link="RuleR4"]

From 3dc4f82833846a0db1728bb9814616ad447c0a41 Mon Sep 17 00:00:00 2001
From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Thu, 6 Jun 2024 18:26:13 -0400
Subject: [PATCH 335/568] fix janitor not spawning with a survival box (#28669)

hi
---
 Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index 9b006cbed16d..83fd9ae5d2e2 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -22,6 +22,9 @@
     id: JanitorPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
+  storage:
+    back:
+    - BoxSurvival
 
 - type: startingGear
   id: JanitorMaidGear
@@ -32,6 +35,3 @@
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-  storage:
-    back:
-    - BoxSurvival

From 997e34de9f9da60f5ca300b5e14f02ac2f0419cb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 6 Jun 2024 22:27:19 +0000
Subject: [PATCH 336/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2be98160bc3c..bfd8060d119e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: You can now use the SCRAM! implant while cuffed.
-    type: Fix
-  - message: The freedom implant can no longer be used while in crit, or dead.
-    type: Fix
-  id: 6193
-  time: '2024-03-18T22:35:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25978
 - author: SlamBamActionman
   changes:
   - message: Recyclers no longer delete items stored inside of recycled entities.
@@ -3849,3 +3840,10 @@
   id: 6692
   time: '2024-06-06T19:24:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28668
+- author: Dutch-VanDerLinde
+  changes:
+  - message: Fixed janitors not spawning with a survival box in their bag
+    type: Fix
+  id: 6693
+  time: '2024-06-06T22:26:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28669

From 08d2918fe7de1aab704a9a634e618626cca20148 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Thu, 6 Jun 2024 19:37:41 -0500
Subject: [PATCH 337/568] Fix typo in slime naming conventions (#28682)

---
 .../Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
index ec393ecdc17c..faaedd4d5112 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
@@ -1,4 +1,4 @@
-<Document>
+<Document>
   # Core Rule 13 - Use realistic character names, and do not use names of famous people
   - No names of people or characters from the real world
   - No titles/honorifics
@@ -30,7 +30,7 @@
   - [color=#449944]Acceptable:[/color] Cleans-the-Airlocks
   - [color=#994444]Bad:[/color] Bans-the-Admins
 
-  Slimes typically have names that are onomonopia. A last name is optional.
+  Slimes typically have names that are onomatopoeia. A last name is optional.
   - [color=#449944]Acceptable:[/color] Foolp Suub
   - [color=#449944]Acceptable:[/color] Foolp
   - [color=#994444]Bad:[/color] Slime

From b317fa4ccf92ec7a8158fc4bf2e7eb5438f85868 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 6 Jun 2024 20:55:35 -0400
Subject: [PATCH 338/568] Flatpacker fixes (#28417)

---
 .../Construction/UI/FlatpackCreatorMenu.xaml  |  2 +-
 .../UI/FlatpackCreatorMenu.xaml.cs            | 38 ++++---------------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
index eec5c229cb53..322e4e66a9a9 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml
@@ -8,7 +8,7 @@
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True" Margin="10">
         <BoxContainer SizeFlagsStretchRatio="2" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
             <BoxContainer Orientation="Vertical">
-                <SpriteView Name="MachineSprite" Scale="4 4" HorizontalAlignment="Center" VerticalExpand="True" MinSize="128 128"/>
+                <EntityPrototypeView Name="MachineSprite" Scale="4 4" HorizontalAlignment="Center" VerticalExpand="True" MinSize="128 128"/>
                 <RichTextLabel Name="MachineNameLabel" HorizontalAlignment="Center" StyleClasses="LabelKeyText"/>
             </BoxContainer>
             <Control MinHeight="10"/>
diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index 002616323784..eae70d536792 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -23,7 +23,6 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
     private readonly ItemSlotsSystem _itemSlots;
     private readonly FlatpackSystem _flatpack;
     private readonly MaterialStorageSystem _materialStorage;
-    private readonly SpriteSystem _spriteSystem;
 
     private readonly EntityUid _owner;
 
@@ -31,7 +30,6 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow
     public const string NoBoardEffectId = "FlatpackerNoBoardEffect";
 
     private EntityUid? _currentBoard = EntityUid.Invalid;
-    private EntityUid? _machinePreview;
 
     public event Action? PackButtonPressed;
 
@@ -43,7 +41,6 @@ public FlatpackCreatorMenu(EntityUid uid)
         _itemSlots = _entityManager.System<ItemSlotsSystem>();
         _flatpack = _entityManager.System<FlatpackSystem>();
         _materialStorage = _entityManager.System<MaterialStorageSystem>();
-        _spriteSystem = _entityManager.System<SpriteSystem>();
 
         _owner = uid;
 
@@ -57,17 +54,10 @@ protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
 
-        if (_machinePreview is not { } && _entityManager.Deleted(_machinePreview))
-        {
-            _machinePreview = null;
-            MachineSprite.SetEntity(_machinePreview);
-        }
-
         if (!_entityManager.TryGetComponent<FlatpackCreatorComponent>(_owner, out var flatpacker) ||
             !_itemSlots.TryGetSlot(_owner, flatpacker.SlotId, out var itemSlot))
             return;
 
-        MachineBoardComponent? machineBoardComp = null;
         if (flatpacker.Packing)
         {
             PackButton.Disabled = true;
@@ -75,7 +65,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         else if (_currentBoard != null)
         {
             Dictionary<string, int> cost;
-            if (_entityManager.TryGetComponent(_currentBoard, out machineBoardComp))
+            if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var machineBoardComp))
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
             else
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker));
@@ -86,9 +76,6 @@ protected override void FrameUpdate(FrameEventArgs args)
         if (_currentBoard == itemSlot.Item)
             return;
 
-        if (_machinePreview != null)
-            _entityManager.DeleteEntity(_machinePreview);
-
         _currentBoard = itemSlot.Item;
         CostHeaderLabel.Visible = _currentBoard != null;
         InsertLabel.Visible = _currentBoard == null;
@@ -98,10 +85,10 @@ protected override void FrameUpdate(FrameEventArgs args)
             string? prototype = null;
             Dictionary<string, int>? cost = null;
 
-            if (machineBoardComp != null || _entityManager.TryGetComponent(_currentBoard, out machineBoardComp))
+            if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var newMachineBoardComp))
             {
-                prototype = machineBoardComp.Prototype;
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
+                prototype = newMachineBoardComp.Prototype;
+                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, newMachineBoardComp));
             }
             else if (_entityManager.TryGetComponent<ComputerBoardComponent>(_currentBoard, out var computerBoard))
             {
@@ -112,21 +99,18 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (prototype is not null && cost is not null)
             {
                 var proto = _prototypeManager.Index<EntityPrototype>(prototype);
-                _machinePreview = _entityManager.Spawn(proto.ID);
-                _spriteSystem.ForceUpdate(_machinePreview.Value);
+                MachineSprite.SetPrototype(prototype);
                 MachineNameLabel.SetMessage(proto.Name);
                 CostLabel.SetMarkup(GetCostString(cost));
             }
         }
         else
         {
-            _machinePreview = _entityManager.Spawn(NoBoardEffectId);
+            MachineSprite.SetPrototype(NoBoardEffectId);
             CostLabel.SetMessage(Loc.GetString("flatpacker-ui-no-board-label"));
             MachineNameLabel.SetMessage(" ");
             PackButton.Disabled = true;
         }
-
-        MachineSprite.SetEntity(_machinePreview);
     }
 
     private string GetCostString(Dictionary<string, int> costs)
@@ -148,7 +132,7 @@ private string GetCostString(Dictionary<string, int> costs)
                 ("amount", amountText),
                 ("material", Loc.GetString(matProto.Name)));
 
-            msg.AddMarkup(text);
+            msg.TryAddMarkup(text, out _);
 
             if (i != orderedCosts.Length - 1)
                 msg.PushNewline();
@@ -156,12 +140,4 @@ private string GetCostString(Dictionary<string, int> costs)
 
         return msg.ToMarkup();
     }
-
-    public override void Close()
-    {
-        base.Close();
-
-        _entityManager.DeleteEntity(_machinePreview);
-        _machinePreview = null;
-    }
 }

From f2792e98b7e6a30dbaab9eb9ac3d9b8eec993aa6 Mon Sep 17 00:00:00 2001
From: blueDev2 <89804215+blueDev2@users.noreply.github.com>
Date: Thu, 6 Jun 2024 21:24:07 -0400
Subject: [PATCH 339/568] Return medicine recipe solid material costs to 1
 (#28679)

Set material costs of medicine recipes to 1
---
 Resources/Prototypes/Recipes/Cooking/medical_recipes.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
index 3bc9e22b0e4f..9d1947f03ebc 100644
--- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -13,7 +13,7 @@
   time: 10
   solids:
     FoodPoppy: 1
-    Brutepack: 10
+    Brutepack: 1
     MaterialCloth1: 1
   reagents:
     TranexamicAcid: 20
@@ -26,7 +26,7 @@
   time: 10
   solids:
     FoodAloe: 1
-    Ointment: 10
+    Ointment: 1
     MaterialCloth1: 1
   reagents:
     Sigynate: 20

From 6bae088d7a5fb19ade7a943a5c088e77d0b2f1dd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 7 Jun 2024 01:25:13 +0000
Subject: [PATCH 340/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bfd8060d119e..31999b221c20 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Recyclers no longer delete items stored inside of recycled entities.
-    type: Fix
-  id: 6194
-  time: '2024-03-19T02:36:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26045
 - author: Vermidia
   changes:
   - message: Made the Artifact Reports page up to date with current Xenoarchaeology
@@ -3847,3 +3840,11 @@
   id: 6693
   time: '2024-06-06T22:26:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28669
+- author: blueDev2
+  changes:
+  - message: Rebalanced medicated suture and regen mesh to only require 1 brute pack/ointment
+      respectively
+    type: Tweak
+  id: 6694
+  time: '2024-06-07T01:24:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28679

From 7ba26f4592e9bc6cc281ab861a27c3a9526e7fe7 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Fri, 7 Jun 2024 15:00:02 +1000
Subject: [PATCH 341/568] Update Core (#28689)

add
---
 Resources/Maps/core.yml | 1489 ++++++++++++++++++++++-----------------
 1 file changed, 831 insertions(+), 658 deletions(-)

diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index b94e800e41ef..e10f54cd03de 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -81,139 +81,139 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: DgAAAAADDgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAA
+          tiles: DgAAAAADDgAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADXQAAAAABXQAAAAAAaAAAAAADbAAAAAAAbAAAAAAAXQAAAAAAaAAAAAAAJAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAABJAAAAAADJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADXQAAAAAAXQAAAAADaAAAAAADbAAAAAAAbAAAAAAAXQAAAAAAaAAAAAAAJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAACJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABaAAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAJAAAAAACJAAAAAACJAAAAAADXQAAAAACJAAAAAADXQAAAAABXQAAAAAAaAAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAABaAAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABaAAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAXQAAAAACJAAAAAADXQAAAAAAXQAAAAADaAAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABHwAAAAADfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABaAAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAACTgAAAAAATgAAAAABaAAAAAABTgAAAAABTgAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAaAAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAACaAAAAAADXQAAAAACXQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAJAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACXQAAAAACTgAAAAACTgAAAAABTgAAAAABXQAAAAAAXQAAAAACTgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABXQAAAAACaAAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAC
+          tiles: XQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABaAAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACTgAAAAACTgAAAAADaAAAAAAATgAAAAACTgAAAAACaAAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACHwAAAAABfgAAAAAAHwAAAAADfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAAAaAAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAaAAAAAADaAAAAAABXQAAAAABJAAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADXQAAAAABTgAAAAACTgAAAAACTgAAAAADXQAAAAABXQAAAAABTgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAABXQAAAAABJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAC
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAADaAAAAAAAXQAAAAAAXQAAAAADaAAAAAAAXQAAAAADXQAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTgAAAAABTgAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAAAJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAAAegAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACegAAAAACegAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAABXQAAAAACHwAAAAABfgAAAAAAHwAAAAAAJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAACJAAAAAACfgAAAAAAJAAAAAAAaAAAAAACaAAAAAADaAAAAAAAXQAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAATgAAAAABTgAAAAACJAAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACXQAAAAAAXQAAAAABXQAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAACXQAAAAADXQAAAAAAaAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAAAXQAAAAACHwAAAAABHwAAAAACfgAAAAAAHwAAAAADXQAAAAADXQAAAAACaAAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACaAAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAACXQAAAAAAXQAAAAABaAAAAAAC
+          tiles: aAAAAAACaAAAAAAAXQAAAAAAXQAAAAACaAAAAAACXQAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAACaAAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADTgAAAAACTgAAAAACaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAaAAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAACJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAJAAAAAACegAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADJAAAAAADfgAAAAAAHwAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACegAAAAABegAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAAAXQAAAAADHwAAAAAAfgAAAAAAHwAAAAADJAAAAAADJAAAAAABJAAAAAABJAAAAAACXQAAAAACXQAAAAADJAAAAAACfgAAAAAAJAAAAAADaAAAAAADaAAAAAACaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAATgAAAAABTgAAAAADJAAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAACXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADXQAAAAAAXQAAAAAAXQAAAAABaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABXQAAAAACXQAAAAACaAAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAACXQAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADXQAAAAAAXQAAAAAAaAAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAABXQAAAAADfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAXQAAAAACXQAAAAADaAAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAACXQAAAAACXQAAAAADaAAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAADaAAAAAAA
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAACXQAAAAACaAAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAHwAAAAACfgAAAAAAHwAAAAABJAAAAAADHwAAAAADfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAAAaAAAAAABaAAAAAAAaAAAAAAAXQAAAAABaAAAAAAAHwAAAAAAHwAAAAACHwAAAAACJAAAAAAAHwAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAADHwAAAAADfgAAAAAAHwAAAAACJAAAAAABHwAAAAABfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAABHwAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAABJAAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAHwAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAADXQAAAAABaAAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAHwAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAAAaAAAAAACHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABHwAAAAADfgAAAAAAHwAAAAACJAAAAAADHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAHwAAAAABaAAAAAACaAAAAAABaAAAAAAAXQAAAAADaAAAAAADHwAAAAADHwAAAAADHwAAAAADJAAAAAADHwAAAAADfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAHwAAAAAAfgAAAAAAHwAAAAABJAAAAAABHwAAAAABfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACHwAAAAADfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAJAAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAABaAAAAAABaAAAAAADXQAAAAABfgAAAAAAHwAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADJAAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAA
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: EgAAAAAAXQAAAAAAegAAAAADegAAAAACXQAAAAAAfgAAAAAAJAAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAaAAAAAABXQAAAAABXQAAAAACXQAAAAACEgAAAAACXQAAAAADegAAAAACegAAAAAAXQAAAAABfgAAAAAAXQAAAAABTgAAAAACTgAAAAAAaAAAAAAATgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAABaAAAAAACEgAAAAADXQAAAAACegAAAAABegAAAAABXQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAaAAAAAABXQAAAAADXQAAAAABXQAAAAACEgAAAAADXQAAAAACegAAAAADegAAAAADXQAAAAACaAAAAAADXQAAAAACaAAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAADegAAAAACegAAAAACXQAAAAABaAAAAAACXQAAAAACTgAAAAAAXQAAAAACXQAAAAABaAAAAAADHwAAAAADHwAAAAADJgAAAAADJgAAAAABJgAAAAAAEgAAAAADXQAAAAACegAAAAACegAAAAADXQAAAAABfgAAAAAAXQAAAAAATgAAAAABXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADTgAAAAACTgAAAAACTgAAAAADXQAAAAAAXQAAAAADKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAABaAAAAAACHwAAAAADHwAAAAADJgAAAAABJgAAAAADJgAAAAACKAAAAAACKAAAAAADKAAAAAAAKAAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABaAAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACegAAAAACegAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA
+          tiles: EgAAAAACXQAAAAAAegAAAAABegAAAAAAXQAAAAADfgAAAAAAJAAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAACEgAAAAAAXQAAAAACegAAAAAAegAAAAACXQAAAAABfgAAAAAAXQAAAAAATgAAAAADTgAAAAADaAAAAAAATgAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAAAEgAAAAAAXQAAAAAAegAAAAABegAAAAADXQAAAAABfgAAAAAAXQAAAAAATgAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAABEgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAADaAAAAAADXQAAAAACaAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAAAegAAAAAAegAAAAABXQAAAAAAaAAAAAADXQAAAAAATgAAAAACXQAAAAACXQAAAAAAaAAAAAABHwAAAAABHwAAAAACJgAAAAAAJgAAAAABJgAAAAABEgAAAAABXQAAAAAAegAAAAAAegAAAAADXQAAAAABfgAAAAAAXQAAAAACTgAAAAAAXQAAAAACXQAAAAACaAAAAAABHwAAAAAAHwAAAAAATgAAAAAATgAAAAADTgAAAAACXQAAAAADXQAAAAABKAAAAAAAKAAAAAADXQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAADXQAAAAACaAAAAAADHwAAAAADHwAAAAADJgAAAAADJgAAAAABJgAAAAACKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADaAAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAABegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADegAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABegAAAAABegAAAAACegAAAAADegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: egAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAADaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAegAAAAAAegAAAAABegAAAAADewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAACKAAAAAACTgAAAAABTgAAAAACaAAAAAADXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABewAAAAABewAAAAADbAAAAAAATgAAAAAATgAAAAABKAAAAAAATgAAAAABTgAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAACewAAAAADewAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAACegAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAABewAAAAADewAAAAACfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAewAAAAACewAAAAAAewAAAAACfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAABQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAABKAAAAAACKAAAAAABfgAAAAAAXQAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAXQAAAAACfgAAAAAAKAAAAAACKAAAAAACKAAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAACXwAAAAABJAAAAAAAXwAAAAADXwAAAAACXwAAAAADXwAAAAACXQAAAAAAXQAAAAABXQAAAAAAaAAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADHwAAAAAAHwAAAAAAXwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABXQAAAAABXQAAAAADXQAAAAAAaAAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAACHwAAAAACHwAAAAACXwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAACegAAAAADegAAAAAAegAAAAABegAAAAABegAAAAADHwAAAAAAHwAAAAADXwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAACegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAaAAAAAACegAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAD
+          tiles: egAAAAABegAAAAAAegAAAAACegAAAAACegAAAAABaAAAAAACXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAegAAAAABegAAAAABegAAAAACewAAAAABewAAAAADfgAAAAAATgAAAAACTgAAAAABKAAAAAABTgAAAAABTgAAAAAAaAAAAAABXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAegAAAAACegAAAAACegAAAAABewAAAAADewAAAAAAbAAAAAAATgAAAAACTgAAAAAAKAAAAAABTgAAAAABTgAAAAADaAAAAAACXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAADewAAAAADewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAACegAAAAABaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAABewAAAAABfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAewAAAAACewAAAAAAewAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADQAAAAAAAfgAAAAAAaAAAAAABfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAADfgAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAACQAAAAAAAQAAAAAAAXQAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAACfgAAAAAAXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAACXwAAAAAAJAAAAAACXwAAAAAAXwAAAAABXwAAAAABXwAAAAABXQAAAAACXQAAAAAAXQAAAAADaAAAAAACegAAAAACegAAAAACegAAAAABegAAAAACegAAAAADHwAAAAACHwAAAAAAXwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAADXQAAAAADXQAAAAADXQAAAAADaAAAAAACegAAAAADegAAAAABegAAAAABegAAAAABegAAAAAAHwAAAAADHwAAAAABXwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAADXQAAAAACXQAAAAADXQAAAAABaAAAAAADegAAAAABegAAAAADegAAAAABegAAAAABegAAAAAAHwAAAAABHwAAAAADXwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAADXQAAAAADXQAAAAADXQAAAAAAaAAAAAACegAAAAABegAAAAADegAAAAABegAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADaAAAAAABegAAAAADegAAAAABegAAAAADegAAAAACegAAAAAD
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAAATgAAAAADaAAAAAADaAAAAAADbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAACXQAAAAACXQAAAAABJAAAAAABJAAAAAACJAAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAJAAAAAABJAAAAAADJAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABaAAAAAADaAAAAAADfgAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADaAAAAAACaAAAAAACHQAAAAAAaAAAAAACaAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABaAAAAAACaAAAAAAAXQAAAAAAaAAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACaAAAAAADaAAAAAADXQAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADaAAAAAACaAAAAAACfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABaAAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADTgAAAAACaAAAAAABaAAAAAABbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAACXQAAAAACXQAAAAABJAAAAAAAJAAAAAACJAAAAAACXQAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAACJAAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACaAAAAAACaAAAAAACfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACaAAAAAAAaAAAAAADHQAAAAACaAAAAAACaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAaAAAAAACaAAAAAABXQAAAAABaAAAAAAAaAAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACaAAAAAADaAAAAAACXQAAAAAAaAAAAAAAaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAaAAAAAACaAAAAAACfgAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAAA
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: HwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABewAAAAABfgAAAAAAewAAAAABHwAAAAACHwAAAAAAMwAAAAAAHwAAAAAAHwAAAAAAewAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAACewAAAAACewAAAAACewAAAAACHwAAAAACHwAAAAACMwAAAAAAHwAAAAACHwAAAAADewAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADewAAAAAAfgAAAAAAewAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAABewAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADewAAAAACewAAAAABewAAAAACewAAAAACewAAAAAAewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABXQAAAAACXQAAAAABegAAAAABJAAAAAADfgAAAAAAHwAAAAABXQAAAAACXQAAAAACXQAAAAAAegAAAAAAegAAAAACegAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAaAAAAAABXQAAAAAATgAAAAADTgAAAAABaAAAAAACTgAAAAACTgAAAAACaAAAAAABaAAAAAADTgAAAAACaAAAAAABTgAAAAACTgAAAAABTgAAAAADaAAAAAADTgAAAAAAaAAAAAADaAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABaAAAAAADXQAAAAACXQAAAAACXQAAAAABaAAAAAABXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: HwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAABewAAAAABfgAAAAAAewAAAAADHwAAAAAAHwAAAAABMwAAAAAAHwAAAAABHwAAAAAAewAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAADewAAAAACewAAAAAAewAAAAABHwAAAAADHwAAAAACMwAAAAAAHwAAAAAAHwAAAAABewAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAACewAAAAACfgAAAAAAewAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACewAAAAACewAAAAACewAAAAADewAAAAABewAAAAACewAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAAAegAAAAABegAAAAABegAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADXQAAAAABXQAAAAAAegAAAAACJAAAAAACfgAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAAAegAAAAACegAAAAAAegAAAAACHwAAAAABHwAAAAACHwAAAAAAHwAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAcAAAAAADcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACaAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABaAAAAAABXQAAAAAATgAAAAADTgAAAAADaAAAAAADTgAAAAACTgAAAAAAaAAAAAACaAAAAAABTgAAAAADaAAAAAAATgAAAAAATgAAAAACTgAAAAADaAAAAAABTgAAAAAAaAAAAAACaAAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAdQAAAAABdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAACfgAAAAAAdQAAAAAAdQAAAAACcAAAAAACJAAAAAABJAAAAAACJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAAAcAAAAAAD
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAACbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAdQAAAAACdQAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABaAAAAAACXQAAAAABfgAAAAAAdQAAAAABdQAAAAADcAAAAAACJAAAAAABJAAAAAACJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAdQAAAAADdQAAAAADcAAAAAAC
           version: 6
         -2,0:
           ind: -2,0
-          tiles: aAAAAAABaAAAAAADaAAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAABegAAAAABegAAAAADegAAAAABegAAAAACaAAAAAACaAAAAAAAXwAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAAAaAAAAAABaAAAAAAAXwAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAABegAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACaAAAAAACegAAAAAAegAAAAACegAAAAACegAAAAAAegAAAAACewAAAAABewAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACXQAAAAADXQAAAAAAXQAAAAABHwAAAAACewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAADXQAAAAABAwAAAAAAegAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAJAAAAAACHwAAAAACHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAAAXQAAAAABAwAAAAAAegAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAABewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABXQAAAAADAwAAAAAAegAAAAACJAAAAAACJAAAAAABJAAAAAACfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAABaAAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACXQAAAAACXQAAAAABXQAAAAAAaAAAAAABXQAAAAACeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADeQAAAAAAeQAAAAACLgAAAAAALgAAAAAAAQAAAAABaAAAAAAAaAAAAAABAQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAJAAAAAACeQAAAAACeQAAAAACeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAACXQAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAADfgAAAAAALgAAAAAAXQAAAAACXQAAAAACPAAAAAAAAQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAABXQAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAABfgAAAAAAfgAAAAAA
+          tiles: aAAAAAACaAAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAaAAAAAADegAAAAACegAAAAAAegAAAAAAegAAAAADegAAAAACaAAAAAABaAAAAAAAXwAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADaAAAAAACegAAAAADegAAAAADegAAAAACegAAAAABegAAAAACaAAAAAABaAAAAAABXwAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACaAAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAADegAAAAADaAAAAAACaAAAAAABaAAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAADegAAAAADegAAAAABewAAAAAAewAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACAwAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAABXQAAAAAAXQAAAAAAXQAAAAADHwAAAAADewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAADXQAAAAADAwAAAAAAegAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAJAAAAAABHwAAAAACHwAAAAADewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAACXQAAAAACAwAAAAAAegAAAAABJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAJAAAAAACHwAAAAACHwAAAAACewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAwAAAAAAegAAAAAAJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAADaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAAAaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAADXQAAAAABXQAAAAAAXQAAAAADaAAAAAABXQAAAAACeQAAAAACeQAAAAAAeQAAAAADeQAAAAABeQAAAAACeQAAAAAALgAAAAAALgAAAAAAAQAAAAAAaAAAAAACaAAAAAAAAQAAAAACfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAADeQAAAAADeQAAAAADeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAABXQAAAAADXQAAAAABaAAAAAADXQAAAAAAXQAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACfgAAAAAALgAAAAAAXQAAAAACXQAAAAAAPAAAAAAAAQAAAAAAXQAAAAADXQAAAAADaAAAAAADXQAAAAAAXQAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAACfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAADfgAAAAAAfgAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: bQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAJAAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAADaAAAAAADXQAAAAABXQAAAAADXQAAAAABfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADTgAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAABfgAAAAAAHwAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAA
+          tiles: bQAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAABJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAJAAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAADXQAAAAABaAAAAAABXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAHwAAAAACaAAAAAACaAAAAAAAaAAAAAACaAAAAAADaAAAAAABHwAAAAADfgAAAAAAHwAAAAADTgAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADHwAAAAADfgAAAAAAHwAAAAAC
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADJAAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABaAAAAAAAaAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACaAAAAAACaAAAAAADJAAAAAABfgAAAAAAXQAAAAABXQAAAAABHwAAAAADHwAAAAADHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAACHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACaAAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAADaAAAAAABTgAAAAADaAAAAAACTgAAAAABaAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACaAAAAAAAaAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACaAAAAAABaAAAAAABJAAAAAAAfgAAAAAAXQAAAAADXQAAAAABHwAAAAAAHwAAAAABHwAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAADHwAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACTgAAAAACaAAAAAABTgAAAAABaAAAAAAD
           version: 6
         1,1:
           ind: 1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADJAAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAXQAAAAADXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAABXQAAAAAAaAAAAAAAaAAAAAADaAAAAAADXQAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAACXQAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAABaAAAAAADaAAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAABJAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAACaAAAAAADXQAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABdQAAAAABdAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABJAAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAADfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAADXQAAAAADaAAAAAABaAAAAAACaAAAAAAAXQAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAAAXQAAAAADfgAAAAAAXQAAAAABaAAAAAADaAAAAAACaAAAAAAAXQAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAADaAAAAAACXQAAAAAAXQAAAAABXQAAAAADJAAAAAADfgAAAAAAXQAAAAACaAAAAAAAaAAAAAACaAAAAAADXQAAAAADaAAAAAABaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAdQAAAAACdAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAAAaAAAAAADXQAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAAAcAAAAAAAdQAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAAAcAAAAAAAdQAAAAACdAAAAAABdAAAAAADdAAAAAADfgAAAAAAXQAAAAAAXQAAAAABHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAABaAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAACaAAAAAADaAAAAAAAaAAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAABcAAAAAAAdQAAAAABdAAAAAABdAAAAAADdAAAAAAAXQAAAAACXQAAAAAAXQAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAADdQAAAAACdAAAAAACdAAAAAACdAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAACdAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAACcAAAAAABaAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABTgAAAAADTgAAAAABaAAAAAADTgAAAAABTgAAAAABaAAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABHwAAAAADHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAADJAAAAAACJAAAAAAAXQAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAATgAAAAADTgAAAAACHwAAAAACTgAAAAAATgAAAAAATgAAAAABHwAAAAAATgAAAAADTgAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAJAAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADJAAAAAADJAAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAAD
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADaAAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAADTgAAAAACTgAAAAAAaAAAAAACTgAAAAABTgAAAAACaAAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACHwAAAAADHwAAAAADXQAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAACJAAAAAADJAAAAAAAXQAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAADTgAAAAADTgAAAAABHwAAAAADTgAAAAADTgAAAAADTgAAAAADHwAAAAABTgAAAAABTgAAAAABHwAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAJAAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABJAAAAAACJAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAC
           version: 6
         -2,1:
           ind: -2,1
-          tiles: AQAAAAADAQAAAAAAAQAAAAADJAAAAAADfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAADfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAACKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABXwAAAAAAXwAAAAADXwAAAAAAXwAAAAAAXwAAAAADXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAADaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABXwAAAAACXwAAAAACXwAAAAAAXwAAAAACXwAAAAADXwAAAAABaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACJAAAAAACKAAAAAADKAAAAAADKAAAAAADKAAAAAADKAAAAAACKAAAAAADXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADegAAAAADegAAAAADegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAC
+          tiles: AQAAAAACAQAAAAACAQAAAAACJAAAAAACfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABKAAAAAADKAAAAAADKAAAAAABKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACXwAAAAACXwAAAAACXwAAAAAAXwAAAAADXwAAAAACXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAADXwAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAABXwAAAAAAaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADJAAAAAABKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAAAKAAAAAAAXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABegAAAAABegAAAAACegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAA
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAACgQAAAAAAfgAAAAAAgQAAAAAAggAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAB
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAADJAAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJgAAAAACJgAAAAADJgAAAAACJgAAAAACJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAABJgAAAAACJgAAAAADJgAAAAACJgAAAAABJAAAAAAAJAAAAAABJAAAAAABJgAAAAAAJgAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAJgAAAAADJgAAAAAAJAAAAAADJAAAAAADJAAAAAAAJgAAAAAAJgAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAABJgAAAAAAJgAAAAACJAAAAAABHwAAAAABHwAAAAAAJAAAAAAAJAAAAAABHwAAAAABHwAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAHwAAAAABHwAAAAACJAAAAAADJAAAAAABHwAAAAAAHwAAAAADHwAAAAACJgAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABJgAAAAABHwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACJAAAAAABJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAACJAAAAAACJAAAAAAAJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAACJAAAAAACJAAAAAAAJgAAAAABJgAAAAACJgAAAAADJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAADJgAAAAADJgAAAAAAJgAAAAACJgAAAAABJAAAAAADJAAAAAABJAAAAAADJgAAAAAAJgAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAACJgAAAAAAJgAAAAAAJAAAAAACJAAAAAADJAAAAAACJgAAAAADJgAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAACJgAAAAACJgAAAAADJAAAAAADHwAAAAACHwAAAAADJAAAAAABJAAAAAABHwAAAAADHwAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAADJAAAAAAAHwAAAAACHwAAAAACJAAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAADJgAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJAAAAAACJAAAAAADJgAAAAAAHwAAAAAC
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: HwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAAAaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAACJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAACXQAAAAABJAAAAAAAfgAAAAAAXQAAAAAATgAAAAABTgAAAAADaAAAAAABTgAAAAABTgAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAAB
+          tiles: HwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAACHwAAAAADfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADaAAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAABXQAAAAABaAAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAACXQAAAAABJAAAAAACfgAAAAAAXQAAAAAATgAAAAADTgAAAAAAaAAAAAACTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAA
           version: 6
         3,-3:
           ind: 3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAALCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAGJAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAEBwAAAAAHJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAAAHwAAAAABOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEBwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAGBwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAFJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAABfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAFJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAA
           version: 6
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADJAAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAKAAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADKAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAegAAAAABegAAAAADegAAAAABKAAAAAABKAAAAAACKAAAAAACKAAAAAACKAAAAAABKAAAAAABKAAAAAAAKAAAAAACfgAAAAAAfgAAAAAAewAAAAAAewAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAACfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAADKAAAAAAAKAAAAAADKAAAAAACKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADegAAAAABegAAAAACegAAAAABegAAAAADJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAABKAAAAAADKAAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAADKAAAAAADXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACJAAAAAACfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAABKAAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAABKAAAAAACKAAAAAABKAAAAAAAKAAAAAACKAAAAAADKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAACKAAAAAADKAAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAABKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAADKAAAAAAAKAAAAAACKAAAAAABKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAABegAAAAABegAAAAADegAAAAAAJAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACKAAAAAACKAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         -3,-1:
           ind: -3,-1
-          tiles: HwAAAAABfgAAAAAAewAAAAABewAAAAABewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAABegAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABTgAAAAABTgAAAAACKAAAAAABTgAAAAAATgAAAAABKAAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAAAKAAAAAAATgAAAAAATgAAAAAAKAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAAAZQAAAAABfgAAAAAAKAAAAAABKAAAAAACKAAAAAACfgAAAAAAaAAAAAAAKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAKAAAAAADKAAAAAADKAAAAAACfgAAAAAAXQAAAAADXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAXwAAAAACXwAAAAAAXwAAAAAAXwAAAAABXwAAAAACJAAAAAAAXwAAAAAAXwAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAADXwAAAAAAHwAAAAAAHwAAAAADJAAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAAAXQAAAAADXQAAAAABfgAAAAAAXwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABXwAAAAACHwAAAAACHwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAABfgAAAAAAXwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAACXwAAAAADHwAAAAAAHwAAAAACJAAAAAACJAAAAAAAJAAAAAABJAAAAAACJAAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAD
+          tiles: HwAAAAADfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAADegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAAATgAAAAABKAAAAAADTgAAAAACTgAAAAACKAAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABTgAAAAAATgAAAAAAKAAAAAAATgAAAAABTgAAAAADKAAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAABegAAAAADegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAABfgAAAAAAewAAAAAAewAAAAAAewAAAAABfgAAAAAAaAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAKAAAAAADKAAAAAAAKAAAAAAAfgAAAAAAaAAAAAADKAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAAAfgAAAAAAKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXwAAAAABXwAAAAAAXwAAAAADXwAAAAACXwAAAAABJAAAAAADXwAAAAACXwAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAXwAAAAAAHwAAAAAAHwAAAAAAJAAAAAACJAAAAAABJAAAAAABJAAAAAAAJAAAAAACXQAAAAADXQAAAAABfgAAAAAAXwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAACXwAAAAACHwAAAAACHwAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAADfgAAAAAAXwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADXwAAAAADHwAAAAACHwAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAA
           version: 6
         -3,0:
           ind: -3,0
-          tiles: ZQAAAAABZQAAAAADZQAAAAAAZQAAAAACZQAAAAADXQAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAAATgAAAAACTgAAAAABaAAAAAABTgAAAAADTgAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAAAXwAAAAADaAAAAAADaAAAAAABaAAAAAAAXwAAAAAAaAAAAAAAZQAAAAAAZQAAAAAAZQAAAAADZQAAAAADZQAAAAABXQAAAAABaAAAAAACaAAAAAABXQAAAAAAXQAAAAAAXwAAAAACaAAAAAACaAAAAAAAaAAAAAACXwAAAAAAaAAAAAACJAAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAACewAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAADXQAAAAADXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAACHwAAAAABHwAAAAADbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAAAewAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACAgAAAAAAJAAAAAADJAAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAADPAAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAA
+          tiles: ZQAAAAABZQAAAAACZQAAAAAAZQAAAAAAZQAAAAAAXQAAAAACaAAAAAABaAAAAAABXQAAAAADXQAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAADXQAAAAADTgAAAAABTgAAAAADaAAAAAABTgAAAAADTgAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAADXQAAAAACXwAAAAABaAAAAAACaAAAAAACaAAAAAACXwAAAAACaAAAAAACZQAAAAAAZQAAAAADZQAAAAAAZQAAAAABZQAAAAABXQAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAABXwAAAAAAaAAAAAAAaAAAAAABaAAAAAACXwAAAAAAaAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAAAJAAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAADaAAAAAABaAAAAAABaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAewAAAAACewAAAAACewAAAAAAewAAAAAAewAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAACXQAAAAADXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAADHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAADewAAAAADfgAAAAAAaAAAAAACaAAAAAACaAAAAAABAgAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAACewAAAAACfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABAgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAACPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAABPAAAAAAAPAAAAAAA
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAADgQAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAAGegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAABgQAAAAAAFQAAAAADfgAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAEfgAAAAAAgQAAAAAAegAAAAACegAAAAABegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABFQAAAAACegAAAAABegAAAAABfgAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAAAFQAAAAADegAAAAAAfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAAAgQAAAAAAFQAAAAAAfgAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAGfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAAAFQAAAAABegAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: aAAAAAADaAAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAABEgAAAAABEgAAAAADEgAAAAAAEgAAAAAAEgAAAAADfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAAAEgAAAAADEgAAAAAAEgAAAAACEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAADaAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAADegAAAAADegAAAAACXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAACEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAAAaAAAAAACXQAAAAAAaAAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAACEgAAAAACEgAAAAABEgAAAAAAEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAADaAAAAAAAaAAAAAADXQAAAAABaAAAAAAAXQAAAAADegAAAAACegAAAAABXQAAAAABEgAAAAADEgAAAAADEgAAAAADEgAAAAABEgAAAAABAwAAAAAAAwAAAAAAJAAAAAABaAAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAABegAAAAAAegAAAAACXQAAAAACEgAAAAABEgAAAAAAEgAAAAAAEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAABKAAAAAACKAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAAAaAAAAAABaAAAAAADaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAKAAAAAADKAAAAAADKAAAAAADKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAADewAAAAABewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAAD
+          tiles: aAAAAAABaAAAAAACaAAAAAABaAAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACegAAAAADegAAAAADXQAAAAACEgAAAAABEgAAAAABEgAAAAABEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAADaAAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAAAEgAAAAABEgAAAAADEgAAAAAAEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAADaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADegAAAAAAegAAAAACXQAAAAAAEgAAAAADEgAAAAACEgAAAAABEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAACaAAAAAABXQAAAAACaAAAAAABXQAAAAACegAAAAABegAAAAAAXQAAAAAAEgAAAAABEgAAAAABEgAAAAABEgAAAAACEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADaAAAAAAAXQAAAAABaAAAAAACXQAAAAABegAAAAADegAAAAAAXQAAAAADEgAAAAABEgAAAAACEgAAAAABEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAADegAAAAACegAAAAAAXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAACEgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADKAAAAAADKAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAKAAAAAABKAAAAAAAKAAAAAABKAAAAAABKAAAAAADKAAAAAADKAAAAAABKAAAAAABaAAAAAABaAAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAADewAAAAACewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAAA
           version: 6
         -3,-3:
           ind: -3,-3
-          tiles: XQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAABTgAAAAACaAAAAAADTgAAAAABTgAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAJfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAADTgAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAADXQAAAAADXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAABKAAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAABaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAAAKAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAC
+          tiles: XQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAAATgAAAAABaAAAAAAATgAAAAADTgAAAAACaAAAAAADaAAAAAAAaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAJAAAAAADJAAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAABTgAAAAADXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAACTgAAAAABXQAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAADKAAAAAAAKAAAAAACKAAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAADaAAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAABKAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAB
           version: 6
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAADZQAAAAAAZQAAAAADZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAADTgAAAAABTgAAAAACaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAAAXQAAAAADZQAAAAAAZQAAAAADZQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAJAAAAAABJAAAAAABJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAACXQAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADJAAAAAACJAAAAAABJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAAAZQAAAAACZQAAAAAAZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAABTgAAAAACTgAAAAADaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAADJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAJAAAAAABJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAXQAAAAABJAAAAAABJAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACJAAAAAABJAAAAAABJAAAAAAAJAAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAACJAAAAAACJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAABJAAAAAADJAAAAAACJAAAAAAB
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAaAAAAAACJAAAAAADAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAABaAAAAAACJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABaAAAAAADJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADaAAAAAADJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACHwAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAACaAAAAAADXQAAAAACaAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAABXQAAAAABaAAAAAADaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAB
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAJAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACaAAAAAACJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAaAAAAAADJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAACJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABHwAAAAACfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADXQAAAAADaAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAACaAAAAAADaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAADfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAA
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAABaAAAAAACTgAAAAACTgAAAAADaAAAAAACTgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXgAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAAAXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABYQAAAAABYQAAAAADXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAACaAAAAAADTgAAAAABTgAAAAABaAAAAAADTgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXgAAAAABXgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAYQAAAAABYQAAAAACXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAB
           version: 6
         2,0:
           ind: 2,0
-          tiles: HwAAAAAAHwAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABaAAAAAAAXQAAAAABdQAAAAABdQAAAAAAdQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADXQAAAAABXQAAAAABTgAAAAABXQAAAAABdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAABTgAAAAAATgAAAAADaAAAAAACaAAAAAABaAAAAAAATgAAAAAATgAAAAACXQAAAAADdQAAAAAAdQAAAAADaAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAaAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABdQAAAAACdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAADcAAAAAAAcAAAAAAAcAAAAAADcAAAAAADcAAAAAABdQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAACTgAAAAADcAAAAAACdQAAAAAAcAAAAAABTgAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAADcAAAAAAAcAAAAAADcAAAAAAAcAAAAAADdQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAACdQAAAAADdQAAAAADdQAAAAABdAAAAAABdQAAAAADfgAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAABdQAAAAABdQAAAAACdAAAAAAAJAAAAAACXQAAAAACXQAAAAAAegAAAAABegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAADfgAAAAAAXQAAAAABegAAAAACegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAADHwAAAAAAJAAAAAADfgAAAAAAXQAAAAADegAAAAABegAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAAATwAAAAAATwAAAAAA
+          tiles: HwAAAAADHwAAAAACHwAAAAADfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAaAAAAAABXQAAAAADdQAAAAADdQAAAAACdQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACJAAAAAABXQAAAAABXQAAAAACXQAAAAADaAAAAAAAXQAAAAACXQAAAAADTgAAAAACXQAAAAABdQAAAAADdQAAAAADdQAAAAADfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAACTgAAAAACTgAAAAAAaAAAAAADaAAAAAAAaAAAAAACTgAAAAAATgAAAAAAXQAAAAABdQAAAAADdQAAAAACaAAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACdQAAAAABdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAACcAAAAAACcAAAAAAAcAAAAAAAcAAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAcAAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAAAdQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAAATgAAAAABcAAAAAABdQAAAAACcAAAAAACTgAAAAADdQAAAAACXQAAAAACXQAAAAACXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAADcAAAAAACcAAAAAABcAAAAAABcAAAAAABdQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADdQAAAAACdQAAAAADdQAAAAAAdAAAAAACdQAAAAAAfgAAAAAAXQAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAAAdQAAAAABdQAAAAAAdAAAAAAAJAAAAAACXQAAAAAAXQAAAAABegAAAAADegAAAAAAegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAABcAAAAAAAcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAXQAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAACHwAAAAAAJAAAAAADfgAAAAAAXQAAAAACegAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACTwAAAAAATwAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
@@ -221,63 +221,63 @@ entities:
           version: 6
         0,2:
           ind: 0,2
-          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAdAAAAAACdAAAAAADdQAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAdAAAAAADdAAAAAAAdQAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HwAAAAADHwAAAAACewAAAAADewAAAAADewAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACJAAAAAADJAAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAADewAAAAADewAAAAADewAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACewAAAAAAewAAAAAAewAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACHwAAAAACHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAACdAAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACgQAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAJAAAAAABJAAAAAADJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAA
+          tiles: HwAAAAABHwAAAAADewAAAAADewAAAAAAewAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACJAAAAAADJAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAHwAAAAABewAAAAAAewAAAAADewAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADewAAAAABewAAAAAAewAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACgQAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAJAAAAAABJAAAAAACJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAB
           version: 6
         -2,2:
           ind: -2,2
-          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACJAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACJAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,3:
           ind: 0,3
-          tiles: XQAAAAABHwAAAAADHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAABTgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAADTgAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAaAAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAABHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAATgAAAAABTgAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABTgAAAAADTgAAAAAAHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABaAAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
-          tiles: fgAAAAAAdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAADdQAAAAAAdQAAAAACcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAcAAAAAADcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAAAdQAAAAABdQAAAAADdQAAAAACcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAADdQAAAAADdQAAAAABdQAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAAAcAAAAAADcAAAAAABdQAAAAABcAAAAAABdQAAAAABcAAAAAADcAAAAAADcAAAAAADcAAAAAADdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAAAcAAAAAACdQAAAAAAcAAAAAABfgAAAAAAcAAAAAACcAAAAAABdQAAAAACdQAAAAACdQAAAAABfgAAAAAAcAAAAAACcAAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAABcAAAAAADdQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADcAAAAAABfgAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABdQAAAAADcAAAAAACcAAAAAACcAAAAAACdQAAAAADdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAABcAAAAAACfgAAAAAAcAAAAAAAdQAAAAABdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABdQAAAAADcAAAAAAAdQAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAJAAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAACdQAAAAACcAAAAAADcAAAAAACcAAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAcAAAAAAAfgAAAAAAcAAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAADdQAAAAACcAAAAAACcAAAAAAAcAAAAAACdQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABdQAAAAACdQAAAAADdQAAAAACcAAAAAABfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAdQAAAAACdQAAAAABdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAADdQAAAAADdQAAAAACcAAAAAAAdQAAAAABcAAAAAADfgAAAAAAcAAAAAABcAAAAAABdQAAAAADdQAAAAACdQAAAAABfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAACdQAAAAAAdQAAAAADdQAAAAADcAAAAAAAdQAAAAACcAAAAAAAcAAAAAADcAAAAAACcAAAAAADdQAAAAACdQAAAAACdQAAAAACdQAAAAAAdQAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAABdQAAAAACcAAAAAAAdQAAAAACcAAAAAADcAAAAAAAcAAAAAADcAAAAAABdQAAAAACdQAAAAAAdQAAAAACfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAADdQAAAAAAdQAAAAACdQAAAAAAcAAAAAABdQAAAAABcAAAAAAAfgAAAAAAcAAAAAACcAAAAAACdQAAAAACdQAAAAAAdQAAAAADfgAAAAAAcAAAAAADcAAAAAABfgAAAAAAdQAAAAABdQAAAAAAdQAAAAAAcAAAAAACdQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABdQAAAAAAcAAAAAABcAAAAAABcAAAAAACdQAAAAAAdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAADcAAAAAABfgAAAAAAcAAAAAADdQAAAAABdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADdQAAAAACcAAAAAAAdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACfgAAAAAAcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAJAAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAACcAAAAAABcAAAAAAAcAAAAAACHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADcAAAAAAAfgAAAAAAcAAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAACdQAAAAAAcAAAAAAAcAAAAAAAcAAAAAACdQAAAAABcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAACdQAAAAACdQAAAAACcAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         3,1:
           ind: 3,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAADXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAABdQAAAAADdQAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAADegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXgAAAAABZAAAAAAAXQAAAAABXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-4:
           ind: -4,-4
-          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
+          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAABJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACJAAAAAACJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAACHwAAAAAAHwAAAAACHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAACHwAAAAAAHwAAAAACHwAAAAADJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAJAAAAAABJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAABdQAAAAACdQAAAAADcAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAACcAAAAAACcAAAAAABdQAAAAABdQAAAAABfgAAAAAAcAAAAAABdQAAAAADdQAAAAABdQAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAACdQAAAAACcAAAAAABfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAABcAAAAAABcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAADcAAAAAACaAAAAAABaAAAAAADaAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABdQAAAAABcAAAAAABcAAAAAADcAAAAAAAdQAAAAACcAAAAAADcAAAAAAAcAAAAAABaAAAAAADaAAAAAABaAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABdQAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAADdQAAAAACcAAAAAACcAAAAAAAdQAAAAACdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAACHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACJAAAAAADJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAABdQAAAAABcAAAAAAAfgAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABdQAAAAAAcAAAAAACcAAAAAAAcAAAAAADdQAAAAADdQAAAAACfgAAAAAAcAAAAAADdQAAAAAAdQAAAAABdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAAAdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAAAdQAAAAACcAAAAAADcAAAAAAAdQAAAAABcAAAAAAAcAAAAAACcAAAAAADaAAAAAACaAAAAAAAaAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADdQAAAAADcAAAAAAAcAAAAAAAcAAAAAACdQAAAAADcAAAAAABcAAAAAADcAAAAAAAaAAAAAADaAAAAAABaAAAAAADcAAAAAADfgAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAACcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADdQAAAAACdQAAAAAAcAAAAAAAfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAADdQAAAAACcAAAAAAAcAAAAAABdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         4,0:
           ind: 4,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: XQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACfgAAAAAAXQAAAAACbQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACXQAAAAABXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAADaAAAAAACfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAXQAAAAACbQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADXQAAAAACXQAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,1:
           ind: 4,1
@@ -285,7 +285,7 @@ entities:
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAABJAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAACegAAAAABegAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAaAAAAAACXQAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAACegAAAAADegAAAAABXQAAAAADXQAAAAABJAAAAAACfgAAAAAAaAAAAAABXQAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAABegAAAAACegAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABJAAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABbQAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAATgAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAABJAAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAABHwAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAACegAAAAADegAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAaAAAAAABXQAAAAADegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAABegAAAAACegAAAAAAXQAAAAACXQAAAAADJAAAAAADfgAAAAAAaAAAAAADXQAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAADegAAAAACegAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACJAAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAAAbQAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACbQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADbQAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAA
           version: 6
         5,-1:
           ind: 5,-1
@@ -293,19 +293,19 @@ entities:
           version: 6
         5,-2:
           ind: 5,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABXQAAAAACXQAAAAAAaAAAAAABaAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACXQAAAAADXQAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAADXQAAAAAAaAAAAAABaAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADXQAAAAABXQAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         4,-3:
           ind: 4,-3
-          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAKBwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAFBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAADfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAAfwAAAAAABwAAAAAHfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAB
           version: 6
         -5,-3:
           ind: -5,-3
@@ -313,7 +313,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -325,11 +325,11 @@ entities:
           version: 6
         5,-3:
           ind: 5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAGWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
-          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-4:
           ind: -2,-4
@@ -337,15 +337,15 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACBwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAFBwAAAAAABwAAAAAGBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAALBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAMBwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAKfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABBwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAALBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
           version: 6
         4,-4:
           ind: 4,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -664,8 +664,6 @@ entities:
             1726: 63,-24
             1727: 65,-25
             1728: 65,-24
-            2093: -10,-41
-            2094: -10,-40
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -882,6 +880,8 @@ entities:
             6930: 45,15
             6972: 82,-11
             6980: 59,-4
+            7023: -11,-40
+            7024: -12,-40
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -3707,7 +3707,6 @@ entities:
             5786: -35,2
             5787: -31,2
             5788: -31,2
-            5789: -33,1
             5790: -28,0
             5791: -30,-1
             5792: -27,-1
@@ -4136,7 +4135,6 @@ entities:
             3714: -54,10
             3715: -53,9
             3716: -54,9
-            3739: -43,1
             3740: -40,2
             3741: -39,1
             3742: -39,1
@@ -4161,7 +4159,6 @@ entities:
             3761: -39,3
             3762: -40,4
             3763: -38,4
-            3764: -33,1
             3765: -31,2
             3766: -31,-1
             3767: -29,0
@@ -5146,18 +5143,6 @@ entities:
             4919: -38,-54
             4920: -37,-53
             4921: -37,-54
-            4922: -14,-39
-            4923: -13,-38
-            4924: -13,-39
-            4925: -13,-40
-            4926: -13,-41
-            4927: -13,-39
-            4928: -13,-40
-            4929: -13,-41
-            4930: -13,-39
-            4931: -13,-40
-            4932: -13,-39
-            4933: -13,-40
             4936: -5,-41
             4937: -5,-40
             4938: -6,-42
@@ -5613,6 +5598,14 @@ entities:
             6855: -38,13
             6947: 43,13
             6948: 42,11
+            7015: 59,-8
+            7016: 57,-5
+            7017: 61,-4
+            7025: -14,-38
+            7026: -13,-37
+            7036: -12,-37
+            7037: -12,-37
+            7038: -11,-40
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -5890,7 +5883,6 @@ entities:
             3327: -36,2
             3328: -35,2
             3329: -37,1
-            3330: -33,1
             3331: -32,2
             3332: -32,1
             3333: -31,2
@@ -5913,7 +5905,6 @@ entities:
             3350: -47,1
             3351: -45,1
             3352: -44,1
-            3353: -43,1
             3354: -54,1
             3355: -54,-4
             3356: -55,-4
@@ -6308,8 +6299,6 @@ entities:
             4878: -14,-27
             4879: -14,-29
             4880: -17,-29
-            4934: -14,-38
-            4935: -14,-38
             4953: -6,-37
             4954: -5,-37
             4955: -4,-37
@@ -6480,6 +6469,24 @@ entities:
             6946: 47,12
             6958: 44,15
             6959: 44,15
+            6999: 58,-7
+            7000: 59,-6
+            7001: 58,-5
+            7002: 60,-5
+            7003: 60,-6
+            7004: 60,-7
+            7005: 60,-6
+            7018: 59,-4
+            7019: 58,-4
+            7020: 58,-4
+            7027: -15,-37
+            7028: -14,-37
+            7034: -11,-37
+            7035: -11,-38
+            7039: -33,1
+            7040: -33,1
+            7042: -43,1
+            7043: -46,1
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -6526,6 +6533,13 @@ entities:
             6955: 46,13
             6956: 46,12
             6957: 42,11
+            7006: 57,-4
+            7007: 57,-6
+            7008: 61,-7
+            7009: 61,-5
+            7029: -15,-38
+            7030: -13,-37
+            7031: -13,-38
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -6573,6 +6587,13 @@ entities:
             6951: 46,11
             6952: 47,13
             6953: 46,14
+            7010: 60,-8
+            7011: 61,-8
+            7012: 61,-8
+            7013: 57,-8
+            7014: 58,-8
+            7032: -14,-38
+            7033: -12,-39
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -7188,7 +7209,6 @@ entities:
             2247: -25,6
             2248: -25,7
             2260: -43,0
-            2261: -43,1
             2262: -43,2
             2263: -43,3
             2264: -43,-1
@@ -7274,6 +7294,7 @@ entities:
             2754: 77,-18
             3079: -54,-50
             6651: -24,-18
+            7041: -43,1
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineN
@@ -12443,12 +12464,6 @@ entities:
       - 19460
       - 19308
       - 18975
-  - uid: 8426
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-38.5
-      parent: 2
   - uid: 8427
     components:
     - type: Transform
@@ -13196,6 +13211,18 @@ entities:
       - 8693
       - 19778
       - 19775
+  - uid: 15596
+    components:
+    - type: Transform
+      pos: -13.5,-35.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7938
+      - 7949
+      - 14066
+      - 7945
+      - 7944
   - uid: 17617
     components:
     - type: Transform
@@ -14740,7 +14767,7 @@ entities:
       pos: -16.5,19.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -50157.324
+      secondsUntilStateChange: -52402.332
       state: Opening
   - uid: 4196
     components:
@@ -15799,13 +15826,6 @@ entities:
     - type: Transform
       pos: 17.5,-39.5
       parent: 2
-  - uid: 7905
-    components:
-    - type: MetaData
-      name: Disposals room hatch
-    - type: Transform
-      pos: -9.5,-37.5
-      parent: 2
   - uid: 8209
     components:
     - type: Transform
@@ -15821,6 +15841,12 @@ entities:
     - type: Transform
       pos: 52.5,19.5
       parent: 2
+  - uid: 12804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-36.5
+      parent: 2
   - uid: 14911
     components:
     - type: Transform
@@ -15868,17 +15894,17 @@ entities:
       parent: 2
 - proto: AirlockMaintMedLocked
   entities:
-  - uid: 548
-    components:
-    - type: Transform
-      pos: 60.5,-1.5
-      parent: 2
   - uid: 7766
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 59.5,-8.5
       parent: 2
+  - uid: 14757
+    components:
+    - type: Transform
+      pos: 60.5,-0.5
+      parent: 2
 - proto: AirlockMaintRnDLocked
   entities:
   - uid: 7130
@@ -15950,16 +15976,25 @@ entities:
     - type: Transform
       pos: 49.5,0.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 21867
   - uid: 6515
     components:
     - type: Transform
       pos: 50.5,0.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 6514
   - uid: 6516
     components:
     - type: Transform
       pos: 51.5,0.5
       parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 21867
   - uid: 6705
     components:
     - type: Transform
@@ -16260,6 +16295,15 @@ entities:
       deviceLists:
       - 7048
       - 4744
+  - uid: 14066
+    components:
+    - type: Transform
+      pos: -10.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15597
+      - 15596
   - uid: 17875
     components:
     - type: Transform
@@ -16953,12 +16997,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-57.5
       parent: 2
-  - uid: 20123
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-39.5
-      parent: 2
   - uid: 20177
     components:
     - type: Transform
@@ -19187,11 +19225,6 @@ entities:
       parent: 2
 - proto: Barricade
   entities:
-  - uid: 1456
-    components:
-    - type: Transform
-      pos: -10.5,-37.5
-      parent: 2
   - uid: 5969
     components:
     - type: Transform
@@ -19239,6 +19272,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -30.5,20.5
       parent: 2
+  - uid: 12924
+    components:
+    - type: Transform
+      pos: -10.5,-36.5
+      parent: 2
   - uid: 14166
     components:
     - type: Transform
@@ -20092,11 +20130,11 @@ entities:
   - uid: 7934
     components:
     - type: Transform
-      pos: -14.5,-39.5
+      pos: -9.5,-41.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7937
+      - 14901
   - uid: 16939
     components:
     - type: Transform
@@ -20748,6 +20786,12 @@ entities:
       parent: 2
 - proto: ButtonFrameCaution
   entities:
+  - uid: 548
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-37.5
+      parent: 2
   - uid: 19830
     components:
     - type: Transform
@@ -20788,12 +20832,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-12.5
       parent: 2
-  - uid: 21615
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-39.5
-      parent: 2
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 20290
@@ -20802,6 +20840,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 56.464813,16.849148
       parent: 2
+- proto: ButtonFrameExit
+  entities:
+  - uid: 21868
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-2.5
+      parent: 2
 - proto: ButtonFrameGrey
   entities:
   - uid: 4982
@@ -21479,6 +21525,11 @@ entities:
     - type: Transform
       pos: 41.5,17.5
       parent: 2
+  - uid: 2701
+    components:
+    - type: Transform
+      pos: -13.5,-39.5
+      parent: 2
   - uid: 2737
     components:
     - type: Transform
@@ -21664,6 +21715,41 @@ entities:
     - type: Transform
       pos: 28.5,26.5
       parent: 2
+  - uid: 7781
+    components:
+    - type: Transform
+      pos: -8.5,-36.5
+      parent: 2
+  - uid: 7887
+    components:
+    - type: Transform
+      pos: -9.5,-36.5
+      parent: 2
+  - uid: 7923
+    components:
+    - type: Transform
+      pos: -10.5,-37.5
+      parent: 2
+  - uid: 7935
+    components:
+    - type: Transform
+      pos: -12.5,-36.5
+      parent: 2
+  - uid: 7936
+    components:
+    - type: Transform
+      pos: -14.5,-36.5
+      parent: 2
+  - uid: 7937
+    components:
+    - type: Transform
+      pos: -10.5,-38.5
+      parent: 2
+  - uid: 8164
+    components:
+    - type: Transform
+      pos: -10.5,-39.5
+      parent: 2
   - uid: 8518
     components:
     - type: Transform
@@ -31854,56 +31940,6 @@ entities:
     - type: Transform
       pos: -7.5,-37.5
       parent: 2
-  - uid: 12797
-    components:
-    - type: Transform
-      pos: -8.5,-37.5
-      parent: 2
-  - uid: 12798
-    components:
-    - type: Transform
-      pos: -9.5,-37.5
-      parent: 2
-  - uid: 12799
-    components:
-    - type: Transform
-      pos: -11.5,-37.5
-      parent: 2
-  - uid: 12800
-    components:
-    - type: Transform
-      pos: -10.5,-37.5
-      parent: 2
-  - uid: 12801
-    components:
-    - type: Transform
-      pos: -12.5,-37.5
-      parent: 2
-  - uid: 12802
-    components:
-    - type: Transform
-      pos: -13.5,-37.5
-      parent: 2
-  - uid: 12803
-    components:
-    - type: Transform
-      pos: -14.5,-37.5
-      parent: 2
-  - uid: 12804
-    components:
-    - type: Transform
-      pos: -14.5,-38.5
-      parent: 2
-  - uid: 12805
-    components:
-    - type: Transform
-      pos: -14.5,-39.5
-      parent: 2
-  - uid: 12806
-    components:
-    - type: Transform
-      pos: -14.5,-40.5
-      parent: 2
   - uid: 12807
     components:
     - type: Transform
@@ -32364,6 +32400,11 @@ entities:
     - type: Transform
       pos: -18.5,9.5
       parent: 2
+  - uid: 12925
+    components:
+    - type: Transform
+      pos: -11.5,-36.5
+      parent: 2
   - uid: 13452
     components:
     - type: Transform
@@ -32374,6 +32415,11 @@ entities:
     - type: Transform
       pos: 36.5,-25.5
       parent: 2
+  - uid: 13521
+    components:
+    - type: Transform
+      pos: -13.5,-36.5
+      parent: 2
   - uid: 13649
     components:
     - type: Transform
@@ -33294,6 +33340,11 @@ entities:
     - type: Transform
       pos: -23.5,23.5
       parent: 2
+  - uid: 14065
+    components:
+    - type: Transform
+      pos: -10.5,-36.5
+      parent: 2
   - uid: 14262
     components:
     - type: Transform
@@ -35704,21 +35755,6 @@ entities:
     - type: Transform
       pos: -11.5,-26.5
       parent: 2
-  - uid: 14851
-    components:
-    - type: Transform
-      pos: -12.5,-38.5
-      parent: 2
-  - uid: 14852
-    components:
-    - type: Transform
-      pos: -12.5,-39.5
-      parent: 2
-  - uid: 14853
-    components:
-    - type: Transform
-      pos: -12.5,-40.5
-      parent: 2
   - uid: 14962
     components:
     - type: Transform
@@ -35944,11 +35980,26 @@ entities:
     - type: Transform
       pos: -21.5,39.5
       parent: 2
+  - uid: 15415
+    components:
+    - type: Transform
+      pos: -10.5,-40.5
+      parent: 2
   - uid: 15589
     components:
     - type: Transform
       pos: 5.5,16.5
       parent: 2
+  - uid: 15594
+    components:
+    - type: Transform
+      pos: -13.5,-37.5
+      parent: 2
+  - uid: 15595
+    components:
+    - type: Transform
+      pos: -13.5,-40.5
+      parent: 2
   - uid: 15955
     components:
     - type: Transform
@@ -36774,6 +36825,11 @@ entities:
     - type: Transform
       pos: -26.5,33.5
       parent: 2
+  - uid: 20109
+    components:
+    - type: Transform
+      pos: -13.5,-38.5
+      parent: 2
   - uid: 20235
     components:
     - type: Transform
@@ -50922,6 +50978,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-46.5
       parent: 2
+  - uid: 7748
+    components:
+    - type: Transform
+      pos: -9.5,-39.5
+      parent: 2
   - uid: 7784
     components:
     - type: Transform
@@ -50956,6 +51017,18 @@ entities:
     - type: Transform
       pos: 19.5,-51.5
       parent: 2
+  - uid: 7917
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-38.5
+      parent: 2
+  - uid: 7919
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-39.5
+      parent: 2
   - uid: 7924
     components:
     - type: Transform
@@ -51167,6 +51240,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -39.5,9.5
       parent: 2
+  - uid: 8197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-38.5
+      parent: 2
   - uid: 8211
     components:
     - type: Transform
@@ -51285,6 +51364,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.5,17.5
       parent: 2
+  - uid: 12799
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-38.5
+      parent: 2
   - uid: 12917
     components:
     - type: Transform
@@ -52475,38 +52560,7 @@ entities:
   - uid: 14064
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-37.5
-      parent: 2
-  - uid: 14065
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-38.5
-      parent: 2
-  - uid: 14066
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-38.5
-      parent: 2
-  - uid: 14067
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-37.5
-      parent: 2
-  - uid: 14068
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-36.5
-      parent: 2
-  - uid: 14069
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-36.5
+      pos: -9.5,-42.5
       parent: 2
   - uid: 14070
     components:
@@ -53701,6 +53755,11 @@ entities:
     - type: Transform
       pos: 0.5,-56.5
       parent: 2
+  - uid: 15598
+    components:
+    - type: Transform
+      pos: -9.5,-41.5
+      parent: 2
   - uid: 15648
     components:
     - type: Transform
@@ -54058,6 +54117,11 @@ entities:
     - type: Transform
       pos: 53.5,-39.5
       parent: 2
+  - uid: 16933
+    components:
+    - type: Transform
+      pos: -9.5,-38.5
+      parent: 2
   - uid: 17059
     components:
     - type: Transform
@@ -54097,12 +54161,29 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 61.5,8.5
       parent: 2
+  - uid: 18163
+    components:
+    - type: Transform
+      pos: -9.5,-40.5
+      parent: 2
   - uid: 19409
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 61.5,9.5
       parent: 2
+  - uid: 20119
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-39.5
+      parent: 2
+  - uid: 20120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-39.5
+      parent: 2
   - uid: 20437
     components:
     - type: Transform
@@ -56581,12 +56662,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,-43.5
       parent: 2
-  - uid: 7947
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-38.5
-      parent: 2
   - uid: 8016
     components:
     - type: Transform
@@ -56754,6 +56829,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-15.5
       parent: 2
+  - uid: 14069
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-38.5
+      parent: 2
   - uid: 14250
     components:
     - type: Transform
@@ -57143,6 +57224,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-5.5
       parent: 21128
+  - uid: 21865
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-4.5
+      parent: 2
+  - uid: 21866
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-3.5
+      parent: 2
 - proto: ChairCursed
   entities:
   - uid: 16559
@@ -57840,11 +57933,6 @@ entities:
     - type: Transform
       pos: -51.5,4.5
       parent: 2
-  - uid: 2700
-    components:
-    - type: Transform
-      pos: -9.5,-40.5
-      parent: 2
   - uid: 4226
     components:
     - type: Transform
@@ -57890,6 +57978,11 @@ entities:
     - type: Transform
       pos: 28.5,-35.5
       parent: 2
+  - uid: 7961
+    components:
+    - type: Transform
+      pos: -13.5,-36.5
+      parent: 2
   - uid: 15835
     components:
     - type: Transform
@@ -57907,6 +58000,11 @@ entities:
       parent: 2
 - proto: ClosetEmergencyN2FilledRandom
   entities:
+  - uid: 14756
+    components:
+    - type: Transform
+      pos: -12.5,-36.5
+      parent: 2
   - uid: 16145
     components:
     - type: Transform
@@ -57949,11 +58047,6 @@ entities:
     - type: Transform
       pos: -39.5,-33.5
       parent: 2
-  - uid: 2701
-    components:
-    - type: Transform
-      pos: -9.5,-39.5
-      parent: 2
   - uid: 4256
     components:
     - type: Transform
@@ -58056,6 +58149,11 @@ entities:
     - type: Transform
       pos: 83.5,-10.5
       parent: 2
+  - uid: 14067
+    components:
+    - type: Transform
+      pos: -14.5,-36.5
+      parent: 2
   - uid: 14740
     components:
     - type: Transform
@@ -58131,11 +58229,6 @@ entities:
     - type: Transform
       pos: 35.5,-6.5
       parent: 2
-  - uid: 14757
-    components:
-    - type: Transform
-      pos: -12.5,-40.5
-      parent: 2
   - uid: 14758
     components:
     - type: Transform
@@ -58193,6 +58286,11 @@ entities:
     - type: Transform
       pos: 5.5,16.5
       parent: 2
+  - uid: 7921
+    components:
+    - type: Transform
+      pos: -8.5,-35.5
+      parent: 2
   - uid: 8502
     components:
     - type: Transform
@@ -58268,11 +58366,6 @@ entities:
     - type: Transform
       pos: 59.5,7.5
       parent: 2
-  - uid: 14756
-    components:
-    - type: Transform
-      pos: -8.5,-36.5
-      parent: 2
   - uid: 14866
     components:
     - type: Transform
@@ -59574,11 +59667,6 @@ entities:
     - type: Transform
       pos: -36.5,-39.5
       parent: 2
-  - uid: 14900
-    components:
-    - type: Transform
-      pos: -14.5,-36.5
-      parent: 2
   - uid: 14903
     components:
     - type: Transform
@@ -59589,6 +59677,11 @@ entities:
     - type: Transform
       pos: 58.5,8.5
       parent: 2
+  - uid: 17438
+    components:
+    - type: Transform
+      pos: -14.5,-36.5
+      parent: 2
   - uid: 20877
     components:
     - type: Transform
@@ -59672,11 +59765,6 @@ entities:
     - type: Transform
       pos: -17.5,23.5
       parent: 2
-  - uid: 14901
-    components:
-    - type: Transform
-      pos: -9.5,-39.5
-      parent: 2
   - uid: 14902
     components:
     - type: Transform
@@ -60322,13 +60410,6 @@ entities:
     - type: Transform
       pos: -37.5,23.5
       parent: 2
-- proto: CondenserMachineCircuitBoard
-  entities:
-  - uid: 16933
-    components:
-    - type: Transform
-      pos: 17.875872,-18.445808
-      parent: 2
 - proto: ContainmentFieldGenerator
   entities:
   - uid: 925
@@ -60380,6 +60461,15 @@ entities:
       parent: 2
 - proto: ConveyorBelt
   entities:
+  - uid: 2696
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-39.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 7940
   - uid: 5475
     components:
     - type: Transform
@@ -60425,89 +60515,87 @@ entities:
     - type: DeviceLinkSink
       links:
       - 5553
-  - uid: 7918
-    components:
-    - type: Transform
-      pos: -14.5,-39.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 7936
-  - uid: 7919
+  - uid: 7905
     components:
     - type: Transform
-      pos: -14.5,-38.5
+      rot: 3.141592653589793 rad
+      pos: -9.5,-42.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 7920
+      - 7940
+  - uid: 7911
     components:
     - type: Transform
-      pos: -14.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-40.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 7921
+      - 20106
+  - uid: 7912
     components:
     - type: Transform
-      pos: -14.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-40.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 7922
+      - 20106
+  - uid: 7913
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-40.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 7923
+      - 20106
+  - uid: 7915
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-36.5
+      rot: 3.141592653589793 rad
+      pos: -9.5,-38.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 7938
+      - 7940
+  - uid: 7916
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-40.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 7939
+      - 20106
+  - uid: 8553
     components:
     - type: Transform
-      pos: -14.5,-41.5
+      rot: 3.141592653589793 rad
+      pos: 25.5,23.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 8199
+      - 15603
+  - uid: 8665
     components:
     - type: Transform
-      pos: -14.5,-42.5
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-40.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
-  - uid: 8553
+      - 20106
+  - uid: 9233
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 25.5,23.5
+      pos: -9.5,-40.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 15603
+      - 7940
   - uid: 17528
     components:
     - type: Transform
@@ -60544,6 +60632,15 @@ entities:
     - type: DeviceLinkSink
       links:
       - 15603
+  - uid: 20107
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-41.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 7940
 - proto: CowToolboxFilled
   entities:
   - uid: 20818
@@ -60591,11 +60688,6 @@ entities:
     - type: Transform
       pos: 29.5,21.5
       parent: 2
-  - uid: 15415
-    components:
-    - type: Transform
-      pos: -11.5,-40.5
-      parent: 2
   - uid: 16411
     components:
     - type: Transform
@@ -60890,6 +60982,11 @@ entities:
     - type: Transform
       pos: -31.385849,-8.650845
       parent: 2
+  - uid: 21862
+    components:
+    - type: Transform
+      pos: 58.554802,-7.6299205
+      parent: 2
 - proto: CryogenicSleepUnit
   entities:
   - uid: 6029
@@ -61236,10 +61333,10 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconDisposals
   entities:
-  - uid: 20842
+  - uid: 14853
     components:
     - type: Transform
-      pos: -12.5,-38.5
+      pos: -11.5,-38.5
       parent: 2
   - uid: 21452
     components:
@@ -61725,17 +61822,23 @@ entities:
       parent: 2
 - proto: DisposalBend
   entities:
+  - uid: 2055
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,14.5
+      parent: 2
   - uid: 6025
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -24.5,19.5
       parent: 2
-  - uid: 12923
+  - uid: 7946
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-37.5
       parent: 2
   - uid: 12928
     components:
@@ -62136,11 +62239,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,5.5
       parent: 2
-  - uid: 13521
-    components:
-    - type: Transform
-      pos: 50.5,13.5
-      parent: 2
   - uid: 13522
     components:
     - type: Transform
@@ -62198,6 +62296,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,16.5
       parent: 2
+  - uid: 20118
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-37.5
+      parent: 2
   - uid: 20691
     components:
     - type: Transform
@@ -62256,6 +62360,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,-31.5
       parent: 2
+  - uid: 20842
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,14.5
+      parent: 2
   - uid: 21325
     components:
     - type: Transform
@@ -62395,6 +62505,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 63.5,-19.5
       parent: 2
+  - uid: 21857
+    components:
+    - type: Transform
+      pos: 50.5,13.5
+      parent: 2
 - proto: DisposalJunctionFlipped
   entities:
   - uid: 3293
@@ -62577,23 +62692,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,17.5
       parent: 2
-  - uid: 9042
+  - uid: 7939
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-44.5
+      pos: -14.5,-39.5
       parent: 2
-  - uid: 12924
+  - uid: 7943
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-37.5
+      pos: -14.5,-38.5
       parent: 2
-  - uid: 12925
+  - uid: 9042
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-44.5
+      parent: 2
+  - uid: 12798
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -10.5,-37.5
+      pos: -12.5,-37.5
       parent: 2
   - uid: 12926
     components:
@@ -65525,6 +65644,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,19.5
       parent: 2
+  - uid: 20085
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-37.5
+      parent: 2
+  - uid: 20116
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-37.5
+      parent: 2
+  - uid: 20123
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-37.5
+      parent: 2
   - uid: 20227
     components:
     - type: Transform
@@ -66014,6 +66151,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,23.5
       parent: 2
+  - uid: 21615
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,14.5
+      parent: 2
   - uid: 21754
     components:
     - type: Transform
@@ -66508,6 +66651,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,14.5
       parent: 2
+  - uid: 21853
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,14.5
+      parent: 2
+  - uid: 21854
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,14.5
+      parent: 2
+  - uid: 21855
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,14.5
+      parent: 2
+  - uid: 21856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,14.5
+      parent: 2
+  - uid: 21858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,14.5
+      parent: 2
 - proto: DisposalTrunk
   entities:
   - uid: 2313
@@ -66516,10 +66689,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-46.5
       parent: 2
-  - uid: 12922
+  - uid: 7947
     components:
     - type: Transform
-      pos: -12.5,-36.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-40.5
+      parent: 2
+  - uid: 8350
+    components:
+    - type: Transform
+      pos: 57.5,15.5
       parent: 2
   - uid: 12936
     components:
@@ -66768,6 +66947,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 45.5,15.5
       parent: 2
+  - uid: 21859
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,2.5
+      parent: 2
+  - uid: 21860
+    components:
+    - type: Transform
+      pos: 21.5,21.5
+      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 950
@@ -67443,6 +67633,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,2.5
       parent: 2
+  - uid: 14068
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-38.5
+      parent: 2
   - uid: 15080
     components:
     - type: Transform
@@ -67889,12 +68085,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-36.5
       parent: 2
-  - uid: 17438
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-38.5
-      parent: 2
   - uid: 17439
     components:
     - type: Transform
@@ -68568,11 +68758,6 @@ entities:
     - type: Transform
       pos: -11.5,-35.5
       parent: 2
-    - type: DeviceList
-      devices:
-      - 20123
-      - 8665
-      - 14946
   - uid: 9188
     components:
     - type: Transform
@@ -68596,6 +68781,16 @@ entities:
       - 19779
       - 8692
       - 8693
+  - uid: 15597
+    components:
+    - type: Transform
+      pos: -12.5,-35.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7938
+      - 7949
+      - 14066
   - uid: 17547
     components:
     - type: Transform
@@ -69585,15 +69780,6 @@ entities:
       - 8622
       - 8623
       - 19317
-  - uid: 17640
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-40.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8665
   - uid: 17641
     components:
     - type: Transform
@@ -70342,6 +70528,16 @@ entities:
     - type: Transform
       pos: 57.5,24.5
       parent: 2
+  - uid: 7938
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15597
+      - 15596
   - uid: 8130
     components:
     - type: Transform
@@ -70663,12 +70859,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-35.5
       parent: 2
-  - uid: 8665
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -9.5,-37.5
-      parent: 2
   - uid: 8666
     components:
     - type: Transform
@@ -71317,6 +71507,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,14.5
       parent: 2
+  - uid: 7949
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15597
+      - 15596
   - uid: 8555
     components:
     - type: Transform
@@ -71488,12 +71688,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-58.5
       parent: 2
-  - uid: 14946
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-36.5
-      parent: 2
   - uid: 16204
     components:
     - type: Transform
@@ -75531,14 +75725,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 20110
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 20114
     components:
     - type: Transform
@@ -75555,14 +75741,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20116
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 20144
     components:
     - type: Transform
@@ -76331,6 +76509,38 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 79.5,-12.5
       parent: 2
+  - uid: 7918
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7922
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7942
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7948
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 8373
     components:
     - type: Transform
@@ -76382,6 +76592,38 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 12797
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12803
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 12923
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 17003
     components:
     - type: Transform
@@ -88594,30 +88836,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 20106
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 20107
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 20108
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 20112
     components:
     - type: Transform
@@ -88640,29 +88858,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 20118
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 20119
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -11.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 20120
-    components:
-    - type: Transform
-      pos: -12.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 20121
     components:
     - type: Transform
@@ -91327,6 +91522,17 @@ entities:
       - 4744
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 7944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15596
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9034
     components:
     - type: Transform
@@ -91374,14 +91580,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18163
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 18217
     components:
     - type: Transform
@@ -92421,6 +92619,17 @@ entities:
       - 4744
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 7945
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15596
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9078
     components:
     - type: Transform
@@ -93439,14 +93648,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 20109
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 20168
     components:
     - type: Transform
@@ -94638,6 +94839,11 @@ entities:
     - type: Transform
       pos: 37.5,-31.5
       parent: 2
+  - uid: 2700
+    components:
+    - type: Transform
+      pos: -10.5,-41.5
+      parent: 2
   - uid: 3184
     components:
     - type: Transform
@@ -95960,18 +96166,6 @@ entities:
     - type: Transform
       pos: 25.5,-49.5
       parent: 2
-  - uid: 7748
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-41.5
-      parent: 2
-  - uid: 7781
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-41.5
-      parent: 2
   - uid: 7810
     components:
     - type: Transform
@@ -95994,12 +96188,6 @@ entities:
     - type: Transform
       pos: 18.5,-61.5
       parent: 2
-  - uid: 7899
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-41.5
-      parent: 2
   - uid: 7901
     components:
     - type: Transform
@@ -96012,18 +96200,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,-45.5
       parent: 2
-  - uid: 7904
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-41.5
-      parent: 2
-  - uid: 7912
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-40.5
-      parent: 2
   - uid: 8049
     components:
     - type: Transform
@@ -96119,6 +96295,21 @@ entities:
     - type: Transform
       pos: -22.5,10.5
       parent: 2
+  - uid: 12800
+    components:
+    - type: Transform
+      pos: -14.5,-41.5
+      parent: 2
+  - uid: 12802
+    components:
+    - type: Transform
+      pos: -13.5,-41.5
+      parent: 2
+  - uid: 14852
+    components:
+    - type: Transform
+      pos: -11.5,-41.5
+      parent: 2
   - uid: 14989
     components:
     - type: Transform
@@ -96304,11 +96495,6 @@ entities:
     - type: Transform
       pos: 4.5,-49.5
       parent: 2
-  - uid: 15594
-    components:
-    - type: Transform
-      pos: -13.5,-42.5
-      parent: 2
   - uid: 15601
     components:
     - type: Transform
@@ -98338,26 +98524,6 @@ entities:
     - type: Transform
       pos: 3.5,-42.5
       parent: 2
-  - uid: 15595
-    components:
-    - type: Transform
-      pos: -12.5,-42.5
-      parent: 2
-  - uid: 15596
-    components:
-    - type: Transform
-      pos: -11.5,-42.5
-      parent: 2
-  - uid: 15597
-    components:
-    - type: Transform
-      pos: -10.5,-42.5
-      parent: 2
-  - uid: 15598
-    components:
-    - type: Transform
-      pos: -9.5,-42.5
-      parent: 2
   - uid: 15608
     components:
     - type: Transform
@@ -99375,12 +99541,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-42.5
       parent: 2
-  - uid: 9233
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-4.5
-      parent: 2
   - uid: 9234
     components:
     - type: Transform
@@ -99411,6 +99571,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,25.5
       parent: 2
+  - uid: 20516
+    components:
+    - type: Transform
+      pos: 29.5,-4.5
+      parent: 2
 - proto: InflatableWallStack5
   entities:
   - uid: 1466
@@ -101182,11 +101347,6 @@ entities:
       parent: 2
 - proto: MaintenanceToolSpawner
   entities:
-  - uid: 2696
-    components:
-    - type: Transform
-      pos: -11.5,-36.5
-      parent: 2
   - uid: 3640
     components:
     - type: Transform
@@ -101229,11 +101389,6 @@ entities:
     - type: Transform
       pos: -41.5,-2.5
       parent: 2
-  - uid: 8197
-    components:
-    - type: Transform
-      pos: -10.5,-36.5
-      parent: 2
   - uid: 15927
     components:
     - type: Transform
@@ -102816,10 +102971,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,24.5
       parent: 2
-  - uid: 7913
+  - uid: 12801
     components:
     - type: Transform
-      pos: -14.5,-41.5
+      pos: -9.5,-41.5
+      parent: 2
+  - uid: 14946
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-40.5
       parent: 2
 - proto: PlasticFlapsClear
   entities:
@@ -106302,15 +106463,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 8164
-    components:
-    - type: Transform
-      pos: -12.5,-36.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 8752
     components:
     - type: Transform
@@ -106331,6 +106483,11 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 12922
+    components:
+    - type: Transform
+      pos: -12.5,-36.5
+      parent: 2
   - uid: 15005
     components:
     - type: Transform
@@ -106929,18 +107086,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-40.5
       parent: 2
-  - uid: 7948
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-36.5
-      parent: 2
-  - uid: 7949
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,-36.5
-      parent: 2
   - uid: 8021
     components:
     - type: Transform
@@ -108425,6 +108570,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 57.5,-21.5
       parent: 2
+  - uid: 14900
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-37.5
+      parent: 2
   - uid: 21557
     components:
     - type: Transform
@@ -110220,6 +110371,16 @@ entities:
     - type: Transform
       pos: 58.5,-8.5
       parent: 2
+  - uid: 21863
+    components:
+    - type: Transform
+      pos: 62.5,-3.5
+      parent: 2
+  - uid: 21864
+    components:
+    - type: Transform
+      pos: 62.5,-4.5
+      parent: 2
 - proto: RandomProduce
   entities:
   - uid: 21375
@@ -110283,6 +110444,11 @@ entities:
     - type: Transform
       pos: -32.5,-0.5
       parent: 2
+  - uid: 20108
+    components:
+    - type: Transform
+      pos: -13.5,-37.5
+      parent: 2
 - proto: RandomSpawner100
   entities:
   - uid: 1924
@@ -110490,16 +110656,6 @@ entities:
     - type: Transform
       pos: -21.5,-36.5
       parent: 2
-  - uid: 8491
-    components:
-    - type: Transform
-      pos: -10.5,-39.5
-      parent: 2
-  - uid: 8492
-    components:
-    - type: Transform
-      pos: -13.5,-38.5
-      parent: 2
   - uid: 8493
     components:
     - type: Transform
@@ -110729,14 +110885,15 @@ entities:
       parent: 2
 - proto: Recycler
   entities:
-  - uid: 7917
+  - uid: 1456
     components:
     - type: Transform
-      pos: -14.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: -9.5,-38.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 7936
+      - 14851
 - proto: ReinforcedGirder
   entities:
   - uid: 14964
@@ -112548,33 +112705,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,-47.5
       parent: 2
-  - uid: 7911
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-41.5
-      parent: 2
-  - uid: 7915
+  - uid: 7899
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -10.5,-41.5
       parent: 2
-  - uid: 7916
-    components:
-    - type: Transform
-      pos: -9.5,-41.5
-      parent: 2
-  - uid: 7933
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-40.5
-      parent: 2
-  - uid: 7940
-    components:
-    - type: Transform
-      pos: -12.5,-41.5
-      parent: 2
   - uid: 7960
     components:
     - type: Transform
@@ -112617,6 +112753,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-39.5
       parent: 2
+  - uid: 8199
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-41.5
+      parent: 2
   - uid: 8204
     components:
     - type: Transform
@@ -112638,6 +112780,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 68.5,20.5
       parent: 2
+  - uid: 8426
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-41.5
+      parent: 2
+  - uid: 8492
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-41.5
+      parent: 2
   - uid: 11658
     components:
     - type: Transform
@@ -113484,11 +113638,6 @@ entities:
       parent: 2
 - proto: SheetPlasma
   entities:
-  - uid: 2055
-    components:
-    - type: Transform
-      pos: 17.650831,-17.633183
-      parent: 2
   - uid: 7262
     components:
     - type: Transform
@@ -114654,6 +114803,15 @@ entities:
         - Pressed: Toggle
         20350:
         - Pressed: Toggle
+  - uid: 21867
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-2.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6516: []
 - proto: SignalButtonDirectional
   entities:
   - uid: 2100
@@ -114788,18 +114946,6 @@ entities:
       linkedPorts:
         2871:
         - Pressed: Toggle
-  - uid: 7937
-    components:
-    - type: MetaData
-      name: disposals door button
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-39.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        7934:
-        - Pressed: Toggle
   - uid: 8185
     components:
     - type: Transform
@@ -114902,6 +115048,16 @@ entities:
       linkedPorts:
         20777:
         - Pressed: Toggle
+  - uid: 14851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.499018,-37.179466
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        1456:
+        - Pressed: Forward
   - uid: 14879
     components:
     - type: MetaData
@@ -114914,6 +115070,16 @@ entities:
       linkedPorts:
         1686:
         - Pressed: Toggle
+  - uid: 14901
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-37.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        7934:
+        - Pressed: Toggle
   - uid: 15913
     components:
     - type: Transform
@@ -115473,6 +115639,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -10.5,18.5
       parent: 2
+  - uid: 21869
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.509625,-34.787674
+      parent: 2
 - proto: SignDirectionalBrig
   entities:
   - uid: 13605
@@ -115794,10 +115966,11 @@ entities:
       parent: 2
 - proto: SignDisposalSpace
   entities:
-  - uid: 8350
+  - uid: 7904
     components:
     - type: Transform
-      pos: -9.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-37.5
       parent: 2
 - proto: SignDoors
   entities:
@@ -119753,17 +119926,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Bridge-Med hallway
-  - uid: 20085
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-38.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Disposals
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 9023
@@ -123483,6 +123645,13 @@ entities:
     - type: Transform
       pos: -27.617392,-17.536655
       parent: 2
+- proto: trayScanner
+  entities:
+  - uid: 21861
+    components:
+    - type: Transform
+      pos: 58.334652,-7.458692
+      parent: 2
 - proto: TwoWayLever
   entities:
   - uid: 5553
@@ -123512,77 +123681,84 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-  - uid: 7936
+  - uid: 7940
     components:
     - type: Transform
-      pos: -11.5,-39.5
+      pos: -10.5,-39.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7923:
+        7915:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7922:
+        2696:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7921:
+        9233:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7920:
+        20107:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7919:
+        7905:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7918:
+  - uid: 15603
+    components:
+    - type: Transform
+      pos: 24.5,23.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        8553:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7938:
+        17528:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7939:
+        17529:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        8199:
+        17530:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        7917:
+        17531:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-  - uid: 15603
+  - uid: 20106
     components:
     - type: Transform
-      pos: 24.5,23.5
+      pos: -11.5,-39.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        8553:
+        7916:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        17528:
+        7913:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        17529:
+        8665:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        17530:
+        7912:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        17531:
+        7911:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
@@ -129051,6 +129227,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -49.5,-41.5
       parent: 2
+  - uid: 8491
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-41.5
+      parent: 2
   - uid: 8519
     components:
     - type: Transform
@@ -135097,12 +135279,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-50.5
       parent: 2
-  - uid: 7887
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-41.5
-      parent: 2
   - uid: 7888
     components:
     - type: Transform
@@ -135145,12 +135321,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,-43.5
       parent: 2
-  - uid: 7961
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,-39.5
-      parent: 2
   - uid: 7962
     components:
     - type: Transform
@@ -139146,20 +139316,16 @@ entities:
     - type: Transform
       pos: -14.5,-35.5
       parent: 2
-  - uid: 7931
-    components:
-    - type: Transform
-      pos: -12.5,-35.5
-      parent: 2
-  - uid: 7932
+  - uid: 7920
     components:
     - type: Transform
-      pos: -9.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-37.5
       parent: 2
-  - uid: 7935
+  - uid: 7931
     components:
     - type: Transform
-      pos: -9.5,-38.5
+      pos: -12.5,-35.5
       parent: 2
   - uid: 7950
     components:
@@ -139462,6 +139628,12 @@ entities:
     - type: Transform
       pos: -25.5,-42.5
       parent: 2
+  - uid: 20110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-37.5
+      parent: 2
   - uid: 20297
     components:
     - type: Transform
@@ -142287,6 +142459,13 @@ entities:
     - type: Transform
       pos: -7.5141225,-25.4744
       parent: 2
+- proto: WelderIndustrial
+  entities:
+  - uid: 17640
+    components:
+    - type: Transform
+      pos: 17.592184,-17.644693
+      parent: 2
 - proto: WeldingFuelTankFull
   entities:
   - uid: 3481
@@ -142504,12 +142683,6 @@ entities:
     - type: Transform
       pos: 60.5,-15.5
       parent: 2
-  - uid: 7942
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-37.5
-      parent: 2
   - uid: 15022
     components:
     - type: Transform
@@ -142600,6 +142773,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,-28.5
       parent: 2
+  - uid: 7933
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-38.5
+      parent: 2
   - uid: 16324
     components:
     - type: Transform
@@ -143558,29 +143737,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-46.5
       parent: 2
-  - uid: 7943
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-37.5
-      parent: 2
-  - uid: 7944
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,-38.5
-      parent: 2
-  - uid: 7945
+  - uid: 7932
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -13.5,-37.5
-      parent: 2
-  - uid: 7946
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-36.5
+      pos: -11.5,-40.5
       parent: 2
   - uid: 8051
     components:
@@ -143624,6 +143785,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-17.5
       parent: 2
+  - uid: 12805
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-40.5
+      parent: 2
   - uid: 14260
     components:
     - type: Transform
@@ -143690,6 +143857,12 @@ entities:
     - type: Transform
       pos: 40.5,-20.5
       parent: 2
+  - uid: 20515
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-39.5
+      parent: 2
   - uid: 21553
     components:
     - type: Transform

From accf8adf972ec28da489c4dfc5cfa89453d88f03 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Fri, 7 Jun 2024 07:28:55 -0400
Subject: [PATCH 342/568] Fixed the guidebook listing every single rule
 (#28680)

* Well i tried this way

* New approach (start)

* Did it

* makes spacelaw available, put it under sec
---
 .../Guidebook/Controls/GuidebookWindow.xaml   |  8 ++-
 .../Controls/GuidebookWindow.xaml.cs          | 11 ++++
 .../Guidebook/GuidebookUIController.cs        |  3 ++
 Content.Shared/Guidebook/GuideEntry.cs        |  2 +
 Resources/Prototypes/Guidebook/rules.yml      | 51 ++++++++++++++++++-
 Resources/Prototypes/Guidebook/security.yml   |  1 +
 Resources/Prototypes/Guidebook/ss14.yml       |  3 --
 7 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
index cc6cc6e82b09..b52eacfa7226 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -2,7 +2,7 @@
                 xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                SetSize="750 700"
+                SetSize="850 700"
                 MinSize="100 200"
                 Resizable="True"
                 Title="{Loc 'guidebook-window-title'}">
@@ -21,9 +21,13 @@
                     Margin="0 5 10 5">
                 </LineEdit>
             </BoxContainer>
+            <BoxContainer Access="Internal" Name="ReturnContainer" Orientation="Horizontal" HorizontalAlignment="Right" Visible="False">
+                <Button Name="HomeButton" Text="{Loc 'ui-rules-button-home'}" Margin="0 0 10 0"/>
+            </BoxContainer>
             <ScrollContainer Name="Scroll" HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True">
                 <Control>
-                    <BoxContainer Orientation="Vertical" Name="EntryContainer" Margin="5 5 5 5" Visible="False"/>
+                    <BoxContainer Orientation="Vertical" Name="EntryContainer" Margin="5 5 5 5" Visible="False">
+                    </BoxContainer>
                     <BoxContainer Orientation="Vertical" Name="Placeholder" Margin="5 5 5 5">
                         <Label HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Loc 'guidebook-placeholder-text'}"/>
                         <Label HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Loc 'guidebook-placeholder-text-2'}"/>
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 3a67dca89da8..f5ee1200cc68 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -3,6 +3,7 @@
 using Content.Client.UserInterface.ControlExtensions;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
+using Content.Client.UserInterface.Systems.Info;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -36,7 +37,13 @@ public GuidebookWindow()
     private void OnSelectionChanged(TreeItem? item)
     {
         if (item != null && item.Metadata is GuideEntry entry)
+        {
             ShowGuide(entry);
+
+            var isRulesEntry = entry.RuleEntry;
+            ReturnContainer.Visible = isRulesEntry;
+            HomeButton.OnPressed += _ => ShowGuide(entry);
+        }
         else
             ClearSelectedGuide();
     }
@@ -153,6 +160,10 @@ private void RepopulateTree(List<ProtoId<GuideEntryPrototype>>? roots = null, Pr
             return null;
         }
 
+        var rulesProto = UserInterfaceManager.GetUIController<InfoUIController>().GetCoreRuleEntry();
+        if (entry.RuleEntry && entry.Id != rulesProto.Id)
+            return null;
+
         var item = Tree.AddItem(parent);
         item.Metadata = entry;
         var name = Loc.GetString(entry.Name);
diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
index e30a6b3a215b..61195f3a9a7e 100644
--- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
+++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
@@ -124,6 +124,9 @@ private void OnWindowClosed()
     {
         if (GuidebookButton != null)
             GuidebookButton.Pressed = false;
+
+        if (_guideWindow != null)
+            _guideWindow.ReturnContainer.Visible = false;
     }
 
     private void OnWindowOpen()
diff --git a/Content.Shared/Guidebook/GuideEntry.cs b/Content.Shared/Guidebook/GuideEntry.cs
index 0e0e166cd55a..c6079aab08b4 100644
--- a/Content.Shared/Guidebook/GuideEntry.cs
+++ b/Content.Shared/Guidebook/GuideEntry.cs
@@ -39,6 +39,8 @@ public class GuideEntry
     /// </summary>
     [DataField] public bool FilterEnabled = default!;
 
+    [DataField] public bool RuleEntry;
+
     /// <summary>
     ///     Priority for sorting top-level guides when shown in a tree / table of contents.
     ///     If the guide is the child of some other guide, the order simply determined by the order of children in <see cref="Children"/>.
diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml
index 4aad44948555..72dd47649554 100644
--- a/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -1,35 +1,41 @@
 - type: guideEntry # Default for forks and stuff. Should not be listed anywhere if the server is using a custom ruleset.
   id: DefaultRuleset
   name: guide-entry-rules
+  ruleEntry: true
   text: "/ServerInfo/Guidebook/ServerRules/DefaultRules.xml"
 
 - type: guideEntry
   id: CoreRuleset
   name: guide-entry-rules-core-only
+  ruleEntry: true
   priority: 0
   text: "/ServerInfo/Guidebook/ServerRules/WizDenCoreOnlyRules.xml"
 
 - type: guideEntry
   id: StandardRuleset
   name: guide-entry-rules-lrp
+  ruleEntry: true
   priority: 5
   text: "/ServerInfo/Guidebook/ServerRules/WizDenLRPRules.xml"
 
 - type: guideEntry
   id: MRPRuleset
   name: guide-entry-rules-mrp
+  ruleEntry: true
   priority: 10
   text: "/ServerInfo/Guidebook/ServerRules/WizDenMRPRules.xml"
 
 - type: guideEntry
   id: RoleTypes
   name: guide-entry-rules-role-types
+  ruleEntry: true
   priority: 20
   text: "/ServerInfo/Guidebook/ServerRules/RoleTypes.xml"
 
 - type: guideEntry
   id: CoreRules
   name: guide-entry-rules-core
+  ruleEntry: true
   priority: 30
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC0.xml"
   children:
@@ -51,90 +57,105 @@
 - type: guideEntry
   id: RuleC1
   name: guide-entry-rules-c1
+  ruleEntry: true
   priority: 1
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC1Admins.xml"
 
 - type: guideEntry
   id: RuleC2
   name: guide-entry-rules-c2
+  ruleEntry: true
   priority: 2
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC2DBAD.xml"
 
 - type: guideEntry
   id: RuleC3
   name: guide-entry-rules-c3
+  ruleEntry: true
   priority: 3
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC3NoHate.xml"
 
 - type: guideEntry
   id: RuleC4
   name: guide-entry-rules-c4
+  ruleEntry: true
   priority: 4
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC4NoERP.xml"
 
 - type: guideEntry
   id: RuleC5
   name: guide-entry-rules-c5
+  ruleEntry: true
   priority: 5
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC5Metacomms.xml"
 
 - type: guideEntry
   id: RuleC6
   name: guide-entry-rules-c6
+  ruleEntry: true
   priority: 6
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC6BanEvasion.xml"
 
 - type: guideEntry
   id: RuleC7
   name: guide-entry-rules-c7
+  ruleEntry: true
   priority: 7
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC7EnglishOnly.xml"
 
 - type: guideEntry
   id: RuleC8
   name: guide-entry-rules-c8
+  ruleEntry: true
   priority: 8
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC8Exploits.xml"
 
 - type: guideEntry
   id: RuleC9
   name: guide-entry-rules-c9
+  ruleEntry: true
   priority: 9
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC9Multikey.xml"
 
 - type: guideEntry
   id: RuleC10
   name: guide-entry-rules-c10
+  ruleEntry: true
   priority: 10
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC10AHelp.xml"
 
 - type: guideEntry
   id: RuleC11
   name: guide-entry-rules-c11
+  ruleEntry: true
   priority: 11
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml"
 
 - type: guideEntry
   id: RuleC12
   name: guide-entry-rules-c12
+  ruleEntry: true
   priority: 12
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC12MinAge.xml"
 
 - type: guideEntry
   id: RuleC13
   name: guide-entry-rules-c13
+  ruleEntry: true
   priority: 13
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml"
 
 - type: guideEntry
   id: RuleC14
   name: guide-entry-rules-c14
+  ruleEntry: true
   priority: 14
   text: "/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC14ICinOOC.xml"
 
 - type: guideEntry
   id: RoleplayRules
   name: guide-entry-rules-roleplay
+  ruleEntry: true
   priority: 40
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR0.xml"
   children:
@@ -157,96 +178,112 @@
 - type: guideEntry
   id: RuleR1
   name: guide-entry-rules-r1
+  ruleEntry: true
   priority: 1
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR1Silicons.xml"
 
 - type: guideEntry
   id: RuleR2
   name: guide-entry-rules-r2
+  ruleEntry: true
   priority: 2
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml"
 
 - type: guideEntry
   id: RuleR3
   name: guide-entry-rules-r3
+  ruleEntry: true
   priority: 3
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml"
 
 - type: guideEntry
   id: RuleR4
   name: guide-entry-rules-r4
+  ruleEntry: true
   priority: 4
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml"
 
 - type: guideEntry
   id: RuleR5
   name: guide-entry-rules-r5
+  ruleEntry: true
   priority: 5
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml"
 
 - type: guideEntry
   id: RuleR6
   name: guide-entry-rules-r6
+  ruleEntry: true
   priority: 6
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR6SelfAntag.xml"
 
 - type: guideEntry
   id: RuleR7
   name: guide-entry-rules-r7
+  ruleEntry: true
   priority: 7
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR7RoundStalling.xml"
 
 - type: guideEntry
   id: RuleR8
   name: guide-entry-rules-r8
+  ruleEntry: true
   priority: 8
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR8NoFriendlyAntag.xml"
 
 - type: guideEntry
   id: RuleR9
   name: guide-entry-rules-r9
+  ruleEntry: true
   priority: 9
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml"
 
 - type: guideEntry
   id: RuleR10
   name: guide-entry-rules-r10
+  ruleEntry: true
   priority: 10
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR10Subordination.xml"
 
 - type: guideEntry
   id: RuleR11
   name: guide-entry-rules-r11
+  ruleEntry: true
   priority: 11
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml"
 
 - type: guideEntry
   id: RuleR12
   name: guide-entry-rules-r12
+  ruleEntry: true
   priority: 12
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR12RoleAbandonment.xml"
 
 - type: guideEntry
   id: RuleR13
   name: guide-entry-rules-r13
+  ruleEntry: true
   priority: 13
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR13PerformRole.xml"
 
 - type: guideEntry
   id: RuleR14
   name: guide-entry-rules-r14
+  ruleEntry: true
   priority: 14
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR14SecComStandard.xml"
 
 - type: guideEntry
   id: RuleR15
   name: guide-entry-rules-r15
+  ruleEntry: true
   priority: 15
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml"
 
 - type: guideEntry
   id: SiliconRules
   name: guide-entry-rules-silicon
+  ruleEntry: true
   priority: 50
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS0.xml"
   children:
@@ -264,67 +301,77 @@
 - type: guideEntry
   id: RuleS1
   name: guide-entry-rules-s1
+  ruleEntry: true
   priority: 1
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS1Laws.xml"
 
 - type: guideEntry
   id: RuleS2
   name: guide-entry-rules-s2
+  ruleEntry: true
   priority: 2
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS2LawPriority.xml"
 
 - type: guideEntry
   id: RuleS3
   name: guide-entry-rules-s3
+  ruleEntry: true
   priority: 3
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS3LawRedefinition.xml"
 
 - type: guideEntry
   id: RuleS4
   name: guide-entry-rules-s4
+  ruleEntry: true
   priority: 4
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS4RequestChanges.xml"
 
 - type: guideEntry
   id: RuleS5
   name: guide-entry-rules-s5
+  ruleEntry: true
   priority: 5
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS5FreeSilicon.xml"
 
 - type: guideEntry
   id: RuleS6
   name: guide-entry-rules-s6
+  ruleEntry: true
   priority: 6
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS6UnreasonableOrders.xml"
 
 - type: guideEntry
   id: RuleS7
   name: guide-entry-rules-s7
+  ruleEntry: true
   priority: 7
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS7Consistency.xml"
 
 - type: guideEntry
   id: RuleS8
   name: guide-entry-rules-s8
+  ruleEntry: true
   priority: 8
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS8DefaultCrewDefinition.xml"
 
 - type: guideEntry
   id: RuleS9
   name: guide-entry-rules-s9
+  ruleEntry: true
   priority: 9
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS9DefaultHarmDefinition.xml"
 
 - type: guideEntry
   id: RuleS10
   name: guide-entry-rules-s10
+  ruleEntry: true
   priority: 10
   text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml"
 
 - type: guideEntry
   id: SpaceLaw
   name: guide-entry-rules-space-law
-  priority: 60
+  priority: 1
   text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml"
   children:
   - SpaceLawCrimeList
@@ -359,11 +406,13 @@
 - type: guideEntry
   id: BanTypes
   name: guide-entry-rules-ban-types
+  ruleEntry: true
   priority: 90
   text: "/ServerInfo/Guidebook/ServerRules/BanTypes.xml"
 
 - type: guideEntry
   id: BanDurations
   name: guide-entry-rules-ban-durations
+  ruleEntry: true
   priority: 100
   text: "/ServerInfo/Guidebook/ServerRules/BanDurations.xml"
diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml
index f5e347082836..17edb0300658 100644
--- a/Resources/Prototypes/Guidebook/security.yml
+++ b/Resources/Prototypes/Guidebook/security.yml
@@ -6,6 +6,7 @@
   - Forensics
   - Defusal
   - CriminalRecords
+  - SpaceLaw
 
 - type: guideEntry
   id: Forensics
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml
index 5b1f1dd8f97a..f0b72b90b43a 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/ss14.yml
@@ -3,7 +3,6 @@
   name: guide-entry-ss14
   text: "/ServerInfo/Guidebook/SpaceStation14.xml"
   children:
-  - SpaceLaw
   - Controls
   - Jobs
   - Survival
@@ -22,5 +21,3 @@
   id: Glossary
   name: guide-entry-glossary
   text: "/ServerInfo/Guidebook/Glossary.xml"
-
-

From 24055021776c814bd14d3abac5256aaa6fbd66cc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 7 Jun 2024 11:30:02 +0000
Subject: [PATCH 343/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 31999b221c20..3865ceee6270 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Vermidia
-  changes:
-  - message: Made the Artifact Reports page up to date with current Xenoarchaeology
-    type: Tweak
-  id: 6195
-  time: '2024-03-19T03:22:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26252
 - author: keronshb
   changes:
   - message: Fixed a bug where stores were enabling refunds after a purchase
@@ -3848,3 +3841,10 @@
   id: 6694
   time: '2024-06-07T01:24:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28679
+- author: AJCM-git
+  changes:
+  - message: Guidebook no longer lists every single rule
+    type: Fix
+  id: 6695
+  time: '2024-06-07T11:28:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28680

From b3debf449ab8b25d0d196ee0b6db693950d10f99 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Fri, 7 Jun 2024 09:03:22 -0500
Subject: [PATCH 344/568] rule fixes first pass (#28701)

update
---
 Resources/Locale/en-US/guidebook/guides.ftl   |  2 +
 Resources/Prototypes/Guidebook/rules.yml      | 17 +++++++
 .../CoreRules/RuleC11AhelpThreats.xml         |  2 +-
 .../CoreRules/RuleC13CharacterNames.xml       |  2 +
 .../RoleplayRules/RuleR11Escalation.xml       |  8 ++--
 .../RoleplayRules/RuleR15SpaceLaw.xml         | 11 ++++-
 .../RoleplayRules/RuleR2Familiars.xml         |  2 +-
 .../RoleplayRules/RuleR4Metashield.xml        |  3 +-
 .../RoleplayRules/RuleR5Arrivals.xml          |  2 +-
 .../RoleplayRules/RuleR9MassSabotage.xml      |  1 +
 .../ServerRules/SpaceLaw/SLCrimeList.xml      | 48 +++++++++----------
 .../SpaceLaw/SLRestrictedWeapons.xml          |  7 ++-
 .../ServerRules/SpaceLaw/SpaceLaw.xml         |  4 +-
 13 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 66c1a42adf28..5b99ea2bbe90 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -100,6 +100,8 @@ guide-entry-rules-r8 = R8
 guide-entry-rules-r9 = R9
 guide-entry-rules-r10 = R10
 guide-entry-rules-r11 = R11
+guide-entry-rules-r11-1 = R11-1
+guide-entry-rules-r11-2 = R11-2
 guide-entry-rules-r12 = R12
 guide-entry-rules-r13 = R13
 guide-entry-rules-r14 = R14
diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml
index 72dd47649554..a867ca233640 100644
--- a/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -251,6 +251,23 @@
   ruleEntry: true
   priority: 11
   text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml"
+  children:
+  - RuleR11-1
+  - RuleR11-2
+
+- type: guideEntry
+  id: RuleR11-1
+  name: guide-entry-rules-r11-1
+  ruleEntry: true
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-1AnimalEscalation.xml"
+
+- type: guideEntry
+  id: RuleR11-2
+  name: guide-entry-rules-r11-2
+  ruleEntry: true
+  priority: 10
+  text: "/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11-2ConflictTypes.xml"
 
 - type: guideEntry
   id: RuleR12
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml
index 47420264946c..15784c4dfeb7 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC11AhelpThreats.xml
@@ -1,6 +1,6 @@
 <Document>
   # Core Rule 11 - Do not threaten to ahelp other players or argue with them about rules
-  Don't threaten to ahelp a player, don't tell them you are ahelping them, and don't tell them you did ahelp them. You can argue in character about Space Law, but do not argue about whether something is or is not against the rules. If you think someone is breaking a rule, ahelp them. If you don't think someone is breaking a rule, don't ahelp them. Either way, the best thing that you can do once you after is to continue in-character.
+  This rule covers out-of-character (OOC) and in-character (IC) actions. Don't threaten to ahelp a player, don't tell them you are ahelping them, and don't tell them you did ahelp them. You can argue in character about Space Law, but do not argue about whether something is or is not against the rules. If you think someone is breaking a rule, ahelp them. If you don't think someone is breaking a rule, don't ahelp them. Either way, the best thing that you can do after is to continue in-character.
 
   ## Example Scenario 1
   You are a security officer and think someone who is causing a ton of problems for security is not an antag and is breaking the rules by doing so.
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
index faaedd4d5112..6c01f9de23a4 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml
@@ -6,6 +6,8 @@
   - Usernames, objects, random characters, very "low effort" names, "meta" names, or otherwise implausible names cannot be used as names. See examples below.
   - Admin rulings on IC names are final and disputes should be done through the forums, not by refusing to comply with an admin
 
+  Clowns and mimes are exempt from the prohibition on titles/honorifics, and have loosened restrictions on low effort and implausible names.
+
   ## Clarification on "Meta" Names
   Meta names are ones which attempt to take advantage of some game mechanic or game design choice. "Urist McHands" is a meta name because it is the default name used for admin spawned humans. "Operator Whiskey" is a meta name because it follows the naming pattern of nuclear operatives. This rule is not intended to prevent things like nuclear operatives using a fake ID with names that appear to be nuclear operative names if they decide that they want to do that.
 
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml
index 6f91fa0fb12a..18ebc79a8361 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR11Escalation.xml
@@ -24,7 +24,7 @@
   People using or brandishing Syndicate items can typically be presumed to have lethal intent. Someone with lethal intent can typically be immediately escalated against at a lethal level, a notable exception is if you have the tools to safely detain them.
 
   ## Escalation Involving Animals
-  See [textlink="Escalation Involving Animals" link="RuleR11-1AnimalEscalation"].
+  See [textlink="Escalation Involving Animals" link="RuleR11-1"].
 
   ## Exemptions
   Escalation rules aren't enforced against non-players, but players will be held responsible for rule violations even if they don't realize that a character or animal was controlled by another player. Characters who have purple text saying that they are catatonic are considered non-players. Characters who are disconnected are still considered players.
@@ -33,7 +33,7 @@
   Escalation rules are enforced even against non-players.
 
   ## Examples of Conflict Types
-  See [textlink="Examples of Conflict Types" link="RuleR11-2ConflictTypes"].
+  See [textlink="Examples of Conflict Types" link="RuleR11-2"].
 
   ## Example Scenarios
   These examples assume that you are not an antagonist.
@@ -54,8 +54,8 @@
   Prohibited:
   - A player starts punching you, so you gib them.
   - A clown throws a pie at you and steals your shoes, so you stab them to crit with a screwdriver.
-  - You are a security officer and tell someone to stop so you can question them. They run away so you use a truncheon to beat them to crit.
-  - An authorized person who you think is unauthorized enters a high risk area of the station, like the armory or atmospherics, so you attack them until they leave.
+  - You are a security officer and tell someone to stop, so you can question them. They run away so you use a truncheon to beat them to crit.
+  - An authorized person who you unreasonably or carelessly think is unauthorized enters a high risk area of the station, like the armory or atmospherics, so you attack them until they leave.
   - An unauthorized person enters a low risk area of the station, like cargo, and you start attacking them with no other escalation.
   - Slipping security all round because they are security.
   - Blocking the head of personnel in their office using walls because they didn't give you what you asked for.
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml
index e2d51d672a1e..57effb54699e 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR15SpaceLaw.xml
@@ -2,9 +2,18 @@
   # Roleplay Rule 15 - Command and Security must follow Space Law
   All non-antagonist command and security roles must obey [textlink="Space Law" link="SpaceLaw"]. This includes non-antagonists who are promoted to or gain a position during the round in any way. This also includes non-antagonists who are acting as a security role.
 
-  This prohibits use of syndicate items, including uplinks by command and security.
+  Space Law violations should be prioritized based on severity and the current situation.
+
+  This prohibits use of syndicate items outside extreme emergencies, including uplinks by command and security. This also prohibits the preparing of syndicate items for an emergency.
 
   ## Examples
+  Acceptable:
+  - After a war announcement, a security officer ignores crewmembers carrying contraband so that they can focus on preparing to defend the station.
+  - A security officer disarms someone attacking them with an energy sword, then uses the sword to kill the attacker.
+
+  Prohibited:
+  - A security officer carries around an energy sword in case of an emergency.
+
   Roles that are included:
   - A security officer
   - The Captain
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml
index 4f008e93c5a6..51a445dfe0f6 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR2Familiars.xml
@@ -1,6 +1,6 @@
 <Document>
   # Roleplay Rule 2 - Familiars must obey their master
-  Familiars are considered non-antagonists, but have instructions to obey someone. They must obey this person even if it causes them to violate Roleplay Rules or die. You are only a familiar if the game clearly and explicitly tells you that you are a familiar. You are only the familiar of the person the game tells you. If your master dies, you can continue to attempt to fulfill orders given to you before they died. You can defend your master without an explicit order to, but must obey your master if they order you to not defend them.
+  Familiars are considered non-antagonists, but have instructions to obey someone. They must obey this person even if it causes them to violate Roleplay Rules or die. You are only a familiar if the game clearly and explicitly tells you that you are a familiar. You are only the familiar of the person the game tells you. If your master dies, you can continue to attempt to fulfill orders given to you before they died. You can defend your master without an explicit order to, but must obey your master if they order you to not defend them. Orders do not override Core Rules.
 
   Masters giving orders that violate Roleplay Rules are the ones that will be held responsible for the rule violations. You can ahelp masters who you believe are breaking rules with an order.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
index 2e263be896a0..4ebbad326c8c 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR4Metashield.xml
@@ -10,7 +10,7 @@
   The following are shielded:
   - Current game mode and possible antags during the current game mode.
   - Events from previous rounds.
-  - Events from previous characters.
+  - Events you experienced as a different character.
   - All information related to the player of a character rather than the character itself. (See "Metafriending and Metagrudging" below.)
   - All information gained while dead or a ghost.
   - The fact that a round will end.
@@ -25,6 +25,7 @@
 
   The revealing condition for this shield is any of the following:
   - discovering a blood red hardsuit
+  - discovering a nuclear operative's shuttle
   - an operative name
   - a War Ops announcement
   - being a nuclear operative
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml
index a54211f32f22..b4a064274016 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR5Arrivals.xml
@@ -1,6 +1,6 @@
 <Document>
   # Roleplay Rule 5 - Do not interfere with arrivals
-  The arrivals station, the arrivals shuttle, at the area immediately around the arrivals shuttle at the station ("arrivals") are off-limits to antagonistic activity or damage (even to antagonists). Do not prevent people from safely arriving to the station. Do not cause people to die immediately after arriving at the station.
+  The arrivals terminal/station, the arrivals shuttle, at the area immediately around the arrivals shuttle at the station ("arrivals") are off-limits to antagonistic activity or damage (even to antagonists). Do not prevent people from safely arriving to the station. Do not cause people to die immediately after arriving at the station.
 
   There is an exemption for antagonists that are allowed to perform mass station sabotage if there is no reasonable way to limit the damage of the mass station sabotage. This exemption only applies to damage that is a direct result of the mass station sabotage.
 
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml
index bc7996f23e8b..366ac6666f2d 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR9MassSabotage.xml
@@ -15,6 +15,7 @@
   - Permanently round removing a single person so that you can impersonate them to make it easier for you to complete a steal objective.
   - Sabotaging station power 10 minutes into the round to try to get the shuttle called because you've completed all of your other objectives and have one to escape on the shuttle alive.
   - Sabotaging a department's power 10 minutes into the round to make a steal objective easier to accomplish.
+  - Permanently round removing many people who have demonstrated a persistence and a capability to either kill you or interfere with the completion of your objectives.
 
   Prohibited:
   - As a traitor with 3 kill objectives, taking steps to permanently round remove many non-objective people who are no longer an immediate threat to you, even if it is done to prevent yourself from being discovered.
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
index 17a2139658dd..04e7139a48b7 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
@@ -42,22 +42,22 @@
     </ColorBox>
     <ColorBox Color="#593a4e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Failure to Comply
+        Failure to Comply (E)
       </Box>
     </ColorBox>
     <ColorBox Color="#593a4e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Breach of Arrest
+        Breach of Arrest (E)
       </Box>
     </ColorBox>
     <ColorBox Color="#593a4e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Breach of Custody
+        Breach of Custody (E)
       </Box>
     </ColorBox>
     <ColorBox Color="#593a4e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Refusal of Mental Shielding
+        Refusal of Mental Shielding (E)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -67,17 +67,17 @@
     </ColorBox>
     <ColorBox Color="#2f3832">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Possession: Substances
+        Possession: Substances (P)
       </Box>
     </ColorBox>
     <ColorBox Color="#2f3832">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Possession: Gear
+        Possession: Gear (P)
       </Box>
     </ColorBox>
     <ColorBox Color="#2f3832">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Possession: Weaponry
+        Possession: Weaponry (P)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -95,7 +95,7 @@
     </ColorBox>
     <ColorBox Color="#2e422e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Petty Theft
+        Petty Theft (H)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -104,7 +104,7 @@
     </ColorBox>
     <ColorBox Color="#2e422e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Grand Theft
+        Grand Theft (H)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -123,17 +123,17 @@
     </ColorBox>
     <ColorBox Color="#453a59">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Vandalism
+        Vandalism (D)
       </Box>
     </ColorBox>
     <ColorBox Color="#453a59">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Damage of Property
+        Damage of Property (D)
       </Box>
     </ColorBox>
     <ColorBox Color="#453a59">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Mass Destruction
+        Mass Destruction (D)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -142,7 +142,7 @@
     </ColorBox>
     <ColorBox Color="#453a59">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Terrorism
+        Terrorism (D)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -152,7 +152,7 @@
     </ColorBox>
     <ColorBox Color="#59563a">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Trespass
+        Trespass (T)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -161,7 +161,7 @@
     </ColorBox>
     <ColorBox Color="#59563a">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Secure Trespass
+        Secure Trespass (T)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -183,22 +183,22 @@
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Endangerment
+        Endangerment (V)
       </Box>
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Assault
+        Assault (V)
       </Box>
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Attempted Murder
+        Attempted Murder (V)
       </Box>
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Prevention of Revival
+        Prevention of Revival (V)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -216,17 +216,17 @@
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Manslaughter
+        Manslaughter (V)
       </Box>
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Murder
+        Murder (V)
       </Box>
     </ColorBox>
     <ColorBox Color="#4d2e2e">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Mass Murder
+        Mass Murder (V)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -236,7 +236,7 @@
     </ColorBox>
     <ColorBox Color="#3b4354">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Disturbance
+        Disturbance (R)
       </Box>
     </ColorBox>
     <ColorBox>
@@ -245,7 +245,7 @@
     </ColorBox>
     <ColorBox Color="#3b4354">
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
-        Rioting
+        Rioting (R)
       </Box>
     </ColorBox>
     <ColorBox>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml
index c1d8ff3b0277..0872683d1cf4 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml
@@ -1,9 +1,12 @@
 <Document>
 # Space Law: Restricted Weapons
-- \[Security\] Lethal firearms, excluding syndicate firearms, proto kinetic accelerators, glaives, daggers, crushers and the antique laser gun
+- \[Security\] Lethal firearms, excluding: syndicate firearms, proto kinetic accelerators, glaives, daggers, crushers, the captain's saber, antique laser guns, and deckards
 - \[Security/Salvage\] Proto kinetic accelerators, glaives, daggers, and crushers
-- \[Security/Command\] Antique laser gun
+- \[Security/Command\] The captain's saber, antique laser guns, and deckards
+- \[Salvage\] seismic charges
+- \[Atmospherics\] Fire axes
 - \[None\] Syndicate weapons
+- \[None\] Explosive devices, excluding seismic charges
 - \[None\] Swords
 - \[None\] Improvised weaponry, including baseball bats
 - \[None\] Lethal implants
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
index f2b913a1714f..b672e35204d1 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
@@ -37,7 +37,7 @@
 
   Use common sense and humanity when issuing punishments. You should not always seek out the highest punishment you can, you don't have to always give the maximum time or always look to demote someone. Prisoners cooperating and on good behavior should have their sentences reduced. Always take in account the severity and only charge for what is needed for someone to learn their lesson.
 
-  [color=#a4885c]Stackable Crimes:[/color] Crimes are to be considered 'stackable' in the sense that if you charge someone with two or more different crimes, you should combine the times you would give them for each crime. Linked crimes, shown in matching colors on the Quick Crime Guide, can not be stacked and instead override each other, you should pick the highest crime that matches the case.
+  [color=#a4885c]Stackable Crimes:[/color] Crimes are to be considered 'stackable' in the sense that if you charge someone with two or more different crimes, you should combine the times you would give them for each crime. Linked crimes, shown in matching colors and suffixes on the Quick Crime Guide, can not be stacked and instead override each other, you should pick the highest crime that matches the case.
 
   - Example: A suspect has committed a 2-01 (possession of restricted gear) and a 3-01 (possession of restricted weapons). The maximum sentence here would be 10 minutes due to them being linked crimes, and 3-01 is the greater crime.
   - Example 2: A suspect commits a 3-04 (Secure trespassing) and a 3-06 (manslaughter). Those crimes stack since they are not linked crimes. You could sentence for a maximum of 20 minutes, but context matters heavily, and maximum sentences should only be used for the worst offenders.
@@ -53,7 +53,7 @@
 
   ## Major Punishments
   [color=#a4885c]Permanent Confinement:[/color] Being held in the permanent brig for the entire duration of the shift. A person is eligible for permanent confinement if their timed sentence would exceed 15 minutes. Any persons subject to this punishment are required to be transported in cuffs to CentComm at the end of the shift. A permanent prisoner can not be deprived of anything covered by the section "Treatment Of Prisoners".
-  [color=#a4885c]Execution:[/color] A humane way of dealing with extremely unruly crewmates. A prisoner who has been given the death sentence may pick how they wish to be killed, common methods are firing line, lethal injection, exile, and high voltage electrocution. Another alternate method of "execution" is the process of placing a staff's mind into a borg, this is allowed so long as it is lawful. Execution can only be issued with the captain's or acting captain's approval; if the HoS is acting captain or there is no acting captain, all heads of staff are to hold a vote on the matter.
+  [color=#a4885c]Execution:[/color] A humane way of dealing with extremely unruly crewmates. Within reason, a prisoner who has been given the death sentence may pick how they wish to be killed, common methods are firing line, lethal injection, exile, and high voltage electrocution. Another alternate method of "execution" is the process of placing a staff's mind into a borg, this is allowed so long as it is lawful. Execution can only be issued with the captain's or acting captain's approval; if the HoS is acting captain or there is no acting captain, all heads of staff are to hold a vote on the matter.
 
   ## Restricted Items
   Items in the lists are preceded by an indication of which department or job is legally allowed to use or possess the item on most stations. The station captain may modify these lists as they see fit so long as they exercise due care and provide reasonable notification to the station. Members of command who oversee a department that is permitted to use a restricted item may issue permits to specific people outside of their department to use those items. "None" indicates that there are no departments or roles authorized to use or possess the item.

From b632a653854b04c77d10548078d5d4d33762d162 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 8 Jun 2024 04:43:02 +1200
Subject: [PATCH 345/568] Add JobRequirementOverride prototypes (#28607)

* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly
---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  3 +-
 .../JobRequirementsManager.cs                 |  8 ++-
 Content.Server/Antag/AntagSelectionSystem.cs  |  3 ++
 .../Roles/Components/GhostRoleComponent.cs    |  4 ++
 .../PlayTimeTrackingSystem.cs                 | 37 ++++---------
 Content.Shared/CCVar/CCVars.cs                |  7 +++
 .../Ghost/Roles/GhostRolePrototype.cs         | 12 ++---
 .../Ghost/Roles/GhostRolesEuiMessages.cs      |  5 ++
 Content.Shared/Roles/AntagPrototype.cs        |  4 +-
 Content.Shared/Roles/JobPrototype.cs          |  2 +-
 .../Roles/JobRequirementOverridePrototype.cs  | 20 +++++++
 Content.Shared/Roles/JobRequirements.cs       | 20 +++----
 Content.Shared/Roles/SharedRoleSystem.cs      | 52 ++++++++++++++++++-
 .../Roles/requirement_overrides.yml           | 16 ++++++
 14 files changed, 145 insertions(+), 48 deletions(-)
 create mode 100644 Content.Shared/Roles/JobRequirementOverridePrototype.cs
 create mode 100644 Resources/Prototypes/Roles/requirement_overrides.yml

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 1681cd93bd2b..8ee25d6880b2 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -623,7 +623,8 @@ public void RefreshAntags()
                 selector.Setup(items, title, 250, description, guides: antag.Guides);
                 selector.Select(Profile?.AntagPreferences.Contains(antag.ID) == true ? 0 : 1);
 
-                if (!_requirements.CheckRoleTime(antag.Requirements, out var reason))
+                var requirements = _entManager.System<SharedRoleSystem>().GetAntagRequirement(antag);
+                if (!_requirements.CheckRoleTime(requirements, out var reason))
                 {
                     selector.LockRequirements(reason);
                     Profile = Profile?.WithAntagPreference(antag.ID, false);
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index cb155cadbf43..bd4ac877dbbf 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -106,7 +106,13 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         if (player == null)
             return true;
 
-        return CheckRoleTime(job.Requirements, out reason);
+        return CheckRoleTime(job, out reason);
+    }
+
+    public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
+        return CheckRoleTime(reqs, out reason);
     }
 
     public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 52ccb1bd708d..55c66e893341 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -374,6 +374,9 @@ public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> en
     /// </summary>
     public bool IsSessionValid(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, EntityUid? mind = null)
     {
+        // TODO ROLE TIMERS
+        // Check if antag role requirements are met
+
         if (session == null)
             return true;
 
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
index 86026b230baf..14007edcbf9c 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
@@ -14,6 +14,10 @@ public sealed partial class GhostRoleComponent : Component
 
         [DataField("rules")] private string _roleRules = "ghost-role-component-default-rules";
 
+        // TODO ROLE TIMERS
+        // Actually make use of / enforce this requirement?
+        // Why is this even here.
+        // Move to ghost role prototype & respect CCvars.GameRoleTimerOverride
         [DataField("requirements")]
         public HashSet<JobRequirement>? Requirements;
 
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
index c3142a709a76..09956e313f34 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
@@ -35,6 +35,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem
     [Dependency] private readonly MindSystem _minds = default!;
     [Dependency] private readonly PlayTimeTrackingManager _tracking = default!;
     [Dependency] private readonly IAdminManager _adminManager = default!;
+    [Dependency] private readonly SharedRoleSystem _role = default!;
 
     public override void Initialize()
     {
@@ -197,7 +198,6 @@ private void OnGetDisallowedJobs(ref GetDisallowedJobsEvent ev)
     public bool IsAllowed(ICommonSession player, string role)
     {
         if (!_prototypes.TryIndex<JobPrototype>(role, out var job) ||
-            job.Requirements == null ||
             !_cfg.GetCVar(CCVars.GameRoleTimers))
             return true;
 
@@ -224,19 +224,8 @@ public HashSet<ProtoId<JobPrototype>> GetDisallowedJobs(ICommonSession player)
 
         foreach (var job in _prototypes.EnumeratePrototypes<JobPrototype>())
         {
-            if (job.Requirements != null)
-            {
-                foreach (var requirement in job.Requirements)
-                {
-                    if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, EntityManager, _prototypes))
-                        continue;
-
-                    goto NoRole;
-                }
-            }
-
-            roles.Add(job.ID);
-            NoRole:;
+            if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes))
+                roles.Add(job.ID);
         }
 
         return roles;
@@ -257,22 +246,14 @@ public void RemoveDisallowedJobs(NetUserId userId, List<ProtoId<JobPrototype>> j
 
         for (var i = 0; i < jobs.Count; i++)
         {
-            var job = jobs[i];
-
-            if (!_prototypes.TryIndex(job, out var jobber) ||
-                jobber.Requirements == null ||
-                jobber.Requirements.Count == 0)
-                continue;
-
-            foreach (var requirement in jobber.Requirements)
+            if (_prototypes.TryIndex(jobs[i], out var job)
+                && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes))
             {
-                if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, EntityManager, _prototypes))
-                    continue;
-
-                jobs.RemoveSwap(i);
-                i--;
-                break;
+                continue;
             }
+
+            jobs.RemoveSwap(i);
+            i--;
         }
     }
 
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index c74a3c236369..0f3e62d33f58 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Maps;
+using Content.Shared.Roles;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Components;
@@ -219,6 +220,12 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool>
             GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        /// Override default role requirements using a <see cref="JobRequirementOverridePrototype"/>
+        /// </summary>
+        public static readonly CVarDef<string>
+            GameRoleTimerOverride = CVarDef.Create("game.role_timer_override", "", CVar.SERVER | CVar.REPLICATED);
+
         /// <summary>
         /// If roles should be restricted based on whether or not they are whitelisted.
         /// </summary>
diff --git a/Content.Shared/Ghost/Roles/GhostRolePrototype.cs b/Content.Shared/Ghost/Roles/GhostRolePrototype.cs
index 43d64322504d..bc36774ea8ba 100644
--- a/Content.Shared/Ghost/Roles/GhostRolePrototype.cs
+++ b/Content.Shared/Ghost/Roles/GhostRolePrototype.cs
@@ -15,24 +15,24 @@ public sealed partial class GhostRolePrototype : IPrototype
     /// <summary>
     ///     The name of the ghostrole.
     /// </summary>
-    [DataField]
+    [DataField(required: true)]
     public string Name { get; set; } = default!;
 
     /// <summary>
     ///     The description of the ghostrole.
     /// </summary>
-    [DataField]
+    [DataField(required: true)]
     public string Description { get; set; } = default!;
 
     /// <summary>
     ///     The entity prototype of the ghostrole
     /// </summary>
-    [DataField]
-    public string EntityPrototype = default!;
+    [DataField(required: true)]
+    public EntProtoId EntityPrototype;
 
     /// <summary>
     ///     Rules of the ghostrole
     /// </summary>
-    [DataField]
+    [DataField(required: true)]
     public string Rules = default!;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
index b7457538ebe0..b5d8fedbd921 100644
--- a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
+++ b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
@@ -11,6 +11,11 @@ public struct GhostRoleInfo
         public string Name { get; set; }
         public string Description { get; set; }
         public string Rules { get; set; }
+
+        // TODO ROLE TIMERS
+        // Actually make use of / enforce this requirement?
+        // Why is this even here.
+        // Move to ghost role prototype & respect CCvars.GameRoleTimerOverride
         public HashSet<JobRequirement>? Requirements { get; set; }
 
         /// <inheritdoc cref="GhostRoleKind"/>
diff --git a/Content.Shared/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs
index 05c0c535049c..3cb81d4f9c56 100644
--- a/Content.Shared/Roles/AntagPrototype.cs
+++ b/Content.Shared/Roles/AntagPrototype.cs
@@ -42,7 +42,9 @@ public sealed partial class AntagPrototype : IPrototype
     /// <summary>
     ///     Requirements that must be met to opt in to this antag role.
     /// </summary>
-    [DataField("requirements")]
+    // TODO ROLE TIMERS
+    // Actually check if the requirements are met. Because apparently this is actually unused.
+    [DataField, Access(typeof(SharedRoleSystem), Other = AccessPermissions.None)]
     public HashSet<JobRequirement>? Requirements;
 
     /// <summary>
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 2a8e9d4b0333..c2549e3925f1 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -41,7 +41,7 @@ public sealed partial class JobPrototype : IPrototype
         [ViewVariables(VVAccess.ReadOnly)]
         public string? LocalizedDescription => Description is null ? null : Loc.GetString(Description);
 
-        [DataField("requirements")]
+        [DataField, Access(typeof(SharedRoleSystem), Other = AccessPermissions.None)]
         public HashSet<JobRequirement>? Requirements;
 
         [DataField("joinNotifyCrew")]
diff --git a/Content.Shared/Roles/JobRequirementOverridePrototype.cs b/Content.Shared/Roles/JobRequirementOverridePrototype.cs
new file mode 100644
index 000000000000..d0ce649f3606
--- /dev/null
+++ b/Content.Shared/Roles/JobRequirementOverridePrototype.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Collection of job, antag, and ghost-role job requirements for per-server requirement overrides.
+/// </summary>
+[Prototype]
+public sealed partial class JobRequirementOverridePrototype : IPrototype
+{
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField]
+    public Dictionary<ProtoId<JobPrototype>, HashSet<JobRequirement>> Jobs = new ();
+
+    [DataField]
+    public Dictionary<ProtoId<AntagPrototype>, HashSet<JobRequirement>> Antags = new ();
+}
diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs
index ba559fadd5cd..c9d66fcf9186 100644
--- a/Content.Shared/Roles/JobRequirements.cs
+++ b/Content.Shared/Roles/JobRequirements.cs
@@ -73,16 +73,18 @@ public static class JobRequirements
     {
         public static bool TryRequirementsMet(
             JobPrototype job,
-            Dictionary<string, TimeSpan> playTimes,
+            IReadOnlyDictionary<string, TimeSpan> playTimes,
             [NotNullWhen(false)] out FormattedMessage? reason,
             IEntityManager entManager,
             IPrototypeManager prototypes)
         {
+            var sys = entManager.System<SharedRoleSystem>();
+            var requirements = sys.GetJobRequirement(job);
             reason = null;
-            if (job.Requirements == null)
+            if (requirements == null)
                 return true;
 
-            foreach (var requirement in job.Requirements)
+            foreach (var requirement in requirements)
             {
                 if (!TryRequirementMet(requirement, playTimes, out reason, entManager, prototypes))
                     return false;
@@ -130,7 +132,7 @@ public static bool TryRequirementMet(
                         if (deptDiff <= 0)
                             return true;
 
-                        reason = FormattedMessage.FromMarkup(Loc.GetString(
+                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
                             "role-timer-department-insufficient",
                             ("time", Math.Ceiling(deptDiff)),
                             ("department", Loc.GetString(deptRequirement.Department)),
@@ -141,7 +143,7 @@ public static bool TryRequirementMet(
                     {
                         if (deptDiff <= 0)
                         {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString(
+                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
                                 "role-timer-department-too-high",
                                 ("time", -deptDiff),
                                 ("department", Loc.GetString(deptRequirement.Department)),
@@ -161,7 +163,7 @@ public static bool TryRequirementMet(
                         if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
                             return true;
 
-                        reason = FormattedMessage.FromMarkup(Loc.GetString(
+                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
                               "role-timer-overall-insufficient",
                               ("time", Math.Ceiling(overallDiff))));
                         return false;
@@ -170,7 +172,7 @@ public static bool TryRequirementMet(
                     {
                         if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
                         {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
+                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
                             return false;
                         }
 
@@ -197,7 +199,7 @@ public static bool TryRequirementMet(
                         if (roleDiff <= 0)
                             return true;
 
-                        reason = FormattedMessage.FromMarkup(Loc.GetString(
+                        reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
                             "role-timer-role-insufficient",
                             ("time", Math.Ceiling(roleDiff)),
                             ("job", Loc.GetString(proto)),
@@ -208,7 +210,7 @@ public static bool TryRequirementMet(
                     {
                         if (roleDiff <= 0)
                         {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString(
+                            reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
                                 "role-timer-role-too-high",
                                 ("time", -roleDiff),
                                 ("job", Loc.GetString(proto)),
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index d5ac2e5923ae..81a360ebb7f7 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -1,10 +1,12 @@
-using System.Linq;
 using Content.Shared.Administration.Logs;
+using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.Ghost.Roles;
 using Content.Shared.Mind;
 using Content.Shared.Roles.Jobs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -16,14 +18,30 @@ public abstract class SharedRoleSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedMindSystem _minds = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     // TODO please lord make role entities
     private readonly HashSet<Type> _antagTypes = new();
 
+    private JobRequirementOverridePrototype? _requirementOverride;
+
     public override void Initialize()
     {
         // TODO make roles entities
         SubscribeLocalEvent<JobComponent, MindGetAllRolesEvent>(OnJobGetAllRoles);
+        Subs.CVar(_cfg, CCVars.GameRoleTimerOverride, SetRequirementOverride, true);
+    }
+
+    private void SetRequirementOverride(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            _requirementOverride = null;
+            return;
+        }
+
+        if (!_prototypes.TryIndex(value, out _requirementOverride ))
+            Log.Error($"Unknown JobRequirementOverridePrototype: {value}");
     }
 
     private void OnJobGetAllRoles(EntityUid uid, JobComponent component, ref MindGetAllRolesEvent args)
@@ -253,4 +271,36 @@ public void MindPlaySound(EntityUid mindId, SoundSpecifier? sound, MindComponent
         if (Resolve(mindId, ref mind) && mind.Session != null)
             _audio.PlayGlobal(sound, mind.Session);
     }
+
+    public HashSet<JobRequirement>? GetJobRequirement(JobPrototype job)
+    {
+        if (_requirementOverride != null && _requirementOverride.Jobs.TryGetValue(job.ID, out var req))
+            return req;
+
+        return job.Requirements;
+    }
+
+    public HashSet<JobRequirement>? GetJobRequirement(ProtoId<JobPrototype> job)
+    {
+        if (_requirementOverride != null && _requirementOverride.Jobs.TryGetValue(job, out var req))
+            return req;
+
+        return _prototypes.Index(job).Requirements;
+    }
+
+    public HashSet<JobRequirement>? GetAntagRequirement(ProtoId<AntagPrototype> antag)
+    {
+        if (_requirementOverride != null && _requirementOverride.Antags.TryGetValue(antag, out var req))
+            return req;
+
+        return _prototypes.Index(antag).Requirements;
+    }
+
+    public HashSet<JobRequirement>? GetAntagRequirement(AntagPrototype antag)
+    {
+        if (_requirementOverride != null && _requirementOverride.Antags.TryGetValue(antag.ID, out var req))
+            return req;
+
+        return antag.Requirements;
+    }
 }
diff --git a/Resources/Prototypes/Roles/requirement_overrides.yml b/Resources/Prototypes/Roles/requirement_overrides.yml
new file mode 100644
index 000000000000..62041f42d7e9
--- /dev/null
+++ b/Resources/Prototypes/Roles/requirement_overrides.yml
@@ -0,0 +1,16 @@
+- type: jobRequirementOverride
+  id: Reduced
+  jobs:
+    Captain:
+    - !type:DepartmentTimeRequirement
+      department: Engineering
+      time: 3600 # 1 hours
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 3600 # 1 hours
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 3600 # 1 hours
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 3600 # 1 hour

From a1a3a0d131e5c89ba26df74092b3307fb291e899 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sat, 8 Jun 2024 04:39:22 +1000
Subject: [PATCH 346/568] Tweak chapel salvage wreck (#28703)

add
---
 Resources/Maps/Salvage/small-chapel.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/Resources/Maps/Salvage/small-chapel.yml b/Resources/Maps/Salvage/small-chapel.yml
index 2af3e1d09def..2c3b117a4a9b 100644
--- a/Resources/Maps/Salvage/small-chapel.yml
+++ b/Resources/Maps/Salvage/small-chapel.yml
@@ -346,13 +346,6 @@ entities:
     - type: Transform
       pos: 0.5,5.5
       parent: 1
-- proto: BloodTomatoSeeds
-  entities:
-  - uid: 51
-    components:
-    - type: Transform
-      pos: 4.5964127,8.285444
-      parent: 1
 - proto: BookshelfFilled
   entities:
   - uid: 62
@@ -538,13 +531,6 @@ entities:
     - type: Transform
       pos: 0.5,1.5
       parent: 1
-- proto: CrateFunATV
-  entities:
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 6.5,4.5
-      parent: 1
 - proto: CrateStoneGrave
   entities:
   - uid: 34
@@ -630,6 +616,13 @@ entities:
     - type: Transform
       pos: 6.5,5.5
       parent: 1
+- proto: KillerTomatoSeeds
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 4.6947265,8.268279
+      parent: 1
 - proto: Lamp
   entities:
   - uid: 66

From 63e0ee08cb50dbd937e11ab1e965b5f79aae134d 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 347/568] 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/Database/ServerDbBase.cs       |   24 +
 Content.Server/Database/ServerDbManager.cs    |   19 +
 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 +
 16 files changed, 3930 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 01dd783e6e07..1e431b17fcf5 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.Info;
-using Content.Shared.Administration.Managers;
 using Content.Shared.CCVar;
 using Content.Shared.Guidebook;
 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 000000000000..e82e58bf5ce2
--- /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 000000000000..af4e5ad4c405
--- /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 0e7fe12926b5..32a655f7f65e 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -648,6 +648,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 000000000000..043230b02b2c
--- /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 000000000000..0b0fd8725c0b
--- /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 c9c388da798c..2c444c83eb36 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -608,6 +608,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 5501e5a22097..60935e8f06ad 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -520,6 +520,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 1332f03c5d6f..af950e9fc207 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -240,7 +240,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/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 4dd0956bcfde..cd03af7087b9 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1032,6 +1032,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
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index f642465b3cc5..1983fe43d20b 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);
@@ -700,6 +707,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();
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 158ec23cce3f..e5b2338c5b7b 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -10,6 +10,7 @@
 using Content.Server.GameTicking;
 using Content.Server.GhostKick;
 using Content.Server.GuideGenerator;
+using Content.Server.Info;
 using Content.Server.IoC;
 using Content.Server.Maps;
 using Content.Server.NodeContainer.NodeGroups;
@@ -135,6 +136,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 000000000000..168e5846b968
--- /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 fc6486891cd3..c6dfcadd3826 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -9,6 +9,7 @@
 using Content.Server.Discord;
 using Content.Server.EUI;
 using Content.Server.GhostKick;
+using Content.Server.Info;
 using Content.Server.Maps;
 using Content.Server.MoMMI;
 using Content.Server.NodeContainer.NodeGroups;
@@ -46,6 +47,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 0f3e62d33f58..43139dc1ca91 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1796,13 +1796,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 9cb73c9aa86c..ac7400238f08 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 567d6a08882304670d6639b80b64e70de8f6f2ea Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sat, 8 Jun 2024 02:56:25 +0200
Subject: [PATCH 348/568] Add locale support for booze and soda jugs labels
 (#28708)

---
 .../Consumable/Drinks/drinks-cartons.yml      |  2 +-
 .../Consumable/Drinks/drinks_bottles.yml      | 62 ++++++++++---------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index aef0c5a8f5ad..f2b2c0450f08 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -130,7 +130,7 @@
           Quantity: 50
   - type: Drink
   - type: Label
-    currentLabel: coconut water
+    currentLabel: reagent-name-coconut-water
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coconutwater.rsi
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 7287119019e8..c9e28954be8c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -210,7 +210,7 @@
         - ReagentId: Cognac
           Quantity: 100
   - type: Label
-    currentLabel: cognac
+    currentLabel: reagent-name-cognac
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cognacbottle.rsi
   - type: Sealable
@@ -228,7 +228,7 @@
         - ReagentId: Cola
           Quantity: 100
   - type: Label
-    currentLabel: cola
+    currentLabel: reagent-name-cola
   - type: Sprite
     sprite: Objects/Consumable/Drinks/colabottle.rsi
   - type: Sealable
@@ -266,7 +266,7 @@
         - ReagentId: Gin
           Quantity: 100
   - type: Label
-    currentLabel: gin
+    currentLabel: reagent-name-gin
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginbottle.rsi
   - type: Sealable
@@ -300,7 +300,7 @@
         - ReagentId: CoffeeLiqueur
           Quantity: 100
   - type: Label
-    currentLabel: coffee liqueur
+    currentLabel: reagent-name-coffeeliqueur
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi
   - type: Sealable
@@ -377,7 +377,7 @@
         - ReagentId: Rum
           Quantity: 100
   - type: Label
-    currentLabel: rum
+    currentLabel: reagent-name-rum
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumbottle.rsi
   - type: Sealable
@@ -396,7 +396,7 @@
           Quantity: 100
   - type: Drink
   - type: Label
-    currentLabel: space mountain wind
+    currentLabel: reagent-name-space-mountain-wind
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
   - type: Sealable
@@ -415,7 +415,7 @@
           Quantity: 100
   - type: Drink
   - type: Label
-    currentLabel: space-up
+    currentLabel: reagent-name-space-up
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
   - type: Sealable
@@ -433,7 +433,7 @@
         - ReagentId: Tequila
           Quantity: 100
   - type: Label
-    currentLabel: tequila
+    currentLabel: reagent-name-tequila
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillabottle.rsi
   - type: Sealable
@@ -451,7 +451,7 @@
         - ReagentId: Vermouth
           Quantity: 100
   - type: Label
-    currentLabel: vermouth
+    currentLabel: reagent-name-vermouth
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vermouthbottle.rsi
   - type: Sealable
@@ -469,7 +469,7 @@
         - ReagentId: Vodka
           Quantity: 100
   - type: Label
-    currentLabel: vodka
+    currentLabel: reagent-name-vodka
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vodkabottle.rsi
   - type: Sealable
@@ -487,7 +487,7 @@
         - ReagentId: Whiskey
           Quantity: 100
   - type: Label
-    currentLabel: whiskey
+    currentLabel: reagent-name-whiskey
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
   - type: Sealable
@@ -505,7 +505,7 @@
         - ReagentId: Wine
           Quantity: 100
   - type: Label
-    currentLabel: wine
+    currentLabel: reagent-name-wine
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
   - type: Sealable
@@ -554,7 +554,7 @@
         - ReagentId: Beer
           Quantity: 150
   - type: Label
-    currentLabel: beer
+    currentLabel: reagent-name-beer
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
   - type: Openable
@@ -598,7 +598,7 @@
         - ReagentId: Ale
           Quantity: 150
   - type: Label
-    currentLabel: ale
+    currentLabel: reagent-name-ale
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
   - type: Openable
@@ -650,7 +650,7 @@
         - ReagentId: SodaWater
           Quantity: 150
   - type: Label
-    currentLabel: soda water
+    currentLabel: reagent-name-soda-water
 
 - type: entity
   parent: DrinkWaterBottleFull
@@ -666,7 +666,7 @@
         - ReagentId: TonicWater
           Quantity: 150
   - type: Label
-    currentLabel: tonic water
+    currentLabel: reagent-name-tonic-water
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -681,7 +681,7 @@
         - ReagentId: Sake
           Quantity: 50
   - type: Label
-    currentLabel: Sake
+    currentLabel: reagent-name-sake
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sakebottle.rsi
   - type: Sealable
@@ -703,7 +703,7 @@
           Quantity: 150
   - type: Drink
   - type: Label
-    currentLabel: lime juice
+    currentLabel: reagent-name-juice-lime
   - type: Sprite
     sprite: Objects/Consumable/Drinks/limejuice.rsi
 
@@ -722,7 +722,7 @@
           Quantity: 150
   - type: Drink
   - type: Label
-    currentLabel: orange juice
+    currentLabel: reagent-name-juice-orange
   - type: Sprite
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
 
@@ -741,7 +741,7 @@
           Quantity: 150
   - type: Drink
   - type: Label
-    currentLabel: cream
+    currentLabel: reagent-name-cream
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cream.rsi
 
@@ -778,7 +778,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: lemon-lime
+    currentLabel: reagent-name-lemon-lime
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -795,7 +795,7 @@
           Quantity: 150
   - type: Drink
   - type: Label
-    currentLabel: mead
+    currentLabel: reagent-name-mead
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -812,7 +812,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: ice
+    currentLabel: reagent-name-ice
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -829,7 +829,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: coconut water
+    currentLabel: reagent-name-coconut-water
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -846,7 +846,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: coffee
+    currentLabel: reagent-name-coffee
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -863,7 +863,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: tea
+    currentLabel: reagent-name-tea
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -880,7 +880,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: green tea
+    currentLabel: reagent-name-green-tea
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -896,6 +896,8 @@
         - ReagentId: IcedTea
           Quantity: 300
   - type: Drink
+  - type: Label
+    currentLabel: reagent-name-iced-tea
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -912,7 +914,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: dr gibb
+    currentLabel: reagent-name-dr-gibb
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -929,7 +931,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: root beer
+    currentLabel: reagent-name-root-beer
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull
@@ -946,7 +948,7 @@
           Quantity: 300
   - type: Drink
   - type: Label
-    currentLabel: watermelon juice
+    currentLabel: reagent-name-juice-watermelon
 
 - type: entity
   parent: DrinkBottlePlasticBaseFull

From d19b430a92611823bb4cc69bf40bef4df9db2071 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Fri, 7 Jun 2024 17:57:07 -0700
Subject: [PATCH 349/568] Swap some InRangeUnobstructed for InRangeUnoccluded
 (#28706)

Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Client/Construction/ConstructionSystem.cs | 4 ++--
 Content.Server/Chat/Systems/ChatSystem.cs         | 6 ++++--
 Content.Server/Instruments/InstrumentSystem.cs    | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 66000a8457dc..453658bebf93 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -27,6 +27,7 @@ public sealed class ConstructionSystem : SharedConstructionSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
 
@@ -195,9 +196,8 @@ public bool TrySpawnGhost(
             if (GhostPresent(loc))
                 return false;
 
-            // This InRangeUnobstructed should probably be replaced with "is there something blocking us in that tile?"
             var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem));
-            if (!_interactionSystem.InRangeUnobstructed(user, loc, 20f, predicate: predicate))
+            if (!_examineSystem.InRangeUnOccluded(user, loc, 20f, predicate: predicate))
                 return false;
 
             if (!CheckConstructionConditions(prototype, loc, dir, user, showPopup: true))
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 0fe9dcbc4d85..65977c74f51a 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
+using Content.Server.Examine;
 using Content.Server.GameTicking;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
@@ -14,6 +15,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
+using Content.Shared.Examine;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
@@ -60,6 +62,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
 
     public const int VoiceRange = 10; // how far voice goes in world units
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
@@ -504,8 +507,7 @@ private void SendEntityWhisper(
             if (data.Range <= WhisperClearRange)
                 _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel);
             //If listener is too far, they only hear fragments of the message
-            //Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind
-            else if (_interactionSystem.InRangeUnobstructed(source, listener, WhisperMuffledRange, Shared.Physics.CollisionGroup.Opaque)) //Shared.Physics.CollisionGroup.Opaque
+            else if (_examineSystem.InRangeUnOccluded(source, listener, WhisperMuffledRange))
                 _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedobfuscatedMessage, source, false, session.Channel);
             //If listener is too far and has no line of sight, they can't identify the whisperer's identity
             else
diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
index f5a6713886de..582bf7fa67b1 100644
--- a/Content.Server/Instruments/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Popups;
 using Content.Server.Stunnable;
 using Content.Shared.Administration;
+using Content.Shared.Examine;
 using Content.Shared.Instruments;
 using Content.Shared.Instruments.UI;
 using Content.Shared.Physics;
@@ -30,6 +31,7 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly InteractionSystem _interactions = default!;
+    [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
 
     private const float MaxInstrumentBandRange = 10f;
 
@@ -250,9 +252,8 @@ private void OnBoundUIRequestBands(EntityUid uid, InstrumentComponent component,
                 continue;
 
             // Maybe a bit expensive but oh well GetBands is queued and has a timer anyway.
-            // Make sure the instrument is visible, uses the Opaque collision group so this works across windows etc.
-            if (!_interactions.InRangeUnobstructed(uid, entity, MaxInstrumentBandRange,
-                    CollisionGroup.Opaque, e => e == playerUid || e == originPlayer))
+            // Make sure the instrument is visible
+            if (!_examineSystem.InRangeUnOccluded(uid, entity, MaxInstrumentBandRange, e => e == playerUid || e == originPlayer))
                 continue;
 
             if (!metadataQuery.TryGetComponent(playerUid, out var playerMetadata)

From b714210e38e3a9bbf6228853aab0a82f67572df9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 00:58:14 +0000
Subject: [PATCH 350/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3865ceee6270..315c8f655261 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: keronshb
-  changes:
-  - message: Fixed a bug where stores were enabling refunds after a purchase
-    type: Fix
-  id: 6196
-  time: '2024-03-19T03:48:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26251
 - author: Errant
   changes:
   - message: Thrown objects can no longer slip while they are still in flight.
@@ -3848,3 +3841,11 @@
   id: 6695
   time: '2024-06-07T11:28:55.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28680
+- author: Plykiya
+  changes:
+  - message: You can now place construction ghosts without getting blocked by things
+      like grilles or windows.
+    type: Fix
+  id: 6696
+  time: '2024-06-08T00:57:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28706

From f37060fc1be72e809730ad39f3ed849796168327 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Fri, 7 Jun 2024 21:15:13 -0500
Subject: [PATCH 351/568] Ports the singularity's values from vgstation
 (#28720)

* ports the singularity values from vgstation

* guidebook fix

* 5000 energy level 6 singulo
---
 .../EntitySystems/SingularitySystem.cs        | 20 ++++++++++---------
 .../Guidebook/Engineering/Singularity.xml     |  3 +--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index de7df3237414..b273b2099d3b 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -132,10 +132,12 @@ public void SetEnergy(EntityUid uid, float value, SingularityComponent? singular
         singularity.Energy = value;
         SetLevel(uid, value switch
         {
-            >= 2400 => 6,
-            >= 1600 => 5,
-            >= 900 => 4,
-            >= 300 => 3,
+			// Normally, a level 6 singularity requires the supermatter + 3000 energy.
+			// The required amount of energy has been bumped up to compensate for the lack of the supermatter.
+            >= 5000 => 6,
+            >= 2000 => 5,
+            >= 1000 => 4,
+            >= 500 => 3,
             >= 200 => 2,
             > 0 => 1,
             _ => 0
@@ -319,11 +321,11 @@ public void UpdateEnergyDrain(EntityUid uid, SingularityComponent comp, Singular
     {
         comp.EnergyDrain = args.NewValue switch
         {
-            6 => 20,
-            5 => 15,
-            4 => 12,
-            3 => 8,
-            2 => 2,
+            6 => 0,
+            5 => 0,
+            4 => 20,
+            3 => 10,
+            2 => 5,
             1 => 1,
             _ => 0
         };
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
index 3c0dd665e25e..68814522788d 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
@@ -88,8 +88,7 @@
 
   [color=red]Do not[/color] turn the PA on unless all the other subsystems are working properly and there is enough power to start the engine.
 
-  Turn power on using the PA control computer. Set the strength to an appropiate level. Currently the only appropriate level is [color=#f0684d]1[/color]; anything above that will ensure that singularity grows too strong to handle.
-  The higher the output stength is set on PA control computer, the bigger the singularity will be.
+  Turn power on using the PA control computer. Set the strength to an appropiate level. The higher the output stength is set on PA control computer, the bigger the singularity will be.
 
   Currently, the output power does not affect the ball lightning, beyond giving the ball lightning extra orbs around it.
 

From 0762f9da175966700ed961200ab3329dc556c12d Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:34:48 -0700
Subject: [PATCH 352/568] Fix action icons when dragging an active action to
 another slot (#28692)

---
 .../UserInterface/Systems/Actions/Controls/ActionButton.cs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index 6be41af0d89e..0d12d8717111 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -289,6 +289,10 @@ public void UpdateIcons()
         {
             if (_action.IconOn != null)
                 SetActionIcon(_spriteSys.Frame0(_action.IconOn));
+            else if (_action.Icon != null)
+                SetActionIcon(_spriteSys.Frame0(_action.Icon));
+            else
+                SetActionIcon(null);
 
             if (_action.BackgroundOn != null)
                 _buttonBackgroundTexture = _spriteSys.Frame0(_action.BackgroundOn);

From 7f1933169eca9309953ffa0fb424763efd850e7a Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:36:29 -0700
Subject: [PATCH 353/568] Add DoPopup data field to OnUseTimerTrigger (#28691)

---
 .../Explosion/EntitySystems/TriggerSystem.OnUse.cs           | 3 ++-
 .../Explosion/Components/OnUseTimerTriggerComponent.cs       | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
index 786d29d94a96..8725dd1ae738 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -171,7 +171,8 @@ private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, Use
         if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
             return;
 
-        _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
+        if (component.DoPopup)
+            _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
 
         HandleTimerTrigger(
             uid,
diff --git a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
index 5e509cb10bba..c4e6e787a4af 100644
--- a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
+++ b/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
@@ -45,5 +45,10 @@ public sealed partial class OnUseTimerTriggerComponent : Component
         ///     Whether you can examine the item to see its timer or not.
         /// </summary>
         [DataField] public bool Examinable = true;
+
+        /// <summary>
+        ///     Whether or not to show the user a popup when starting the timer.
+        /// </summary>
+        [DataField] public bool DoPopup = true;
     }
 }

From 1584a50a1d99b132ac1e6d3c6e010524d7af0397 Mon Sep 17 00:00:00 2001
From: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Date: Sat, 8 Jun 2024 01:49:42 -0400
Subject: [PATCH 354/568] Dropping Corpses Devoured by Space Dragons on
 Gib/Butcher. (#28709)

* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---
 Content.Server/Devour/DevourSystem.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs
index febbd093a6cd..d9c50f260a31 100644
--- a/Content.Server/Devour/DevourSystem.cs
+++ b/Content.Server/Devour/DevourSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Devour;
@@ -15,6 +16,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
     }
 
     private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args)
@@ -45,5 +47,15 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter
 
         _audioSystem.PlayPvs(component.SoundDevour, uid);
     }
+    
+    private void OnGibContents(EntityUid uid, DevourerComponent component, ref BeingGibbedEvent args)
+    {
+        if (!component.ShouldStoreDevoured)
+            return;
+
+        // For some reason we have two different systems that should handle gibbing,
+        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
+        ContainerSystem.EmptyContainer(component.Stomach);
+    }
 }
 

From 4d10f3523b99bf6a4f96f078109c5fd81386da47 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 05:50:48 +0000
Subject: [PATCH 355/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 315c8f655261..585e10a22d5f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Errant
-  changes:
-  - message: Thrown objects can no longer slip while they are still in flight.
-    type: Tweak
-  id: 6197
-  time: '2024-03-20T11:57:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24494
 - author: Killerqu00
   changes:
   - message: Airlock wires are now different between departments.
@@ -3849,3 +3842,10 @@
   id: 6696
   time: '2024-06-08T00:57:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28706
+- author: Lyndomen
+  changes:
+  - message: Space Dragons will drop bodies upon being gibbed/butchered
+    type: Fix
+  id: 6697
+  time: '2024-06-08T05:49:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28709

From 49496b40e5e7f21cf938cf6b96b4095e43dd791d Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Sat, 8 Jun 2024 01:53:17 -0400
Subject: [PATCH 356/568] Improve grammar of various petting messages (#28715)

Improve grammar of various petting message
---
 .../interaction-popup-component.ftl           | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 7db99c3d0aea..55be1fb3b976 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -36,23 +36,23 @@ petting-success-nymph = You pet {THE($target)} on {POSS-ADJ($target)} wooden lit
 petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
 petting-failure-bat = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too hard to catch!
-petting-failure-carp = You reach out to pet {THE($target)}, but {POSS_ADJ($target)} sharp teeth make you think twice.
+petting-failure-carp = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} sharp teeth make you think twice.
 petting-failure-corrupted-corgi = You reach out to pet {THE($target)}, but think better of it.
-petting-failure-crab = You reach out to pet {THE($target)}, but {SUBJECT($target)} snaps {POSS-ADJ($target)} claws in your general direction!
+petting-failure-crab = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "snap", "snaps")} {POSS-ADJ($target)} claws in your general direction!
 petting-failure-dehydrated-carp = You pet {THE($target)} on {POSS-ADJ($target)} dry little head.
-petting-failure-goat = You reach out to pet {THE($target)}, but {SUBJECT($target)} stubbornly refuses!
+petting-failure-goat = You reach out to pet {THE($target)}, but {SUBJECT($target)} stubbornly {CONJUGATE-BASIC($target, "refuse", "refuses")}!
 petting-failure-goose = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too horrible!
 petting-failure-possum = You reach out to pet {THE($target)}, but are met with hisses and snarls!
 petting-failure-pig = You reach out to pet {THE($target)}, but are met with irritated oinks and squeals!
-petting-failure-raccoon = You reach out to pet {THE($target)}, but {THE($target)} is busy raccooning around.
-petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($target)} somehow dodge with ludicrous speed!
+petting-failure-raccoon = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy raccooning around.
+petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($target)} somehow { CONJUGATE-BASIC($target, "dodge", "dodges") } with ludicrous speed!
 petting-failure-holo = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} spikes almost impale your hand!
-petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you decide you'd rather not be toasty carp food.
-petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
-petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
-petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost bites your fingers!
-petting-failure-nymph = You reach out to pet {THE($target)}, but {SUBJECT($target)} move their branches away.
-petting-failure-shadow = You're trying to pet {THE($target)}, but your hand passes through the cold darkness of his body.
+petting-failure-dragon = You raise your hand, but as {THE($target)} {CONJUGATE-BASIC($target, "roar", "roars")}, you decide you'd rather not be toasty carp food.
+petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "attempt", "attempts")} to bite your finger and only your quick reflexes save you from an almost fatal injury.
+petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "growl", "growls")}, making you think twice.
+petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost {CONJUGATE-BASIC($target, "bite", "bites")} your fingers!
+petting-failure-nymph = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "move", "moves")} {POSS-ADJ($target)} branches away.
+petting-failure-shadow = You try to pet {THE($target)}, but your hand passes through the cold darkness of {POSS-ADJ($target)} body.
 
 ## Petting silicons
 
@@ -62,7 +62,7 @@ petting-success-cleanbot = You pet {THE($target)} on {POSS-ADJ($target)} damp me
 petting-success-medibot = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
 petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.
 
-petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} honks in refusal!
+petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "honk", "honks")} in refusal!
 petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy mopping!
 petting-failure-mimebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy miming!
 petting-failure-medibot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} syringe nearly stabs your hand!
@@ -80,5 +80,4 @@ hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you.
 ## Other
 
 petting-success-tesla = You pet {THE($target)}, violating the laws of nature and physics.
-
-petting-failure-tesla = You reach out towards {THE($target)}, but it zaps your hand away.
+petting-failure-tesla = You reach out towards {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "zap", "zaps")} your hand away.

From a7c7cd74ec52a00d6471cf590341d6208bb217a5 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:53:54 -0700
Subject: [PATCH 357/568] Fix DamageOtherOnHit.OnDoHit when the target is
 terminating or deleted (#28690)

---
 .../Damage/Systems/DamageOtherOnHitSystem.cs  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index 0efa53498151..ff4d1cabe98a 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -32,22 +32,25 @@ public override void Initialize()
 
         private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args)
         {
-            var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower);
+            if (!TerminatingOrDeleted(args.Target))
+            {
+                var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower);
 
-            // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
-            if (dmg != null && HasComp<MobStateComponent>(args.Target))
-                _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
+                // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
+                if (dmg != null && HasComp<MobStateComponent>(args.Target))
+                    _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
 
-            if (dmg is { Empty: false })
-            {
-                _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
-            }
+                if (dmg is { Empty: false })
+                {
+                    _color.RaiseEffect(Color.Red, new List<EntityUid>() { args.Target }, Filter.Pvs(args.Target, entityManager: EntityManager));
+                }
 
-            _guns.PlayImpactSound(args.Target, dmg, null, false);
-            if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
-            {
-                var direction = body.LinearVelocity.Normalized();
-                _sharedCameraRecoil.KickCamera(args.Target, direction);
+                _guns.PlayImpactSound(args.Target, dmg, null, false);
+                if (TryComp<PhysicsComponent>(uid, out var body) && body.LinearVelocity.LengthSquared() > 0f)
+                {
+                    var direction = body.LinearVelocity.Normalized();
+                    _sharedCameraRecoil.KickCamera(args.Target, direction);
+                }
             }
 
             // TODO: If more stuff touches this then handle it after.

From c2bbc72cf40c12710c88f815a70251e0872fed5a Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sat, 8 Jun 2024 18:35:58 +1000
Subject: [PATCH 358/568] Update Core (#28735)

add
---
 Resources/Maps/core.yml | 12599 ++++++++++++++++++++------------------
 1 file changed, 6647 insertions(+), 5952 deletions(-)

diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml
index e10f54cd03de..48ee0290fa21 100644
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -81,139 +81,139 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: DgAAAAADDgAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAA
+          tiles: DgAAAAADDgAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAAADgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADXQAAAAAAXQAAAAADaAAAAAADbAAAAAAAbAAAAAAAXQAAAAAAaAAAAAAAJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAACJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACXQAAAAADXQAAAAABaAAAAAACbAAAAAAAbAAAAAAAXQAAAAADaAAAAAACJAAAAAADJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAABJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAABaAAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABaAAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAXQAAAAACJAAAAAADXQAAAAAAXQAAAAADaAAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABHwAAAAADfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAADaAAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAaAAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAJAAAAAACJAAAAAABJAAAAAADXQAAAAAAJAAAAAABXQAAAAADXQAAAAABaAAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAACfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: XQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABaAAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACTgAAAAACTgAAAAADaAAAAAAATgAAAAACTgAAAAACaAAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACHwAAAAABfgAAAAAAHwAAAAADfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAAAaAAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAaAAAAAADaAAAAAABXQAAAAABJAAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADXQAAAAABTgAAAAACTgAAAAACTgAAAAADXQAAAAABXQAAAAABTgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAABXQAAAAABJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABXQAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAC
+          tiles: XQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAADaAAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABaAAAAAACaAAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAACaAAAAAABaAAAAAABaAAAAAADTgAAAAABTgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAACaAAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAABaAAAAAADXQAAAAACXQAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAaAAAAAADaAAAAAADXQAAAAABJAAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAXQAAAAACTgAAAAAATgAAAAADTgAAAAADXQAAAAAAXQAAAAACTgAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAADXQAAAAAAJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAD
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: aAAAAAACaAAAAAAAXQAAAAAAXQAAAAACaAAAAAACXQAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAACaAAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADTgAAAAACTgAAAAACaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAaAAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAACJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAJAAAAAACegAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADJAAAAAADfgAAAAAAHwAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACegAAAAABegAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAAAXQAAAAADHwAAAAAAfgAAAAAAHwAAAAADJAAAAAADJAAAAAABJAAAAAABJAAAAAACXQAAAAACXQAAAAADJAAAAAACfgAAAAAAJAAAAAADaAAAAAADaAAAAAACaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAATgAAAAABTgAAAAADJAAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAACXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADXQAAAAAAXQAAAAAAXQAAAAABaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABXQAAAAACXQAAAAACaAAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAACXQAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADXQAAAAAAXQAAAAAAaAAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAABXQAAAAADfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAXQAAAAACXQAAAAADaAAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAACXQAAAAACXQAAAAADaAAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAADaAAAAAAA
+          tiles: aAAAAAABaAAAAAADXQAAAAADXQAAAAACaAAAAAACXQAAAAADXQAAAAADXQAAAAADaAAAAAAAXQAAAAABaAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABTgAAAAABTgAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABaAAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACJAAAAAAAJAAAAAACJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAABegAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACegAAAAAAegAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAHwAAAAADfgAAAAAAHwAAAAAAJAAAAAAAJAAAAAADJAAAAAABJAAAAAACXQAAAAACXQAAAAACJAAAAAAAfgAAAAAAJAAAAAACaAAAAAAAaAAAAAAAaAAAAAABXQAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAATgAAAAADTgAAAAACJAAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAABXQAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAABaAAAAAACaAAAAAACaAAAAAAAaAAAAAACXQAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAADXQAAAAAAXQAAAAAAaAAAAAACXQAAAAADXQAAAAACXQAAAAABfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADaAAAAAABXQAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACXQAAAAAAXQAAAAADaAAAAAADHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAABXQAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAACXQAAAAABXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAAAHwAAAAACHwAAAAABXQAAAAACXQAAAAAAaAAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAABaAAAAAAD
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: XQAAAAADXQAAAAABaAAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAHwAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAAAaAAAAAACHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABHwAAAAADfgAAAAAAHwAAAAACJAAAAAADHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAHwAAAAABaAAAAAACaAAAAAABaAAAAAAAXQAAAAADaAAAAAADHwAAAAADHwAAAAADHwAAAAADJAAAAAADHwAAAAADfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAHwAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAHwAAAAAAfgAAAAAAHwAAAAABJAAAAAABHwAAAAABfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACHwAAAAADfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAJAAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAABaAAAAAABaAAAAAADXQAAAAABfgAAAAAAHwAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADJAAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
+          tiles: XQAAAAACXQAAAAABaAAAAAADXQAAAAADaAAAAAABXQAAAAACfgAAAAAAHwAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAACHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAHwAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAABHwAAAAADfgAAAAAAHwAAAAACJAAAAAACHwAAAAACfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAACaAAAAAABXQAAAAADaAAAAAAAHwAAAAADHwAAAAAAHwAAAAADJAAAAAACHwAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAHwAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAADHwAAAAADfgAAAAAAHwAAAAABJAAAAAABHwAAAAADfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAACHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABJAAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADXQAAAAADfgAAAAAAHwAAAAACJAAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADJAAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAABXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAA
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: EgAAAAACXQAAAAAAegAAAAABegAAAAAAXQAAAAADfgAAAAAAJAAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAACEgAAAAAAXQAAAAACegAAAAAAegAAAAACXQAAAAABfgAAAAAAXQAAAAAATgAAAAADTgAAAAADaAAAAAAATgAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAAAEgAAAAAAXQAAAAAAegAAAAABegAAAAADXQAAAAABfgAAAAAAXQAAAAAATgAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAABEgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAADaAAAAAADXQAAAAACaAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAAAegAAAAAAegAAAAABXQAAAAAAaAAAAAADXQAAAAAATgAAAAACXQAAAAACXQAAAAAAaAAAAAABHwAAAAABHwAAAAACJgAAAAAAJgAAAAABJgAAAAABEgAAAAABXQAAAAAAegAAAAAAegAAAAADXQAAAAABfgAAAAAAXQAAAAACTgAAAAAAXQAAAAACXQAAAAACaAAAAAABHwAAAAAAHwAAAAAATgAAAAAATgAAAAADTgAAAAACXQAAAAADXQAAAAABKAAAAAAAKAAAAAADXQAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAADXQAAAAACaAAAAAADHwAAAAADHwAAAAADJgAAAAADJgAAAAABJgAAAAACKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADaAAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAABegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADegAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABegAAAAABegAAAAACegAAAAADegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAA
+          tiles: EgAAAAAAXQAAAAABegAAAAADegAAAAABXQAAAAADfgAAAAAAJAAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAACXQAAAAADXQAAAAABXQAAAAADEgAAAAADXQAAAAAAegAAAAABegAAAAADXQAAAAADfgAAAAAAXQAAAAADTgAAAAAATgAAAAABaAAAAAAATgAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAABEgAAAAABXQAAAAAAegAAAAACegAAAAACXQAAAAADfgAAAAAAXQAAAAAATgAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACaAAAAAACXQAAAAADXQAAAAADXQAAAAABEgAAAAADXQAAAAAAegAAAAACegAAAAAAXQAAAAADaAAAAAABXQAAAAAAaAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADEgAAAAACXQAAAAACegAAAAABegAAAAAAXQAAAAABaAAAAAABXQAAAAAATgAAAAADXQAAAAAAXQAAAAABaAAAAAAAHwAAAAADHwAAAAADJgAAAAABJgAAAAABJgAAAAABEgAAAAABXQAAAAADegAAAAADegAAAAABXQAAAAADfgAAAAAAXQAAAAAATgAAAAABXQAAAAACXQAAAAACaAAAAAABHwAAAAACHwAAAAABTgAAAAABTgAAAAABTgAAAAABXQAAAAAAXQAAAAACKAAAAAABKAAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAADaAAAAAABHwAAAAABHwAAAAAAJgAAAAABJgAAAAACJgAAAAABKAAAAAAAKAAAAAADKAAAAAADKAAAAAABXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAACegAAAAAAegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAACegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAADegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABegAAAAADegAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: egAAAAABegAAAAAAegAAAAACegAAAAACegAAAAABaAAAAAACXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAegAAAAABegAAAAABegAAAAACewAAAAABewAAAAADfgAAAAAATgAAAAACTgAAAAABKAAAAAABTgAAAAABTgAAAAAAaAAAAAABXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAegAAAAACegAAAAACegAAAAABewAAAAADewAAAAAAbAAAAAAATgAAAAACTgAAAAAAKAAAAAABTgAAAAABTgAAAAADaAAAAAACXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAADewAAAAADewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAACegAAAAABaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAABewAAAAABfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAewAAAAACewAAAAAAewAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADQAAAAAAAfgAAAAAAaAAAAAABfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAADfgAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAACQAAAAAAAQAAAAAAAXQAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAACfgAAAAAAXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAACXwAAAAAAJAAAAAACXwAAAAAAXwAAAAABXwAAAAABXwAAAAABXQAAAAACXQAAAAAAXQAAAAADaAAAAAACegAAAAACegAAAAACegAAAAABegAAAAACegAAAAADHwAAAAACHwAAAAAAXwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAADXQAAAAADXQAAAAADXQAAAAADaAAAAAACegAAAAADegAAAAABegAAAAABegAAAAABegAAAAAAHwAAAAADHwAAAAABXwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAADXQAAAAACXQAAAAADXQAAAAABaAAAAAADegAAAAABegAAAAADegAAAAABegAAAAABegAAAAAAHwAAAAABHwAAAAADXwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAADXQAAAAADXQAAAAADXQAAAAAAaAAAAAACegAAAAABegAAAAADegAAAAABegAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADaAAAAAABegAAAAADegAAAAABegAAAAADegAAAAACegAAAAAD
+          tiles: egAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAABaAAAAAACXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAAAewAAAAAAewAAAAADfgAAAAAATgAAAAABTgAAAAABKAAAAAACTgAAAAAATgAAAAADaAAAAAACXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAACewAAAAABewAAAAADbAAAAAAATgAAAAACTgAAAAABKAAAAAABTgAAAAAATgAAAAAAaAAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAewAAAAAAewAAAAABfgAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAABegAAAAACaAAAAAABXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAABewAAAAADewAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAewAAAAADewAAAAABewAAAAABfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAAAKAAAAAABKAAAAAAAfgAAAAAAXQAAAAABaAAAAAACaAAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACQAAAAAAAQAAAAAAAXQAAAAACfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAXQAAAAABXQAAAAACaAAAAAADXQAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAABQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXwAAAAABXwAAAAABJAAAAAACXwAAAAADXwAAAAAAXwAAAAADXwAAAAADXQAAAAAAXQAAAAADXQAAAAADaAAAAAADegAAAAACegAAAAAAegAAAAAAegAAAAACegAAAAACHwAAAAADHwAAAAADXwAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAADegAAAAACegAAAAACegAAAAADegAAAAADegAAAAAAHwAAAAAAHwAAAAAAXwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAXQAAAAADXQAAAAAAXQAAAAADaAAAAAACegAAAAADegAAAAAAegAAAAADegAAAAABegAAAAABHwAAAAACHwAAAAABXwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADaAAAAAABegAAAAADegAAAAABegAAAAACegAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAABegAAAAACegAAAAAAegAAAAADegAAAAAAegAAAAAC
           version: 6
         1,0:
           ind: 1,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABaAAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADTgAAAAACaAAAAAABaAAAAAABbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAACXQAAAAACXQAAAAABJAAAAAAAJAAAAAACJAAAAAACXQAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAACJAAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACaAAAAAACaAAAAAACfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACaAAAAAAAaAAAAAADHQAAAAACaAAAAAACaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAaAAAAAACaAAAAAABXQAAAAABaAAAAAAAaAAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACaAAAAAADaAAAAAACXQAAAAAAaAAAAAAAaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAaAAAAAACaAAAAAACfgAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAAAaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAADTgAAAAACaAAAAAADaAAAAAABbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAAAXQAAAAADXQAAAAADJAAAAAABJAAAAAACJAAAAAABXQAAAAADXQAAAAABaAAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADfgAAAAAAJAAAAAADJAAAAAADJAAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAADfgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABaAAAAAAAaAAAAAACfgAAAAAAaAAAAAABaAAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADaAAAAAACaAAAAAAAHQAAAAADaAAAAAAAaAAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADaAAAAAACaAAAAAABXQAAAAACaAAAAAADaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADaAAAAAABaAAAAAAAXQAAAAACaAAAAAACaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABaAAAAAADaAAAAAACfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAAA
           version: 6
         2,-2:
           ind: 2,-2
-          tiles: HwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAABewAAAAABfgAAAAAAewAAAAADHwAAAAAAHwAAAAABMwAAAAAAHwAAAAABHwAAAAAAewAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAADewAAAAACewAAAAAAewAAAAABHwAAAAADHwAAAAACMwAAAAAAHwAAAAAAHwAAAAABewAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAACewAAAAACfgAAAAAAewAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACewAAAAACewAAAAACewAAAAADewAAAAABewAAAAACewAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAAAegAAAAABegAAAAABegAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADXQAAAAABXQAAAAAAegAAAAACJAAAAAACfgAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAAAegAAAAACegAAAAAAegAAAAACHwAAAAABHwAAAAACHwAAAAAAHwAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAcAAAAAADcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACaAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABaAAAAAABXQAAAAAATgAAAAADTgAAAAADaAAAAAADTgAAAAACTgAAAAAAaAAAAAACaAAAAAABTgAAAAADaAAAAAAATgAAAAAATgAAAAACTgAAAAADaAAAAAABTgAAAAAAaAAAAAACaAAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: HwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABewAAAAAAfgAAAAAAewAAAAADHwAAAAACHwAAAAAAMwAAAAAAHwAAAAACHwAAAAADewAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAACewAAAAAAewAAAAABewAAAAAAHwAAAAAAHwAAAAADMwAAAAAAHwAAAAABHwAAAAACewAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACewAAAAADfgAAAAAAewAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAABewAAAAADfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACewAAAAADewAAAAACewAAAAACewAAAAAAewAAAAADewAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAXQAAAAACegAAAAAAegAAAAACegAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAXQAAAAAAXQAAAAADegAAAAABJAAAAAADfgAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABegAAAAADegAAAAACegAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAcAAAAAAAcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADaAAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAABTgAAAAABTgAAAAACaAAAAAABaAAAAAADTgAAAAADaAAAAAACTgAAAAACTgAAAAABTgAAAAACaAAAAAACTgAAAAACaAAAAAAAaAAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABaAAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAACbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAdQAAAAACdQAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABaAAAAAACXQAAAAABfgAAAAAAdQAAAAABdQAAAAADcAAAAAACJAAAAAABJAAAAAACJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAdQAAAAADdQAAAAADcAAAAAAC
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAADaAAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAdQAAAAADdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAdQAAAAADdQAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAABcAAAAAAAJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAACfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAABfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAADaAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAdQAAAAAAdQAAAAADcAAAAAAD
           version: 6
         -2,0:
           ind: -2,0
-          tiles: aAAAAAACaAAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAaAAAAAADegAAAAACegAAAAAAegAAAAAAegAAAAADegAAAAACaAAAAAABaAAAAAAAXwAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADaAAAAAACegAAAAADegAAAAADegAAAAACegAAAAABegAAAAACaAAAAAABaAAAAAABXwAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACaAAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAADegAAAAADaAAAAAACaAAAAAABaAAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAADegAAAAADegAAAAABewAAAAAAewAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACAwAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAABXQAAAAAAXQAAAAAAXQAAAAADHwAAAAADewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAADXQAAAAADAwAAAAAAegAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAJAAAAAABHwAAAAACHwAAAAADewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAACXQAAAAACAwAAAAAAegAAAAABJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAJAAAAAACHwAAAAACHwAAAAACewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAwAAAAAAegAAAAAAJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAADaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAAAaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAADXQAAAAABXQAAAAAAXQAAAAADaAAAAAABXQAAAAACeQAAAAACeQAAAAAAeQAAAAADeQAAAAABeQAAAAACeQAAAAAALgAAAAAALgAAAAAAAQAAAAAAaAAAAAACaAAAAAAAAQAAAAACfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAADeQAAAAADeQAAAAADeQAAAAABeQAAAAACfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAABXQAAAAADXQAAAAABaAAAAAADXQAAAAAAXQAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACfgAAAAAALgAAAAAAXQAAAAACXQAAAAAAPAAAAAAAAQAAAAAAXQAAAAADXQAAAAADaAAAAAADXQAAAAAAXQAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAACfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAADfgAAAAAAfgAAAAAA
+          tiles: aAAAAAACaAAAAAADaAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAAAaAAAAAABaAAAAAABXwAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADaAAAAAADegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAADaAAAAAACaAAAAAABXwAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAaAAAAAACegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAACaAAAAAABaAAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAAAegAAAAABegAAAAACegAAAAACegAAAAADegAAAAACewAAAAACewAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAAwAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAADXQAAAAACXQAAAAABXQAAAAAAHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAAAXQAAAAABAwAAAAAAegAAAAADHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAJAAAAAADHwAAAAACHwAAAAACewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAAAXQAAAAADAwAAAAAAegAAAAABJAAAAAACJAAAAAAAJAAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAADXQAAAAADAwAAAAAAegAAAAACJAAAAAABJAAAAAADJAAAAAADfgAAAAAAJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAACaAAAAAACaAAAAAABaAAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAeQAAAAABeQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAABXQAAAAAAXQAAAAACXQAAAAACaAAAAAABXQAAAAAAeQAAAAABeQAAAAADeQAAAAACeQAAAAADeQAAAAAAeQAAAAABLgAAAAAALgAAAAAAAQAAAAADaAAAAAABaAAAAAABAQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAJAAAAAADeQAAAAABeQAAAAAAeQAAAAACeQAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAABXQAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAABfgAAAAAALgAAAAAAXQAAAAABXQAAAAADPAAAAAAAAQAAAAACXQAAAAAAXQAAAAAAaAAAAAADXQAAAAADXQAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABfgAAAAAAfgAAAAAA
           version: 6
         1,-3:
           ind: 1,-3
-          tiles: bQAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAABJAAAAAACJAAAAAAAJAAAAAABJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAJAAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAADXQAAAAABaAAAAAABXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAHwAAAAACaAAAAAACaAAAAAAAaAAAAAACaAAAAAADaAAAAAABHwAAAAADfgAAAAAAHwAAAAADTgAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADHwAAAAADfgAAAAAAHwAAAAAC
+          tiles: bQAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACbQAAAAAAbQAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAABfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAABJAAAAAADJAAAAAADJAAAAAACJAAAAAADJAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAJAAAAAABJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAJAAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAADXQAAAAAAaAAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAHwAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAACHwAAAAACfgAAAAAAHwAAAAABTgAAAAACaAAAAAADaAAAAAAAaAAAAAACaAAAAAAAXQAAAAACfgAAAAAAHwAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAADHwAAAAABfgAAAAAAHwAAAAAD
           version: 6
         0,-3:
           ind: 0,-3
-          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACaAAAAAAAaAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACaAAAAAABaAAAAAABJAAAAAAAfgAAAAAAXQAAAAADXQAAAAABHwAAAAAAHwAAAAABHwAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAADHwAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACTgAAAAACaAAAAAABTgAAAAABaAAAAAAD
+          tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABJAAAAAABJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABaAAAAAACaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACaAAAAAACaAAAAAAAJAAAAAACfgAAAAAAXQAAAAABXQAAAAADHwAAAAACHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAACHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACTgAAAAADaAAAAAACTgAAAAABaAAAAAAC
           version: 6
         1,1:
           ind: 1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABJAAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAADfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAADXQAAAAADaAAAAAABaAAAAAACaAAAAAAAXQAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAAAXQAAAAADfgAAAAAAXQAAAAABaAAAAAADaAAAAAACaAAAAAAAXQAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAADaAAAAAACXQAAAAAAXQAAAAABXQAAAAADJAAAAAADfgAAAAAAXQAAAAACaAAAAAAAaAAAAAACaAAAAAADXQAAAAADaAAAAAABaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAdQAAAAACdAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADJAAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAADaAAAAAACaAAAAAACXQAAAAAAaAAAAAABaAAAAAABaAAAAAADXQAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAACXQAAAAABfgAAAAAAXQAAAAABaAAAAAAAaAAAAAABaAAAAAADXQAAAAAAaAAAAAACaAAAAAAAaAAAAAADXQAAAAAAXQAAAAABaAAAAAABXQAAAAABXQAAAAADXQAAAAADJAAAAAACfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAADaAAAAAAAXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABdQAAAAADdAAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAACaAAAAAADaAAAAAAAaAAAAAABaAAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAABcAAAAAAAdQAAAAABdAAAAAABdAAAAAADdAAAAAAAXQAAAAACXQAAAAAAXQAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAADdQAAAAACdAAAAAACdAAAAAACdAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAACdAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAACcAAAAAABaAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADaAAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAACXQAAAAACXQAAAAABXQAAAAACaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAAAcAAAAAABdQAAAAABdAAAAAACdAAAAAADdAAAAAACXQAAAAABXQAAAAACXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAAAcAAAAAABdQAAAAAAdAAAAAACdAAAAAACdAAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAACdAAAAAADdAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAABdQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAACcAAAAAAAaAAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADaAAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACaAAAAAADTgAAAAACTgAAAAAAaAAAAAACTgAAAAABTgAAAAACaAAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACHwAAAAADHwAAAAADXQAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAACJAAAAAADJAAAAAAAXQAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAADTgAAAAADTgAAAAABHwAAAAADTgAAAAADTgAAAAADTgAAAAADHwAAAAABTgAAAAABTgAAAAABHwAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAJAAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABJAAAAAACJAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAC
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAACTgAAAAAATgAAAAAAaAAAAAABTgAAAAAATgAAAAAAaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABaAAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAHwAAAAACHwAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACHwAAAAACHwAAAAABXQAAAAADfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAABJAAAAAABJAAAAAAAXQAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAADTgAAAAACTgAAAAACHwAAAAADTgAAAAABTgAAAAADTgAAAAAAHwAAAAADTgAAAAAATgAAAAACHwAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACJAAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACJAAAAAABJAAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAAA
           version: 6
         -2,1:
           ind: -2,1
-          tiles: AQAAAAACAQAAAAACAQAAAAACJAAAAAACfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABKAAAAAADKAAAAAADKAAAAAABKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACXwAAAAACXwAAAAACXwAAAAAAXwAAAAADXwAAAAACXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAADXwAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAABXwAAAAAAaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADJAAAAAABKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAAAKAAAAAAAXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABegAAAAABegAAAAACegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAA
+          tiles: AQAAAAACAQAAAAACAQAAAAACJAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAABfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAKAAAAAABKAAAAAADKAAAAAAAKAAAAAABKAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAXwAAAAACXwAAAAADXwAAAAAAXwAAAAABXwAAAAABXwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAaAAAAAADXwAAAAADXwAAAAACXwAAAAAAXwAAAAACXwAAAAACXwAAAAABaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADJAAAAAABKAAAAAABKAAAAAABKAAAAAAAKAAAAAACKAAAAAACKAAAAAABXQAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAegAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAABegAAAAADegAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAC
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAACgQAAAAAAfgAAAAAAgQAAAAAAggAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAACgQAAAAAAfgAAAAAAgQAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAB
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACJAAAAAABJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAACJAAAAAACJAAAAAAAJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAACJAAAAAACJAAAAAAAJgAAAAABJgAAAAACJgAAAAADJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAADJgAAAAADJgAAAAAAJgAAAAACJgAAAAABJAAAAAADJAAAAAABJAAAAAADJgAAAAAAJgAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAACJgAAAAAAJgAAAAAAJAAAAAACJAAAAAADJAAAAAACJgAAAAADJgAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAACJgAAAAACJgAAAAADJAAAAAADHwAAAAACHwAAAAADJAAAAAABJAAAAAABHwAAAAADHwAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAADJAAAAAAAHwAAAAACHwAAAAACJAAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAADJgAAAAACJAAAAAAAJAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJAAAAAACJAAAAAADJgAAAAAAHwAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADJAAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAJAAAAAACJAAAAAACJAAAAAABJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAACJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAADJAAAAAACJAAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAAAJAAAAAABJAAAAAACJAAAAAABJgAAAAADJgAAAAAAJgAAAAAAJgAAAAABJgAAAAAAJgAAAAAAJgAAAAADJgAAAAADJgAAAAADJgAAAAAAJgAAAAACJgAAAAACJAAAAAABJAAAAAABJAAAAAAAJgAAAAABJgAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAABJgAAAAADJgAAAAAAJAAAAAADJAAAAAADJAAAAAACJgAAAAADJgAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAACJgAAAAABJgAAAAAAJAAAAAABHwAAAAAAHwAAAAADJAAAAAACJAAAAAABHwAAAAACHwAAAAABJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAABHwAAAAAAHwAAAAABJAAAAAADJAAAAAABHwAAAAADHwAAAAAAHwAAAAADJgAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAABJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAACJgAAAAACHwAAAAAA
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: HwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABHwAAAAACHwAAAAADfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADaAAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAABXQAAAAABaAAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAaAAAAAAAXQAAAAACXQAAAAABJAAAAAACfgAAAAAAXQAAAAAATgAAAAADTgAAAAAAaAAAAAACTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAA
+          tiles: HwAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADHwAAAAADHwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAHwAAAAAAHwAAAAACfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADJAAAAAABfgAAAAAAXQAAAAACTgAAAAADTgAAAAADaAAAAAAATgAAAAAATgAAAAACaAAAAAADaAAAAAADaAAAAAABaAAAAAACaAAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         3,-3:
           ind: 3,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEBwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAGBwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAFJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAABfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAFJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAALCwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAABBwAAAAALBwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAJJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAACJAAAAAADfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAALBwAAAAAAJAAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAADBwAAAAADfwAAAAAAJAAAAAABJAAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAB
           version: 6
         -2,-3:
           ind: -2,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACJAAAAAACfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAABKAAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAABKAAAAAACKAAAAAABKAAAAAAAKAAAAAACKAAAAAADKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAegAAAAADegAAAAADegAAAAACKAAAAAADKAAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAABKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAADKAAAAAAAKAAAAAACKAAAAAABKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAABegAAAAABegAAAAADegAAAAAAJAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACKAAAAAACKAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAADegAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAACFQAAAAAEegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAABgQAAAAAAFQAAAAAFegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABJAAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAACKAAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAADfgAAAAAAegAAAAABegAAAAACegAAAAACegAAAAADegAAAAACegAAAAABegAAAAADegAAAAABegAAAAACegAAAAABegAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAABfgAAAAAAegAAAAAAegAAAAAAegAAAAABKAAAAAABKAAAAAABKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAewAAAAADewAAAAABfgAAAAAAegAAAAAAegAAAAADegAAAAACKAAAAAABKAAAAAACKAAAAAADKAAAAAAAKAAAAAABKAAAAAADKAAAAAABKAAAAAACfgAAAAAAfgAAAAAAewAAAAACewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAABKAAAAAADKAAAAAADKAAAAAABKAAAAAACKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAADegAAAAACegAAAAABegAAAAAAJAAAAAACfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAABKAAAAAACKAAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAACKAAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         -3,-1:
           ind: -3,-1
-          tiles: HwAAAAADfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAADegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAAATgAAAAABKAAAAAADTgAAAAACTgAAAAACKAAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABTgAAAAAATgAAAAAAKAAAAAAATgAAAAABTgAAAAADKAAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAABegAAAAADegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAABfgAAAAAAewAAAAAAewAAAAAAewAAAAABfgAAAAAAaAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAKAAAAAADKAAAAAAAKAAAAAAAfgAAAAAAaAAAAAADKAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAAAfgAAAAAAKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXwAAAAABXwAAAAAAXwAAAAADXwAAAAACXwAAAAABJAAAAAADXwAAAAACXwAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAXwAAAAAAHwAAAAAAHwAAAAAAJAAAAAACJAAAAAABJAAAAAABJAAAAAAAJAAAAAACXQAAAAADXQAAAAABfgAAAAAAXwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAACXwAAAAACHwAAAAACHwAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAADfgAAAAAAXwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADXwAAAAADHwAAAAACHwAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAA
+          tiles: HwAAAAAAfgAAAAAAewAAAAABewAAAAABewAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAADegAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAAATgAAAAAAKAAAAAABTgAAAAACTgAAAAAAKAAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAACTgAAAAADKAAAAAAATgAAAAADTgAAAAABKAAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAADegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAAAfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAaAAAAAADKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAACZQAAAAACfgAAAAAAKAAAAAACKAAAAAADKAAAAAABfgAAAAAAaAAAAAAAKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAACZQAAAAABfgAAAAAAKAAAAAACKAAAAAACKAAAAAACfgAAAAAAXQAAAAACXQAAAAACBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAXwAAAAABXwAAAAADXwAAAAABXwAAAAABXwAAAAAAJAAAAAADXwAAAAACXwAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAADXwAAAAACHwAAAAAAHwAAAAACJAAAAAADJAAAAAADJAAAAAAAJAAAAAABJAAAAAADXQAAAAACXQAAAAACfgAAAAAAXwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABXwAAAAABHwAAAAACHwAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAADfgAAAAAAXwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAABXwAAAAADHwAAAAABHwAAAAACJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAC
           version: 6
         -3,0:
           ind: -3,0
-          tiles: ZQAAAAABZQAAAAACZQAAAAAAZQAAAAAAZQAAAAAAXQAAAAACaAAAAAABaAAAAAABXQAAAAADXQAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAADXQAAAAADTgAAAAABTgAAAAADaAAAAAABTgAAAAADTgAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAADXQAAAAACXwAAAAABaAAAAAACaAAAAAACaAAAAAACXwAAAAACaAAAAAACZQAAAAAAZQAAAAADZQAAAAAAZQAAAAABZQAAAAABXQAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAABXwAAAAAAaAAAAAAAaAAAAAABaAAAAAACXwAAAAAAaAAAAAADJAAAAAAAJAAAAAAAJAAAAAADJAAAAAAAJAAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAADaAAAAAABaAAAAAABaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAewAAAAACewAAAAACewAAAAAAewAAAAAAewAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAACXQAAAAADXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAADHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAADewAAAAADfgAAAAAAaAAAAAACaAAAAAACaAAAAAABAgAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAACewAAAAACfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABAgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAACPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAABPAAAAAAAPAAAAAAA
+          tiles: ZQAAAAADZQAAAAADZQAAAAADZQAAAAACZQAAAAADXQAAAAACaAAAAAAAaAAAAAAAXQAAAAAAXQAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAACXQAAAAACTgAAAAABTgAAAAABaAAAAAACTgAAAAADTgAAAAABaAAAAAADaAAAAAACaAAAAAADXQAAAAAAXQAAAAABXwAAAAACaAAAAAACaAAAAAABaAAAAAADXwAAAAABaAAAAAADZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAADZQAAAAABXQAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAACXwAAAAAAaAAAAAACaAAAAAACaAAAAAADXwAAAAAAaAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADJAAAAAABJAAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAACaAAAAAACaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACewAAAAAAewAAAAABewAAAAACewAAAAAAewAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAACJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAACewAAAAADfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAAgAAAAAAJAAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAACewAAAAADfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACAgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACAQAAAAADPAAAAAAAXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAA
           version: 6
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAAAFQAAAAADegAAAAAAfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAAAgQAAAAAAFQAAAAAAfgAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAGfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAAAFQAAAAABegAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAACegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAADegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAADRQAAAAAAIwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAAAFQAAAAAGegAAAAACfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAADfgAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAFQAAAAAAfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABFQAAAAAEegAAAAABegAAAAACfgAAAAAAegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,-2:
           ind: -3,-2
-          tiles: aAAAAAABaAAAAAACaAAAAAABaAAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACegAAAAADegAAAAADXQAAAAACEgAAAAABEgAAAAABEgAAAAABEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAADaAAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAAAEgAAAAABEgAAAAADEgAAAAAAEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAADaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADegAAAAAAegAAAAACXQAAAAAAEgAAAAADEgAAAAACEgAAAAABEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAACaAAAAAABXQAAAAACaAAAAAABXQAAAAACegAAAAABegAAAAAAXQAAAAAAEgAAAAABEgAAAAABEgAAAAABEgAAAAACEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADaAAAAAAAXQAAAAABaAAAAAACXQAAAAABegAAAAADegAAAAAAXQAAAAADEgAAAAABEgAAAAACEgAAAAABEgAAAAAAEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAADegAAAAACegAAAAAAXQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAACEgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADKAAAAAADKAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAKAAAAAABKAAAAAAAKAAAAAABKAAAAAABKAAAAAADKAAAAAADKAAAAAABKAAAAAABaAAAAAABaAAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAADewAAAAACewAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAAA
+          tiles: aAAAAAABaAAAAAADaAAAAAACaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACegAAAAACegAAAAADXQAAAAADEgAAAAACEgAAAAACEgAAAAADEgAAAAACEgAAAAADfgAAAAAAfgAAAAAAJAAAAAACaAAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACegAAAAAAegAAAAADXQAAAAAAEgAAAAABEgAAAAADEgAAAAADEgAAAAACEgAAAAACAwAAAAAAAwAAAAAAJAAAAAABaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADegAAAAADegAAAAACXQAAAAADEgAAAAABEgAAAAABEgAAAAACEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADaAAAAAACXQAAAAABaAAAAAAAXQAAAAAAegAAAAABegAAAAABXQAAAAADEgAAAAAAEgAAAAABEgAAAAABEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADaAAAAAADXQAAAAABaAAAAAACXQAAAAABegAAAAABegAAAAAAXQAAAAADEgAAAAADEgAAAAACEgAAAAAAEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAABaAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABegAAAAADegAAAAACXQAAAAACEgAAAAAAEgAAAAAAEgAAAAABEgAAAAACEgAAAAABfgAAAAAAfgAAAAAAJAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACKAAAAAABKAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAABKAAAAAADKAAAAAADKAAAAAABKAAAAAADKAAAAAAAKAAAAAAAKAAAAAADKAAAAAADaAAAAAACaAAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAAAewAAAAADewAAAAABfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAACewAAAAACewAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACKAAAAAAB
           version: 6
         -3,-3:
           ind: -3,-3
-          tiles: XQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAAATgAAAAABaAAAAAAATgAAAAADTgAAAAACaAAAAAADaAAAAAAAaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAJAAAAAADJAAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAABTgAAAAADXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAACTgAAAAABXQAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAADKAAAAAAAKAAAAAACKAAAAAAAKAAAAAADKAAAAAADKAAAAAACKAAAAAADaAAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAABKAAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAB
+          tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAADTgAAAAABaAAAAAAATgAAAAABTgAAAAADaAAAAAADaAAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAJAAAAAAAJAAAAAACHwAAAAADHwAAAAACfgAAAAAAegAAAAADaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAHwAAAAACHwAAAAAAfgAAAAAAegAAAAACaAAAAAABXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAADHwAAAAADfgAAAAAAegAAAAACTgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAABfgAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAABTgAAAAABXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAAAaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAABXQAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACTgAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAACKAAAAAACKAAAAAACKAAAAAADKAAAAAACKAAAAAABKAAAAAAAKAAAAAAAaAAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAACKAAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAD
           version: 6
         -4,0:
           ind: -4,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAAAZQAAAAACZQAAAAAAZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAABTgAAAAACTgAAAAADaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAABZQAAAAAAZQAAAAAAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAADJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAJAAAAAABJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAAAXQAAAAAAZQAAAAADZQAAAAADZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAADTgAAAAAATgAAAAACaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACXQAAAAACZQAAAAABZQAAAAADZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACJAAAAAABJAAAAAACJAAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAADJAAAAAABJAAAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-1:
           ind: -4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAACJAAAAAACJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAABJAAAAAADJAAAAAACJAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAADXQAAAAAAJAAAAAACJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACJAAAAAADJAAAAAADJAAAAAADJAAAAAAC
           version: 6
         -4,-2:
           ind: -4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAJAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACaAAAAAACJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAaAAAAAADJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAACJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABHwAAAAACfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADXQAAAAADaAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAAAXQAAAAACaAAAAAADaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAADfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAACfgAAAAAAXQAAAAABaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAABaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAACJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABaAAAAAADJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABHwAAAAACfgAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAABXQAAAAABaAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAADaAAAAAABXQAAAAADaAAAAAADaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAaAAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABaAAAAAACaAAAAAADaAAAAAAAaAAAAAABaAAAAAACfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAD
           version: 6
         -4,-3:
           ind: -4,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAACaAAAAAADTgAAAAABTgAAAAABaAAAAAADTgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXgAAAAABXgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAYQAAAAABYQAAAAACXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAACaAAAAAADTgAAAAACTgAAAAABaAAAAAADTgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXgAAAAABXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACYQAAAAAEYQAAAAAEXgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAD
           version: 6
         2,0:
           ind: 2,0
-          tiles: HwAAAAADHwAAAAACHwAAAAADfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAaAAAAAABXQAAAAADdQAAAAADdQAAAAACdQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACJAAAAAABXQAAAAABXQAAAAACXQAAAAADaAAAAAAAXQAAAAACXQAAAAADTgAAAAACXQAAAAABdQAAAAADdQAAAAADdQAAAAADfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAACTgAAAAACTgAAAAAAaAAAAAADaAAAAAAAaAAAAAACTgAAAAAATgAAAAAAXQAAAAABdQAAAAADdQAAAAACaAAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACdQAAAAABdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAACcAAAAAACcAAAAAAAcAAAAAAAcAAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAcAAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAAAdQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAAATgAAAAABcAAAAAABdQAAAAACcAAAAAACTgAAAAADdQAAAAACXQAAAAACXQAAAAACXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAADcAAAAAACcAAAAAABcAAAAAABcAAAAAABdQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADdQAAAAACdQAAAAADdQAAAAAAdAAAAAACdQAAAAAAfgAAAAAAXQAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAAAdQAAAAABdQAAAAAAdAAAAAAAJAAAAAACXQAAAAAAXQAAAAABegAAAAADegAAAAAAegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAABcAAAAAAAcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAXQAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAACHwAAAAAAJAAAAAADfgAAAAAAXQAAAAACegAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACTwAAAAAATwAAAAAA
+          tiles: HwAAAAACHwAAAAACHwAAAAADfgAAAAAAaAAAAAABaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAAAaAAAAAAAXQAAAAAAdQAAAAAAdQAAAAADdQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACJAAAAAABXQAAAAACXQAAAAACXQAAAAAAaAAAAAADXQAAAAAAXQAAAAADTgAAAAAAXQAAAAACdQAAAAAAdQAAAAAAdQAAAAADfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABTgAAAAADTgAAAAADaAAAAAAAaAAAAAADaAAAAAABTgAAAAABTgAAAAABXQAAAAACdQAAAAACdQAAAAAAaAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAACaAAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADdQAAAAACdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAADcAAAAAACcAAAAAADcAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAdQAAAAAAdQAAAAAAcAAAAAACcAAAAAAAcAAAAAACcAAAAAABcAAAAAADdQAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAdQAAAAABTgAAAAABcAAAAAAAdQAAAAACcAAAAAAATgAAAAACdQAAAAAAXQAAAAADXQAAAAADXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAACcAAAAAABcAAAAAADcAAAAAACcAAAAAAAdQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAABdQAAAAAAdQAAAAAAdQAAAAACdAAAAAACdQAAAAACfgAAAAAAXQAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAABdQAAAAAAdQAAAAAAdQAAAAABdAAAAAACJAAAAAACXQAAAAADXQAAAAACegAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAADcAAAAAABcAAAAAADcAAAAAAAcAAAAAABcAAAAAADfgAAAAAAXQAAAAADegAAAAABegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACHwAAAAADJAAAAAAAfgAAAAAAXQAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAADTwAAAAAATwAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
@@ -221,71 +221,71 @@ entities:
           version: 6
         0,2:
           ind: 0,2
-          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAdAAAAAADdAAAAAAAdQAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAdAAAAAADdAAAAAAAdQAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HwAAAAABHwAAAAADewAAAAADewAAAAAAewAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACJAAAAAADJAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAHwAAAAABewAAAAAAewAAAAADewAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADewAAAAABewAAAAAAewAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACgQAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAJAAAAAABJAAAAAACJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAB
+          tiles: HwAAAAAAHwAAAAABewAAAAABewAAAAADewAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAJAAAAAABJAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAHwAAAAAAewAAAAADewAAAAACewAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABHwAAAAABHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABewAAAAACewAAAAAAewAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAACdAAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACgQAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAAA
           version: 6
         -2,2:
           ind: -2,2
-          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAADfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,3:
           ind: -1,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACJAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADJAAAAAADXQAAAAADXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABHwAAAAADHwAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,3:
           ind: 0,3
-          tiles: XQAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAABHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,1:
           ind: 2,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAABHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAATgAAAAABTgAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABTgAAAAADTgAAAAAAHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABaAAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAABTwAAAAAATwAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAAATgAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABTgAAAAABTgAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAaAAAAAABHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
-          tiles: fgAAAAAAdQAAAAACdQAAAAABdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAAdQAAAAADdQAAAAADdQAAAAACcAAAAAAAdQAAAAABcAAAAAADfgAAAAAAcAAAAAABcAAAAAABdQAAAAADdQAAAAACdQAAAAABfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAACdQAAAAAAdQAAAAADdQAAAAADcAAAAAAAdQAAAAACcAAAAAAAcAAAAAADcAAAAAACcAAAAAADdQAAAAACdQAAAAACdQAAAAACdQAAAAAAdQAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAABdQAAAAACcAAAAAAAdQAAAAACcAAAAAADcAAAAAAAcAAAAAADcAAAAAABdQAAAAACdQAAAAAAdQAAAAACfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAADdQAAAAAAdQAAAAACdQAAAAAAcAAAAAABdQAAAAABcAAAAAAAfgAAAAAAcAAAAAACcAAAAAACdQAAAAACdQAAAAAAdQAAAAADfgAAAAAAcAAAAAADcAAAAAABfgAAAAAAdQAAAAABdQAAAAAAdQAAAAAAcAAAAAACdQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABdQAAAAAAcAAAAAABcAAAAAABcAAAAAACdQAAAAAAdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAADcAAAAAABfgAAAAAAcAAAAAADdQAAAAABdQAAAAADdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADdQAAAAACcAAAAAAAdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACfgAAAAAAcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAJAAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAACcAAAAAABcAAAAAAAcAAAAAACHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADcAAAAAAAfgAAAAAAcAAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAACdQAAAAAAcAAAAAAAcAAAAAAAcAAAAAACdQAAAAABcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAACdQAAAAACdQAAAAACcAAAAAABfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAdQAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACfgAAAAAAdQAAAAACdQAAAAABdQAAAAABcAAAAAACdQAAAAAAcAAAAAADfgAAAAAAcAAAAAADcAAAAAAAdQAAAAABdQAAAAABdQAAAAACfgAAAAAAcAAAAAACdQAAAAACdQAAAAACdQAAAAAAdQAAAAAAdQAAAAAAcAAAAAACdQAAAAABcAAAAAAAcAAAAAADcAAAAAACcAAAAAABdQAAAAAAdQAAAAABdQAAAAACdQAAAAAAdQAAAAAAdQAAAAADcAAAAAAAcAAAAAACcAAAAAADdQAAAAABcAAAAAACdQAAAAADcAAAAAADcAAAAAADcAAAAAACcAAAAAAAdQAAAAADdQAAAAACdQAAAAADfgAAAAAAcAAAAAADdQAAAAACdQAAAAABdQAAAAAAdQAAAAAAdQAAAAACcAAAAAAAdQAAAAACcAAAAAADfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAdQAAAAACdQAAAAADfgAAAAAAcAAAAAABcAAAAAABfgAAAAAAdQAAAAAAdQAAAAADdQAAAAABcAAAAAACdQAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACcAAAAAAAfgAAAAAAcAAAAAABcAAAAAABcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAADdQAAAAADcAAAAAAAcAAAAAACcAAAAAAAdQAAAAAAdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAAAdQAAAAABcAAAAAADfgAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACdQAAAAACcAAAAAADdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAABdQAAAAACcAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAADdQAAAAABcAAAAAAAcAAAAAADcAAAAAABHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAABcAAAAAADfgAAAAAAcAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAABdQAAAAABcAAAAAABcAAAAAACcAAAAAADdQAAAAADcAAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAABdQAAAAADdQAAAAAAcAAAAAACfgAAAAAAfgAAAAAA
           version: 6
         3,1:
           ind: 3,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAABdQAAAAADdQAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAADegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXgAAAAABZAAAAAAAXQAAAAABXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAABdQAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAACegAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAACXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAACfgAAAAAAegAAAAAAegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -4,-4:
           ind: -4,-4
-          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAABJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACJAAAAAACJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
+          tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAACHwAAAAADHwAAAAADHwAAAAAAJAAAAAACJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAJAAAAAADJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAAAJAAAAAABJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAABHwAAAAADJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAACHwAAAAAAHwAAAAACHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAACHwAAAAAAHwAAAAACHwAAAAADJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAJAAAAAABJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAABHwAAAAABHwAAAAABHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAACJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAADJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAJAAAAAADJAAAAAAAJAAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAABfgAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -4,-5:
           ind: -4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -3,-5:
           ind: -3,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAACHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACJAAAAAADJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAABdQAAAAABcAAAAAAAfgAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABdQAAAAAAcAAAAAACcAAAAAAAcAAAAAADdQAAAAADdQAAAAACfgAAAAAAcAAAAAADdQAAAAAAdQAAAAABdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAAAdQAAAAACcAAAAAADfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAAAdQAAAAACcAAAAAADcAAAAAAAdQAAAAABcAAAAAAAcAAAAAACcAAAAAADaAAAAAACaAAAAAAAaAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADdQAAAAADcAAAAAAAcAAAAAAAcAAAAAACdQAAAAADcAAAAAABcAAAAAADcAAAAAAAaAAAAAADaAAAAAABaAAAAAADcAAAAAADfgAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAACcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADdQAAAAACdQAAAAAAcAAAAAAAfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAADdQAAAAACcAAAAAAAcAAAAAABdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAXQAAAAADHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAADdQAAAAACcAAAAAADfgAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAACcAAAAAAAcAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADdQAAAAADcAAAAAACcAAAAAADcAAAAAADdQAAAAADdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAABcAAAAAACfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABdQAAAAABcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAACdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAcAAAAAADdQAAAAABdQAAAAADdQAAAAADcAAAAAAAcAAAAAABdQAAAAABcAAAAAADcAAAAAABcAAAAAABaAAAAAACaAAAAAABaAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAdQAAAAAAcAAAAAACcAAAAAACcAAAAAADdQAAAAABcAAAAAABcAAAAAABcAAAAAADaAAAAAADaAAAAAABaAAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAABcAAAAAADdQAAAAABcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAAAcAAAAAABfgAAAAAAdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAADdQAAAAABcAAAAAACcAAAAAABdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         4,0:
           ind: 4,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: XQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAADaAAAAAACfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAXQAAAAACbQAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADXQAAAAACXQAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAABfgAAAAAAXQAAAAABbQAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAATgAAAAACXQAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAACfgAAAAAAXQAAAAAAbQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,1:
           ind: 4,1
-          tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABfgAAAAAAgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADJAAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAABJAAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAABHwAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAACegAAAAADegAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAaAAAAAABXQAAAAADegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAABegAAAAACegAAAAAAXQAAAAACXQAAAAADJAAAAAADfgAAAAAAaAAAAAADXQAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAADegAAAAACegAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACJAAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAAAbQAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACbQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADbQAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADJAAAAAABJAAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADJAAAAAABHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAACegAAAAAAegAAAAACXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAaAAAAAADXQAAAAADegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAADegAAAAAAegAAAAABXQAAAAAAXQAAAAABJAAAAAACfgAAAAAAaAAAAAABXQAAAAABegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADegAAAAADegAAAAAAegAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACJAAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAACbQAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAATgAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABbQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAA
           version: 6
         5,-1:
           ind: 5,-1
@@ -293,19 +293,19 @@ entities:
           version: 6
         5,-2:
           ind: 5,-2
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAADXQAAAAAAaAAAAAABaAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADXQAAAAABXQAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAXQAAAAACXQAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAADaAAAAAADaAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACXQAAAAAAXQAAAAAAJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACXQAAAAADXQAAAAADJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         4,-3:
           ind: 4,-3
-          tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAKBwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: CwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         1,-4:
           ind: 1,-4
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAADfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAAfwAAAAAABwAAAAAHfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAADJAAAAAADfgAAAAAAfgAAAAAABwAAAAAFBwAAAAAABwAAAAAKfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAACBwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAADBwAAAAAKBwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAGfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAGBwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAD
           version: 6
         -5,-3:
           ind: -5,-3
@@ -313,7 +313,7 @@ entities:
           version: 6
         -3,2:
           ind: -3,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-4:
           ind: -1,-4
@@ -325,11 +325,11 @@ entities:
           version: 6
         5,-3:
           ind: 5,-3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAFWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAJgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,2:
           ind: 1,2
-          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-4:
           ind: -2,-4
@@ -337,15 +337,15 @@ entities:
           version: 6
         2,-4:
           ind: 2,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAFBwAAAAAABwAAAAAGBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAALBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAMBwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAHBwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABBwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAALBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAABwAAAAACBwAAAAAAfwAAAAAABwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAEBwAAAAAEfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAALCwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAGBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA
           version: 6
         4,-4:
           ind: 4,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAKBwAAAAAKBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAADfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -398,21 +398,21 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            6929: 46,14
+            6853: 46,14
         - node:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            1829: 69,-28
-            1830: 70,-28
-            6024: -44.266167,24.17379
-            6025: -43.71579,24.16156
-            6689: 7.80612,-46.838108
-            6690: 8.233204,-46.827694
-            6924: 43.669937,12.024849
-            6925: 43.669937,12.431099
-            6926: 44.341812,12.009224
-            6927: 44.341812,12.399849
+            1827: 69,-28
+            1828: 70,-28
+            5960: -44.266167,24.17379
+            5961: -43.71579,24.16156
+            6625: 7.80612,-46.838108
+            6626: 8.233204,-46.827694
+            6848: 43.669937,12.024849
+            6849: 43.669937,12.431099
+            6850: 44.341812,12.009224
+            6851: 44.341812,12.399849
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -423,19 +423,19 @@ entities:
             1302: -18,28
             1723: 62,-25
             1724: 62,-24
-            1893: 61,-18
-            1894: 61,-20
-            1918: 22,-38
-            1919: 22,-37
-            6022: -45.159,22.681658
-            6023: -45.17123,23.256496
+            1865: 61,-18
+            1866: 61,-20
+            1890: 22,-38
+            1891: 22,-37
+            5958: -45.159,22.681658
+            5959: -45.17123,23.256496
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            2920: -25,37
+            2885: -25,37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -443,33 +443,32 @@ entities:
           decals:
             1248: 25,23
             1249: 29,23
-            1750: 68.96644,-11.160069
-            1751: 69.96644,-11.15081
-            1752: 67.97107,-11.15544
-            6020: -43.71579,21.837746
-            6021: -44.32732,21.837746
-            6513: -33,-12
+            1748: 68.96644,-11.160069
+            1749: 69.96644,-11.15081
+            1750: 67.97107,-11.15544
+            5956: -43.71579,21.837746
+            5957: -44.32732,21.837746
+            6449: -33,-12
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: Arrows
           decals:
             1247: 25,12
-            6018: -42.87188,22.669428
-            6019: -42.85965,23.219805
+            5954: -42.87188,22.669428
+            5955: -42.85965,23.219805
         - node:
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
             309: 26,-21
-            2170: 26,1
-            6718: 54.43144,-23.18127
+            2140: 26,1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt1
           decals:
-            2961: 80.98914,-5.89228
+            2926: 80.98914,-5.89228
         - node:
             color: '#FFFFFFFF'
             id: Basalt2
@@ -480,7 +479,7 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt2
           decals:
-            2963: 79.36655,-6.805498
+            2928: 79.36655,-6.805498
         - node:
             color: '#FFFFFFFF'
             id: Basalt3
@@ -492,14 +491,13 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt3
           decals:
-            2960: 80.410225,-6.9767265
+            2925: 80.410225,-6.9767265
         - node:
             color: '#FFFFFFFF'
             id: Basalt4
           decals:
             315: 26,-24
             916: -48,-27
-            1879: 56,-23
         - node:
             color: '#FFFFFFFF'
             id: Basalt5
@@ -507,10 +505,7 @@ entities:
             311: 26,-22
             314: 25,-23
             915: -48,-28
-            1877: 54,-21
-            2171: 25,1
-            6717: 54.08898,-21.835905
-            6719: 56.437256,-22.899967
+            2141: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Basalt6
@@ -523,20 +518,18 @@ entities:
             310: 25,-22
             913: -49,-29
             1698: 57,18
-            1878: 57,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Basalt7
           decals:
-            2962: 80.88314,-7.8817906
+            2927: 80.88314,-7.8817906
         - node:
             color: '#FFFFFFFF'
             id: Basalt8
           decals:
             34: -4,-12
             917: -47,-30
-            6720: 56.755253,-20.832996
         - node:
             color: '#FFFFFFFF'
             id: Basalt9
@@ -548,31 +541,31 @@ entities:
             color: '#FFFFFFFF'
             id: Basalt9
           decals:
-            2964: 79.17086,-7.824714
+            2929: 79.17086,-7.824714
         - node:
             color: '#D4D4D428'
             id: Bot
           decals:
-            2125: -36,-58
-            2126: -36,-59
-            2127: -36,-60
-            2128: -36,-61
-            2129: -36,-62
-            2130: -36,-63
-            2131: -36,-64
-            2132: -60,-58
-            2133: -60,-59
-            2134: -60,-60
-            2135: -60,-61
-            2136: -60,-62
-            2137: -60,-63
-            2138: -60,-64
+            2095: -36,-58
+            2096: -36,-59
+            2097: -36,-60
+            2098: -36,-61
+            2099: -36,-62
+            2100: -36,-63
+            2101: -36,-64
+            2102: -60,-58
+            2103: -60,-59
+            2104: -60,-60
+            2105: -60,-61
+            2106: -60,-62
+            2107: -60,-63
+            2108: -60,-64
         - node:
             color: '#DE3A3A41'
             id: Bot
           decals:
-            6443: -38,-45
-            6444: -38,-45
+            6379: -38,-45
+            6380: -38,-45
         - node:
             color: '#EFB34196'
             id: Bot
@@ -633,14 +626,14 @@ entities:
             288: 18,-21
             289: 15,-22
             290: 15,-21
-            6916: 41,13
-            6917: 41,12
-            6918: 41,11
-            6919: 47,11
-            6920: 45,11
-            6921: 45,12
-            6922: 43,11
-            6923: 43,12
+            6840: 41,13
+            6841: 41,12
+            6842: 41,11
+            6843: 47,11
+            6844: 45,11
+            6845: 45,12
+            6846: 43,11
+            6847: 43,12
         - node:
             color: '#EFB341FF'
             id: Bot
@@ -653,8 +646,8 @@ entities:
             color: '#FFFFFF4A'
             id: Bot
           decals:
-            6560: 18,-56
-            6561: 19,-56
+            6496: 18,-56
+            6497: 19,-56
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -747,306 +740,313 @@ entities:
             1707: 57,-14
             1711: 64,-24
             1712: 64,-25
-            1747: 71,-11
-            1748: 71,-12
-            1749: 71,-13
-            1809: 63,-19
-            1814: 70,-22
-            1843: 69,-13
-            1898: 22,-39
-            1917: 22,-36
-            1958: 28,-36
-            1959: 29,-36
-            1960: 28,-47
-            2015: 12,-46
-            2016: 13,-46
-            2057: -2,-35
-            2058: -1,-35
-            2059: 3,-38
-            2060: 3,-37
-            2065: 10,-41
-            2071: 12,-38
-            2090: -6,-34
-            2091: -5,-34
-            2092: -4,-34
-            2142: 41,-10
-            2143: -23,12
-            2759: 66,-23
-            2791: -27,30
-            2804: 57,15
-            3082: 75,-13
-            3083: 75,-15
-            3088: 75,-19
-            3089: 75,-17
-            6227: 48,-10
-            6228: 51,5
-            6229: 53,10
-            6371: -36,-65
-            6372: -60,-65
-            6501: -34,-11
-            6502: -34,-10
-            6503: -32,-11
-            6504: -32,-10
-            6523: 61,-21
-            6530: -24,-42
-            6540: 3,48
-            6645: 54,-33
-            6649: 22,-59
-            6650: 15,-59
-            6653: -19,-38
-            6679: 7,-48
-            6680: 7,-49
-            6681: 9,-48
-            6682: 9,-49
-            6691: 7,-45
-            6692: 9,-45
-            6693: 76,-23
-            6694: 80,-25
-            6695: 76,-25
-            6706: 76,-23
-            6707: 58,-27
-            6708: 58,-26
-            6721: 49,17
-            6722: 50,17
-            6723: 53,17
-            6724: 54,17
-            6725: 55,17
-            6726: 69,6
-            6727: 68,4
-            6728: 69,4
-            6729: 67,0
-            6730: 65,-4
-            6731: 65,-5
-            6732: 79,-11
-            6733: 80,-11
-            6734: 81,-11
-            6735: 21,-41
-            6736: 5,-42
-            6737: 5,-43
-            6738: 5,-40
-            6739: 5,-39
-            6740: -12,-34
-            6741: -11,-34
-            6742: -10,-34
-            6743: -14,-34
-            6744: -15,-34
-            6745: -62,-32
-            6746: -63,-32
-            6747: -64,-32
-            6748: -46,-12
-            6749: -45,-12
-            6750: -41,17
-            6751: -40,17
-            6752: -39,17
-            6753: -21,31
-            6754: -20,31
-            6755: -7,38
-            6756: -6,38
-            6757: -5,38
-            6758: 3,38
-            6759: -11,17
-            6760: -10,17
-            6761: -9,17
-            6762: -12,17
-            6763: -13,17
-            6764: 1,16
-            6765: 2,16
-            6766: 3,16
-            6767: 10,16
-            6768: 11,16
-            6769: 15,4
-            6770: 17,1
-            6771: -14,-12
-            6772: -14,-11
-            6773: 39,-7
-            6774: 39,-8
-            6775: 39,-9
-            6776: 39,-10
-            6777: 39,-11
-            6778: 73,-21
-            6779: 73,-22
-            6780: 45,-10
-            6781: 45,-11
-            6782: 15,1
-            6783: -17,17
-            6784: 45,-17
-            6785: 45,-16
-            6786: 45,-15
-            6787: -37,-42
-            6788: -37,-40
-            6789: -37,-41
-            6828: -29,15
-            6901: 47,12
-            6930: 45,15
-            6972: 82,-11
-            6980: 59,-4
-            7023: -11,-40
-            7024: -12,-40
+            1745: 71,-11
+            1746: 71,-12
+            1747: 71,-13
+            1807: 63,-19
+            1812: 70,-22
+            1841: 69,-13
+            1870: 22,-39
+            1889: 22,-36
+            1930: 28,-36
+            1931: 29,-36
+            1932: 28,-47
+            1987: 12,-46
+            1988: 13,-46
+            2029: -2,-35
+            2030: -1,-35
+            2031: 3,-38
+            2032: 3,-37
+            2037: 10,-41
+            2043: 12,-38
+            2062: -6,-34
+            2063: -5,-34
+            2064: -4,-34
+            2112: 41,-10
+            2113: -23,12
+            2724: 66,-23
+            2756: -27,30
+            2769: 57,15
+            3047: 75,-13
+            3048: 75,-15
+            3053: 75,-19
+            3054: 75,-17
+            6163: 48,-10
+            6164: 51,5
+            6165: 53,10
+            6307: -36,-65
+            6308: -60,-65
+            6437: -34,-11
+            6438: -34,-10
+            6439: -32,-11
+            6440: -32,-10
+            6459: 61,-21
+            6466: -24,-42
+            6476: 3,48
+            6581: 54,-33
+            6585: 22,-59
+            6586: 15,-59
+            6589: -19,-38
+            6615: 7,-48
+            6616: 7,-49
+            6617: 9,-48
+            6618: 9,-49
+            6627: 7,-45
+            6628: 9,-45
+            6629: 76,-23
+            6630: 80,-25
+            6631: 76,-25
+            6642: 76,-23
+            6643: 58,-27
+            6644: 58,-26
+            6645: 49,17
+            6646: 50,17
+            6647: 53,17
+            6648: 54,17
+            6649: 55,17
+            6650: 69,6
+            6651: 68,4
+            6652: 69,4
+            6653: 67,0
+            6654: 65,-4
+            6655: 65,-5
+            6656: 79,-11
+            6657: 80,-11
+            6658: 81,-11
+            6659: 21,-41
+            6660: 5,-42
+            6661: 5,-43
+            6662: 5,-40
+            6663: 5,-39
+            6664: -12,-34
+            6665: -11,-34
+            6666: -10,-34
+            6667: -14,-34
+            6668: -15,-34
+            6669: -62,-32
+            6670: -63,-32
+            6671: -64,-32
+            6672: -46,-12
+            6673: -45,-12
+            6674: -41,17
+            6675: -40,17
+            6676: -39,17
+            6677: -21,31
+            6678: -20,31
+            6679: -7,38
+            6680: -6,38
+            6681: -5,38
+            6682: 3,38
+            6683: -11,17
+            6684: -10,17
+            6685: -9,17
+            6686: -12,17
+            6687: -13,17
+            6688: 1,16
+            6689: 2,16
+            6690: 3,16
+            6691: 10,16
+            6692: 11,16
+            6693: 15,4
+            6694: 17,1
+            6695: -14,-12
+            6696: -14,-11
+            6697: 39,-7
+            6698: 39,-8
+            6699: 39,-9
+            6700: 39,-10
+            6701: 39,-11
+            6702: 73,-21
+            6703: 73,-22
+            6704: 45,-10
+            6705: 45,-11
+            6706: 15,1
+            6707: -17,17
+            6708: 45,-17
+            6709: 45,-16
+            6710: 45,-15
+            6711: -37,-42
+            6712: -37,-40
+            6713: -37,-41
+            6752: -29,15
+            6825: 47,12
+            6854: 45,15
+            6896: 82,-11
+            6904: 59,-4
+            6945: -11,-40
+            6946: -12,-40
+            6995: 55,-30
+            6996: 56,-30
+            6999: 53,-24
+            7009: 65,19
+            7010: 65,21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            2888: -25,34
-            2889: -25,35
-            2890: -30,35
-            2891: -30,34
-            2917: -23,38
-            2918: -10,38
-            2919: -9,38
-            2965: 78,-8
-            2966: 79,-8
+            2853: -25,34
+            2854: -25,35
+            2855: -30,35
+            2856: -30,34
+            2882: -23,38
+            2883: -10,38
+            2884: -9,38
+            2930: 78,-8
+            2931: 79,-8
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            6389: 91,-19
-            6390: 91,-18
-            6391: 92,-18
-            6392: 92,-19
-            6393: 87,-19
-            6394: 88,-19
-            6395: 88,-18
-            6396: 87,-18
+            6325: 91,-19
+            6326: 91,-18
+            6327: 92,-18
+            6328: 92,-19
+            6329: 87,-19
+            6330: 88,-19
+            6331: 88,-18
+            6332: 87,-18
         - node:
             color: '#52B4E996'
             id: BotGreyscale
           decals:
-            6132: 55,8
-            6133: 55,8
-            6134: 56,8
-            6135: 56,8
-            6149: 57,1
-            6150: 57,1
-            6151: 56,1
-            6152: 56,1
-            6153: 55,4
-            6154: 55,4
-            6155: 56,4
-            6156: 56,4
-            6157: 57,4
-            6158: 57,4
+            6068: 55,8
+            6069: 55,8
+            6070: 56,8
+            6071: 56,8
+            6085: 57,1
+            6086: 57,1
+            6087: 56,1
+            6088: 56,1
+            6089: 55,4
+            6090: 55,4
+            6091: 56,4
+            6092: 56,4
+            6093: 57,4
+            6094: 57,4
         - node:
             cleanable: True
             color: '#D4D4D428'
             id: BotGreyscale
           decals:
-            2938: 78,-30
+            2903: 78,-30
         - node:
             color: '#EFB34196'
             id: BotLeft
           decals:
-            6932: 43,14
+            6856: 43,14
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeft
           decals:
-            5958: 6,-14
-            5960: 6,-14
+            5894: 6,-14
+            5896: 6,-14
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            1807: 74,-13
-            1808: 74,-12
-            1899: 23,-39
-            1900: 24,-39
-            1901: 25,-39
-            2069: 12,-39
-            6351: -3,33
-            6829: -33,12
-            6830: -34,12
-            6831: -35,12
-            6832: -35,11
-            6833: -34,11
-            6834: -33,11
-            6979: 60,-4
+            1805: 74,-13
+            1806: 74,-12
+            1871: 23,-39
+            1872: 24,-39
+            1873: 25,-39
+            2041: 12,-39
+            6287: -3,33
+            6753: -33,12
+            6754: -34,12
+            6755: -35,12
+            6756: -35,11
+            6757: -34,11
+            6758: -33,11
+            6903: 60,-4
+            6997: 54,-24
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            5955: 6,-14
+            5891: 6,-14
         - node:
             color: '#D4D4D496'
             id: BotLeftGreyscale
           decals:
-            6698: 77,-30
-            6699: 76,-30
+            6634: 77,-30
+            6635: 76,-30
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotLeftGreyscale
           decals:
-            6431: -1,-20
-            6432: -1,-21
+            6367: -1,-20
+            6368: -1,-21
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotLeftGreyscale
           decals:
-            5959: 6,-14
+            5895: 6,-14
         - node:
             angle: -6.283185307179586 rad
             color: '#EFB34196'
             id: BotRight
           decals:
-            6433: -2,-21
-            6434: -2,-20
+            6369: -2,-21
+            6370: -2,-20
         - node:
             color: '#EFB34196'
             id: BotRight
           decals:
-            6931: 47,14
+            6855: 47,14
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRight
           decals:
-            5961: 6,-15
+            5897: 6,-15
         - node:
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            1805: 73,-12
-            1806: 73,-13
-            1902: 23,-36
-            1903: 24,-36
-            1904: 25,-36
-            2070: 12,-40
-            6352: -3,34
-            6835: -35,16
-            6836: -34,16
-            6837: -33,16
-            6838: -33,17
-            6839: -34,17
-            6840: -35,17
-            6978: 58,-4
+            1803: 73,-12
+            1804: 73,-13
+            1874: 23,-36
+            1875: 24,-36
+            1876: 25,-36
+            2042: 12,-40
+            6288: -3,34
+            6759: -35,16
+            6760: -34,16
+            6761: -33,16
+            6762: -33,17
+            6763: -34,17
+            6764: -35,17
+            6902: 58,-4
+            6998: 52,-24
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            5956: 6,-15
+            5892: 6,-15
         - node:
             color: '#D4D4D496'
             id: BotRightGreyscale
           decals:
-            6696: 79,-30
-            6697: 80,-30
+            6632: 79,-30
+            6633: 80,-30
         - node:
             cleanable: True
             color: '#EFB341FF'
             id: BotRightGreyscale
           decals:
-            5957: 6,-15
+            5893: 6,-15
         - node:
             color: '#EFB34196'
             id: Box
           decals:
-            6928: 45,14
+            6852: 45,14
         - node:
             color: '#FFFFFFFF'
             id: Box
@@ -1055,36 +1055,38 @@ entities:
             1062: 34,0
             1091: -57,-24
             1092: -56,-24
-            1932: 19,-37
-            1933: 19,-36
-            6416: 92,-20
-            6825: -31,17
-            6826: -30,17
-            6827: -29,16
-            6841: -31,12
-            6842: -30,12
-            6843: -30,11
-            6844: -31,11
-            6894: 47,16
-            6981: 60,-8
-            6982: 61,-8
+            1904: 19,-37
+            1905: 19,-36
+            6352: 92,-20
+            6749: -31,17
+            6750: -30,17
+            6751: -29,16
+            6765: -31,12
+            6766: -30,12
+            6767: -30,11
+            6768: -31,11
+            6818: 47,16
+            6905: 60,-8
+            6906: 61,-8
+            7000: 66,-25
+            7001: 66,-24
         - node:
             color: '#52B4E996'
             id: BrickCornerOverlaySW
           decals:
-            6991: 57,-8
+            6915: 57,-8
         - node:
             color: '#52B4E996'
             id: BrickLineOverlayS
           decals:
-            6992: 58,-8
+            6916: 58,-8
         - node:
             color: '#FFFFFFFF'
             id: BrickLineOverlayS
           decals:
-            6983: 58,-5
-            6984: 59,-5
-            6985: 60,-5
+            6907: 58,-5
+            6908: 59,-5
+            6909: 60,-5
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
@@ -1092,9 +1094,9 @@ entities:
             770: -31,-36
             1042: 28,-29
             1405: 58,-34
-            1822: 69,-29
-            2039: 22,-53
-            6678: 9,-48
+            1820: 69,-29
+            2011: 22,-53
+            6614: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
@@ -1103,9 +1105,9 @@ entities:
             769: -33,-36
             1040: 24,-29
             1402: 56,-34
-            1821: 70,-29
-            2042: 15,-53
-            6677: 7,-48
+            1819: 70,-29
+            2014: 15,-53
+            6613: 7,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
@@ -1114,10 +1116,10 @@ entities:
             969: 46,-34
             1041: 28,-34
             1403: 58,-36
-            1824: 69,-30
-            2017: 17,-53
-            2041: 22,-60
-            6676: 9,-49
+            1822: 69,-30
+            1989: 17,-53
+            2013: 22,-60
+            6612: 9,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
@@ -1126,10 +1128,10 @@ entities:
             968: 34,-34
             1043: 24,-34
             1404: 56,-36
-            1823: 70,-30
-            2018: 20,-53
-            2040: 15,-60
-            6675: 7,-49
+            1821: 70,-30
+            1990: 20,-53
+            2012: 15,-60
+            6611: 7,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
@@ -1138,13 +1140,13 @@ entities:
             604: -39,-16
             1127: -4,21
             1397: 56,-36
-            1746: 70,-11
-            1801: 74,-17
-            1804: 74,-14
-            2033: 15,-60
-            2038: 22,-53
-            2045: 21,-53
-            2046: 22,-54
+            1744: 70,-11
+            1799: 74,-17
+            1802: 74,-14
+            2005: 15,-60
+            2010: 22,-53
+            2017: 21,-53
+            2018: 22,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
@@ -1154,11 +1156,11 @@ entities:
             231: 0,-22
             1126: -1,21
             1396: 58,-36
-            1745: 68,-11
-            2034: 22,-60
-            2037: 15,-53
-            2043: 16,-53
-            2044: 15,-54
+            1743: 68,-11
+            2006: 22,-60
+            2009: 15,-53
+            2015: 16,-53
+            2016: 15,-54
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
@@ -1166,11 +1168,11 @@ entities:
             603: -39,-13
             1132: -4,27
             1395: 56,-34
-            1802: 74,-15
-            1803: 74,-19
-            2032: 15,-53
-            2035: 22,-60
-            2047: 21,-60
+            1800: 74,-15
+            1801: 74,-19
+            2004: 15,-53
+            2007: 22,-60
+            2019: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
@@ -1178,9 +1180,9 @@ entities:
             45: -12,-14
             478: -25,-1
             1394: 58,-34
-            2031: 22,-53
-            2036: 15,-60
-            2048: 16,-60
+            2003: 22,-53
+            2008: 15,-60
+            2020: 16,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -1266,24 +1268,24 @@ entities:
             1230: 0,48
             1391: 56,-35
             1398: 58,-35
-            1817: 69,-30
-            1818: 69,-29
-            1895: 22,-39
-            1896: 22,-38
-            1897: 22,-37
-            1938: 27,-47
-            1939: 27,-46
-            1940: 27,-45
-            1941: 27,-44
-            1942: 27,-43
-            1943: 27,-42
-            2027: 15,-58
-            2028: 15,-57
-            2029: 15,-55
-            2030: 15,-54
-            2053: 16,-60
-            6230: 53,12
-            6231: 53,11
+            1815: 69,-30
+            1816: 69,-29
+            1867: 22,-39
+            1868: 22,-38
+            1869: 22,-37
+            1910: 27,-47
+            1911: 27,-46
+            1912: 27,-45
+            1913: 27,-44
+            1914: 27,-43
+            1915: 27,-42
+            1999: 15,-58
+            2000: 15,-57
+            2001: 15,-55
+            2002: 15,-54
+            2025: 16,-60
+            6166: 53,12
+            6167: 53,11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -1364,30 +1366,30 @@ entities:
             1459: -46,-49
             1460: -45,-49
             1461: -44,-49
-            1743: 67,-11
-            1744: 71,-11
-            1827: 71,-29
-            1828: 68,-29
-            1952: 28,-43
-            1953: 29,-43
-            2021: 16,-60
-            2022: 21,-60
-            2049: 15,-57
-            2050: 22,-57
-            5945: -14,-23
-            5946: -15,-23
-            5947: -16,-23
-            6404: 87,-20
-            6405: 88,-20
-            6406: 89,-20
-            6407: 90,-20
-            6408: 91,-20
-            6409: 92,-20
-            6664: 33,-2
-            6665: 34,-2
-            6672: 7,-48
-            6673: 8,-48
-            6674: 9,-48
+            1741: 67,-11
+            1742: 71,-11
+            1825: 71,-29
+            1826: 68,-29
+            1924: 28,-43
+            1925: 29,-43
+            1993: 16,-60
+            1994: 21,-60
+            2021: 15,-57
+            2022: 22,-57
+            5881: -14,-23
+            5882: -15,-23
+            5883: -16,-23
+            6340: 87,-20
+            6341: 88,-20
+            6342: 89,-20
+            6343: 90,-20
+            6344: 91,-20
+            6345: 92,-20
+            6600: 33,-2
+            6601: 34,-2
+            6608: 7,-48
+            6609: 8,-48
+            6610: 9,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1460,49 +1462,49 @@ entities:
             1464: -54,-54
             1465: -41,-54
             1466: -40,-54
-            1825: 68,-30
-            1826: 71,-30
-            1954: 28,-46
-            1955: 29,-46
-            2019: 16,-53
-            2020: 21,-53
-            2051: 22,-55
-            2052: 15,-55
-            2076: 10,-40
-            2077: 11,-40
-            2141: -42,-54
-            5942: -14,-25
-            5943: -15,-25
-            5944: -16,-25
-            6027: -3,43
-            6028: -2,43
-            6029: -1,43
-            6204: 49,-11
-            6205: 52,-11
-            6368: -29,-17
-            6410: 87,-21
-            6411: 89,-21
-            6412: 88,-21
-            6413: 90,-21
-            6414: 91,-21
-            6415: 92,-21
-            6669: 7,-49
-            6670: 8,-49
-            6671: 9,-49
+            1823: 68,-30
+            1824: 71,-30
+            1926: 28,-46
+            1927: 29,-46
+            1991: 16,-53
+            1992: 21,-53
+            2023: 22,-55
+            2024: 15,-55
+            2048: 10,-40
+            2049: 11,-40
+            2111: -42,-54
+            5878: -14,-25
+            5879: -15,-25
+            5880: -16,-25
+            5963: -3,43
+            5964: -2,43
+            5965: -1,43
+            6140: 49,-11
+            6141: 52,-11
+            6304: -29,-17
+            6346: 87,-21
+            6347: 89,-21
+            6348: 88,-21
+            6349: 90,-21
+            6350: 91,-21
+            6351: 92,-21
+            6605: 7,-49
+            6606: 8,-49
+            6607: 9,-49
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            2892: -30,36
-            2893: -29,36
-            2894: -28,36
-            2895: -27,36
-            2896: -26,36
-            2916: -30,36
-            2935: 77,-25
-            2936: 78,-25
-            2937: 79,-25
+            2857: -30,36
+            2858: -29,36
+            2859: -28,36
+            2860: -27,36
+            2861: -26,36
+            2881: -30,36
+            2900: 77,-25
+            2901: 78,-25
+            2902: 79,-25
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -1588,13 +1590,13 @@ entities:
             1262: 26,8
             1390: 58,-35
             1399: 56,-35
-            1819: 70,-30
-            1820: 70,-29
-            2023: 22,-58
-            2024: 22,-57
-            2025: 22,-55
-            2026: 22,-54
-            2054: 21,-60
+            1817: 70,-30
+            1818: 70,-29
+            1995: 22,-58
+            1996: 22,-57
+            1997: 22,-55
+            1998: 22,-54
+            2026: 21,-60
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
@@ -1605,34 +1607,30 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerSe
           decals:
-            6821: -29,12
+            6745: -29,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNe
           decals:
             678: -39,-34
-            1888: 57,-21
-            6508: -33,-12
+            6444: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
             677: -30,-34
-            1887: 54,-21
-            6507: -33,-12
+            6443: -33,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
           decals:
             676: -39,-25
-            1889: 57,-23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
             675: -30,-25
             1389: 44,5
-            1890: 54,-23
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
@@ -1659,21 +1657,21 @@ entities:
             780: -52,2
             1139: -6,27
             1140: -6,26
-            1796: 74,-15
-            1797: 74,-14
-            1798: 74,-17
-            1799: 74,-18
-            1800: 74,-19
-            6818: -29,13
-            6819: -29,14
-            6964: -34,-18
-            6965: -34,-21
-            6966: -34,-20
-            6967: -34,-19
-            6968: -34,-18
-            6969: -34,-19
-            6970: -34,-20
-            6971: -34,-21
+            1794: 74,-15
+            1795: 74,-14
+            1796: 74,-17
+            1797: 74,-18
+            1798: 74,-19
+            6742: -29,13
+            6743: -29,14
+            6888: -34,-18
+            6889: -34,-21
+            6890: -34,-20
+            6891: -34,-19
+            6892: -34,-18
+            6893: -34,-19
+            6894: -34,-20
+            6895: -34,-21
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineN
@@ -1704,27 +1702,27 @@ entities:
             1136: -9,28
             1137: -10,28
             1138: -11,28
-            1815: 69,-28
-            1816: 70,-28
-            2055: 0,-37
-            2056: 1,-37
-            2061: 2,-37
-            2788: -27,27
-            2789: -26,27
-            2790: -25,27
-            6505: -34,-12
-            6506: -32,-12
-            6815: -32,16
-            6816: -31,16
-            6817: -30,16
-            6962: -22,10
-            6963: -21,10
+            1813: 69,-28
+            1814: 70,-28
+            2027: 0,-37
+            2028: 1,-37
+            2033: 2,-37
+            2753: -27,27
+            2754: -26,27
+            2755: -25,27
+            6441: -34,-12
+            6442: -32,-12
+            6739: -32,16
+            6740: -31,16
+            6741: -30,16
+            6886: -22,10
+            6887: -21,10
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineS
           decals:
-            5963: 83,-35
+            5899: 83,-35
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
@@ -1755,20 +1753,20 @@ entities:
             1387: 42,5
             1388: 43,5
             1427: 41,5
-            2970: 51,22
-            2971: 50,22
-            2972: 52,22
-            6366: -34,-17
-            6367: -33,-17
-            6820: -32,12
-            6960: -22,10
-            6961: -21,10
+            2935: 51,22
+            2936: 50,22
+            2937: 52,22
+            6302: -34,-17
+            6303: -33,-17
+            6744: -32,12
+            6884: -22,10
+            6885: -21,10
         - node:
             cleanable: True
             color: '#FFFFFF35'
             id: BrickTileSteelLineW
           decals:
-            5962: 81,-34
+            5898: 81,-34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
@@ -1798,10 +1796,10 @@ entities:
             1384: 44,2
             1385: 44,3
             1421: 44,4
-            6811: -35,13
-            6812: -35,14
-            6813: -35,14
-            6814: -35,15
+            6735: -35,13
+            6736: -35,14
+            6737: -35,14
+            6738: -35,15
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNe
@@ -1814,24 +1812,25 @@ entities:
             color: '#D381C996'
             id: BrickTileWhiteCornerNe
           decals:
-            1731: 60,-13
-            1753: 70,-12
+            1729: 60,-13
+            1751: 70,-12
+            7017: 54,-23
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            6497: 52,-26
+            6433: 52,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2765: -4,14
+            2730: -4,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
-            2901: -25,38
+            2866: -25,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerNw
@@ -1842,25 +1841,26 @@ entities:
             color: '#D381C996'
             id: BrickTileWhiteCornerNw
           decals:
-            1732: 58,-13
-            1756: 68,-12
+            1730: 58,-13
+            1754: 68,-12
+            7016: 52,-23
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            6496: 51,-26
+            6432: 51,-26
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2121: -54,9
-            2764: -2,14
+            2091: -54,9
+            2729: -2,14
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
           decals:
-            2900: -30,38
+            2865: -30,38
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSe
@@ -1873,13 +1873,13 @@ entities:
             color: '#D381C996'
             id: BrickTileWhiteCornerSe
           decals:
-            1733: 60,-14
-            1754: 70,-14
+            1731: 60,-14
+            1752: 70,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            6495: 52,-27
+            6431: 52,-27
         - node:
             color: '#A4610696'
             id: BrickTileWhiteCornerSw
@@ -1889,18 +1889,18 @@ entities:
             color: '#D381C996'
             id: BrickTileWhiteCornerSw
           decals:
-            1734: 58,-14
-            1755: 68,-14
+            1732: 58,-14
+            1753: 68,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            6498: 51,-27
+            6434: 51,-27
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteEndE
           decals:
-            2787: 63,9
+            2752: 63,9
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
@@ -1913,8 +1913,8 @@ entities:
             id: BrickTileWhiteInnerNe
           decals:
             1429: 41,5
-            6178: 48,-1
-            6195: 49,-7
+            6114: 48,-1
+            6131: 49,-7
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerNe
@@ -1935,8 +1935,8 @@ entities:
             id: BrickTileWhiteInnerNw
           decals:
             1428: 45,5
-            6177: 52,-1
-            6194: 51,-7
+            6113: 52,-1
+            6130: 51,-7
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerSe
@@ -1947,9 +1947,9 @@ entities:
             id: BrickTileWhiteInnerSe
           decals:
             1431: 45,4
-            6176: 48,-8
-            6193: 49,-2
-            6197: 50,-8
+            6112: 48,-8
+            6129: 49,-2
+            6133: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSe
@@ -1969,9 +1969,9 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSw
           decals:
-            6175: 52,-8
-            6192: 51,-2
-            6196: 50,-8
+            6111: 52,-8
+            6128: 51,-2
+            6132: 50,-8
         - node:
             color: '#A4610696'
             id: BrickTileWhiteInnerSw
@@ -2001,53 +2001,53 @@ entities:
             color: '#52B4E93E'
             id: BrickTileWhiteLineE
           decals:
-            6646: 51,6
-            6647: 51,6
-            6648: 51,6
+            6582: 51,6
+            6583: 51,6
+            6584: 51,6
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
           decals:
-            6081: 42,9
-            6082: 42,7
-            6088: 47,9
-            6089: 47,8
-            6090: 47,7
-            6106: 51,1
-            6107: 51,2
-            6108: 51,3
-            6109: 51,4
-            6110: 51,7
-            6111: 51,8
-            6112: 51,9
-            6113: 51,10
-            6114: 51,11
-            6115: 51,12
-            6116: 51,13
-            6117: 51,14
-            6118: 51,15
-            6123: 56,10
-            6124: 56,11
-            6125: 56,12
-            6129: 56,6
-            6130: 56,7
-            6131: 56,8
-            6167: 52,-1
-            6168: 52,-2
-            6169: 52,-3
-            6170: 52,-4
-            6171: 52,-5
-            6172: 52,-6
-            6173: 52,-7
-            6174: 52,-8
-            6188: 49,-6
-            6189: 49,-5
-            6190: 49,-4
-            6191: 49,-3
-            6987: 61,-7
-            6988: 61,-6
-            6989: 61,-5
-            6990: 61,-4
+            6017: 42,9
+            6018: 42,7
+            6024: 47,9
+            6025: 47,8
+            6026: 47,7
+            6042: 51,1
+            6043: 51,2
+            6044: 51,3
+            6045: 51,4
+            6046: 51,7
+            6047: 51,8
+            6048: 51,9
+            6049: 51,10
+            6050: 51,11
+            6051: 51,12
+            6052: 51,13
+            6053: 51,14
+            6054: 51,15
+            6059: 56,10
+            6060: 56,11
+            6061: 56,12
+            6065: 56,6
+            6066: 56,7
+            6067: 56,8
+            6103: 52,-1
+            6104: 52,-2
+            6105: 52,-3
+            6106: 52,-4
+            6107: 52,-5
+            6108: 52,-6
+            6109: 52,-7
+            6110: 52,-8
+            6124: 49,-6
+            6125: 49,-5
+            6126: 49,-4
+            6127: 49,-3
+            6911: 61,-7
+            6912: 61,-6
+            6913: 61,-5
+            6914: 61,-4
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineE
@@ -2086,19 +2086,19 @@ entities:
             color: '#D381C996'
             id: BrickTileWhiteLineE
           decals:
-            1757: 70,-13
-            1761: 65,-21
-            1762: 65,-20
-            1763: 65,-19
-            1764: 65,-18
-            1765: 65,-17
-            1766: 65,-16
-            1767: 65,-15
-            1768: 65,-14
-            1769: 65,-13
-            1770: 65,-12
-            1844: 71,-27
-            1845: 71,-26
+            1755: 70,-13
+            1759: 65,-21
+            1760: 65,-20
+            1761: 65,-19
+            1762: 65,-18
+            1763: 65,-17
+            1764: 65,-16
+            1765: 65,-15
+            1766: 65,-14
+            1767: 65,-13
+            1768: 65,-12
+            1842: 71,-27
+            1843: 71,-26
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
@@ -2107,9 +2107,9 @@ entities:
             1110: -1,24
             1117: -1,25
             1298: -18,28
-            6435: -37,-44
-            6436: -37,-45
-            6449: -37,-46
+            6371: -37,-44
+            6372: -37,-45
+            6385: -37,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
@@ -2117,20 +2117,20 @@ entities:
             177: 2,-22
             235: 10,-23
             236: 10,-22
-            2098: -4,-37
-            2099: -4,-35
-            2802: -39,-38
+            2068: -4,-37
+            2069: -4,-35
+            2767: -39,-38
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineE
           decals:
-            2899: -25,37
-            2906: -32,38
-            2907: -32,37
-            2908: -32,36
-            2909: -32,35
-            2910: -32,34
+            2864: -25,37
+            2871: -32,38
+            2872: -32,37
+            2873: -32,36
+            2874: -32,35
+            2875: -32,34
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
@@ -2145,10 +2145,10 @@ entities:
             993: 41,-34
             1023: 38,-34
             1024: 42,-34
-            1911: 19,-36
-            1912: 20,-36
-            1916: 21,-36
-            1946: 24,-46
+            1883: 19,-36
+            1884: 20,-36
+            1888: 21,-36
+            1918: 24,-46
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineN
@@ -2171,16 +2171,16 @@ entities:
             1426: 44,5
             1670: 59,4
             1671: 60,4
-            6140: 53,3
-            6141: 54,3
-            6142: 55,3
-            6143: 57,3
-            6179: 51,-1
-            6180: 50,-1
-            6181: 49,-1
-            6201: 49,-10
-            6202: 50,-10
-            6203: 51,-10
+            6076: 53,3
+            6077: 54,3
+            6078: 55,3
+            6079: 57,3
+            6115: 51,-1
+            6116: 50,-1
+            6117: 49,-1
+            6137: 49,-10
+            6138: 50,-10
+            6139: 51,-10
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineN
@@ -2192,7 +2192,7 @@ entities:
           decals:
             1237: -1,53
             1238: 0,53
-            1944: 24,-43
+            1916: 24,-43
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineN
@@ -2212,19 +2212,20 @@ entities:
             1715: 65,-23
             1720: 61,-23
             1721: 62,-23
-            1735: 59,-13
-            1759: 69,-12
-            1782: 77,-13
-            1783: 75,-13
-            1784: 77,-17
-            1785: 75,-17
-            3084: 76,-13
-            3087: 76,-17
+            1733: 59,-13
+            1757: 69,-12
+            1780: 77,-13
+            1781: 75,-13
+            1782: 77,-17
+            1783: 75,-17
+            3049: 76,-13
+            3052: 76,-17
+            7018: 53,-23
         - node:
             color: '#D4D4D496'
             id: BrickTileWhiteLineN
           decals:
-            1945: 25,-43
+            1917: 25,-43
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineN
@@ -2232,7 +2233,7 @@ entities:
             1178: -3,32
             1179: -2,32
             1180: -1,32
-            1947: 25,-46
+            1919: 25,-46
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
@@ -2249,32 +2250,32 @@ entities:
             284: 19,-21
             285: 20,-21
             286: 21,-21
-            2095: 0,-35
-            2096: 1,-35
-            2122: -53,9
-            2800: -62,-21
-            2801: -61,-21
-            6905: 43,13
-            6906: 44,13
-            6907: 45,13
-            6934: 47,13
+            2065: 0,-35
+            2066: 1,-35
+            2092: -53,9
+            2765: -62,-21
+            2766: -61,-21
+            6829: 43,13
+            6830: 44,13
+            6831: 45,13
+            6858: 47,13
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineN
           decals:
-            2902: -29,38
-            2903: -28,38
-            2904: -27,38
-            2905: -26,38
+            2867: -29,38
+            2868: -28,38
+            2869: -27,38
+            2870: -26,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
           decals:
-            2152: 13,25
-            2153: 14,25
-            2154: 15,25
-            6008: 14,22
+            2122: 13,25
+            2123: 14,25
+            2124: 15,25
+            5944: 14,22
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineS
@@ -2285,11 +2286,11 @@ entities:
             356: 47,-22
             357: 48,-22
             358: 49,-22
-            1913: 19,-39
-            1914: 20,-39
-            1915: 21,-39
-            6476: 52,-37
-            6477: 51,-37
+            1885: 19,-39
+            1886: 20,-39
+            1887: 21,-39
+            6412: 52,-37
+            6413: 51,-37
         - node:
             color: '#474F52A7'
             id: BrickTileWhiteLineS
@@ -2310,18 +2311,18 @@ entities:
             1430: 46,4
             1668: 60,0
             1669: 59,0
-            1950: 24,-46
-            6144: 57,2
-            6145: 56,2
-            6146: 55,2
-            6147: 54,2
-            6148: 53,2
-            6182: 49,-8
-            6183: 51,-8
-            6198: 48,-11
-            6199: 51,-11
-            6200: 53,-11
-            6206: 50,-11
+            1922: 24,-46
+            6080: 57,2
+            6081: 56,2
+            6082: 55,2
+            6083: 54,2
+            6084: 53,2
+            6118: 49,-8
+            6119: 51,-8
+            6134: 48,-11
+            6135: 51,-11
+            6136: 53,-11
+            6142: 50,-11
         - node:
             color: '#79150096'
             id: BrickTileWhiteLineS
@@ -2353,7 +2354,7 @@ entities:
             1330: 28,17
             1360: 34,17
             1361: 35,17
-            1948: 24,-43
+            1920: 24,-43
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineS
@@ -2362,18 +2363,18 @@ entities:
             1717: 64,-27
             1718: 65,-27
             1719: 66,-27
-            1736: 59,-14
-            1737: 58,-15
-            1738: 59,-15
-            1739: 60,-15
-            1758: 69,-14
-            1786: 75,-19
-            1787: 77,-19
-            1788: 75,-15
-            1789: 77,-15
-            1951: 25,-43
-            3085: 76,-15
-            3086: 76,-19
+            1734: 59,-14
+            1735: 58,-15
+            1736: 59,-15
+            1737: 60,-15
+            1756: 69,-14
+            1784: 75,-19
+            1785: 77,-19
+            1786: 75,-15
+            1787: 77,-15
+            1923: 25,-43
+            3050: 76,-15
+            3051: 76,-19
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
@@ -2403,15 +2404,15 @@ entities:
             237: 7,-25
             282: 21,-23
             283: 20,-23
-            1949: 25,-46
-            2068: 9,-41
-            2776: 61,-31
-            2777: 62,-31
-            2778: 63,-31
-            6902: 43,13
-            6903: 44,13
-            6904: 45,13
-            6933: 47,13
+            1921: 25,-46
+            2040: 9,-41
+            2741: 61,-31
+            2742: 62,-31
+            2743: 63,-31
+            6826: 43,13
+            6827: 44,13
+            6828: 45,13
+            6857: 47,13
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
@@ -2434,45 +2435,45 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
-            6083: 46,7
-            6084: 46,9
-            6085: 41,9
-            6086: 41,8
-            6087: 41,7
-            6091: 49,1
-            6092: 49,2
-            6093: 49,3
-            6094: 49,4
-            6095: 49,5
-            6096: 49,6
-            6097: 49,7
-            6098: 49,8
-            6099: 49,9
-            6100: 49,10
-            6101: 49,11
-            6102: 49,12
-            6103: 49,13
-            6104: 49,14
-            6105: 49,15
-            6126: 53,6
-            6127: 53,7
-            6128: 53,8
-            6159: 48,-8
-            6160: 48,-7
-            6161: 48,-6
-            6162: 48,-5
-            6163: 48,-4
-            6164: 48,-3
-            6165: 48,-2
-            6166: 48,-1
-            6184: 51,-6
-            6185: 51,-5
-            6186: 51,-4
-            6187: 51,-3
-            6986: 57,-7
-            6994: 57,-6
-            6995: 57,-5
-            6996: 57,-4
+            6019: 46,7
+            6020: 46,9
+            6021: 41,9
+            6022: 41,8
+            6023: 41,7
+            6027: 49,1
+            6028: 49,2
+            6029: 49,3
+            6030: 49,4
+            6031: 49,5
+            6032: 49,6
+            6033: 49,7
+            6034: 49,8
+            6035: 49,9
+            6036: 49,10
+            6037: 49,11
+            6038: 49,12
+            6039: 49,13
+            6040: 49,14
+            6041: 49,15
+            6062: 53,6
+            6063: 53,7
+            6064: 53,8
+            6095: 48,-8
+            6096: 48,-7
+            6097: 48,-6
+            6098: 48,-5
+            6099: 48,-4
+            6100: 48,-3
+            6101: 48,-2
+            6102: 48,-1
+            6120: 51,-6
+            6121: 51,-5
+            6122: 51,-4
+            6123: 51,-3
+            6910: 57,-7
+            6918: 57,-6
+            6919: 57,-5
+            6920: 57,-4
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
@@ -2507,23 +2508,23 @@ entities:
             color: '#D381C996'
             id: BrickTileWhiteLineW
           decals:
-            1760: 68,-13
-            1771: 63,-21
-            1772: 63,-20
-            1773: 63,-19
-            1774: 63,-17
-            1775: 63,-18
-            1776: 63,-16
-            1777: 63,-15
-            1778: 63,-14
-            1779: 63,-13
-            1780: 63,-12
-            1839: 68,-23
-            1840: 68,-22
-            1841: 68,-21
-            1842: 68,-24
-            1846: 68,-27
-            1847: 68,-26
+            1758: 68,-13
+            1769: 63,-21
+            1770: 63,-20
+            1771: 63,-19
+            1772: 63,-17
+            1773: 63,-18
+            1774: 63,-16
+            1775: 63,-15
+            1776: 63,-14
+            1777: 63,-13
+            1778: 63,-12
+            1837: 68,-23
+            1838: 68,-22
+            1839: 68,-21
+            1840: 68,-24
+            1844: 68,-27
+            1845: 68,-26
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
@@ -2535,10 +2536,10 @@ entities:
             color: '#EFB34131'
             id: BrickTileWhiteLineW
           decals:
-            6619: 14,39
-            6620: 14,40
-            6621: 14,41
-            6622: 14,42
+            6555: 14,39
+            6556: 14,40
+            6557: 14,41
+            6558: 14,42
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -2552,29 +2553,29 @@ entities:
             182: 5,-25
             216: 4,-19
             220: 4,-22
-            2066: 8,-40
-            2067: 8,-39
-            2097: -2,-36
-            2100: -6,-37
-            2101: -6,-36
-            2102: -6,-35
-            2111: 39,-15
-            2112: 39,-17
-            2113: 39,-16
-            2794: -22,34
-            2795: -22,35
+            2038: 8,-40
+            2039: 8,-39
+            2067: -2,-36
+            2070: -6,-37
+            2071: -6,-36
+            2072: -6,-35
+            2081: 39,-15
+            2082: 39,-17
+            2083: 39,-16
+            2759: -22,34
+            2760: -22,35
         - node:
             cleanable: True
             color: '#EFB34196'
             id: BrickTileWhiteLineW
           decals:
-            2897: -30,36
-            2898: -30,37
-            2911: -34,34
-            2912: -34,35
-            2913: -34,36
-            2914: -34,37
-            2915: -34,38
+            2862: -30,36
+            2863: -30,37
+            2876: -34,34
+            2877: -34,35
+            2878: -34,36
+            2879: -34,37
+            2880: -34,38
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
@@ -2597,17 +2598,11 @@ entities:
             526: -39,7
             840: -50,-2
             903: -49,-30
-        - node:
-            color: '#FFFFFFFF'
-            id: BushATwo
-          decals:
-            6709: 57.061016,-21.004225
         - node:
             color: '#FFFFFFFF'
             id: BushCOne
           decals:
             837: -45,4
-            1869: 56,-21
         - node:
             color: '#FFFFFFFF'
             id: BushCThree
@@ -2617,7 +2612,7 @@ entities:
             841: -48,-2
             1080: 42,-30
             1433: -49,-49
-            2166: 24,1
+            2136: 24,1
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
@@ -2626,18 +2621,12 @@ entities:
             321: 26,-23
             525: -38,6
             1434: -46,-49
-            1870: 56,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            2941: 81,-8
-        - node:
-            color: '#FFFFFFFF'
-            id: BushDThree
-          decals:
-            6711: 54.199055,-22.34959
+            2906: 81,-8
         - node:
             color: '#FFFFFFFF'
             id: BushDTwo
@@ -2649,14 +2638,12 @@ entities:
           decals:
             523: -39,5
             900: -48,-28
-            1872: 57,-23
-            1891: 54,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Busha1
           decals:
-            2942: 82,-6
+            2907: 82,-6
         - node:
             color: '#FFFFFFFF'
             id: Busha2
@@ -2664,7 +2651,6 @@ entities:
             531: -30,7
             901: -47,-29
             1675: 58,19
-            1871: 55,-23
         - node:
             color: '#FFFFFFFF'
             id: Busha3
@@ -2685,7 +2671,7 @@ entities:
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
-            2939: 81,-7
+            2904: 81,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushb2
@@ -2693,7 +2679,6 @@ entities:
             558: -24,7
             891: -47,-8
             1693: 57,19
-            1867: 54,-21
         - node:
             color: '#FFFFFFFF'
             id: Bushb3
@@ -2710,27 +2695,26 @@ entities:
             530: -29,6
             842: -45,-2
             904: -49,-27
-            1868: 55,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushc1
           decals:
-            2940: 82,-7
+            2905: 82,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushc2
           decals:
             528: -28,6
             1435: -47,-49
-            2168: 25,1
+            2138: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Bushc3
           decals:
             35: -5,-12
             1432: -51,-49
-            2167: 26,1
+            2137: 26,1
         - node:
             color: '#FFFFFFFF'
             id: Bushd2
@@ -2741,12 +2725,6 @@ entities:
             id: Bushd4
           decals:
             847: -44,4
-            6710: 56.804173,-21.505678
-        - node:
-            color: '#FFFFFFFF'
-            id: Bushg2
-          decals:
-            6712: 56.804173,-21.884827
         - node:
             color: '#FFFFFFFF'
             id: Bushh1
@@ -2768,13 +2746,12 @@ entities:
             905: -48,-29
             1439: -48,-49
             1677: 60,19
-            6713: 57.220013,-21.982672
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            2945: 80,-7
+            2910: 80,-7
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
@@ -2783,9 +2760,7 @@ entities:
             851: -51,4
             888: -48,-8
             889: -51,-9
-            1873: 54,-22
-            1892: 53.45864,-23.10261
-            2169: 24,1
+            2139: 24,1
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
@@ -2798,7 +2773,7 @@ entities:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            2943: 82,-8
+            2908: 82,-8
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
@@ -2808,14 +2783,12 @@ entities:
             890: -46,-7
             1081: 42,-31
             1440: -45,-49
-            1874: 56,-23
-            1880: 57.568016,-22.290323
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            2944: 81,-6
+            2909: 81,-6
         - node:
             color: '#FFFFFFFF'
             id: Bushj3
@@ -2835,37 +2808,37 @@ entities:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1924: 24,-37
-            1928: 23,-37
-            1929: 25,-37
+            1896: 24,-37
+            1900: 23,-37
+            1901: 25,-37
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            1925: 24,-38
-            1926: 23,-38
-            1927: 25,-38
+            1897: 24,-38
+            1898: 23,-38
+            1899: 25,-38
         - node:
             color: '#334E6DC8'
             id: CheckerNWSE
           decals:
-            1920: 20,-37
-            1921: 21,-37
-            1922: 21,-38
-            1923: 20,-38
+            1892: 20,-37
+            1893: 21,-37
+            1894: 21,-38
+            1895: 20,-38
         - node:
             color: '#474F528F'
             id: CheckerNWSE
           decals:
-            2144: -17,11
-            2145: -16,11
-            2146: -16,12
-            2147: -17,12
-            2148: -17,13
-            2149: -16,13
-            2150: -16,14
-            2151: -17,14
+            2114: -17,11
+            2115: -16,11
+            2116: -16,12
+            2117: -17,12
+            2118: -17,13
+            2119: -16,13
+            2120: -16,14
+            2121: -17,14
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
@@ -2880,26 +2853,26 @@ entities:
             color: '#D381C996'
             id: CheckerNWSE
           decals:
-            1781: 66,-21
+            1779: 66,-21
         - node:
             color: '#DE3A3A41'
             id: CheckerNWSE
           decals:
-            6437: -36,-46
-            6438: -36,-45
-            6439: -36,-44
-            6440: -35,-44
-            6441: -35,-45
-            6442: -35,-46
+            6373: -36,-46
+            6374: -36,-45
+            6375: -36,-44
+            6376: -35,-44
+            6377: -35,-45
+            6378: -35,-46
         - node:
             color: '#EFB34131'
             id: CheckerNWSE
           decals:
-            6570: 13,40
-            6571: 13,39
-            6572: 13,41
-            6573: 13,42
-            6618: 15,40
+            6506: 13,40
+            6507: 13,39
+            6508: 13,41
+            6509: 13,42
+            6554: 15,40
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -2910,65 +2883,65 @@ entities:
             149: -2,-27
             150: -3,-27
             151: -3,-28
-            2106: 37,-15
-            2107: 37,-16
-            2108: 37,-17
-            2109: 38,-16
-            2110: 38,-15
-            2114: 38,-17
-            2115: 38,6
-            2116: 38,7
-            2117: -54,10
-            2118: -53,10
-            2119: -55,10
-            2120: -55,9
-            2760: -4,15
-            2761: -3,15
-            2762: -2,15
-            2763: -3,14
-            2766: -38,-54
-            2767: -38,-53
-            2768: -37,-53
-            2769: -37,-54
-            2770: 61,-32
-            2771: 62,-32
-            2772: 63,-32
-            2773: 63,-33
-            2774: 62,-33
-            2775: 61,-33
-            2779: 63,10
-            2780: 64,10
-            2781: 65,10
-            2782: 65,9
-            2783: 65,8
-            2784: 64,8
-            2785: 63,8
-            2786: 64,9
-            2792: -23,34
-            2793: -23,35
-            2796: 14,-39
-            2797: 15,-39
-            2798: -61,-20
-            2799: -62,-20
-            2803: -38,-38
-            6487: 51,-30
-            6488: 51,-29
-            6489: 52,-29
-            6490: 52,-30
+            2076: 37,-15
+            2077: 37,-16
+            2078: 37,-17
+            2079: 38,-16
+            2080: 38,-15
+            2084: 38,-17
+            2085: 38,6
+            2086: 38,7
+            2087: -54,10
+            2088: -53,10
+            2089: -55,10
+            2090: -55,9
+            2725: -4,15
+            2726: -3,15
+            2727: -2,15
+            2728: -3,14
+            2731: -38,-54
+            2732: -38,-53
+            2733: -37,-53
+            2734: -37,-54
+            2735: 61,-32
+            2736: 62,-32
+            2737: 63,-32
+            2738: 63,-33
+            2739: 62,-33
+            2740: 61,-33
+            2744: 63,10
+            2745: 64,10
+            2746: 65,10
+            2747: 65,9
+            2748: 65,8
+            2749: 64,8
+            2750: 63,8
+            2751: 64,9
+            2757: -23,34
+            2758: -23,35
+            2761: 14,-39
+            2762: 15,-39
+            2763: -61,-20
+            2764: -62,-20
+            2768: -38,-38
+            6423: 51,-30
+            6424: 51,-29
+            6425: 52,-29
+            6426: 52,-30
         - node:
             color: '#D4D4D496'
             id: Delivery
           decals:
-            6373: 0,30
-            6374: 0,31
+            6309: 0,30
+            6310: 0,31
         - node:
             color: '#DE3A3A41'
             id: Delivery
           decals:
-            6445: -38,-46
-            6446: -38,-46
-            6447: -38,-44
-            6448: -38,-44
+            6381: -38,-46
+            6382: -38,-46
+            6383: -38,-44
+            6384: -38,-44
         - node:
             color: '#DE3A3A96'
             id: Delivery
@@ -2983,10 +2956,10 @@ entities:
             color: '#EFB34131'
             id: Delivery
           decals:
-            6614: 15,41
-            6615: 15,41
-            6616: 15,41
-            6617: 15,41
+            6550: 15,41
+            6551: 15,41
+            6552: 15,41
+            6553: 15,41
         - node:
             color: '#EFB34196'
             id: Delivery
@@ -3044,138 +3017,138 @@ entities:
             1422: 46,3
             1423: 46,3
             1708: 60,-12
-            1930: 26,-37
-            1931: 26,-38
-            1934: 31,-37
-            1935: 31,-38
-            2078: 8,-41
-            2978: 3,20
-            2979: -9,19
-            2980: -9,20
-            2981: -9,21
-            2982: -17,21
-            2983: -17,20
-            2984: -17,19
-            2985: 3,21
-            2986: 3,19
-            2987: 17,19
-            2988: 17,20
-            2989: 17,21
-            2990: 19,17
-            2991: 21,17
-            2992: 20,17
-            2993: 21,6
-            2994: 20,6
-            2995: 19,6
-            2996: 29,2
-            2997: 29,4
-            2998: 29,3
-            2999: 39,2
-            3000: 39,3
-            3001: 39,4
-            3002: 43,0
-            3003: 42,0
-            3004: 41,0
-            3005: 43,-14
-            3006: 42,-14
-            3007: 41,-14
-            3008: 46,-21
-            3009: 46,-19
-            3010: 46,-20
-            3011: 38,-19
-            3012: 38,-21
-            3013: 38,-20
-            3014: 30,-21
-            3015: 30,-20
-            3016: 30,-19
-            3017: 30,-20
-            3018: 21,-28
-            3019: 20,-28
-            3020: 19,-28
-            3021: 18,-32
-            3022: 18,-33
-            3023: 18,-34
-            3024: 10,-34
-            3025: 10,-33
-            3026: 10,-32
-            3027: 4,-32
-            3028: 4,-31
-            3029: 4,-30
-            3030: -9,-32
-            3031: -9,-31
-            3032: -9,-30
-            3033: -20,-32
-            3034: -20,-30
-            3035: -20,-31
-            3036: -24,-22
-            3037: -25,-22
-            3038: -26,-22
-            3039: -42,-29
-            3040: -42,-28
-            3041: -27,-29
-            3042: -27,-28
-            3043: -26,-12
-            3044: -25,-12
-            3045: -24,-12
-            3046: -23,-6
-            3047: -24,-6
-            3048: -25,-6
-            3049: -25,10
-            3050: -26,10
-            3051: -27,10
-            3052: -42,0
-            3053: -42,1
-            3054: -42,2
-            3055: -53,-5
-            3056: -54,-5
-            3057: -55,-5
-            3058: -55,-19
-            3059: -54,-19
-            3060: -53,-19
-            3061: -49,-34
-            3062: -47,-34
-            3063: -48,-34
-            3064: -47,-45
-            3065: -48,-45
-            3066: -49,-45
-            3067: -41,-49
-            3068: -42,-49
-            3069: -40,-49
-            3070: -54,-49
-            3071: -55,-49
-            3072: -56,-49
-            3073: -56,-55
-            3074: -55,-55
-            3075: -54,-55
-            3076: -42,-55
-            3077: -41,-55
-            3078: -40,-55
-            6375: 60,-24
-            6376: 60,-23
-            6475: 32,21
+            1902: 26,-37
+            1903: 26,-38
+            1906: 31,-37
+            1907: 31,-38
+            2050: 8,-41
+            2943: 3,20
+            2944: -9,19
+            2945: -9,20
+            2946: -9,21
+            2947: -17,21
+            2948: -17,20
+            2949: -17,19
+            2950: 3,21
+            2951: 3,19
+            2952: 17,19
+            2953: 17,20
+            2954: 17,21
+            2955: 19,17
+            2956: 21,17
+            2957: 20,17
+            2958: 21,6
+            2959: 20,6
+            2960: 19,6
+            2961: 29,2
+            2962: 29,4
+            2963: 29,3
+            2964: 39,2
+            2965: 39,3
+            2966: 39,4
+            2967: 43,0
+            2968: 42,0
+            2969: 41,0
+            2970: 43,-14
+            2971: 42,-14
+            2972: 41,-14
+            2973: 46,-21
+            2974: 46,-19
+            2975: 46,-20
+            2976: 38,-19
+            2977: 38,-21
+            2978: 38,-20
+            2979: 30,-21
+            2980: 30,-20
+            2981: 30,-19
+            2982: 30,-20
+            2983: 21,-28
+            2984: 20,-28
+            2985: 19,-28
+            2986: 18,-32
+            2987: 18,-33
+            2988: 18,-34
+            2989: 10,-34
+            2990: 10,-33
+            2991: 10,-32
+            2992: 4,-32
+            2993: 4,-31
+            2994: 4,-30
+            2995: -9,-32
+            2996: -9,-31
+            2997: -9,-30
+            2998: -20,-32
+            2999: -20,-30
+            3000: -20,-31
+            3001: -24,-22
+            3002: -25,-22
+            3003: -26,-22
+            3004: -42,-29
+            3005: -42,-28
+            3006: -27,-29
+            3007: -27,-28
+            3008: -26,-12
+            3009: -25,-12
+            3010: -24,-12
+            3011: -23,-6
+            3012: -24,-6
+            3013: -25,-6
+            3014: -25,10
+            3015: -26,10
+            3016: -27,10
+            3017: -42,0
+            3018: -42,1
+            3019: -42,2
+            3020: -53,-5
+            3021: -54,-5
+            3022: -55,-5
+            3023: -55,-19
+            3024: -54,-19
+            3025: -53,-19
+            3026: -49,-34
+            3027: -47,-34
+            3028: -48,-34
+            3029: -47,-45
+            3030: -48,-45
+            3031: -49,-45
+            3032: -41,-49
+            3033: -42,-49
+            3034: -40,-49
+            3035: -54,-49
+            3036: -55,-49
+            3037: -56,-49
+            3038: -56,-55
+            3039: -55,-55
+            3040: -54,-55
+            3041: -42,-55
+            3042: -41,-55
+            3043: -40,-55
+            6311: 60,-24
+            6312: 60,-23
+            6411: 32,21
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            2921: 24,5
-            2922: 25,5
-            2923: 26,5
-            2924: 14,1
-            2925: 14,-12
-            2926: 0,14
-            2927: -6,14
+            2886: 24,5
+            2887: 25,5
+            2888: 26,5
+            2889: 14,1
+            2890: 14,-12
+            2891: 0,14
+            2892: -6,14
         - node:
             color: '#52B4E996'
             id: DeliveryGreyscale
           decals:
-            6136: 48,2
-            6137: 48,2
-            6138: 48,1
-            6139: 48,1
-            6369: 50,-5
-            6370: 50,-5
+            6072: 48,2
+            6073: 48,2
+            6074: 48,1
+            6075: 48,1
+            6305: 50,-5
+            6306: 50,-5
         - node:
             color: '#DE3A3A96'
             id: DeliveryGreyscale
@@ -3186,3428 +3159,3448 @@ entities:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            2155: 9,23
-            2156: 9,24
+            2125: 9,23
+            2126: 9,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: Dirt
           decals:
-            2806: -37,28
-            2807: -36,27
-            2808: -37,27
-            2809: -37,25
-            2810: -37,24
-            2811: -36,25
-            2812: -36,24
-            2813: -36,25
-            2814: -38,28
-            2815: -39,29
-            2816: -40,28
-            2817: -38,28
-            2818: -37,27
-            2819: -37,28
-            2820: -37,27
-            2821: -36,25
-            2822: -36,24
-            2823: -34,24
-            2824: -34,23
-            2825: -34,22
-            2826: -36,22
-            2827: -37,22
-            2828: -36,24
-            2829: -37,24
-            2830: -36,23
-            2831: -37,25
-            2832: -36,25
-            2833: -37,26
-            2834: -38,27
-            2835: -38,28
-            2836: -39,27
-            2837: -39,26
-            2838: -39,26
+            2771: -37,28
+            2772: -36,27
+            2773: -37,27
+            2774: -37,25
+            2775: -37,24
+            2776: -36,25
+            2777: -36,24
+            2778: -36,25
+            2779: -38,28
+            2780: -39,29
+            2781: -40,28
+            2782: -38,28
+            2783: -37,27
+            2784: -37,28
+            2785: -37,27
+            2786: -36,25
+            2787: -36,24
+            2788: -34,24
+            2789: -34,23
+            2790: -34,22
+            2791: -36,22
+            2792: -37,22
+            2793: -36,24
+            2794: -37,24
+            2795: -36,23
+            2796: -37,25
+            2797: -36,25
+            2798: -37,26
+            2799: -38,27
+            2800: -38,28
+            2801: -39,27
+            2802: -39,26
+            2803: -39,26
         - node:
             cleanable: True
             color: '#A4610696'
             id: Dirt
           decals:
-            5313: -34,-26
-            5314: -37,-25
-            5315: -39,-28
-            5316: -40,-28
-            5317: -40,-31
-            5318: -39,-33
-            5319: -37,-33
-            5320: -32,-33
-            5321: -29,-33
-            5322: -29,-31
-            5323: -30,-28
-            5324: -29,-27
-            5325: -25,-30
-            5326: -25,-27
-            5327: -25,-26
-            5328: -25,-23
-            5329: -24,-21
-            5330: -25,-18
-            5331: -29,-20
-            5332: -29,-19
-            5333: -33,-19
-            5334: -33,-20
-            5335: -31,-14
-            5336: -29,-15
-            5337: -33,-16
-            5338: -29,-13
-            5339: -29,-11
-            5340: -38,-11
-            5341: -37,-15
-            5342: -36,-16
-            5343: -40,-10
-            5344: -38,-17
-            5345: -47,-8
-            5346: -45,0
-            5347: -47,0
-            5348: -44,2
-            5349: -48,-2
-            5350: -47,-1
-            5351: -49,3
-            5352: -50,-1
-            5353: -45,1
-            5354: -53,4
-            5355: -48,5
-            5356: -50,6
-            5357: -47,1
-            5358: -38,-1
-            5359: -36,1
-            5360: -35,-1
-            5361: -32,-1
-            5362: -33,0
-            5363: -33,-3
-            5364: -24,-2
-            5365: -28,3
-            5366: -26,3
-            5367: -26,8
-            5368: -27,13
-            5369: -26,14
-            5370: -26,18
-            5371: -22,13
-            5372: -20,12
-            5373: -22,13
-            5374: -24,19
-            5375: -20,20
-            5376: -18,19
-            5377: -16,20
-            5378: -13,19
-            5379: -15,24
-            5380: -14,24
-            5381: -13,27
-            5382: -14,28
-            5383: -13,27
-            5384: -5,28
-            5385: -20,28
-            5386: -18,25
-            5387: -13,31
-            5388: -15,32
-            5389: -14,34
-            5390: -17,32
-            5391: -8,32
-            5392: -8,32
-            5393: -6,33
-            5394: -6,27
-            5395: -3,28
-            5396: -1,30
-            5397: -2,33
-            5398: -2,33
-            5399: -2,36
-            5400: -2,43
-            5401: -7,42
-            5402: -5,45
-            5403: -3,47
-            5404: 0,45
-            5405: -2,47
-            5406: -1,47
-            5407: -2,51
-            5408: 1,51
-            5409: -1,52
-            5410: 1,52
-            5411: 2,45
-            5412: 2,47
-            5413: 2,42
-            5414: 1,40
-            5415: 6,41
-            5416: 8,39
-            5417: 6,41
-            5418: 5,31
-            5419: 3,31
-            5420: 5,30
-            5421: 4,30
-            5422: 3,26
-            5423: 2,27
-            5424: 4,25
-            5425: 3,23
-            5426: 2,24
-            5427: 1,23
-            5428: -2,24
-            5429: 1,21
-            5430: -1,19
-            5431: 4,20
-            5432: 9,20
-            5433: 9,20
-            5434: 15,19
-            5435: 11,24
-            5436: 14,23
-            5437: 14,25
-            5438: 15,24
-            5439: 14,29
-            5440: 14,31
-            5441: 17,25
-            5442: 17,23
-            5443: 16,20
-            5444: 20,20
-            5445: 20,18
-            5446: 20,15
-            5447: 21,15
-            5448: 20,12
-            5449: 22,12
-            5450: 20,11
-            5451: 27,12
-            5452: 27,11
-            5453: 26,14
-            5454: 25,19
-            5455: 30,19
-            5456: 31,16
-            5457: 31,12
-            5458: 35,14
-            5459: 35,14
-            5460: 35,14
-            5461: 32,8
-            5462: 34,9
-            5463: 32,7
-            5464: 26,7
-            5465: 24,7
-            5466: 24,3
-            5467: 24,2
-            5468: 23,2
-            5469: 20,6
-            5470: 20,9
-            5471: 23,3
-            5472: 32,3
-            5473: 34,2
-            5474: 32,-2
-            5475: 32,-2
-            5476: 32,-4
-            5477: 37,-4
-            5478: 36,3
-            5479: 42,2
-            5480: 38,-2
-            5481: 42,-5
-            5482: 42,-2
-            5483: 42,-4
-            5484: 43,6
-            5485: 52,12
-            5486: 50,14
-            5487: 50,7
-            5488: 53,14
-            5489: 59,15
-            5490: 60,17
-            5491: 55,7
-            5492: 54,7
-            5493: 50,7
-            5494: 49,0
-            5495: 45,-1
-            5496: 46,-5
-            5497: 46,-8
-            5498: 50,-4
-            5499: 50,-7
-            5500: 55,-5
-            5501: 53,-5
-            5502: 59,-14
-            5503: 60,-14
-            5504: 59,-14
-            5505: 59,-18
-            5506: 59,-20
-            5507: 60,-18
-            5508: 60,-17
-            5509: 64,-13
-            5510: 64,-17
-            5511: 65,-19
-            5512: 64,-19
-            5513: 64,-25
-            5514: 65,-24
-            5515: 63,-26
-            5516: 63,-24
-            5517: 62,-26
-            5518: 64,-26
-            5519: 70,-28
-            5520: 71,-26
-            5521: 69,-27
-            5522: 69,-23
-            5523: 70,-24
-            5524: 69,-22
-            5525: 66,-18
-            5526: 70,-18
-            5527: 71,-17
-            5528: 69,-13
-            5529: 71,-14
-            5530: 69,-12
-            5531: 70,-14
-            5532: 76,-17
-            5533: 77,-18
-            5534: 74,-15
-            5535: 76,-14
-            5536: 74,-14
-            5537: 68,-8
-            5538: 70,-10
-            5539: 76,-6
-            5540: 48,-25
-            5541: 48,-26
-            5542: 48,-27
-            5543: 48,-30
-            5544: 48,-31
-            5545: 47,-31
-            5546: 49,-34
-            5547: 47,-36
-            5548: 46,-36
-            5549: 44,-37
-            5550: 42,-35
-            5551: 42,-36
-            5552: 38,-36
-            5553: 38,-35
-            5554: 37,-37
-            5555: 32,-35
-            5556: 32,-36
-            5557: 32,-33
-            5558: 33,-31
-            5559: 32,-31
-            5560: 33,-27
-            5561: 32,-25
-            5562: 33,-24
-            5563: 35,-26
-            5564: 37,-26
-            5565: 41,-25
-            5566: 40,-26
-            5567: 41,-29
-            5568: 40,-29
-            5569: 40,-31
-            5570: 43,-29
-            5571: 44,-31
-            5572: 45,-30
-            5573: 27,-34
-            5574: 25,-34
-            5575: 24,-32
-            5576: 26,-29
-            5577: 23,-29
-            5578: 23,-31
-            5579: 25,-38
-            5580: 24,-37
-            5581: 22,-38
-            5582: 21,-37
-            5583: 21,-38
-            5584: 29,-39
-            5585: 28,-41
-            5586: 29,-44
-            5587: 28,-42
-            5588: 28,-45
-            5589: 26,-45
-            5590: 27,-44
-            5591: 24,-43
-            5592: 25,-46
-            5593: 27,-45
-            5594: 25,-46
-            5595: 32,-30
-            5596: 33,-28
-            5597: 36,-26
-            5598: 35,-26
-            5599: 36,-23
-            5600: 36,-30
-            5601: 42,-28
-            5602: 43,-29
-            5603: 52,-31
-            5604: 52,-35
-            5605: 55,-29
-            5606: 55,-30
-            5607: 57,-30
-            5608: 55,-34
-            5609: 55,-34
-            5610: 55,-36
-            5611: 57,-34
-            5612: 20,-45
-            5613: 17,-44
-            5614: 18,-45
-            5615: 19,-46
-            5616: 18,-48
-            5617: 19,-49
-            5618: 18,-50
-            5619: 20,-53
-            5620: 18,-54
-            5621: 17,-54
-            5622: 16,-54
-            5623: 16,-58
-            5624: 16,-59
-            5625: 19,-58
-            5626: 21,-58
-            5627: 21,-59
-            5628: 13,-47
-            5629: 14,-47
-            5630: 13,-48
-            5631: 13,-45
-            5632: 12,-45
-            5633: 10,-39
-            5634: 11,-39
-            5635: 0,-37
-            5636: 0,-36
-            5637: 1,-36
-            5638: 2,-38
-            5639: 0,-36
-            5640: -1,-37
-            5641: -2,-36
-            5642: -5,-36
-            5643: -4,-36
-            5644: -6,-36
-            5645: -7,-32
-            5646: -8,-32
-            5647: -7,-30
-            5648: -11,-31
-            5649: -12,-32
-            5650: -15,-32
-            5651: -16,-32
-            5652: -13,-30
-            5653: -16,-30
-            5654: -17,-30
-            5655: -22,-30
-            5656: -23,-30
-            5657: -24,-30
-            5658: -24,-29
-            5659: -24,-28
-            5660: -22,-32
-            5661: -24,-32
-            5662: -25,-32
-            5663: -26,-30
-            5664: -26,-28
-            5665: -26,-26
-            5666: -26,-24
-            5667: -24,-24
-            5668: -24,-22
-            5669: -24,-19
-            5670: -26,-21
-            5671: -26,-18
-            5672: -26,-17
-            5673: -24,-14
-            5674: -25,-15
-            5675: -27,-15
-            5676: -30,-15
-            5677: -30,-15
-            5678: -34,-15
-            5679: -35,-14
-            5680: -37,-15
-            5681: -38,-14
-            5682: -35,-15
-            5683: -34,-14
-            5684: -37,-10
-            5685: -38,-10
-            5686: -36,-9
-            5687: -29,-10
-            5688: -29,-11
-            5689: -33,-20
-            5690: -33,-18
-            5691: -32,-20
-            5692: -33,-18
-            5693: -29,-19
-            5694: -30,-21
-            5695: -29,-19
-            5696: -30,-20
-            5697: -37,-18
-            5698: -40,-18
-            5699: -39,-20
-            5700: -37,-19
-            5701: -39,-19
-            5702: -32,-26
-            5703: -35,-25
-            5704: -39,-26
-            5705: -39,-26
-            5706: -39,-27
-            5707: -40,-28
-            5708: -38,-30
-            5709: -39,-32
-            5710: -39,-33
-            5711: -37,-33
-            5712: -34,-33
-            5713: -31,-33
-            5714: -34,-34
-            5715: -30,-33
-            5716: -30,-31
-            5717: -31,-28
-            5718: -29,-27
-            5719: -29,-30
-            5720: -43,-30
-            5721: -44,-28
-            5722: -45,-31
-            5723: -46,-27
-            5724: -45,-25
-            5725: -45,-25
-            5726: -47,-25
-            5727: -49,-25
-            5728: -51,-26
-            5729: -50,-29
-            5730: -51,-30
-            5731: -51,-30
-            5732: -50,-32
-            5733: -47,-32
-            5734: -48,-33
-            5735: -44,-31
-            5736: -44,-29
-            5737: -55,-25
-            5738: -56,-25
-            5739: -55,-29
-            5740: -56,-29
-            5741: -55,-29
-            5742: -60,-27
-            5743: -60,-29
-            5744: -62,-27
-            5745: -61,-21
-            5746: -61,-21
-            5747: -54,-21
-            5748: -54,-21
-            5749: -55,-16
-            5750: -53,-14
-            5751: -54,-13
-            5752: -53,-10
-            5753: -54,-7
-            5754: -53,-5
-            5755: -55,-2
-            5756: -54,0
-            5757: -53,1
-            5758: -53,-4
-            5759: -54,-3
-            5760: -54,-4
-            5761: -54,-9
-            5762: -46,-4
-            5763: -47,-4
-            5764: -48,-3
-            5765: -50,0
-            5766: -45,1
-            5767: -47,1
-            5768: -44,1
-            5769: -47,1
-            5770: -46,7
-            5771: -49,7
-            5772: -49,11
-            5773: -46,11
-            5774: -49,10
-            5775: -48,13
-            5776: -45,11
-            5777: -54,10
-            5778: -54,9
-            5779: -53,10
-            5780: -39,1
-            5781: -37,0
-            5782: -39,-1
-            5783: -34,-1
-            5784: -37,-1
-            5785: -36,0
-            5786: -35,2
-            5787: -31,2
-            5788: -31,2
-            5790: -28,0
-            5791: -30,-1
-            5792: -27,-1
-            5793: -33,-4
-            5794: -27,-5
-            5795: -24,-3
-            5796: -24,1
-            5797: -22,3
-            5798: -23,-2
-            5799: -22,-3
-            5800: -17,-3
-            5801: -19,-3
-            5802: -17,-3
-            5803: -18,-4
-            5804: -14,-4
-            5805: -18,-4
-            5806: -17,-4
-            5807: -17,-4
-            5808: -19,-4
-            5809: -19,-2
-            5810: -19,-2
-            5811: -20,-3
-            5812: -20,-5
-            5813: -16,0
-            5814: -16,1
-            5815: -16,3
-            5816: -15,0
-            5817: -15,6
-            5818: -17,5
-            5819: -15,7
-            5820: -21,5
-            5821: -21,6
-            5822: -20,7
-            5823: -22,8
-            5824: -24,9
-            5825: -21,9
-            5826: -23,8
-            5827: -22,8
-            5828: -23,8
-            5829: -21,13
-            5830: -22,11
-            5831: -20,13
-            5832: -22,14
-            5833: -26,12
-            5834: -26,16
-            5835: -26,17
-            5836: -26,20
-            5837: -19,20
-            5838: -25,20
-            5839: -22,19
-            5840: -24,26
-            5841: -25,26
-            5842: -26,26
-            5843: -25,29
-            5844: -26,29
-            5845: -26,26
-            5846: -26,27
-            5847: -25,29
-            5848: -29,26
-            5849: -29,26
-            5850: -19,26
-            5851: -21,26
-            5852: -19,28
-            5853: -18,26
-            5854: -14,28
-            5855: -14,26
-            5856: -13,28
-            5857: -11,23
-            5858: -7,32
-            5859: -9,32
-            5860: -14,32
-            5861: -15,33
-            5862: -18,32
-            5863: -3,28
-            5864: -4,27
-            5865: -1,29
-            5866: -2,23
-            5867: -1,19
-            5868: -3,14
-            5869: -3,14
-            5870: -2,15
-            5871: -4,15
-            5872: -3,15
-            5873: 2,-14
-            5874: 2,-16
-            5875: -1,-17
-            5876: -2,-14
-            5877: -7,-17
-            5878: -6,-16
-            5879: -7,-19
-            5880: -7,-19
-            5881: -7,-23
-            5882: -1,-24
-            5883: 4,-20
-            5884: 6,-23
-            5885: 6,-20
-            5886: 7,-22
-            5887: 7,-20
-            5888: 11,-18
-            5889: 13,-18
-            5890: 13,-22
-            5891: 13,-22
-            5892: 12,-22
-            5893: 15,-26
-            5894: 12,-26
-            5895: 12,-29
-            5896: 7,-30
-            5897: 8,-32
-            5898: 7,-32
-            5899: 10,-34
-            5900: 13,-33
-            5901: 16,-32
-            5902: 21,-37
-            5903: 20,-38
-            5904: 24,-38
-            5905: 25,-37
-            5906: 28,-34
-            5907: 25,-34
-            5908: 27,-29
-            5909: 24,-29
-            5910: 33,-34
-            5911: 32,-37
-            5912: 35,-37
-            5913: 38,-36
-            5914: 40,-36
-            5915: 39,-30
-            5916: 44,-25
-            5917: 43,-25
-            5918: 42,-20
-            5919: 42,-18
-            5920: 41,-16
-            5921: 38,-16
-            5922: 37,-17
-            5923: 37,-15
-            5924: 37,-17
-            5925: 37,-16
-            5926: 37,-16
-            5927: 37,-16
-            5928: 38,-4
-            5929: 33,-3
-            5930: 33,-3
-            5931: 38,7
-            5932: 36,13
-            5933: 37,13
-            5934: 35,13
-            5935: 34,13
-            5936: 34,14
-            5937: 36,13
-            5938: 36,13
-            5939: 34,14
-            5940: 35,18
-            5941: 36,18
+            5250: -34,-26
+            5251: -37,-25
+            5252: -39,-28
+            5253: -40,-28
+            5254: -40,-31
+            5255: -39,-33
+            5256: -37,-33
+            5257: -32,-33
+            5258: -29,-33
+            5259: -29,-31
+            5260: -30,-28
+            5261: -29,-27
+            5262: -25,-30
+            5263: -25,-27
+            5264: -25,-26
+            5265: -25,-23
+            5266: -24,-21
+            5267: -25,-18
+            5268: -29,-20
+            5269: -29,-19
+            5270: -33,-19
+            5271: -33,-20
+            5272: -31,-14
+            5273: -29,-15
+            5274: -33,-16
+            5275: -29,-13
+            5276: -29,-11
+            5277: -38,-11
+            5278: -37,-15
+            5279: -36,-16
+            5280: -40,-10
+            5281: -38,-17
+            5282: -47,-8
+            5283: -45,0
+            5284: -47,0
+            5285: -44,2
+            5286: -48,-2
+            5287: -47,-1
+            5288: -49,3
+            5289: -50,-1
+            5290: -45,1
+            5291: -53,4
+            5292: -48,5
+            5293: -50,6
+            5294: -47,1
+            5295: -38,-1
+            5296: -36,1
+            5297: -35,-1
+            5298: -32,-1
+            5299: -33,0
+            5300: -33,-3
+            5301: -24,-2
+            5302: -28,3
+            5303: -26,3
+            5304: -26,8
+            5305: -27,13
+            5306: -26,14
+            5307: -26,18
+            5308: -22,13
+            5309: -20,12
+            5310: -22,13
+            5311: -24,19
+            5312: -20,20
+            5313: -18,19
+            5314: -16,20
+            5315: -13,19
+            5316: -15,24
+            5317: -14,24
+            5318: -13,27
+            5319: -14,28
+            5320: -13,27
+            5321: -5,28
+            5322: -20,28
+            5323: -18,25
+            5324: -13,31
+            5325: -15,32
+            5326: -14,34
+            5327: -17,32
+            5328: -8,32
+            5329: -8,32
+            5330: -6,33
+            5331: -6,27
+            5332: -3,28
+            5333: -1,30
+            5334: -2,33
+            5335: -2,33
+            5336: -2,36
+            5337: -2,43
+            5338: -7,42
+            5339: -5,45
+            5340: -3,47
+            5341: 0,45
+            5342: -2,47
+            5343: -1,47
+            5344: -2,51
+            5345: 1,51
+            5346: -1,52
+            5347: 1,52
+            5348: 2,45
+            5349: 2,47
+            5350: 2,42
+            5351: 1,40
+            5352: 6,41
+            5353: 8,39
+            5354: 6,41
+            5355: 5,31
+            5356: 3,31
+            5357: 5,30
+            5358: 4,30
+            5359: 3,26
+            5360: 2,27
+            5361: 4,25
+            5362: 3,23
+            5363: 2,24
+            5364: 1,23
+            5365: -2,24
+            5366: 1,21
+            5367: -1,19
+            5368: 4,20
+            5369: 9,20
+            5370: 9,20
+            5371: 15,19
+            5372: 11,24
+            5373: 14,23
+            5374: 14,25
+            5375: 15,24
+            5376: 14,29
+            5377: 14,31
+            5378: 17,25
+            5379: 17,23
+            5380: 16,20
+            5381: 20,20
+            5382: 20,18
+            5383: 20,15
+            5384: 21,15
+            5385: 20,12
+            5386: 22,12
+            5387: 20,11
+            5388: 27,12
+            5389: 27,11
+            5390: 26,14
+            5391: 25,19
+            5392: 30,19
+            5393: 31,16
+            5394: 31,12
+            5395: 35,14
+            5396: 35,14
+            5397: 35,14
+            5398: 32,8
+            5399: 34,9
+            5400: 32,7
+            5401: 26,7
+            5402: 24,7
+            5403: 24,3
+            5404: 24,2
+            5405: 23,2
+            5406: 20,6
+            5407: 20,9
+            5408: 23,3
+            5409: 32,3
+            5410: 34,2
+            5411: 32,-2
+            5412: 32,-2
+            5413: 32,-4
+            5414: 37,-4
+            5415: 36,3
+            5416: 42,2
+            5417: 38,-2
+            5418: 42,-5
+            5419: 42,-2
+            5420: 42,-4
+            5421: 43,6
+            5422: 52,12
+            5423: 50,14
+            5424: 50,7
+            5425: 53,14
+            5426: 59,15
+            5427: 60,17
+            5428: 55,7
+            5429: 54,7
+            5430: 50,7
+            5431: 49,0
+            5432: 45,-1
+            5433: 46,-5
+            5434: 46,-8
+            5435: 50,-4
+            5436: 50,-7
+            5437: 55,-5
+            5438: 53,-5
+            5439: 59,-14
+            5440: 60,-14
+            5441: 59,-14
+            5442: 59,-18
+            5443: 59,-20
+            5444: 60,-18
+            5445: 60,-17
+            5446: 64,-13
+            5447: 64,-17
+            5448: 65,-19
+            5449: 64,-19
+            5450: 64,-25
+            5451: 65,-24
+            5452: 63,-26
+            5453: 63,-24
+            5454: 62,-26
+            5455: 64,-26
+            5456: 70,-28
+            5457: 71,-26
+            5458: 69,-27
+            5459: 69,-23
+            5460: 70,-24
+            5461: 69,-22
+            5462: 66,-18
+            5463: 70,-18
+            5464: 71,-17
+            5465: 69,-13
+            5466: 71,-14
+            5467: 69,-12
+            5468: 70,-14
+            5469: 76,-17
+            5470: 77,-18
+            5471: 74,-15
+            5472: 76,-14
+            5473: 74,-14
+            5474: 68,-8
+            5475: 70,-10
+            5476: 76,-6
+            5477: 48,-25
+            5478: 48,-26
+            5479: 48,-27
+            5480: 48,-30
+            5481: 48,-31
+            5482: 47,-31
+            5483: 49,-34
+            5484: 47,-36
+            5485: 46,-36
+            5486: 44,-37
+            5487: 42,-35
+            5488: 42,-36
+            5489: 38,-36
+            5490: 38,-35
+            5491: 37,-37
+            5492: 32,-35
+            5493: 32,-36
+            5494: 32,-33
+            5495: 33,-31
+            5496: 32,-31
+            5497: 33,-27
+            5498: 32,-25
+            5499: 33,-24
+            5500: 35,-26
+            5501: 37,-26
+            5502: 41,-25
+            5503: 40,-26
+            5504: 41,-29
+            5505: 40,-29
+            5506: 40,-31
+            5507: 43,-29
+            5508: 44,-31
+            5509: 45,-30
+            5510: 27,-34
+            5511: 25,-34
+            5512: 24,-32
+            5513: 26,-29
+            5514: 23,-29
+            5515: 23,-31
+            5516: 25,-38
+            5517: 24,-37
+            5518: 22,-38
+            5519: 21,-37
+            5520: 21,-38
+            5521: 29,-39
+            5522: 28,-41
+            5523: 29,-44
+            5524: 28,-42
+            5525: 28,-45
+            5526: 26,-45
+            5527: 27,-44
+            5528: 24,-43
+            5529: 25,-46
+            5530: 27,-45
+            5531: 25,-46
+            5532: 32,-30
+            5533: 33,-28
+            5534: 36,-26
+            5535: 35,-26
+            5536: 36,-23
+            5537: 36,-30
+            5538: 42,-28
+            5539: 43,-29
+            5540: 52,-31
+            5541: 52,-35
+            5542: 55,-29
+            5543: 55,-30
+            5544: 57,-30
+            5545: 55,-34
+            5546: 55,-34
+            5547: 55,-36
+            5548: 57,-34
+            5549: 20,-45
+            5550: 17,-44
+            5551: 18,-45
+            5552: 19,-46
+            5553: 18,-48
+            5554: 19,-49
+            5555: 18,-50
+            5556: 20,-53
+            5557: 18,-54
+            5558: 17,-54
+            5559: 16,-54
+            5560: 16,-58
+            5561: 16,-59
+            5562: 19,-58
+            5563: 21,-58
+            5564: 21,-59
+            5565: 13,-47
+            5566: 14,-47
+            5567: 13,-48
+            5568: 13,-45
+            5569: 12,-45
+            5570: 10,-39
+            5571: 11,-39
+            5572: 0,-37
+            5573: 0,-36
+            5574: 1,-36
+            5575: 2,-38
+            5576: 0,-36
+            5577: -1,-37
+            5578: -2,-36
+            5579: -5,-36
+            5580: -4,-36
+            5581: -6,-36
+            5582: -7,-32
+            5583: -8,-32
+            5584: -7,-30
+            5585: -11,-31
+            5586: -12,-32
+            5587: -15,-32
+            5588: -16,-32
+            5589: -13,-30
+            5590: -16,-30
+            5591: -17,-30
+            5592: -22,-30
+            5593: -23,-30
+            5594: -24,-30
+            5595: -24,-29
+            5596: -24,-28
+            5597: -22,-32
+            5598: -24,-32
+            5599: -25,-32
+            5600: -26,-30
+            5601: -26,-28
+            5602: -26,-26
+            5603: -26,-24
+            5604: -24,-24
+            5605: -24,-22
+            5606: -24,-19
+            5607: -26,-21
+            5608: -26,-18
+            5609: -26,-17
+            5610: -24,-14
+            5611: -25,-15
+            5612: -27,-15
+            5613: -30,-15
+            5614: -30,-15
+            5615: -34,-15
+            5616: -35,-14
+            5617: -37,-15
+            5618: -38,-14
+            5619: -35,-15
+            5620: -34,-14
+            5621: -37,-10
+            5622: -38,-10
+            5623: -36,-9
+            5624: -29,-10
+            5625: -29,-11
+            5626: -33,-20
+            5627: -33,-18
+            5628: -32,-20
+            5629: -33,-18
+            5630: -29,-19
+            5631: -30,-21
+            5632: -29,-19
+            5633: -30,-20
+            5634: -37,-18
+            5635: -40,-18
+            5636: -39,-20
+            5637: -37,-19
+            5638: -39,-19
+            5639: -32,-26
+            5640: -35,-25
+            5641: -39,-26
+            5642: -39,-26
+            5643: -39,-27
+            5644: -40,-28
+            5645: -38,-30
+            5646: -39,-32
+            5647: -39,-33
+            5648: -37,-33
+            5649: -34,-33
+            5650: -31,-33
+            5651: -34,-34
+            5652: -30,-33
+            5653: -30,-31
+            5654: -31,-28
+            5655: -29,-27
+            5656: -29,-30
+            5657: -43,-30
+            5658: -44,-28
+            5659: -45,-31
+            5660: -46,-27
+            5661: -45,-25
+            5662: -45,-25
+            5663: -47,-25
+            5664: -49,-25
+            5665: -51,-26
+            5666: -50,-29
+            5667: -51,-30
+            5668: -51,-30
+            5669: -50,-32
+            5670: -47,-32
+            5671: -48,-33
+            5672: -44,-31
+            5673: -44,-29
+            5674: -55,-25
+            5675: -56,-25
+            5676: -55,-29
+            5677: -56,-29
+            5678: -55,-29
+            5679: -60,-27
+            5680: -60,-29
+            5681: -62,-27
+            5682: -61,-21
+            5683: -61,-21
+            5684: -54,-21
+            5685: -54,-21
+            5686: -55,-16
+            5687: -53,-14
+            5688: -54,-13
+            5689: -53,-10
+            5690: -54,-7
+            5691: -53,-5
+            5692: -55,-2
+            5693: -54,0
+            5694: -53,1
+            5695: -53,-4
+            5696: -54,-3
+            5697: -54,-4
+            5698: -54,-9
+            5699: -46,-4
+            5700: -47,-4
+            5701: -48,-3
+            5702: -50,0
+            5703: -45,1
+            5704: -47,1
+            5705: -44,1
+            5706: -47,1
+            5707: -46,7
+            5708: -49,7
+            5709: -49,11
+            5710: -46,11
+            5711: -49,10
+            5712: -48,13
+            5713: -45,11
+            5714: -54,10
+            5715: -54,9
+            5716: -53,10
+            5717: -39,1
+            5718: -37,0
+            5719: -39,-1
+            5720: -34,-1
+            5721: -37,-1
+            5722: -36,0
+            5723: -35,2
+            5724: -31,2
+            5725: -31,2
+            5726: -28,0
+            5727: -30,-1
+            5728: -27,-1
+            5729: -33,-4
+            5730: -27,-5
+            5731: -24,-3
+            5732: -24,1
+            5733: -22,3
+            5734: -23,-2
+            5735: -22,-3
+            5736: -17,-3
+            5737: -19,-3
+            5738: -17,-3
+            5739: -18,-4
+            5740: -14,-4
+            5741: -18,-4
+            5742: -17,-4
+            5743: -17,-4
+            5744: -19,-4
+            5745: -19,-2
+            5746: -19,-2
+            5747: -20,-3
+            5748: -20,-5
+            5749: -16,0
+            5750: -16,1
+            5751: -16,3
+            5752: -15,0
+            5753: -15,6
+            5754: -17,5
+            5755: -15,7
+            5756: -21,5
+            5757: -21,6
+            5758: -20,7
+            5759: -22,8
+            5760: -24,9
+            5761: -21,9
+            5762: -23,8
+            5763: -22,8
+            5764: -23,8
+            5765: -21,13
+            5766: -22,11
+            5767: -20,13
+            5768: -22,14
+            5769: -26,12
+            5770: -26,16
+            5771: -26,17
+            5772: -26,20
+            5773: -19,20
+            5774: -25,20
+            5775: -22,19
+            5776: -24,26
+            5777: -25,26
+            5778: -26,26
+            5779: -25,29
+            5780: -26,29
+            5781: -26,26
+            5782: -26,27
+            5783: -25,29
+            5784: -29,26
+            5785: -29,26
+            5786: -19,26
+            5787: -21,26
+            5788: -19,28
+            5789: -18,26
+            5790: -14,28
+            5791: -14,26
+            5792: -13,28
+            5793: -11,23
+            5794: -7,32
+            5795: -9,32
+            5796: -14,32
+            5797: -15,33
+            5798: -18,32
+            5799: -3,28
+            5800: -4,27
+            5801: -1,29
+            5802: -2,23
+            5803: -1,19
+            5804: -3,14
+            5805: -3,14
+            5806: -2,15
+            5807: -4,15
+            5808: -3,15
+            5809: 2,-14
+            5810: 2,-16
+            5811: -1,-17
+            5812: -2,-14
+            5813: -7,-17
+            5814: -6,-16
+            5815: -7,-19
+            5816: -7,-19
+            5817: -7,-23
+            5818: -1,-24
+            5819: 4,-20
+            5820: 6,-23
+            5821: 6,-20
+            5822: 7,-22
+            5823: 7,-20
+            5824: 11,-18
+            5825: 13,-18
+            5826: 13,-22
+            5827: 13,-22
+            5828: 12,-22
+            5829: 15,-26
+            5830: 12,-26
+            5831: 12,-29
+            5832: 7,-30
+            5833: 8,-32
+            5834: 7,-32
+            5835: 10,-34
+            5836: 13,-33
+            5837: 16,-32
+            5838: 21,-37
+            5839: 20,-38
+            5840: 24,-38
+            5841: 25,-37
+            5842: 28,-34
+            5843: 25,-34
+            5844: 27,-29
+            5845: 24,-29
+            5846: 33,-34
+            5847: 32,-37
+            5848: 35,-37
+            5849: 38,-36
+            5850: 40,-36
+            5851: 39,-30
+            5852: 44,-25
+            5853: 43,-25
+            5854: 42,-20
+            5855: 42,-18
+            5856: 41,-16
+            5857: 38,-16
+            5858: 37,-17
+            5859: 37,-15
+            5860: 37,-17
+            5861: 37,-16
+            5862: 37,-16
+            5863: 37,-16
+            5864: 38,-4
+            5865: 33,-3
+            5866: 33,-3
+            5867: 38,7
+            5868: 36,13
+            5869: 37,13
+            5870: 35,13
+            5871: 34,13
+            5872: 34,14
+            5873: 36,13
+            5874: 36,13
+            5875: 34,14
+            5876: 35,18
+            5877: 36,18
         - node:
             cleanable: True
             color: '#D4D4D447'
             id: Dirt
           decals:
-            6545: 37,-3
-            6546: 37,-2
-            6547: 37,-2
-            6548: 38,-3
-            6549: 39,-2
-            6550: 39,-2
-            6551: 38,-3
-            6552: 38,-2
-            6553: 36,-3
-            6554: 36,-3
-            6555: 36,-2
-            6556: 36,-2
-            6557: 39,-3
-            6558: 37,-3
-            6559: 37,-3
+            6481: 37,-3
+            6482: 37,-2
+            6483: 37,-2
+            6484: 38,-3
+            6485: 39,-2
+            6486: 39,-2
+            6487: 38,-3
+            6488: 38,-2
+            6489: 36,-3
+            6490: 36,-3
+            6491: 36,-2
+            6492: 36,-2
+            6493: 39,-3
+            6494: 37,-3
+            6495: 37,-3
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: Dirt
           decals:
-            6454: 15,-30
-            6455: 15,-30
-            6456: 16,-27
-            6457: 16,-27
+            6390: 15,-30
+            6391: 15,-30
+            6392: 16,-27
+            6393: 16,-27
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            5953: 51,20
-            5954: 50,21
-            5991: 81,-34
-            5992: 83,-35
-            5993: 81,-34
-            5994: 81,-34
-            5995: 83,-35
-            5996: 81,-35
-            5997: 82,-35
-            5998: 82,-35
-            5999: 80,-35
-            6000: 83,-36
-            6005: 82,-34
-            6526: -25,-42
+            5889: 51,20
+            5890: 50,21
+            5927: 81,-34
+            5928: 83,-35
+            5929: 81,-34
+            5930: 81,-34
+            5931: 83,-35
+            5932: 81,-35
+            5933: 82,-35
+            5934: 82,-35
+            5935: 80,-35
+            5936: 83,-36
+            5941: 82,-34
+            6462: -25,-42
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            2932: -44,16
-            2933: -43,17
-            2934: -41,14
+            2897: -44,16
+            2898: -43,17
+            2899: -41,14
         - node:
             cleanable: True
             color: '#1D1D21FF'
             id: DirtHeavy
           decals:
-            2857: -39,26
-            2858: -40,29
-            2859: -38,28
-            2860: -36,29
-            2861: -35,27
-            2862: -35,26
-            2863: -35,26
-            2864: -37,26
-            2865: -37,26
-            2866: -37,25
-            2867: -39,26
-            2868: -34,25
-            2869: -34,25
-            2870: -36,24
+            2822: -39,26
+            2823: -40,29
+            2824: -38,28
+            2825: -36,29
+            2826: -35,27
+            2827: -35,26
+            2828: -35,26
+            2829: -37,26
+            2830: -37,26
+            2831: -37,25
+            2832: -39,26
+            2833: -34,25
+            2834: -34,25
+            2835: -36,24
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavy
           decals:
-            2849: -36,26
-            2850: -35,27
-            2851: -37,26
-            2852: -37,27
-            2853: -37,25
-            2854: -39,26
-            2855: -38,27
-            2856: -38,28
+            2814: -36,26
+            2815: -35,27
+            2816: -37,26
+            2817: -37,27
+            2818: -37,25
+            2819: -39,26
+            2820: -38,27
+            2821: -38,28
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            6419: 89,-20
-            6420: 87,-21
-            6421: 92,-21
+            6355: 89,-20
+            6356: 87,-21
+            6357: 92,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2877: -8,-40
-            2878: -7,-39
-            2879: -5,-40
-            2880: -6,-42
-            2881: -4,-39
-            2882: -6,-40
-            2883: -6,-40
-            2884: -7,-40
-            2885: -7,-39
-            2886: -7,-39
-            2887: -8,-39
-            3547: -60,-66
-            3548: -59,-65
-            3549: -59,-63
-            3550: -59,-61
-            3551: -59,-59
-            3552: -59,-57
-            3553: -60,-57
-            3554: -57,-57
-            3555: -58,-58
-            3556: -56,-57
-            3557: -56,-58
-            3558: -56,-60
-            3559: -56,-62
-            3560: -56,-64
-            3561: -56,-66
-            3562: -58,-66
-            3563: -55,-56
-            3564: -54,-54
-            3565: -54,-52
-            3566: -54,-50
-            3567: -56,-53
-            3568: -56,-52
-            3569: -56,-47
-            3570: -53,-48
-            3571: -52,-46
-            3572: -54,-46
-            3573: -51,-46
-            3574: -50,-48
-            3575: -47,-48
-            3576: -45,-48
-            3577: -43,-46
-            3578: -45,-46
-            3579: -43,-48
-            3580: -42,-48
-            3581: -40,-48
-            3582: -40,-50
-            3583: -40,-52
-            3584: -40,-54
-            3585: -42,-51
-            3586: -42,-53
-            3587: -42,-54
-            3588: -41,-56
-            3589: -39,-57
-            3590: -40,-58
-            3591: -37,-57
-            3592: -37,-58
-            3593: -37,-61
-            3594: -37,-64
-            3595: -37,-65
-            3596: -36,-65
-            3597: -36,-66
-            3598: -39,-66
-            3599: -40,-65
-            3600: -40,-63
-            3601: -40,-60
-            3602: -47,-44
-            3603: -47,-42
-            3604: -47,-39
-            3605: -47,-35
-            3606: -47,-33
-            3607: -49,-33
-            3608: -49,-37
-            3609: -49,-39
-            3610: -49,-41
-            3611: -49,-44
-            3612: -49,-44
-            3613: -49,-43
-            3614: -44,-32
-            3615: -44,-30
-            3616: -43,-31
-            3617: -43,-27
-            3618: -44,-26
-            3619: -43,-26
-            3620: -44,-25
-            3621: -52,-32
-            3622: -52,-30
-            3623: -52,-29
-            3624: -52,-25
-            3625: -52,-22
-            3626: -54,-22
-            3627: -55,-22
-            3628: -52,-20
-            3629: -50,-20
-            3630: -47,-20
-            3631: -46,-20
-            3632: -45,-20
-            3633: -44,-20
-            3634: -44,-22
-            3635: -51,-18
-            3636: -51,-17
-            3637: -49,-17
-            3638: -48,-15
-            3639: -48,-13
-            3640: -50,-13
-            3641: -51,-14
-            3642: -51,-15
-            3643: -44,-15
-            3644: -46,-15
-            3645: -46,-14
-            3646: -54,-24
-            3647: -56,-24
-            3648: -54,-30
-            3649: -56,-29
-            3650: -57,-28
-            3651: -54,-28
-            3652: -61,-29
-            3653: -59,-29
-            3654: -59,-27
-            3655: -59,-25
-            3656: -61,-25
-            3657: -55,-17
-            3658: -55,-15
-            3659: -55,-13
-            3660: -55,-10
-            3661: -53,-17
-            3662: -53,-14
-            3663: -53,-12
-            3664: -53,-11
-            3665: -53,-9
-            3666: -53,-7
-            3667: -53,-6
-            3668: -53,-4
-            3669: -55,-3
-            3670: -55,-7
-            3671: -55,-8
-            3672: -53,0
-            3673: -53,-2
-            3674: -51,-4
-            3675: -49,-4
-            3676: -50,-5
-            3677: -48,-5
-            3686: -53,2
-            3687: -53,4
-            3688: -53,6
-            3689: -53,7
-            3690: -55,7
-            3691: -55,5
-            3692: -55,-1
-            3693: -51,6
-            3694: -50,7
-            3695: -47,7
-            3696: -48,6
-            3697: -46,6
-            3698: -45,7
-            3699: -47,9
-            3700: -45,9
-            3701: -44,9
-            3702: -50,9
-            3703: -50,9
-            3704: -51,11
-            3705: -51,13
-            3706: -50,13
-            3707: -48,13
-            3708: -46,13
-            3709: -48,12
-            3710: -43,11
-            3711: -44,12
-            3712: -43,13
-            3713: -43,12
-            3714: -54,10
-            3715: -53,9
-            3716: -54,9
-            3740: -40,2
-            3741: -39,1
-            3742: -39,1
-            3743: -40,-1
-            3744: -38,-1
-            3745: -40,-2
-            3746: -39,-2
-            3747: -40,-4
-            3748: -39,-5
-            3749: -38,-5
-            3750: -37,-5
-            3751: -36,-5
-            3752: -38,-4
-            3753: -36,-3
-            3754: -36,-2
-            3755: -36,-4
-            3756: -34,-3
-            3757: -32,-4
-            3758: -34,-1
-            3759: -32,0
-            3760: -35,0
-            3761: -39,3
-            3762: -40,4
-            3763: -38,4
-            3765: -31,2
-            3766: -31,-1
-            3767: -29,0
-            3768: -32,-2
-            3769: -31,-3
-            3770: -33,-4
-            3771: -32,-5
-            3772: -31,-4
-            3773: -30,-3
-            3774: -28,-3
-            3775: -28,-4
-            3776: -26,-5
-            3777: -27,-2
-            3778: -27,-3
-            3779: -29,0
-            3780: -27,0
-            3781: -27,2
-            3782: -28,3
-            3783: -27,3
-            3784: -27,1
-            3785: -26,-1
-            3786: -32,-1
-            3787: -28,4
-            3788: -26,5
-            3789: -26,6
-            3790: -26,3
-            3791: -26,3
-            3792: -24,2
-            3793: -23,1
-            3794: -25,0
-            3795: -23,-2
-            3796: -25,-3
-            3797: -23,-3
-            3798: -25,-4
-            3799: -23,-5
-            3800: -25,-5
-            3801: -24,-1
-            3802: -25,-1
-            3803: -23,3
-            3804: -15,-1
-            3805: -16,-1
-            3806: -15,0
-            3807: -16,1
-            3808: -16,3
-            3809: -15,3
-            3810: -15,2
-            3811: -15,1
-            3812: -15,1
-            3813: -27,6
-            3814: -27,7
-            3815: -27,9
-            3816: -20,5
-            3817: -21,5
-            3822: -17,5
-            3823: -16,5
-            3824: -16,5
-            3825: -22,11
-            3826: -21,11
-            3827: -22,13
-            3828: -20,14
-            3829: -22,13
-            3830: -22,15
-            3831: -20,14
-            3832: -20,13
-            3833: -20,12
-            3834: -19,11
-            3835: -22,14
-            3836: -23,14
-            3837: -17,11
-            3838: -17,11
-            3839: -17,12
-            3840: -16,11
-            3841: -16,12
-            3842: -17,13
-            3843: -16,14
-            3844: -17,14
-            3845: -16,12
-            3846: -17,12
-            3847: -17,11
-            3850: -39,11
-            3851: -27,11
-            3852: -27,13
-            3853: -27,16
-            3854: -27,17
-            3855: -27,19
-            3856: -27,20
-            3857: -27,21
-            3858: -25,18
-            3859: -25,16
-            3860: -25,14
-            3861: -25,12
-            3862: -25,11
-            3863: -24,18
-            3864: -22,18
-            3865: -23,17
-            3866: -21,17
-            3867: -20,18
-            3868: -19,17
-            3869: -20,20
-            3870: -22,20
-            3871: -24,20
-            3872: -20,21
-            3873: -17,19
-            3874: -16,19
-            3875: -14,19
-            3876: -17,21
-            3877: -15,21
-            3878: -13,21
-            3879: -11,21
-            3880: -13,19
-            3881: -10,19
-            3882: -8,19
-            3883: -6,19
-            3884: -9,21
-            3885: -7,21
-            3886: -5,21
-            3887: -3,21
-            3888: 0,21
-            3889: -5,19
-            3890: -2,19
-            3891: 0,19
-            3892: 0,21
-            3893: 2,21
-            3894: 5,21
-            3895: 6,21
-            3896: 2,19
-            3897: 4,19
-            3898: 7,19
-            3899: 10,19
-            3900: 8,21
-            3901: 10,21
-            3902: 11,21
-            3903: 13,21
-            3904: 12,19
-            3905: 14,19
-            3906: 15,19
-            3907: 17,19
-            3908: 15,23
-            3909: 14,23
-            3910: 13,24
-            3911: 15,25
-            3912: 15,24
-            3913: 11,23
-            3914: 10,23
-            3915: 11,24
-            3916: 17,23
-            3917: 17,25
-            3918: 17,25
-            3919: 16,23
-            3920: 18,19
-            3921: 19,19
-            3922: 19,21
-            3923: 17,21
-            3924: 16,21
-            3925: 21,20
-            3926: 21,18
-            3927: 21,17
-            3928: 19,18
-            3929: 19,15
-            3930: 19,12
-            3931: 19,11
-            3932: 21,16
-            3933: 21,13
-            3934: 21,12
-            3935: 21,10
-            3936: 21,8
-            3937: 21,7
-            3938: 19,9
-            3939: 19,7
-            3940: 19,6
-            3941: 23,10
-            3942: 24,10
-            3943: 26,10
-            3944: 27,10
-            3945: 28,7
-            3946: 27,8
-            3947: 27,6
-            3948: 28,6
-            3949: 30,6
-            3950: 30,8
-            3951: 30,9
-            3952: 30,10
-            3953: 33,10
-            3954: 34,10
-            3955: 31,12
-            3956: 31,13
-            3957: 30,14
-            3958: 31,17
-            3959: 30,17
-            3960: 31,19
-            3961: 31,20
-            3962: 31,22
-            3963: 30,22
-            3964: 28,22
-            3965: 29,23
-            3966: 26,22
-            3967: 24,22
-            3968: 23,22
-            3969: 23,23
-            3970: 23,20
-            3971: 23,18
-            3972: 25,18
-            3973: 25,17
-            3974: 26,18
-            3975: 27,17
-            3976: 26,19
-            3977: 27,20
-            3978: 29,18
-            3979: 27,18
-            3980: 30,17
-            3981: 33,22
-            3982: 35,22
-            3983: 33,19
-            3984: 33,18
-            3985: 35,18
-            3986: 36,17
-            3987: 34,17
-            3988: 35,17
-            3989: 33,13
-            3990: 33,15
-            3991: 33,15
-            3992: 32,13
-            3993: 26,7
-            3994: 23,2
-            3995: 26,2
-            3996: 20,2
-            3997: 21,2
-            3998: 19,4
-            4004: 31,2
-            4005: 33,2
-            4006: 33,4
-            4007: 32,4
-            4008: 35,4
-            4009: 37,4
-            4010: 37,2
-            4011: 40,2
-            4012: 41,2
-            4013: 41,1
-            4014: 38,2
-            4015: 39,-4
-            4016: 37,-4
-            4017: 39,-5
-            4018: 33,-1
-            4019: 31,-1
-            4020: 31,0
-            4021: 33,0
-            4022: 32,1
-            4023: 38,7
-            4024: 54,14
-            4025: 58,14
-            4026: 59,14
-            4027: 60,14
-            4028: 58,16
-            4029: 55,10
-            4030: 55,12
-            4031: 54,12
-            4032: 54,6
-            4033: 59,3
-            4034: 60,4
-            4035: 59,0
-            4036: 55,-5
-            4037: 56,-4
-            4038: 41,-1
-            4039: 41,-3
-            4040: 41,-5
-            4041: 41,-7
-            4042: 41,-10
-            4043: 41,-11
-            4044: 43,-12
-            4045: 43,-14
-            4046: 43,-16
-            4047: 43,-17
-            4048: 41,-15
-            4049: 41,-16
-            4050: 41,-17
-            4051: 41,-19
-            4052: 40,-19
-            4053: 40,-21
-            4054: 42,-21
-            4055: 43,-21
-            4056: 45,-21
-            4061: 45,-19
-            4062: 47,-19
-            4063: 48,-19
-            4064: 51,-19
-            4065: 47,-21
-            4066: 49,-21
-            4067: 47,-22
-            4068: 51,-21
-            4069: 52,-21
-            4070: 52,-23
-            4071: 53,-24
-            4072: 56,-24
-            4073: 57,-24
-            4074: 58,-24
-            4075: 58,-23
-            4076: 59,-21
-            4077: 60,-21
-            4078: 61,-20
-            4079: 59,-19
-            4080: 61,-19
-            4081: 60,-17
-            4082: 60,-17
-            4083: 58,-18
-            4084: 58,-19
-            4085: 56,-19
-            4086: 55,-19
-            4087: 53,-19
-            4088: 60,-15
-            4089: 58,-15
-            4090: 59,-14
-            4091: 57,-13
-            4092: 57,-12
-            4093: 60,-13
-            4094: 60,-12
-            4095: 60,-14
-            4096: 61,-13
-            4097: 63,-13
-            4098: 64,-12
-            4099: 65,-14
-            4100: 63,-14
-            4101: 63,-16
-            4102: 65,-16
-            4103: 65,-18
-            4104: 65,-20
-            4105: 63,-18
-            4106: 63,-20
-            4107: 63,-21
-            4108: 65,-21
-            4109: 62,-23
-            4110: 61,-24
-            4111: 64,-24
-            4112: 63,-25
-            4113: 64,-26
-            4114: 65,-27
-            4115: 66,-26
-            4116: 65,-24
-            4117: 65,-23
-            4118: 65,-23
-            4122: 68,-21
-            4123: 69,-21
-            4124: 69,-23
-            4125: 69,-24
-            4127: 69,-27
-            4128: 70,-26
-            4129: 70,-26
-            4130: 71,-27
-            4131: 71,-28
-            4132: 70,-28
-            4133: 68,-28
-            4134: 69,-29
-            4135: 70,-30
-            4136: 69,-30
-            4137: 70,-29
-            4138: 70,-29
-            4139: 70,-29
-            4140: 71,-30
-            4141: 71,-17
-            4142: 68,-17
-            4143: 67,-19
-            4144: 70,-17
-            4145: 70,-19
-            4146: 71,-18
-            4147: 68,-18
-            4148: 69,-19
-            4168: 69,-9
-            4169: 68,-9
-            4170: 67,-9
-            4171: 70,-10
-            4172: 77,-18
-            4173: 75,-18
-            4174: 76,-19
-            4175: 77,-18
-            4176: 76,-17
-            4177: 76,-15
-            4178: 75,-15
-            4179: 76,-13
-            4180: 77,-14
-            4181: 74,-14
-            4182: 74,-16
-            4183: 73,-14
-            4184: 74,-17
-            4185: 74,-18
-            4186: 72,-17
-            4187: 73,-19
-            4188: 73,-17
-            4189: 74,-16
-            4190: 73,-15
-            4191: 74,-16
-            4192: 74,-15
-            4193: 76,-18
-            4194: 79,-14
-            4195: 80,-13
-            4196: 81,-14
-            4197: 79,-14
-            4198: 80,-15
-            4199: 81,-13
-            4200: 80,-19
-            4201: 79,-18
-            4202: 80,-18
-            4203: 80,-19
-            4204: 79,-19
-            4205: 80,-19
-            4206: 81,-19
-            4207: 80,-17
-            4208: 80,-18
-            4209: 79,-19
-            4210: 50,-13
-            4211: 51,-14
-            4212: 50,-13
-            4213: 51,-13
-            4214: 50,-14
-            4215: 50,-14
-            4216: 48,-13
-            4217: 48,-14
-            4218: 48,-13
-            4219: 53,-13
-            4220: 53,-14
-            4221: 53,-12
-            4222: 53,-14
-            4223: 53,-13
-            4224: 53,-14
-            4225: 50,-15
-            4226: 51,-15
-            4227: 50,-14
-            4228: 51,-13
-            4229: 50,-12
-            4230: 50,-12
-            4231: 48,-12
-            4232: 50,-12
-            4233: 51,-13
-            4234: 47,-24
-            4235: 49,-25
-            4236: 48,-26
-            4237: 47,-25
-            4238: 49,-25
-            4239: 48,-23
-            4240: 47,-28
-            4241: 49,-29
-            4242: 47,-30
-            4243: 48,-32
-            4244: 49,-31
-            4245: 48,-33
-            4246: 47,-33
-            4247: 49,-33
-            4248: 48,-34
-            4249: 47,-34
-            4250: 43,-36
-            4251: 40,-36
-            4252: 37,-35
-            4253: 36,-35
-            4254: 37,-36
-            4255: 40,-36
-            4256: 43,-35
-            4257: 43,-35
-            4258: 41,-35
-            4259: 43,-35
-            4260: 43,-34
-            4286: 33,-34
-            4287: 31,-34
-            4288: 33,-32
-            4289: 32,-32
-            4290: 32,-31
-            4291: 32,-30
-            4292: 33,-28
-            4293: 31,-29
-            4294: 33,-31
-            4295: 33,-31
-            4296: 35,-30
-            4297: 36,-30
-            4298: 36,-29
-            4299: 33,-25
-            4300: 31,-25
-            4301: 33,-25
-            4302: 31,-25
-            4303: 33,-25
-            4304: 32,-26
-            4305: 31,-25
-            4306: 32,-24
-            4307: 32,-25
-            4308: 31,-24
-            4309: 40,-25
-            4310: 39,-24
-            4311: 40,-26
-            4312: 42,-25
-            4313: 42,-25
-            4314: 44,-24
-            4315: 42,-25
-            4316: 44,-25
-            4317: 45,-25
-            4318: 42,-26
-            4319: 43,-25
-            4320: 43,-25
-            4321: 41,-25
-            4322: 40,-25
-            4323: 40,-25
-            4324: 40,-24
-            4325: 35,-23
-            4326: 37,-23
-            4327: 36,-23
-            4328: 35,-23
-            4329: 38,-21
-            4330: 35,-21
-            4331: 33,-21
-            4332: 33,-22
-            4333: 32,-22
-            4334: 32,-21
-            4335: 37,-19
-            4336: 34,-19
-            4337: 32,-19
-            4338: 31,-19
-            4339: 28,-19
-            4340: 27,-19
-            4341: 27,-20
-            4342: 27,-21
-            4343: 30,-21
-            4344: 29,-21
-            4345: 29,-23
-            4346: 29,-24
-            4347: 29,-25
-            4348: 29,-26
-            4349: 27,-22
-            4350: 27,-24
-            4351: 27,-25
-            4352: 26,-25
-            4353: 25,-25
-            4354: 29,-27
-            4355: 27,-27
-            4356: 25,-27
-            4357: 24,-27
-            4358: 21,-27
-            4359: 21,-25
-            4360: 20,-25
-            4361: 19,-25
-            4362: 19,-26
-            4363: 19,-28
-            4364: 19,-28
-            4365: 19,-30
-            4366: 19,-31
-            4367: 19,-32
-            4368: 21,-30
-            4369: 21,-33
-            4370: 21,-34
-            4371: 21,-34
-            4372: 19,-34
-            4373: 20,-36
-            4374: 20,-37
-            4375: 19,-37
-            4376: 20,-39
-            4377: 21,-38
-            4378: 22,-39
-            4379: 21,-37
-            4380: 24,-37
-            4381: 23,-38
-            4382: 25,-37
-            4383: 25,-38
-            4384: 24,-38
-            4385: 25,-38
-            4386: 17,-34
-            4387: 17,-35
-            4388: 16,-34
-            4389: 14,-34
-            4390: 17,-32
-            4391: 15,-32
-            4392: 13,-32
-            4393: 11,-32
-            4394: 10,-32
-            4395: 12,-34
-            4396: 9,-34
-            4397: 8,-34
-            4398: 7,-34
-            4399: 7,-32
-            4400: 7,-32
-            4401: 6,-32
-            4402: 9,-30
-            4403: 8,-29
-            4404: 7,-29
-            4405: 7,-29
-            4406: 6,-28
-            4407: 8,-27
-            4408: 9,-27
-            4409: 7,-28
-            4410: 6,-27
-            4411: 5,-29
-            4412: 7,-30
-            4413: 9,-30
-            4414: 3,-30
-            4415: 1,-30
-            4416: 3,-32
-            4417: 2,-32
-            4418: 2,-33
-            4419: 0,-33
-            4420: -1,-33
-            4421: -1,-32
-            4422: 0,-30
-            4423: -3,-30
-            4424: -4,-30
-            4425: -6,-30
-            4426: -7,-30
-            4427: -9,-30
-            4428: -6,-32
-            4429: -5,-32
-            4430: -3,-32
-            4431: -8,-32
-            4432: -8,-33
-            4433: -9,-32
-            4434: -10,-32
-            4435: -11,-32
-            4436: -13,-32
-            4437: -10,-30
-            4438: -11,-30
-            4439: -13,-30
-            4440: -15,-30
-            4441: -16,-30
-            4442: -12,-29
-            4443: -12,-30
-            4444: -16,-32
-            4445: -17,-33
-            4446: -17,-32
-            4447: -19,-32
-            4448: -18,-30
-            4449: -20,-30
-            4450: -22,-30
-            4451: -23,-30
-            4452: -23,-29
-            4453: -22,-32
-            4454: -24,-32
-            4455: -24,-32
-            4456: -26,-30
-            4457: -26,-29
-            4458: -26,-27
-            4459: -26,-25
-            4460: -24,-27
-            4461: -24,-26
-            4462: -24,-25
-            4463: -24,-24
-            4464: -26,-23
-            4465: -26,-22
-            4466: -26,-20
-            4467: -24,-21
-            4468: -24,-19
-            4469: -24,-18
-            4470: -24,-16
-            4471: -26,-17
-            4472: -26,-16
-            4473: -26,-14
-            4474: -26,-13
-            4475: -26,-12
-            4476: -26,-10
-            4477: -26,-9
-            4478: -25,-9
-            4479: -24,-11
-            4480: -23,-11
-            4481: -23,-10
-            4482: -23,-9
-            4483: -24,-5
-            4484: -24,-4
-            4485: -24,-2
-            4486: -19,-11
-            4487: -19,-10
-            4488: -20,-10
-            4489: -20,-9
-            4490: -19,-9
-            4491: -30,-21
-            4492: -30,-19
-            4493: -29,-19
-            4494: -30,-18
-            4495: -32,-21
-            4496: -32,-19
-            4497: -33,-18
-            4498: -36,-15
-            4499: -36,-14
-            4500: -33,-14
-            4501: -33,-14
-            4502: -33,-15
-            4503: -30,-14
-            4504: -36,-10
-            4505: -37,-9
-            4506: -37,-10
-            4507: -29,-10
-            4508: -30,-11
-            4509: -30,-9
-            4510: -28,-10
-            4511: -40,-11
-            4512: -41,-10
-            4513: -41,-9
-            4514: -40,-9
-            4515: -41,-10
-            4516: -41,-10
-            4517: -49,-18
-            4518: -38,-33
-            4519: -36,-33
-            4520: -33,-33
-            4521: -32,-33
-            4522: -31,-33
-            4523: -31,-31
-            4524: -31,-29
-            4525: -31,-28
-            4526: -31,-26
-            4527: -33,-26
-            4528: -35,-26
-            4529: -36,-26
-            4530: -37,-26
-            4531: -38,-26
-            4532: -38,-27
-            4533: -38,-29
-            4534: -38,-30
-            4535: -38,-31
-            4536: -38,-29
-            4537: -38,-26
-            4538: -40,-26
-            4539: -40,-25
-            4540: -41,-25
-            4541: -41,-26
-            4542: -41,-28
-            4543: -41,-29
-            4544: -41,-30
-            4545: -41,-32
-            4546: -41,-33
-            4547: -41,-34
-            4548: -39,-33
-            4549: -40,-34
-            4550: -35,-34
-            4551: -34,-34
-            4552: -32,-34
-            4553: -31,-34
-            4554: -30,-34
-            4555: -30,-33
-            4556: -28,-34
-            4557: -28,-32
-            4558: -28,-31
-            4559: -28,-29
-            4560: -28,-27
-            4561: -28,-26
-            4562: -29,-25
-            4563: -30,-25
-            4564: -30,-26
-            4565: -32,-25
-            4566: -33,-26
-            4567: -35,-25
-            4568: -32,6
-            4569: -32,7
-            4570: -32,6
-            4571: -36,6
-            4572: -36,5
-            4573: -36,7
-            4574: -34,6
-            4575: -34,5
-            4576: -35,6
-            4577: -33,6
-            4578: -35,-4
-            4579: -35,-2
-            4580: -36,-5
-            4581: -35,-2
-            4582: -34,-2
-            4583: -35,-1
-            4595: -25,28
-            4596: -26,28
-            4597: -18,32
-            4598: -17,31
-            4599: -17,33
-            4600: -18,32
-            4601: -15,34
-            4602: -15,32
-            4603: -15,31
-            4604: -13,31
-            4605: -12,31
-            4606: -15,34
-            4607: -15,34
-            4608: -12,39
-            4609: -13,40
-            4610: -14,40
-            4611: -15,40
-            4612: -16,40
-            4613: -16,40
-            4614: -13,40
-            4615: -12,40
-            4616: -12,38
-            4617: -12,40
-            4623: -5,40
-            4624: -6,40
-            4625: -6,42
-            4626: -6,43
-            4627: -5,42
-            4628: -6,43
-            4629: -6,45
-            4630: -6,46
-            4631: -6,47
-            4632: -5,46
-            4633: -4,48
-            4634: -5,46
-            4635: -2,48
-            4636: -4,46
-            4637: -1,47
-            4638: -3,45
-            4639: 0,46
-            4640: -3,47
-            4641: -1,45
-            4642: -3,46
-            4643: 1,45
-            4644: 1,47
-            4645: 0,46
-            4646: 1,48
-            4647: 2,48
-            4648: 3,47
-            4649: 2,45
-            4650: 2,44
-            4651: 2,43
-            4652: 2,42
-            4653: 1,42
-            4654: 3,42
-            4655: -2,43
-            4656: -1,41
-            4657: -3,40
-            4658: -3,40
-            4659: 1,51
-            4660: -2,50
-            4661: -3,50
-            4662: -2,51
-            4663: 0,51
-            4664: -1,52
-            4665: -2,51
-            4666: -2,53
-            4667: 1,53
-            4668: 2,51
-            4669: 2,50
-            4670: 0,50
-            4671: -4,45
-            4672: -4,47
-            4699: 6,42
-            4700: 5,41
-            4701: 5,39
-            4702: 7,39
-            4703: 8,39
-            4704: 9,41
-            4705: 9,40
-            4706: 8,42
-            4707: 8,41
-            4708: 15,37
-            4709: 14,37
-            4710: 14,35
-            4711: 14,34
-            4712: 13,35
-            4713: 13,36
-            4714: 15,34
-            4715: 16,35
-            4716: 15,36
-            4717: 15,34
-            4718: 15,35
-            4719: 15,37
-            4720: 14,37
-            4721: 15,30
-            4722: 14,29
-            4723: 14,29
-            4724: 15,28
-            4725: 14,29
-            4726: 14,32
-            4727: 13,32
-            4728: 15,24
-            4752: 2,24
-            4753: 1,24
-            4754: 1,24
-            4755: 2,23
-            4756: 4,23
-            4757: 4,24
-            4758: 3,26
-            4759: 4,28
-            4760: 2,27
-            4761: 2,27
-            4762: 3,27
-            4763: -2,25
-            4764: -3,25
-            4765: -3,23
-            4766: -2,24
-            4767: -4,23
-            4768: -4,25
-            4804: -14,28
-            4805: -15,28
-            4806: -14,29
-            4807: -13,26
-            4808: -10,26
-            4809: -9,27
-            4810: -10,28
-            4811: -7,28
-            4812: -8,26
-            4813: -5,28
-            4814: -7,24
-            4815: -8,24
-            4816: -7,23
-            4817: -6,24
-            4818: -6,23
-            4819: -7,23
-            4820: -8,23
-            4821: -8,23
-            4822: -12,23
-            4823: -11,24
-            4824: -10,23
-            4825: -10,24
-            4826: -10,24
-            4827: -12,24
-            4828: -12,24
-            4829: -14,24
-            4830: -14,23
-            4831: -16,24
-            4832: -14,24
-            4833: -15,23
-            4834: -16,24
-            4835: -14,25
-            4836: -10,25
-            4837: -7,25
-            4838: -1,28
-            4839: -3,27
-            4840: -1,30
-            4841: -1,33
-            4842: -1,34
-            4843: -1,37
-            4844: -3,37
-            4845: -3,38
-            4846: -1,37
-            4847: -2,37
-            4848: -1,40
-            4849: -3,41
-            4850: -3,43
-            4851: -2,43
-            4852: -20,25
-            4853: -21,25
-            4854: -19,25
-            4855: -21,25
-            4856: -22,17
-            4857: -23,17
-            4858: -22,5
-            4859: -22,5
-            4860: -22,5
-            4861: -19,-28
-            4862: -16,-28
-            4863: -16,-27
-            4864: -15,-28
-            4865: -16,-26
-            4866: -15,-27
-            4867: -15,-28
-            4868: -15,-26
-            4869: -15,-26
-            4870: -14,-26
-            4881: -25,-34
-            4882: -23,-34
-            4883: -22,-34
-            4884: -21,-34
-            4885: -20,-34
-            4886: -20,-37
-            4887: -20,-36
-            4888: -19,-38
-            4889: -19,-36
-            4890: -22,-37
-            4891: -23,-37
-            4892: -23,-38
-            4893: -23,-36
-            4894: -24,-37
-            4895: -26,-37
-            4896: -26,-36
-            4897: -26,-37
-            4898: -28,-40
-            4899: -27,-40
-            4900: -25,-40
-            4901: -24,-40
-            4902: -23,-40
-            4903: -21,-40
-            4904: -19,-40
-            4905: -21,-40
-            4906: -24,-40
-            4907: -26,-40
-            4908: -32,-40
-            4909: -31,-40
-            4910: -33,-39
-            4911: -33,-40
-            4912: -32,-39
-            4913: -31,-39
-            4914: -34,-39
-            4915: -33,-40
-            4916: -39,-38
-            4917: -38,-38
-            4918: -38,-53
-            4919: -38,-54
-            4920: -37,-53
-            4921: -37,-54
-            4936: -5,-41
-            4937: -5,-40
-            4938: -6,-42
-            4939: -5,-36
-            4940: -6,-36
-            4941: -4,-35
-            4942: -4,-36
-            4943: 0,-36
-            4944: -2,-36
-            4945: 1,-35
-            4946: 1,-37
-            4947: 1,-38
-            4948: 2,-37
-            4949: 2,-38
-            4950: 0,-37
-            4951: 3,-37
-            4952: -1,-36
-            4956: -6,-28
-            4957: -6,-27
-            4958: -5,-27
-            4959: -6,-26
-            4960: -2,-27
-            4961: -3,-26
-            4962: -2,-28
-            4963: -1,-27
-            4964: 0,-27
-            4965: 0,-27
-            4966: -2,-27
-            4967: -2,-27
-            4968: 0,-24
-            4969: -2,-24
-            4970: -2,-23
-            4971: 0,-22
-            4972: 1,-22
-            4973: 1,-21
-            4974: -4,-19
-            4975: -5,-19
-            4976: -7,-19
-            4977: -9,-19
-            4978: -6,-19
-            4979: -7,-17
-            4980: -8,-17
-            4981: -9,-16
-            4982: -9,-16
-            4983: -5,-16
-            4984: -4,-14
-            4985: -5,-15
-            4986: -8,-16
-            4987: -8,-15
-            4988: -14,-14
-            4989: -12,-14
-            4990: -12,-16
-            4991: -13,-18
-            4992: -14,-16
-            4993: -13,-16
-            4994: -13,-19
-            4995: -14,-19
-            4996: -2,-17
-            4997: -2,-15
-            4998: -2,-13
-            4999: -2,-12
-            5000: -1,-15
-            5001: -1,-16
-            5002: -1,-17
-            5003: 1,-17
-            5004: -1,-18
-            5005: 2,-18
-            5006: 2,-16
-            5007: 2,-15
-            5008: 2,-13
-            5009: 1,-12
-            5010: 1,-14
-            5011: -1,-13
-            5012: 0,-14
-            5013: 2,-16
-            5014: -4,-14
-            5015: -7,-24
-            5016: -7,-22
-            5017: -8,-23
-            5018: -10,-23
-            5019: -9,-23
-            5020: -1,-24
-            5021: 8,-23
-            5022: 8,-22
-            5023: 10,-22
-            5024: 9,-23
-            5025: 8,-25
-            5026: 8,-21
-            5027: 8,-19
-            5028: 8,-18
-            5029: 6,-18
-            5030: 5,-18
-            5031: 0,-27
-            5032: 2,-27
-            5033: 10,-23
-            5034: 13,-23
-            5035: 12,-23
-            5036: 13,-21
-            5037: 14,-22
-            5038: 13,-18
-            5039: 14,-18
-            5040: 14,-17
-            5041: 12,-18
-            5042: 11,-18
-            5043: 11,-16
-            5044: 13,-17
-            5045: 11,-30
-            5046: 11,-28
-            5047: 11,-27
-            5048: 11,-26
-            5049: 17,-26
-            5050: 17,-28
-            5051: 17,-28
-            5052: 17,-30
-            5053: 17,-30
-            5054: 18,-23
-            5055: 20,-22
-            5056: 21,-23
-            5057: 19,-22
-            5058: 21,-22
-            5059: 20,-21
-            5060: 24,-22
-            5061: 23,-23
-            5062: 23,-21
-            5063: 23,-23
-            5064: 17,-16
-            5065: 19,-14
-            5066: 18,-13
-            5067: 20,-13
-            5068: 19,-12
-            5069: 22,-11
-            5070: 22,-13
-            5071: 20,-11
-            5072: 24,-13
-            5073: 26,-11
-            5074: 21,-11
-            5075: 20,-11
-            5076: 25,-13
-            5077: 22,-13
-            5078: 23,-12
-            5079: 26,-12
-            5080: 19,-12
-            5081: 23,-13
-            5082: 23,-11
-            5083: 19,-10
-            5084: 26,-11
-            5085: 28,-12
-            5086: 25,-12
-            5087: 23,-16
-            5088: 23,-16
-            5089: 13,-19
-            5090: 23,-34
-            5091: 23,-31
-            5092: 23,-30
-            5093: 23,-29
-            5094: 23,-32
-            5095: 29,-34
-            5096: 29,-33
-            5097: 29,-32
-            5098: 29,-30
-            5099: 29,-29
-            5100: 32,-34
-            5101: 32,-31
-            5102: 32,-30
-            5103: 36,-30
-            5104: 35,-29
-            5105: 33,-26
-            5106: 36,-21
-            5107: 38,-16
-            5108: 37,-15
-            5109: 39,-16
-            5110: 38,-17
-            5111: 38,-15
-            5112: 37,-15
-            5113: 62,-31
-            5114: 62,-33
-            5115: 61,-31
-            5116: 63,-33
-            5117: 63,-33
-            5118: 63,-32
-            5119: 62,-32
-            5120: 62,-32
-            5121: 64,8
-            5122: 63,9
-            5123: 65,9
-            5124: 64,8
-            5125: 64,9
-            5126: 64,10
-            5127: 67,6
-            5128: 68,4
-            5129: 68,6
-            5130: 67,5
-            5131: 68,0
-            5132: 68,1
-            5133: 68,2
-            5134: 67,0
-            5135: 68,-2
-            5136: 67,-3
-            5137: 68,-4
-            5138: 68,-3
-            5139: 68,-3
-            5140: 76,-6
-            5146: 54,-30
-            5147: 52,-31
-            5148: 51,-31
-            5149: 52,-33
-            5150: 52,-34
-            5151: 51,-33
-            5152: 51,-32
-            5153: 52,-35
-            5154: 51,-33
-            5155: 51,-31
-            5156: 52,-35
-            5157: 52,-35
-            5158: 55,-35
-            5159: 54,-34
-            5160: 56,-33
-            5161: 57,-33
-            5162: 55,-34
-            5163: 55,-36
-            5164: 54,-35
-            5165: 55,-34
-            5166: 54,-35
-            5167: 55,-35
-            5168: 55,-34
-            5169: 40,-31
-            5170: 40,-30
-            5171: 40,-30
-            5172: 41,-31
-            5173: 41,-29
-            5174: 42,-29
-            5175: 43,-29
-            5176: 44,-29
-            5177: 44,-31
-            5178: 43,-30
-            5179: 33,-29
-            5180: 15,-39
-            5181: 14,-39
-            5182: 14,-39
-            5183: 9,-40
-            5184: 9,-39
-            5185: 9,-41
-            5186: 8,-40
-            5187: 19,-45
-            5188: 17,-45
-            5189: 16,-44
-            5190: 16,-45
-            5191: 16,-43
-            5192: 19,-45
-            5193: 20,-44
-            5194: 20,-45
-            5195: 18,-44
-            5196: 21,-45
-            5197: 21,-43
-            5198: 15,-48
-            5199: 14,-48
-            5200: 12,-47
-            5201: 12,-48
-            5202: 14,-48
-            5203: 16,-47
-            5204: 14,-48
-            5205: 13,-48
-            5206: 15,-47
-            5213: 21,-54
-            5214: 20,-54
-            5215: 18,-54
-            5216: 16,-54
-            5217: 16,-55
-            5218: 18,-53
-            5219: 19,-53
-            5220: 21,-55
-            5221: 21,-58
-            5222: 21,-59
-            5223: 20,-58
-            5224: 18,-58
-            5225: 17,-58
-            5226: 16,-58
-            5227: 16,-59
-            5228: 19,-59
-            5229: 19,-59
-            5230: 18,-59
-            5231: 27,-46
-            5232: 26,-45
-            5233: 26,-44
-            5234: 27,-45
-            5235: 27,-45
-            5236: 28,-42
-            5237: 29,-42
-            5238: 29,-40
-            5239: 28,-39
-            5240: 28,-39
-            5241: 28,-40
-            5242: 29,-47
-            5243: 28,-47
-            5244: 66,-52
-            5245: 65,-51
-            5246: 66,-52
-            5247: 66,-51
-            5248: 65,-52
-            5249: 66,-51
-            5250: 27,15
-            5251: 28,15
-            5252: 27,14
-            5253: 27,12
-            5254: -23,34
-            5255: -23,35
-            5256: -22,34
-            5257: -27,36
-            5258: -27,34
-            5259: -28,35
-            5260: -27,35
-            5261: -29,36
-            5262: -30,37
-            5263: -30,38
-            5264: -28,35
-            5265: -28,34
-            5266: -29,35
-            5267: -26,36
-            5268: -25,38
-            5269: -26,37
-            5270: -32,36
-            5271: -33,35
-            5272: -33,37
-            5273: -33,35
-            5274: -34,36
-            5275: -33,38
-            5276: -33,35
-            5277: -36,5
-            5278: -42,6
-            5279: -43,4
-            5280: -43,6
-            5281: -42,7
-            5282: -51,9
-            5283: -49,13
-            5284: -42,-5
-            5285: -43,-5
-            5286: -42,-3
-            5287: -45,-4
-            5288: -45,-5
-            5289: -46,-4
-            5290: -43,-3
-            5291: -43,-2
-            5292: -42,-2
-            5293: -60,-29
-            5294: -60,-29
-            5295: -57,-36
-            5296: -58,-36
-            5297: -59,-36
-            5298: -57,-37
-            5299: -58,-35
-            5300: -58,-34
-            5301: -57,-35
-            5302: -59,-34
-            5303: -58,-34
-            5304: -59,-34
-            5305: -60,-34
-            5306: -60,-35
-            5307: -61,-21
-            5308: -62,-21
-            5309: -62,-20
-            5310: -61,-20
-            5311: -61,-20
-            5312: 13,35
-            5949: 52,20
-            5950: 51,21
-            5951: 53,20
-            5952: 53,21
-            6232: 49,-7
-            6233: 48,-6
-            6234: 48,-4
-            6235: 49,-4
-            6236: 52,-7
-            6237: 52,-5
-            6238: 51,-6
-            6239: 52,-2
-            6240: 52,-3
-            6241: 48,-1
-            6242: 48,-2
-            6262: 49,-12
-            6263: 49,-14
-            6264: 49,-15
-            6265: 49,-13
-            6266: 52,-14
-            6267: 52,-13
-            6268: 52,-12
-            6269: 52,-15
-            6270: 52,-15
-            6271: 52,-10
-            6272: 51,1
-            6273: 51,3
-            6274: 51,4
-            6275: 51,8
-            6276: 51,9
-            6277: 51,11
-            6278: 51,13
-            6279: 49,13
-            6280: 49,11
-            6281: 49,9
-            6282: 49,7
-            6283: 49,5
-            6284: 49,3
-            6285: 49,1
-            6298: 42,9
-            6299: 43,9
-            6300: 42,7
-            6301: 43,7
-            6302: 45,7
-            6303: 45,9
-            6304: 46,7
-            6305: 40,4
-            6306: 42,4
-            6307: 43,4
-            6308: 43,2
-            6309: 43,1
-            6310: 43,-2
-            6311: 43,-4
-            6312: 43,-7
-            6313: 43,-6
-            6314: 43,-10
-            6315: 43,-11
-            6316: 45,5
-            6317: 42,5
-            6318: 41,5
-            6397: 90,-18
-            6398: 89,-18
-            6478: 51,-39
-            6479: 52,-39
-            6480: 54,-39
-            6481: 52,-37
-            6491: 51,-30
-            6492: 52,-29
-            6514: -33,-12
-            6515: -33,-10
-            6531: -36,-45
-            6532: -35,-44
-            6533: -35,-46
-            6623: 14,39
-            6624: 13,40
-            6625: 15,42
-            6626: 15,41
-            6627: 16,39
-            6687: 8,-47
-            6845: -34,14
-            6846: -33,15
-            6847: -30,15
-            6848: -31,16
-            6849: -30,17
-            6850: -29,14
-            6851: -29,12
-            6852: -32,12
-            6853: -35,14
-            6854: -37,14
-            6855: -38,13
-            6947: 43,13
-            6948: 42,11
-            7015: 59,-8
-            7016: 57,-5
-            7017: 61,-4
-            7025: -14,-38
-            7026: -13,-37
-            7036: -12,-37
-            7037: -12,-37
-            7038: -11,-40
+            2842: -8,-40
+            2843: -7,-39
+            2844: -5,-40
+            2845: -6,-42
+            2846: -4,-39
+            2847: -6,-40
+            2848: -6,-40
+            2849: -7,-40
+            2850: -7,-39
+            2851: -7,-39
+            2852: -8,-39
+            3507: -60,-66
+            3508: -59,-65
+            3509: -59,-63
+            3510: -59,-61
+            3511: -59,-59
+            3512: -59,-57
+            3513: -60,-57
+            3514: -57,-57
+            3515: -58,-58
+            3516: -56,-57
+            3517: -56,-58
+            3518: -56,-60
+            3519: -56,-62
+            3520: -56,-64
+            3521: -56,-66
+            3522: -58,-66
+            3523: -55,-56
+            3524: -54,-54
+            3525: -54,-52
+            3526: -54,-50
+            3527: -56,-53
+            3528: -56,-52
+            3529: -56,-47
+            3530: -53,-48
+            3531: -52,-46
+            3532: -54,-46
+            3533: -51,-46
+            3534: -50,-48
+            3535: -47,-48
+            3536: -45,-48
+            3537: -43,-46
+            3538: -45,-46
+            3539: -43,-48
+            3540: -42,-48
+            3541: -40,-48
+            3542: -40,-50
+            3543: -40,-52
+            3544: -40,-54
+            3545: -42,-51
+            3546: -42,-53
+            3547: -42,-54
+            3548: -41,-56
+            3549: -39,-57
+            3550: -40,-58
+            3551: -37,-57
+            3552: -37,-58
+            3553: -37,-61
+            3554: -37,-64
+            3555: -37,-65
+            3556: -36,-65
+            3557: -36,-66
+            3558: -39,-66
+            3559: -40,-65
+            3560: -40,-63
+            3561: -40,-60
+            3562: -47,-44
+            3563: -47,-42
+            3564: -47,-39
+            3565: -47,-35
+            3566: -47,-33
+            3567: -49,-33
+            3568: -49,-37
+            3569: -49,-39
+            3570: -49,-41
+            3571: -49,-44
+            3572: -49,-44
+            3573: -49,-43
+            3574: -44,-32
+            3575: -44,-30
+            3576: -43,-31
+            3577: -43,-27
+            3578: -44,-26
+            3579: -43,-26
+            3580: -44,-25
+            3581: -52,-32
+            3582: -52,-30
+            3583: -52,-29
+            3584: -52,-25
+            3585: -52,-22
+            3586: -54,-22
+            3587: -55,-22
+            3588: -52,-20
+            3589: -50,-20
+            3590: -47,-20
+            3591: -46,-20
+            3592: -45,-20
+            3593: -44,-20
+            3594: -44,-22
+            3595: -51,-18
+            3596: -51,-17
+            3597: -49,-17
+            3598: -48,-15
+            3599: -48,-13
+            3600: -50,-13
+            3601: -51,-14
+            3602: -51,-15
+            3603: -44,-15
+            3604: -46,-15
+            3605: -46,-14
+            3606: -54,-24
+            3607: -56,-24
+            3608: -54,-30
+            3609: -56,-29
+            3610: -57,-28
+            3611: -54,-28
+            3612: -61,-29
+            3613: -59,-29
+            3614: -59,-27
+            3615: -59,-25
+            3616: -61,-25
+            3617: -55,-17
+            3618: -55,-15
+            3619: -55,-13
+            3620: -55,-10
+            3621: -53,-17
+            3622: -53,-14
+            3623: -53,-12
+            3624: -53,-11
+            3625: -53,-9
+            3626: -53,-7
+            3627: -53,-6
+            3628: -53,-4
+            3629: -55,-3
+            3630: -55,-7
+            3631: -55,-8
+            3632: -53,0
+            3633: -53,-2
+            3634: -51,-4
+            3635: -49,-4
+            3636: -50,-5
+            3637: -48,-5
+            3646: -53,2
+            3647: -53,4
+            3648: -53,6
+            3649: -53,7
+            3650: -55,7
+            3651: -55,5
+            3652: -55,-1
+            3653: -51,6
+            3654: -50,7
+            3655: -47,7
+            3656: -48,6
+            3657: -46,6
+            3658: -45,7
+            3659: -47,9
+            3660: -45,9
+            3661: -44,9
+            3662: -50,9
+            3663: -50,9
+            3664: -51,11
+            3665: -51,13
+            3666: -50,13
+            3667: -48,13
+            3668: -46,13
+            3669: -48,12
+            3670: -43,11
+            3671: -44,12
+            3672: -43,13
+            3673: -43,12
+            3674: -54,10
+            3675: -53,9
+            3676: -54,9
+            3699: -40,2
+            3700: -39,1
+            3701: -39,1
+            3702: -40,-1
+            3703: -38,-1
+            3704: -40,-2
+            3705: -39,-2
+            3706: -40,-4
+            3707: -39,-5
+            3708: -38,-5
+            3709: -37,-5
+            3710: -36,-5
+            3711: -38,-4
+            3712: -36,-3
+            3713: -36,-2
+            3714: -36,-4
+            3715: -34,-3
+            3716: -32,-4
+            3717: -34,-1
+            3718: -32,0
+            3719: -35,0
+            3720: -39,3
+            3721: -40,4
+            3722: -38,4
+            3723: -31,2
+            3724: -31,-1
+            3725: -29,0
+            3726: -32,-2
+            3727: -31,-3
+            3728: -33,-4
+            3729: -32,-5
+            3730: -31,-4
+            3731: -30,-3
+            3732: -28,-3
+            3733: -28,-4
+            3734: -26,-5
+            3735: -27,-2
+            3736: -27,-3
+            3737: -29,0
+            3738: -27,0
+            3739: -27,2
+            3740: -28,3
+            3741: -27,3
+            3742: -27,1
+            3743: -26,-1
+            3744: -32,-1
+            3745: -28,4
+            3746: -26,5
+            3747: -26,6
+            3748: -26,3
+            3749: -26,3
+            3750: -24,2
+            3751: -23,1
+            3752: -25,0
+            3753: -23,-2
+            3754: -25,-3
+            3755: -23,-3
+            3756: -25,-4
+            3757: -23,-5
+            3758: -25,-5
+            3759: -24,-1
+            3760: -25,-1
+            3761: -23,3
+            3762: -15,-1
+            3763: -16,-1
+            3764: -15,0
+            3765: -16,1
+            3766: -16,3
+            3767: -15,3
+            3768: -15,2
+            3769: -15,1
+            3770: -15,1
+            3771: -27,6
+            3772: -27,7
+            3773: -27,9
+            3774: -20,5
+            3775: -21,5
+            3780: -17,5
+            3781: -16,5
+            3782: -16,5
+            3783: -22,11
+            3784: -21,11
+            3785: -22,13
+            3786: -20,14
+            3787: -22,13
+            3788: -22,15
+            3789: -20,14
+            3790: -20,13
+            3791: -20,12
+            3792: -19,11
+            3793: -22,14
+            3794: -23,14
+            3795: -17,11
+            3796: -17,11
+            3797: -17,12
+            3798: -16,11
+            3799: -16,12
+            3800: -17,13
+            3801: -16,14
+            3802: -17,14
+            3803: -16,12
+            3804: -17,12
+            3805: -17,11
+            3808: -39,11
+            3809: -27,11
+            3810: -27,13
+            3811: -27,16
+            3812: -27,17
+            3813: -27,19
+            3814: -27,20
+            3815: -27,21
+            3816: -25,18
+            3817: -25,16
+            3818: -25,14
+            3819: -25,12
+            3820: -25,11
+            3821: -24,18
+            3822: -22,18
+            3823: -23,17
+            3824: -21,17
+            3825: -20,18
+            3826: -19,17
+            3827: -20,20
+            3828: -22,20
+            3829: -24,20
+            3830: -20,21
+            3831: -17,19
+            3832: -16,19
+            3833: -14,19
+            3834: -17,21
+            3835: -15,21
+            3836: -13,21
+            3837: -11,21
+            3838: -13,19
+            3839: -10,19
+            3840: -8,19
+            3841: -6,19
+            3842: -9,21
+            3843: -7,21
+            3844: -5,21
+            3845: -3,21
+            3846: 0,21
+            3847: -5,19
+            3848: -2,19
+            3849: 0,19
+            3850: 0,21
+            3851: 2,21
+            3852: 5,21
+            3853: 6,21
+            3854: 2,19
+            3855: 4,19
+            3856: 7,19
+            3857: 10,19
+            3858: 8,21
+            3859: 10,21
+            3860: 11,21
+            3861: 13,21
+            3862: 12,19
+            3863: 14,19
+            3864: 15,19
+            3865: 17,19
+            3866: 15,23
+            3867: 14,23
+            3868: 13,24
+            3869: 15,25
+            3870: 15,24
+            3871: 11,23
+            3872: 10,23
+            3873: 11,24
+            3874: 17,23
+            3875: 17,25
+            3876: 17,25
+            3877: 16,23
+            3878: 18,19
+            3879: 19,19
+            3880: 19,21
+            3881: 17,21
+            3882: 16,21
+            3883: 21,20
+            3884: 21,18
+            3885: 21,17
+            3886: 19,18
+            3887: 19,15
+            3888: 19,12
+            3889: 19,11
+            3890: 21,16
+            3891: 21,13
+            3892: 21,12
+            3893: 21,10
+            3894: 21,8
+            3895: 21,7
+            3896: 19,9
+            3897: 19,7
+            3898: 19,6
+            3899: 23,10
+            3900: 24,10
+            3901: 26,10
+            3902: 27,10
+            3903: 28,7
+            3904: 27,8
+            3905: 27,6
+            3906: 28,6
+            3907: 30,6
+            3908: 30,8
+            3909: 30,9
+            3910: 30,10
+            3911: 33,10
+            3912: 34,10
+            3913: 31,12
+            3914: 31,13
+            3915: 30,14
+            3916: 31,17
+            3917: 30,17
+            3918: 31,19
+            3919: 31,20
+            3920: 31,22
+            3921: 30,22
+            3922: 28,22
+            3923: 29,23
+            3924: 26,22
+            3925: 24,22
+            3926: 23,22
+            3927: 23,23
+            3928: 23,20
+            3929: 23,18
+            3930: 25,18
+            3931: 25,17
+            3932: 26,18
+            3933: 27,17
+            3934: 26,19
+            3935: 27,20
+            3936: 29,18
+            3937: 27,18
+            3938: 30,17
+            3939: 33,22
+            3940: 35,22
+            3941: 33,19
+            3942: 33,18
+            3943: 35,18
+            3944: 36,17
+            3945: 34,17
+            3946: 35,17
+            3947: 33,13
+            3948: 33,15
+            3949: 33,15
+            3950: 32,13
+            3951: 26,7
+            3952: 23,2
+            3953: 26,2
+            3954: 20,2
+            3955: 21,2
+            3956: 19,4
+            3962: 31,2
+            3963: 33,2
+            3964: 33,4
+            3965: 32,4
+            3966: 35,4
+            3967: 37,4
+            3968: 37,2
+            3969: 40,2
+            3970: 41,2
+            3971: 41,1
+            3972: 38,2
+            3973: 39,-4
+            3974: 37,-4
+            3975: 39,-5
+            3976: 33,-1
+            3977: 31,-1
+            3978: 31,0
+            3979: 33,0
+            3980: 32,1
+            3981: 38,7
+            3982: 54,14
+            3983: 58,14
+            3984: 59,14
+            3985: 60,14
+            3986: 58,16
+            3987: 55,10
+            3988: 55,12
+            3989: 54,12
+            3990: 54,6
+            3991: 59,3
+            3992: 60,4
+            3993: 59,0
+            3994: 55,-5
+            3995: 56,-4
+            3996: 41,-1
+            3997: 41,-3
+            3998: 41,-5
+            3999: 41,-7
+            4000: 41,-10
+            4001: 41,-11
+            4002: 43,-12
+            4003: 43,-14
+            4004: 43,-16
+            4005: 43,-17
+            4006: 41,-15
+            4007: 41,-16
+            4008: 41,-17
+            4009: 41,-19
+            4010: 40,-19
+            4011: 40,-21
+            4012: 42,-21
+            4013: 43,-21
+            4014: 45,-21
+            4019: 45,-19
+            4020: 47,-19
+            4021: 48,-19
+            4022: 51,-19
+            4023: 47,-21
+            4024: 49,-21
+            4025: 47,-22
+            4026: 51,-21
+            4027: 59,-21
+            4028: 60,-21
+            4029: 61,-20
+            4030: 59,-19
+            4031: 61,-19
+            4032: 60,-17
+            4033: 60,-17
+            4034: 58,-18
+            4035: 58,-19
+            4036: 56,-19
+            4037: 55,-19
+            4038: 53,-19
+            4039: 60,-15
+            4040: 58,-15
+            4041: 59,-14
+            4042: 57,-13
+            4043: 57,-12
+            4044: 60,-13
+            4045: 60,-12
+            4046: 60,-14
+            4047: 61,-13
+            4048: 63,-13
+            4049: 64,-12
+            4050: 65,-14
+            4051: 63,-14
+            4052: 63,-16
+            4053: 65,-16
+            4054: 65,-18
+            4055: 65,-20
+            4056: 63,-18
+            4057: 63,-20
+            4058: 63,-21
+            4059: 65,-21
+            4060: 62,-23
+            4061: 61,-24
+            4062: 64,-24
+            4063: 63,-25
+            4064: 64,-26
+            4065: 65,-27
+            4066: 66,-26
+            4067: 65,-24
+            4068: 65,-23
+            4069: 65,-23
+            4073: 68,-21
+            4074: 69,-21
+            4075: 69,-23
+            4076: 69,-24
+            4078: 69,-27
+            4079: 70,-26
+            4080: 70,-26
+            4081: 71,-27
+            4082: 71,-28
+            4083: 70,-28
+            4084: 68,-28
+            4085: 69,-29
+            4086: 70,-30
+            4087: 69,-30
+            4088: 70,-29
+            4089: 70,-29
+            4090: 70,-29
+            4091: 71,-30
+            4092: 71,-17
+            4093: 68,-17
+            4094: 67,-19
+            4095: 70,-17
+            4096: 70,-19
+            4097: 71,-18
+            4098: 68,-18
+            4099: 69,-19
+            4119: 69,-9
+            4120: 68,-9
+            4121: 67,-9
+            4122: 70,-10
+            4123: 77,-18
+            4124: 75,-18
+            4125: 76,-19
+            4126: 77,-18
+            4127: 76,-17
+            4128: 76,-15
+            4129: 75,-15
+            4130: 76,-13
+            4131: 77,-14
+            4132: 74,-14
+            4133: 74,-16
+            4134: 73,-14
+            4135: 74,-17
+            4136: 74,-18
+            4137: 72,-17
+            4138: 73,-19
+            4139: 73,-17
+            4140: 74,-16
+            4141: 73,-15
+            4142: 74,-16
+            4143: 74,-15
+            4144: 76,-18
+            4145: 79,-14
+            4146: 80,-13
+            4147: 81,-14
+            4148: 79,-14
+            4149: 80,-15
+            4150: 81,-13
+            4151: 80,-19
+            4152: 79,-18
+            4153: 80,-18
+            4154: 80,-19
+            4155: 79,-19
+            4156: 80,-19
+            4157: 81,-19
+            4158: 80,-17
+            4159: 80,-18
+            4160: 79,-19
+            4161: 50,-13
+            4162: 51,-14
+            4163: 50,-13
+            4164: 51,-13
+            4165: 50,-14
+            4166: 50,-14
+            4167: 48,-13
+            4168: 48,-14
+            4169: 48,-13
+            4170: 53,-13
+            4171: 53,-14
+            4172: 53,-12
+            4173: 53,-14
+            4174: 53,-13
+            4175: 53,-14
+            4176: 50,-15
+            4177: 51,-15
+            4178: 50,-14
+            4179: 51,-13
+            4180: 50,-12
+            4181: 50,-12
+            4182: 48,-12
+            4183: 50,-12
+            4184: 51,-13
+            4185: 47,-24
+            4186: 49,-25
+            4187: 48,-26
+            4188: 47,-25
+            4189: 49,-25
+            4190: 48,-23
+            4191: 47,-28
+            4192: 49,-29
+            4193: 47,-30
+            4194: 48,-32
+            4195: 49,-31
+            4196: 48,-33
+            4197: 47,-33
+            4198: 49,-33
+            4199: 48,-34
+            4200: 47,-34
+            4201: 43,-36
+            4202: 40,-36
+            4203: 37,-35
+            4204: 36,-35
+            4205: 37,-36
+            4206: 40,-36
+            4207: 43,-35
+            4208: 43,-35
+            4209: 41,-35
+            4210: 43,-35
+            4211: 43,-34
+            4237: 33,-34
+            4238: 31,-34
+            4239: 33,-32
+            4240: 32,-32
+            4241: 32,-31
+            4242: 32,-30
+            4243: 33,-28
+            4244: 31,-29
+            4245: 33,-31
+            4246: 33,-31
+            4247: 35,-30
+            4248: 36,-30
+            4249: 36,-29
+            4250: 33,-25
+            4251: 31,-25
+            4252: 33,-25
+            4253: 31,-25
+            4254: 33,-25
+            4255: 32,-26
+            4256: 31,-25
+            4257: 32,-24
+            4258: 32,-25
+            4259: 31,-24
+            4260: 40,-25
+            4261: 39,-24
+            4262: 40,-26
+            4263: 42,-25
+            4264: 42,-25
+            4265: 44,-24
+            4266: 42,-25
+            4267: 44,-25
+            4268: 45,-25
+            4269: 42,-26
+            4270: 43,-25
+            4271: 43,-25
+            4272: 41,-25
+            4273: 40,-25
+            4274: 40,-25
+            4275: 40,-24
+            4276: 35,-23
+            4277: 37,-23
+            4278: 36,-23
+            4279: 35,-23
+            4280: 38,-21
+            4281: 35,-21
+            4282: 33,-21
+            4283: 33,-22
+            4284: 32,-22
+            4285: 32,-21
+            4286: 37,-19
+            4287: 34,-19
+            4288: 32,-19
+            4289: 31,-19
+            4290: 28,-19
+            4291: 27,-19
+            4292: 27,-20
+            4293: 27,-21
+            4294: 30,-21
+            4295: 29,-21
+            4296: 29,-23
+            4297: 29,-24
+            4298: 29,-25
+            4299: 29,-26
+            4300: 27,-22
+            4301: 27,-24
+            4302: 27,-25
+            4303: 26,-25
+            4304: 25,-25
+            4305: 29,-27
+            4306: 27,-27
+            4307: 25,-27
+            4308: 24,-27
+            4309: 21,-27
+            4310: 21,-25
+            4311: 20,-25
+            4312: 19,-25
+            4313: 19,-26
+            4314: 19,-28
+            4315: 19,-28
+            4316: 19,-30
+            4317: 19,-31
+            4318: 19,-32
+            4319: 21,-30
+            4320: 21,-33
+            4321: 21,-34
+            4322: 21,-34
+            4323: 19,-34
+            4324: 20,-36
+            4325: 20,-37
+            4326: 19,-37
+            4327: 20,-39
+            4328: 21,-38
+            4329: 22,-39
+            4330: 21,-37
+            4331: 24,-37
+            4332: 23,-38
+            4333: 25,-37
+            4334: 25,-38
+            4335: 24,-38
+            4336: 25,-38
+            4337: 17,-34
+            4338: 17,-35
+            4339: 16,-34
+            4340: 14,-34
+            4341: 17,-32
+            4342: 15,-32
+            4343: 13,-32
+            4344: 11,-32
+            4345: 10,-32
+            4346: 12,-34
+            4347: 9,-34
+            4348: 8,-34
+            4349: 7,-34
+            4350: 7,-32
+            4351: 7,-32
+            4352: 6,-32
+            4353: 9,-30
+            4354: 8,-29
+            4355: 7,-29
+            4356: 7,-29
+            4357: 6,-28
+            4358: 8,-27
+            4359: 9,-27
+            4360: 7,-28
+            4361: 6,-27
+            4362: 5,-29
+            4363: 7,-30
+            4364: 9,-30
+            4365: 3,-30
+            4366: 1,-30
+            4367: 3,-32
+            4368: 2,-32
+            4369: 2,-33
+            4370: 0,-33
+            4371: -1,-33
+            4372: -1,-32
+            4373: 0,-30
+            4374: -3,-30
+            4375: -4,-30
+            4376: -6,-30
+            4377: -7,-30
+            4378: -9,-30
+            4379: -6,-32
+            4380: -5,-32
+            4381: -3,-32
+            4382: -8,-32
+            4383: -8,-33
+            4384: -9,-32
+            4385: -10,-32
+            4386: -11,-32
+            4387: -13,-32
+            4388: -10,-30
+            4389: -11,-30
+            4390: -13,-30
+            4391: -15,-30
+            4392: -16,-30
+            4393: -12,-29
+            4394: -12,-30
+            4395: -16,-32
+            4396: -17,-33
+            4397: -17,-32
+            4398: -19,-32
+            4399: -18,-30
+            4400: -20,-30
+            4401: -22,-30
+            4402: -23,-30
+            4403: -23,-29
+            4404: -22,-32
+            4405: -24,-32
+            4406: -24,-32
+            4407: -26,-30
+            4408: -26,-29
+            4409: -26,-27
+            4410: -26,-25
+            4411: -24,-27
+            4412: -24,-26
+            4413: -24,-25
+            4414: -24,-24
+            4415: -26,-23
+            4416: -26,-22
+            4417: -26,-20
+            4418: -24,-21
+            4419: -24,-19
+            4420: -24,-18
+            4421: -24,-16
+            4422: -26,-17
+            4423: -26,-16
+            4424: -26,-14
+            4425: -26,-13
+            4426: -26,-12
+            4427: -26,-10
+            4428: -26,-9
+            4429: -25,-9
+            4430: -24,-11
+            4431: -23,-11
+            4432: -23,-10
+            4433: -23,-9
+            4434: -24,-5
+            4435: -24,-4
+            4436: -24,-2
+            4437: -19,-11
+            4438: -19,-10
+            4439: -20,-10
+            4440: -20,-9
+            4441: -19,-9
+            4442: -30,-21
+            4443: -30,-19
+            4444: -29,-19
+            4445: -30,-18
+            4446: -32,-21
+            4447: -32,-19
+            4448: -33,-18
+            4449: -36,-15
+            4450: -36,-14
+            4451: -33,-14
+            4452: -33,-14
+            4453: -33,-15
+            4454: -30,-14
+            4455: -36,-10
+            4456: -37,-9
+            4457: -37,-10
+            4458: -29,-10
+            4459: -30,-11
+            4460: -30,-9
+            4461: -28,-10
+            4462: -40,-11
+            4463: -41,-10
+            4464: -41,-9
+            4465: -40,-9
+            4466: -41,-10
+            4467: -41,-10
+            4468: -49,-18
+            4469: -38,-33
+            4470: -36,-33
+            4471: -33,-33
+            4472: -32,-33
+            4473: -31,-33
+            4474: -31,-31
+            4475: -31,-29
+            4476: -31,-28
+            4477: -31,-26
+            4478: -33,-26
+            4479: -35,-26
+            4480: -36,-26
+            4481: -37,-26
+            4482: -38,-26
+            4483: -38,-27
+            4484: -38,-29
+            4485: -38,-30
+            4486: -38,-31
+            4487: -38,-29
+            4488: -38,-26
+            4489: -40,-26
+            4490: -40,-25
+            4491: -41,-25
+            4492: -41,-26
+            4493: -41,-28
+            4494: -41,-29
+            4495: -41,-30
+            4496: -41,-32
+            4497: -41,-33
+            4498: -41,-34
+            4499: -39,-33
+            4500: -40,-34
+            4501: -35,-34
+            4502: -34,-34
+            4503: -32,-34
+            4504: -31,-34
+            4505: -30,-34
+            4506: -30,-33
+            4507: -28,-34
+            4508: -28,-32
+            4509: -28,-31
+            4510: -28,-29
+            4511: -28,-27
+            4512: -28,-26
+            4513: -29,-25
+            4514: -30,-25
+            4515: -30,-26
+            4516: -32,-25
+            4517: -33,-26
+            4518: -35,-25
+            4519: -32,6
+            4520: -32,7
+            4521: -32,6
+            4522: -36,6
+            4523: -36,5
+            4524: -36,7
+            4525: -34,6
+            4526: -34,5
+            4527: -35,6
+            4528: -33,6
+            4529: -35,-4
+            4530: -35,-2
+            4531: -36,-5
+            4532: -35,-2
+            4533: -34,-2
+            4534: -35,-1
+            4546: -25,28
+            4547: -26,28
+            4548: -18,32
+            4549: -17,31
+            4550: -17,33
+            4551: -18,32
+            4552: -15,34
+            4553: -15,32
+            4554: -15,31
+            4555: -13,31
+            4556: -12,31
+            4557: -15,34
+            4558: -15,34
+            4559: -12,39
+            4560: -13,40
+            4561: -14,40
+            4562: -15,40
+            4563: -16,40
+            4564: -16,40
+            4565: -13,40
+            4566: -12,40
+            4567: -12,38
+            4568: -12,40
+            4574: -5,40
+            4575: -6,40
+            4576: -6,42
+            4577: -6,43
+            4578: -5,42
+            4579: -6,43
+            4580: -6,45
+            4581: -6,46
+            4582: -6,47
+            4583: -5,46
+            4584: -4,48
+            4585: -5,46
+            4586: -2,48
+            4587: -4,46
+            4588: -1,47
+            4589: -3,45
+            4590: 0,46
+            4591: -3,47
+            4592: -1,45
+            4593: -3,46
+            4594: 1,45
+            4595: 1,47
+            4596: 0,46
+            4597: 1,48
+            4598: 2,48
+            4599: 3,47
+            4600: 2,45
+            4601: 2,44
+            4602: 2,43
+            4603: 2,42
+            4604: 1,42
+            4605: 3,42
+            4606: -2,43
+            4607: -1,41
+            4608: -3,40
+            4609: -3,40
+            4610: 1,51
+            4611: -2,50
+            4612: -3,50
+            4613: -2,51
+            4614: 0,51
+            4615: -1,52
+            4616: -2,51
+            4617: -2,53
+            4618: 1,53
+            4619: 2,51
+            4620: 2,50
+            4621: 0,50
+            4622: -4,45
+            4623: -4,47
+            4650: 6,42
+            4651: 5,41
+            4652: 5,39
+            4653: 7,39
+            4654: 8,39
+            4655: 9,41
+            4656: 9,40
+            4657: 8,42
+            4658: 8,41
+            4659: 15,37
+            4660: 14,37
+            4661: 14,35
+            4662: 14,34
+            4663: 13,35
+            4664: 13,36
+            4665: 15,34
+            4666: 16,35
+            4667: 15,36
+            4668: 15,34
+            4669: 15,35
+            4670: 15,37
+            4671: 14,37
+            4672: 15,30
+            4673: 14,29
+            4674: 14,29
+            4675: 15,28
+            4676: 14,29
+            4677: 14,32
+            4678: 13,32
+            4679: 15,24
+            4703: 2,24
+            4704: 1,24
+            4705: 1,24
+            4706: 2,23
+            4707: 4,23
+            4708: 4,24
+            4709: 3,26
+            4710: 4,28
+            4711: 2,27
+            4712: 2,27
+            4713: 3,27
+            4714: -2,25
+            4715: -3,25
+            4716: -3,23
+            4717: -2,24
+            4718: -4,23
+            4719: -4,25
+            4755: -14,28
+            4756: -15,28
+            4757: -14,29
+            4758: -13,26
+            4759: -10,26
+            4760: -9,27
+            4761: -10,28
+            4762: -7,28
+            4763: -8,26
+            4764: -5,28
+            4765: -7,24
+            4766: -8,24
+            4767: -7,23
+            4768: -6,24
+            4769: -6,23
+            4770: -7,23
+            4771: -8,23
+            4772: -8,23
+            4773: -12,23
+            4774: -11,24
+            4775: -10,23
+            4776: -10,24
+            4777: -10,24
+            4778: -12,24
+            4779: -12,24
+            4780: -14,24
+            4781: -14,23
+            4782: -16,24
+            4783: -14,24
+            4784: -15,23
+            4785: -16,24
+            4786: -14,25
+            4787: -10,25
+            4788: -7,25
+            4789: -1,28
+            4790: -3,27
+            4791: -1,30
+            4792: -1,33
+            4793: -1,34
+            4794: -1,37
+            4795: -3,37
+            4796: -3,38
+            4797: -1,37
+            4798: -2,37
+            4799: -1,40
+            4800: -3,41
+            4801: -3,43
+            4802: -2,43
+            4803: -20,25
+            4804: -21,25
+            4805: -19,25
+            4806: -21,25
+            4807: -22,17
+            4808: -23,17
+            4809: -22,5
+            4810: -22,5
+            4811: -22,5
+            4812: -19,-28
+            4813: -16,-28
+            4814: -16,-27
+            4815: -15,-28
+            4816: -16,-26
+            4817: -15,-27
+            4818: -15,-28
+            4819: -15,-26
+            4820: -15,-26
+            4821: -14,-26
+            4832: -25,-34
+            4833: -23,-34
+            4834: -22,-34
+            4835: -21,-34
+            4836: -20,-34
+            4837: -20,-37
+            4838: -20,-36
+            4839: -19,-38
+            4840: -19,-36
+            4841: -22,-37
+            4842: -23,-37
+            4843: -23,-38
+            4844: -23,-36
+            4845: -24,-37
+            4846: -26,-37
+            4847: -26,-36
+            4848: -26,-37
+            4849: -28,-40
+            4850: -27,-40
+            4851: -25,-40
+            4852: -24,-40
+            4853: -23,-40
+            4854: -21,-40
+            4855: -19,-40
+            4856: -21,-40
+            4857: -24,-40
+            4858: -26,-40
+            4859: -32,-40
+            4860: -31,-40
+            4861: -33,-39
+            4862: -33,-40
+            4863: -32,-39
+            4864: -31,-39
+            4865: -34,-39
+            4866: -33,-40
+            4867: -39,-38
+            4868: -38,-38
+            4869: -38,-53
+            4870: -38,-54
+            4871: -37,-53
+            4872: -37,-54
+            4873: -5,-41
+            4874: -5,-40
+            4875: -6,-42
+            4876: -5,-36
+            4877: -6,-36
+            4878: -4,-35
+            4879: -4,-36
+            4880: 0,-36
+            4881: -2,-36
+            4882: 1,-35
+            4883: 1,-37
+            4884: 1,-38
+            4885: 2,-37
+            4886: 2,-38
+            4887: 0,-37
+            4888: 3,-37
+            4889: -1,-36
+            4893: -6,-28
+            4894: -6,-27
+            4895: -5,-27
+            4896: -6,-26
+            4897: -2,-27
+            4898: -3,-26
+            4899: -2,-28
+            4900: -1,-27
+            4901: 0,-27
+            4902: 0,-27
+            4903: -2,-27
+            4904: -2,-27
+            4905: 0,-24
+            4906: -2,-24
+            4907: -2,-23
+            4908: 0,-22
+            4909: 1,-22
+            4910: 1,-21
+            4911: -4,-19
+            4912: -5,-19
+            4913: -7,-19
+            4914: -9,-19
+            4915: -6,-19
+            4916: -7,-17
+            4917: -8,-17
+            4918: -9,-16
+            4919: -9,-16
+            4920: -5,-16
+            4921: -4,-14
+            4922: -5,-15
+            4923: -8,-16
+            4924: -8,-15
+            4925: -14,-14
+            4926: -12,-14
+            4927: -12,-16
+            4928: -13,-18
+            4929: -14,-16
+            4930: -13,-16
+            4931: -13,-19
+            4932: -14,-19
+            4933: -2,-17
+            4934: -2,-15
+            4935: -2,-13
+            4936: -2,-12
+            4937: -1,-15
+            4938: -1,-16
+            4939: -1,-17
+            4940: 1,-17
+            4941: -1,-18
+            4942: 2,-18
+            4943: 2,-16
+            4944: 2,-15
+            4945: 2,-13
+            4946: 1,-12
+            4947: 1,-14
+            4948: -1,-13
+            4949: 0,-14
+            4950: 2,-16
+            4951: -4,-14
+            4952: -7,-24
+            4953: -7,-22
+            4954: -8,-23
+            4955: -10,-23
+            4956: -9,-23
+            4957: -1,-24
+            4958: 8,-23
+            4959: 8,-22
+            4960: 10,-22
+            4961: 9,-23
+            4962: 8,-25
+            4963: 8,-21
+            4964: 8,-19
+            4965: 8,-18
+            4966: 6,-18
+            4967: 5,-18
+            4968: 0,-27
+            4969: 2,-27
+            4970: 10,-23
+            4971: 13,-23
+            4972: 12,-23
+            4973: 13,-21
+            4974: 14,-22
+            4975: 13,-18
+            4976: 14,-18
+            4977: 14,-17
+            4978: 12,-18
+            4979: 11,-18
+            4980: 11,-16
+            4981: 13,-17
+            4982: 11,-30
+            4983: 11,-28
+            4984: 11,-27
+            4985: 11,-26
+            4986: 17,-26
+            4987: 17,-28
+            4988: 17,-28
+            4989: 17,-30
+            4990: 17,-30
+            4991: 18,-23
+            4992: 20,-22
+            4993: 21,-23
+            4994: 19,-22
+            4995: 21,-22
+            4996: 20,-21
+            4997: 24,-22
+            4998: 23,-23
+            4999: 23,-21
+            5000: 23,-23
+            5001: 17,-16
+            5002: 19,-14
+            5003: 18,-13
+            5004: 20,-13
+            5005: 19,-12
+            5006: 22,-11
+            5007: 22,-13
+            5008: 20,-11
+            5009: 24,-13
+            5010: 26,-11
+            5011: 21,-11
+            5012: 20,-11
+            5013: 25,-13
+            5014: 22,-13
+            5015: 23,-12
+            5016: 26,-12
+            5017: 19,-12
+            5018: 23,-13
+            5019: 23,-11
+            5020: 19,-10
+            5021: 26,-11
+            5022: 28,-12
+            5023: 25,-12
+            5024: 23,-16
+            5025: 23,-16
+            5026: 13,-19
+            5027: 23,-34
+            5028: 23,-31
+            5029: 23,-30
+            5030: 23,-29
+            5031: 23,-32
+            5032: 29,-34
+            5033: 29,-33
+            5034: 29,-32
+            5035: 29,-30
+            5036: 29,-29
+            5037: 32,-34
+            5038: 32,-31
+            5039: 32,-30
+            5040: 36,-30
+            5041: 35,-29
+            5042: 33,-26
+            5043: 36,-21
+            5044: 38,-16
+            5045: 37,-15
+            5046: 39,-16
+            5047: 38,-17
+            5048: 38,-15
+            5049: 37,-15
+            5050: 62,-31
+            5051: 62,-33
+            5052: 61,-31
+            5053: 63,-33
+            5054: 63,-33
+            5055: 63,-32
+            5056: 62,-32
+            5057: 62,-32
+            5058: 64,8
+            5059: 63,9
+            5060: 65,9
+            5061: 64,8
+            5062: 64,9
+            5063: 64,10
+            5064: 67,6
+            5065: 68,4
+            5066: 68,6
+            5067: 67,5
+            5068: 68,0
+            5069: 68,1
+            5070: 68,2
+            5071: 67,0
+            5072: 68,-2
+            5073: 67,-3
+            5074: 68,-4
+            5075: 68,-3
+            5076: 68,-3
+            5077: 76,-6
+            5083: 54,-30
+            5084: 52,-31
+            5085: 51,-31
+            5086: 52,-33
+            5087: 52,-34
+            5088: 51,-33
+            5089: 51,-32
+            5090: 52,-35
+            5091: 51,-33
+            5092: 51,-31
+            5093: 52,-35
+            5094: 52,-35
+            5095: 55,-35
+            5096: 54,-34
+            5097: 56,-33
+            5098: 57,-33
+            5099: 55,-34
+            5100: 55,-36
+            5101: 54,-35
+            5102: 55,-34
+            5103: 54,-35
+            5104: 55,-35
+            5105: 55,-34
+            5106: 40,-31
+            5107: 40,-30
+            5108: 40,-30
+            5109: 41,-31
+            5110: 41,-29
+            5111: 42,-29
+            5112: 43,-29
+            5113: 44,-29
+            5114: 44,-31
+            5115: 43,-30
+            5116: 33,-29
+            5117: 15,-39
+            5118: 14,-39
+            5119: 14,-39
+            5120: 9,-40
+            5121: 9,-39
+            5122: 9,-41
+            5123: 8,-40
+            5124: 19,-45
+            5125: 17,-45
+            5126: 16,-44
+            5127: 16,-45
+            5128: 16,-43
+            5129: 19,-45
+            5130: 20,-44
+            5131: 20,-45
+            5132: 18,-44
+            5133: 21,-45
+            5134: 21,-43
+            5135: 15,-48
+            5136: 14,-48
+            5137: 12,-47
+            5138: 12,-48
+            5139: 14,-48
+            5140: 16,-47
+            5141: 14,-48
+            5142: 13,-48
+            5143: 15,-47
+            5150: 21,-54
+            5151: 20,-54
+            5152: 18,-54
+            5153: 16,-54
+            5154: 16,-55
+            5155: 18,-53
+            5156: 19,-53
+            5157: 21,-55
+            5158: 21,-58
+            5159: 21,-59
+            5160: 20,-58
+            5161: 18,-58
+            5162: 17,-58
+            5163: 16,-58
+            5164: 16,-59
+            5165: 19,-59
+            5166: 19,-59
+            5167: 18,-59
+            5168: 27,-46
+            5169: 26,-45
+            5170: 26,-44
+            5171: 27,-45
+            5172: 27,-45
+            5173: 28,-42
+            5174: 29,-42
+            5175: 29,-40
+            5176: 28,-39
+            5177: 28,-39
+            5178: 28,-40
+            5179: 29,-47
+            5180: 28,-47
+            5181: 66,-52
+            5182: 65,-51
+            5183: 66,-52
+            5184: 66,-51
+            5185: 65,-52
+            5186: 66,-51
+            5187: 27,15
+            5188: 28,15
+            5189: 27,14
+            5190: 27,12
+            5191: -23,34
+            5192: -23,35
+            5193: -22,34
+            5194: -27,36
+            5195: -27,34
+            5196: -28,35
+            5197: -27,35
+            5198: -29,36
+            5199: -30,37
+            5200: -30,38
+            5201: -28,35
+            5202: -28,34
+            5203: -29,35
+            5204: -26,36
+            5205: -25,38
+            5206: -26,37
+            5207: -32,36
+            5208: -33,35
+            5209: -33,37
+            5210: -33,35
+            5211: -34,36
+            5212: -33,38
+            5213: -33,35
+            5214: -36,5
+            5215: -42,6
+            5216: -43,4
+            5217: -43,6
+            5218: -42,7
+            5219: -51,9
+            5220: -49,13
+            5221: -42,-5
+            5222: -43,-5
+            5223: -42,-3
+            5224: -45,-4
+            5225: -45,-5
+            5226: -46,-4
+            5227: -43,-3
+            5228: -43,-2
+            5229: -42,-2
+            5230: -60,-29
+            5231: -60,-29
+            5232: -57,-36
+            5233: -58,-36
+            5234: -59,-36
+            5235: -57,-37
+            5236: -58,-35
+            5237: -58,-34
+            5238: -57,-35
+            5239: -59,-34
+            5240: -58,-34
+            5241: -59,-34
+            5242: -60,-34
+            5243: -60,-35
+            5244: -61,-21
+            5245: -62,-21
+            5246: -62,-20
+            5247: -61,-20
+            5248: -61,-20
+            5249: 13,35
+            5885: 52,20
+            5886: 51,21
+            5887: 53,20
+            5888: 53,21
+            6168: 49,-7
+            6169: 48,-6
+            6170: 48,-4
+            6171: 49,-4
+            6172: 52,-7
+            6173: 52,-5
+            6174: 51,-6
+            6175: 52,-2
+            6176: 52,-3
+            6177: 48,-1
+            6178: 48,-2
+            6198: 49,-12
+            6199: 49,-14
+            6200: 49,-15
+            6201: 49,-13
+            6202: 52,-14
+            6203: 52,-13
+            6204: 52,-12
+            6205: 52,-15
+            6206: 52,-15
+            6207: 52,-10
+            6208: 51,1
+            6209: 51,3
+            6210: 51,4
+            6211: 51,8
+            6212: 51,9
+            6213: 51,11
+            6214: 51,13
+            6215: 49,13
+            6216: 49,11
+            6217: 49,9
+            6218: 49,7
+            6219: 49,5
+            6220: 49,3
+            6221: 49,1
+            6234: 42,9
+            6235: 43,9
+            6236: 42,7
+            6237: 43,7
+            6238: 45,7
+            6239: 45,9
+            6240: 46,7
+            6241: 40,4
+            6242: 42,4
+            6243: 43,4
+            6244: 43,2
+            6245: 43,1
+            6246: 43,-2
+            6247: 43,-4
+            6248: 43,-7
+            6249: 43,-6
+            6250: 43,-10
+            6251: 43,-11
+            6252: 45,5
+            6253: 42,5
+            6254: 41,5
+            6333: 90,-18
+            6334: 89,-18
+            6414: 51,-39
+            6415: 52,-39
+            6416: 54,-39
+            6417: 52,-37
+            6427: 51,-30
+            6428: 52,-29
+            6450: -33,-12
+            6451: -33,-10
+            6467: -36,-45
+            6468: -35,-44
+            6469: -35,-46
+            6559: 14,39
+            6560: 13,40
+            6561: 15,42
+            6562: 15,41
+            6563: 16,39
+            6623: 8,-47
+            6769: -34,14
+            6770: -33,15
+            6771: -30,15
+            6772: -31,16
+            6773: -30,17
+            6774: -29,14
+            6775: -29,12
+            6776: -32,12
+            6777: -35,14
+            6778: -37,14
+            6779: -38,13
+            6871: 43,13
+            6872: 42,11
+            6939: 59,-8
+            6940: 57,-5
+            6941: 61,-4
+            6947: -14,-38
+            6948: -13,-37
+            6958: -12,-37
+            6959: -12,-37
+            6960: -11,-40
+            6976: 53,-21
+            6977: 54,-21
+            6978: 57,-21
+            6979: 56,-23
+            6980: 58,-24
+            7011: 78,-7
+            7019: 52,-23
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            2931: -43,17
+            2896: -43,17
         - node:
             cleanable: True
             color: '#835432FF'
             id: DirtHeavyMonotile
           decals:
-            2839: -38,29
-            2840: -36,28
-            2841: -34,26
-            2842: -34,24
-            2843: -36,22
-            2844: -37,25
-            2845: -37,26
-            2846: -37,27
-            2847: -38,27
-            2848: -36,26
+            2804: -38,29
+            2805: -36,28
+            2806: -34,26
+            2807: -34,24
+            2808: -36,22
+            2809: -37,25
+            2810: -37,26
+            2811: -37,27
+            2812: -38,27
+            2813: -36,26
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            6422: 88,-21
-            6423: 88,-20
-            6424: 91,-20
-            6427: 87,-20
-            6430: 88,-19
+            6358: 88,-21
+            6359: 88,-20
+            6360: 91,-20
+            6363: 87,-20
+            6366: 88,-19
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            3090: 4,-31
-            3091: 0,-31
-            3092: -4,-31
-            3093: -8,-31
-            3094: -10,-31
-            3095: -13,-31
-            3096: -17,-31
-            3097: -18,-31
-            3098: -21,-31
-            3099: -25,-31
-            3100: -25,-27
-            3101: -25,-24
-            3102: -25,-22
-            3103: -25,-19
-            3104: -25,-18
-            3105: -25,-13
-            3106: -25,-11
-            3107: -24,-10
-            3108: -24,-8
-            3109: -22,-2
-            3110: -22,0
-            3111: -22,3
-            3112: -20,8
-            3113: -22,9
-            3114: -24,8
-            3115: -25,9
-            3116: -26,8
-            3117: -26,12
-            3118: -26,15
-            3119: -26,17
-            3120: -25,20
-            3121: -23,19
-            3122: -20,19
-            3123: -18,20
-            3124: -15,20
-            3125: -12,20
-            3126: -7,20
-            3127: -3,20
-            3128: -1,20
-            3129: 2,20
-            3130: 6,20
-            3131: 9,20
-            3132: 11,20
-            3133: 14,20
-            3134: 17,20
-            3135: 20,19
-            3136: 20,17
-            3137: 20,15
-            3138: 20,11
-            3139: 20,9
-            3140: 20,6
-            3141: 20,3
-            3142: 22,3
-            3143: 25,3
-            3144: 27,3
-            3145: 30,3
-            3146: 33,3
-            3147: 36,3
-            3148: 41,3
-            3149: 42,2
-            3150: 42,0
-            3151: 42,-3
-            3152: 42,-6
-            3153: 42,-9
-            3154: 42,-11
-            3155: 42,-15
-            3156: 42,-18
-            3157: 42,-20
-            3158: 44,-20
-            3159: 42,-13
-            3160: 42,-10
-            3161: 42,-7
-            3162: 42,-5
-            3163: 42,-2
-            3164: 42,1
-            3165: 39,3
-            3166: 37,3
-            3167: 35,3
-            3168: 32,3
-            3169: 31,3
-            3170: 26,3
-            3171: 22,3
-            3172: 20,6
-            3173: 20,9
-            3174: 20,12
-            3175: 20,15
-            3176: 20,19
-            3177: 19,20
-            3178: 12,20
-            3179: 8,20
-            3180: 5,20
-            3181: 2,20
-            3182: -1,20
-            3183: -5,20
-            3184: -9,20
-            3185: -12,20
-            3186: -16,20
-            3188: -19,19
-            3189: -26,20
-            3190: -26,16
-            3191: -26,11
-            3192: -26,8
-            3193: -23,8
-            3194: -22,9
-            3195: -21,8
-            3196: -20,9
-            3197: -22,3
-            3198: -22,0
-            3199: -22,-3
-            3200: -22,-5
-            3201: -23,-7
-            3202: -25,-7
-            3203: -23,-8
-            3204: -25,-10
-            3205: -25,-10
-            3206: -25,-14
-            3207: -25,-18
-            3208: -25,-21
-            3209: -25,-25
-            3210: -25,-28
-            3211: -23,-31
-            3212: -20,-31
-            3213: -15,-31
-            3214: -9,-31
-            3215: -5,-31
-            3216: 1,-31
-            3217: 1,-32
-            3218: 7,-31
-            3219: 5,-31
-            3220: 8,-32
-            3221: 9,-33
-            3222: 12,-33
-            3223: 15,-33
-            3224: 18,-33
-            3225: 19,-33
-            3226: 20,-29
-            3227: 20,-27
-            3228: 21,-26
-            3229: 24,-26
-            3230: 27,-26
-            3231: 28,-26
-            3232: 28,-22
-            3233: 28,-21
-            3234: 28,-20
-            3235: 32,-20
-            3236: 35,-20
-            3237: 39,-20
-            3238: 42,-20
-            3239: 40,-20
-            3240: 42,-17
-            3241: 42,-19
-            3242: 49,-20
-            3243: 52,-20
-            3244: 47,-20
-            3245: 53,-20
-            3246: 53,-22
-            3247: 53,-23
-            3248: 54,-20
-            3249: 56,-20
-            3250: 58,-20
-            3251: 58,-20
-            3252: 58,-22
-            3253: 58,-23
-            3254: 58,-22
-            3255: 49,-20
-            3256: 50,-20
-            3257: 44,-13
-            3258: 41,-13
-            3259: 39,-1
-            3260: 37,-1
-            3261: 36,-1
-            3262: 50,6
-            3263: 50,2
-            3264: 50,14
-            3265: 46,-7
-            3266: 45,-8
-            3267: 46,-4
-            3268: 46,-5
-            3269: 45,-1
-            3270: 46,-2
-            3271: 54,-1
-            3272: 55,-1
-            3273: 55,-7
-            3274: 62,-6
-            3275: 61,-6
-            3276: 55,7
-            3277: 54,7
-            3278: 59,15
-            3279: 58,15
-            3280: 60,16
-            3281: 60,3
-            3282: 60,1
-            3283: 63,1
-            3284: 62,1
-            3285: 62,0
-            3286: 62,3
-            3287: 62,4
-            3288: 28,3
-            3289: 28,3
-            3290: 24,8
-            3291: 24,6
-            3292: 23,8
-            3293: 25,7
-            3294: 24,7
-            3295: 24,6
-            3296: 25,11
-            3297: 25,13
-            3298: 25,14
-            3299: 23,15
-            3300: 22,12
-            3301: 23,12
-            3302: 23,14
-            3303: 23,11
-            3304: 26,19
-            3305: 24,20
-            3306: 25,21
-            3307: 26,19
-            3308: 25,20
-            3309: 29,20
-            3310: 29,19
-            3311: 30,19
-            3312: 29,21
-            3313: -19,26
-            3314: -21,28
-            3315: -20,26
-            3316: -20,28
-            3317: -7,40
-            3318: 3,40
-            3319: -26,19
-            3320: -17,11
-            3321: -16,11
-            3322: -16,13
-            3323: -17,13
-            3324: -30,3
-            3325: -32,3
-            3326: -37,3
-            3327: -36,2
-            3328: -35,2
-            3329: -37,1
-            3331: -32,2
-            3332: -32,1
-            3333: -31,2
-            3334: -33,2
-            3335: -38,0
-            3336: -37,0
-            3337: -34,0
-            3338: -33,0
-            3339: -31,0
-            3340: -30,0
-            3341: -55,6
-            3342: -54,6
-            3343: -54,4
-            3344: -54,2
-            3345: -56,5
-            3346: -55,4
-            3347: -53,1
-            3348: -51,1
-            3349: -49,1
-            3350: -47,1
-            3351: -45,1
-            3352: -44,1
-            3354: -54,1
-            3355: -54,-4
-            3356: -55,-4
-            3357: -54,-8
-            3358: -54,-10
-            3359: -54,-12
-            3360: -54,-14
-            3361: -54,-16
-            3362: -54,-19
-            3363: -53,-21
-            3364: -51,-21
-            3365: -54,-21
-            3366: -54,-20
-            3367: -54,-18
-            3368: -48,-21
-            3369: -48,-23
-            3370: -48,-24
-            3371: -50,-25
-            3372: -47,-25
-            3373: -45,-25
-            3374: -45,-26
-            3375: -45,-29
-            3376: -44,-28
-            3377: -43,-28
-            3378: -45,-31
-            3379: -48,-32
-            3380: -49,-32
-            3381: -51,-32
-            3382: -51,-30
-            3383: -51,-28
-            3384: -51,-26
-            3385: -48,-33
-            3386: -54,-26
-            3387: -56,-25
-            3388: -55,-25
-            3389: -56,-26
-            3390: -57,-26
-            3391: -55,-26
-            3392: -56,-25
-            3393: -48,-36
-            3394: -48,-38
-            3395: -48,-40
-            3396: -48,-42
-            3397: -48,-44
-            3398: -48,-47
-            3399: -49,-47
-            3400: -51,-47
-            3401: -53,-47
-            3402: -54,-47
-            3403: -45,-47
-            3404: -45,-47
-            3405: -43,-47
-            3406: -41,-47
-            3407: -41,-47
-            3408: -41,-50
-            3409: -41,-51
-            3410: -41,-54
-            3411: -36,-58
-            3412: -36,-60
-            3413: -36,-63
-            3414: -36,-64
-            3415: -36,-56
-            3416: -37,-56
-            3417: -41,-61
-            3418: -42,-62
-            3419: -41,-64
-            3420: -41,-64
-            3421: -42,-62
-            3422: -41,-48
-            3423: -53,-47
-            3424: -55,-47
-            3425: -55,-49
-            3426: -55,-52
-            3427: -55,-54
-            3428: -60,-58
-            3429: -60,-60
-            3430: -60,-62
-            3431: -60,-63
-            3432: -60,-64
-            3433: -58,-56
-            3434: -60,-56
-            3435: -55,-64
-            3436: -55,-62
-            3437: -54,-61
-            3438: -54,-63
-            3439: -54,-64
-            3440: -8,-28
-            3441: -7,-26
-            3442: -8,-27
-            3443: -8,-27
-            3444: 7,-22
-            3445: 5,-22
-            3446: 4,-23
-            3447: 4,-20
-            3448: 4,-19
-            3449: 7,-20
-            3450: 7,-21
-            3451: 7,-24
-            3452: 7,-25
-            3453: 10,-16
-            3454: 10,-18
-            3455: 10,-18
-            3456: 12,-29
-            3457: 12,-28
-            3458: 12,-26
-            3459: 13,-25
-            3460: 14,-25
-            3461: 14,-26
-            3462: 15,-25
-            3463: 16,-26
-            3464: 16,-29
-            3465: -4,-36
-            3466: -4,-37
-            3467: -6,-37
-            3468: 34,-3
-            3469: 32,-2
-            3470: 32,-3
-            3471: 31,-2
-            3472: 31,-3
-            3473: 31,-35
-            3474: 33,-35
-            3475: 32,-37
-            3476: 33,-36
-            3477: 33,-38
-            3478: 32,-36
-            3479: 31,-38
-            3480: 47,-36
-            3481: 47,-35
-            3482: 49,-35
-            3483: 49,-37
-            3484: 47,-37
-            3485: 47,-38
-            3486: 49,-38
-            3487: 47,-39
-            3488: 24,-29
-            3489: 26,-29
-            3490: 27,-29
-            3491: 28,-29
-            3492: 25,-34
-            3493: 27,-34
-            3494: 28,-34
-            3495: 26,-34
-            3496: 28,-43
-            3497: 29,-43
-            3498: 28,-45
-            3499: 29,-45
-            3500: 28,-46
-            3501: 29,-46
-            3502: 19,-46
-            3503: 18,-46
-            3504: 18,-47
-            3505: 19,-49
-            3506: 19,-49
-            3507: 18,-50
-            3508: 19,-50
-            3509: 18,-48
-            3510: 16,-48
-            3511: 14,-48
-            3512: 12,-47
-            3513: 10,-40
-            3514: 11,-39
-            3515: 11,-40
-            3516: 11,-40
-            3517: 8,-31
-            3518: 8,-31
-            3519: 5,-14
-            3520: 6,-14
-            3521: 6,-15
-            3522: 5,-15
-            3523: 4,-15
-            3524: 4,-15
-            3525: 25,7
-            3526: 20,16
-            3527: 20,18
-            3528: 15,26
-            3529: 14,26
-            3530: 13,26
-            3531: 13,26
-            3532: -44,10
-            3533: -45,10
-            3534: -46,10
-            3535: -47,10
-            3536: -49,10
-            3537: -50,10
-            3538: -50,12
-            3539: -47,12
-            3540: -48,1
-            3541: -47,1
-            3542: -48,-41
-            3543: -38,-56
-            3544: -38,-56
-            3545: -42,-57
-            3546: -55,-57
-            3678: -50,0
-            3679: -50,2
-            3680: -48,2
-            3681: -46,2
-            3682: -45,2
-            3683: -44,0
-            3684: -46,0
-            3685: -48,0
-            3717: -51,3
-            3718: -49,3
-            3719: -47,3
-            3720: -45,3
-            3721: -44,5
-            3722: -46,5
-            3723: -48,5
-            3724: -50,5
-            3725: -50,-1
-            3726: -49,-1
-            3727: -47,-1
-            3728: -46,-1
-            3729: -44,-1
-            3730: -44,-3
-            3731: -46,-3
-            3732: -47,-3
-            3733: -49,-3
-            3734: -50,-3
-            3735: -48,-3
-            3736: -46,-3
-            3737: -48,3
-            3738: -46,3
-            3818: -21,6
-            3819: -21,7
-            3820: -22,6
-            3821: -21,7
-            3999: 19,1
-            4000: 21,1
-            4001: 22,1
-            4002: 23,1
-            4003: 23,1
-            4057: 40,-22
-            4058: 41,-22
-            4059: 43,-22
-            4060: 44,-22
-            4119: 61,-25
-            4120: 62,-25
-            4121: 62,-26
-            4126: 68,-23
-            4149: 68,-15
-            4150: 68,-13
-            4151: 68,-14
-            4152: 67,-12
-            4153: 70,-12
-            4154: 70,-14
-            4155: 68,-11
-            4156: 71,-12
-            4157: 70,-14
-            4158: 70,-15
-            4159: 71,-13
-            4160: 69,-13
-            4161: 69,-12
-            4162: 68,-10
-            4163: 67,-10
-            4164: 68,-8
-            4165: 69,-8
-            4166: 70,-9
-            4167: 70,-10
-            4261: 39,-34
-            4262: 40,-34
-            4263: 39,-34
-            4264: 42,-34
-            4265: 40,-34
-            4266: 41,-33
-            4267: 34,-36
-            4268: 34,-35
-            4269: 35,-36
-            4270: 38,-37
-            4271: 43,-37
-            4272: 43,-37
-            4273: 46,-37
-            4274: 46,-35
-            4275: 46,-37
-            4276: 47,-37
-            4277: 48,-36
-            4278: 48,-37
-            4279: 46,-39
-            4280: 44,-39
-            4281: 41,-39
-            4282: 37,-39
-            4283: 35,-39
-            4284: 39,-38
-            4285: 33,-38
-            4584: -20,6
-            4585: -20,7
-            4586: -21,6
-            4587: -20,7
-            4588: -20,6
-            4589: -21,12
-            4590: -25,29
-            4591: -25,28
-            4592: -26,30
-            4593: -26,28
-            4594: -26,29
-            4618: -16,40
-            4619: -17,41
-            4620: -15,39
-            4621: -13,41
-            4622: -12,39
-            4673: -2,46
-            4674: -4,46
-            4675: -1,48
-            4676: 0,47
-            4677: -3,50
-            4678: 0,51
-            4679: 2,47
-            4680: 2,45
-            4681: 2,43
-            4682: 2,40
-            4683: -6,40
-            4684: -7,40
-            4685: -7,40
-            4686: -4,46
-            4687: -5,45
-            4688: -6,46
-            4689: 7,41
-            4690: 6,42
-            4691: 9,40
-            4692: 6,39
-            4693: 8,40
-            4694: 6,39
-            4695: 8,39
-            4696: 7,42
-            4697: 7,41
-            4698: 5,41
-            4729: 14,34
-            4730: 13,36
-            4731: 14,37
-            4732: 16,37
-            4733: 14,36
-            4734: 5,30
-            4735: 4,30
-            4736: 3,32
-            4737: 5,32
-            4738: 5,32
-            4739: 4,31
-            4740: 4,31
-            4741: 3,32
-            4742: 3,28
-            4743: 2,27
-            4744: 1,28
-            4745: 3,27
-            4746: 4,26
-            4747: 3,25
-            4748: 4,24
-            4749: 3,23
-            4750: 1,24
-            4751: 2,23
-            4769: -3,25
-            4770: -4,23
-            4771: -2,23
-            4772: -3,24
-            4773: 0,24
-            4774: 0,23
-            4775: -16,29
-            4776: -15,26
-            4777: -15,28
-            4778: -13,28
-            4779: -13,29
-            4780: -9,28
-            4781: -10,26
-            4782: -9,27
-            4783: -11,28
-            4784: -8,29
-            4785: -9,26
-            4786: -6,27
-            4787: -6,26
-            4788: -6,28
-            4789: -3,29
-            4790: -4,27
-            4791: -1,28
-            4792: -3,29
-            4793: -2,30
-            4794: -3,32
-            4795: -2,33
-            4796: -2,34
-            4797: -8,33
-            4798: -7,32
-            4799: -8,32
-            4800: -9,33
-            4801: -6,34
-            4802: -6,33
-            4803: -13,34
-            4871: -17,-28
-            4872: -19,-28
-            4873: -20,-27
-            4874: -20,-26
-            4875: -20,-27
-            4876: -15,-28
-            4877: -14,-28
-            4878: -14,-27
-            4879: -14,-29
-            4880: -17,-29
-            4953: -6,-37
-            4954: -5,-37
-            4955: -4,-37
-            5141: 78,-28
-            5142: 79,-28
-            5143: 78,-28
-            5144: 78,-27
-            5145: 78,-29
-            5207: 13,-45
-            5208: 12,-45
-            5209: 12,-50
-            5210: 12,-49
-            5211: 16,-49
-            5212: 15,-49
-            6001: 81,-34
-            6002: 82,-35
-            6003: 81,-35
-            6004: 81,-35
-            6030: -2,41
-            6031: -2,42
-            6032: -3,42
-            6033: -3,42
-            6034: -1,43
-            6243: 49,-1
-            6244: 51,-1
-            6245: 50,-2
-            6246: 49,-3
-            6247: 49,-5
-            6248: 51,-5
-            6249: 51,-3
-            6250: 50,-8
-            6251: 49,-8
-            6252: 48,-7
-            6253: 52,-8
-            6254: 54,-7
-            6255: 49,-10
-            6256: 50,-11
-            6257: 48,-11
-            6258: 51,-10
-            6259: 51,-11
-            6260: 52,-11
-            6261: 53,-11
-            6286: 50,2
-            6287: 50,4
-            6288: 50,9
-            6289: 50,12
-            6290: 50,13
-            6291: 47,9
-            6292: 47,7
-            6293: 41,8
-            6294: 41,7
-            6295: 40,8
-            6296: 40,7
-            6297: 44,8
-            6319: 46,4
-            6320: 45,4
-            6321: 46,2
-            6322: 45,2
-            6323: 45,1
-            6324: 46,5
-            6325: 40,5
-            6326: 44,4
-            6327: 44,7
-            6328: 55,3
-            6329: 54,2
-            6330: 53,3
-            6331: 55,4
-            6332: 57,4
-            6333: 56,2
-            6334: 55,1
-            6335: 55,6
-            6336: 53,7
-            6337: 53,6
-            6338: 55,8
-            6339: 56,10
-            6340: 55,10
-            6341: 53,12
-            6342: 53,11
-            6343: 57,14
-            6353: -1,-23
-            6354: 0,-23
-            6355: -4,-23
-            6356: -5,-23
-            6357: 35,19
-            6358: 34,19
-            6359: 35,20
-            6360: -8,27
-            6361: -12,27
-            6362: -10,27
-            6363: -14,27
-            6364: -15,27
-            6365: -15,27
-            6399: 88,-18
-            6400: 87,-18
-            6401: 91,-19
-            6402: 91,-18
-            6403: 92,-19
-            6482: 51,-36
-            6483: 51,-37
-            6484: 53,-39
-            6485: 54,-40
-            6486: 51,-35
-            6493: 51,-29
-            6499: 51,-26
-            6500: 52,-27
-            6516: -32,-12
-            6517: -34,-11
-            6518: -32,-10
-            6519: -33,-9
-            6520: -34,-9
-            6524: 61,-21
-            6525: -24,-42
-            6527: -25,-42
-            6528: -22,-42
-            6529: -22,-42
-            6536: -37,-45
-            6537: -38,-44
-            6538: -38,-46
-            6539: -37,-46
-            6628: 13,41
-            6629: 15,39
-            6630: 16,41
-            6666: 33,-2
-            6667: 34,-2
-            6668: 34,-2
-            6686: 7,-47
-            6791: -20,10
-            6792: -24,13
-            6856: -35,12
-            6857: -33,11
-            6858: -32,13
-            6859: -31,13
-            6860: -32,16
-            6861: -34,16
-            6862: -34,17
-            6863: -32,17
-            6864: -30,17
-            6865: -29,16
-            6866: -29,13
-            6867: -29,11
-            6868: -32,12
-            6869: -37,14
-            6870: -38,13
-            6871: -39,14
-            6881: -35,17
-            6882: -35,11
-            6883: -34,11
-            6884: -31,11
-            6885: -30,11
-            6886: -33,16
-            6887: -38,10
-            6888: -29,15
-            6889: -29,15
-            6890: -29,16
-            6891: -29,17
-            6892: -32,17
-            6935: 44,11
-            6936: 45,12
-            6937: 44,14
-            6938: 43,15
-            6939: 44,16
-            6940: 47,14
-            6941: 41,12
-            6942: 41,13
-            6943: 41,11
-            6944: 41,11
-            6945: 47,11
-            6946: 47,12
-            6958: 44,15
-            6959: 44,15
-            6999: 58,-7
-            7000: 59,-6
-            7001: 58,-5
-            7002: 60,-5
-            7003: 60,-6
-            7004: 60,-7
-            7005: 60,-6
-            7018: 59,-4
-            7019: 58,-4
-            7020: 58,-4
-            7027: -15,-37
-            7028: -14,-37
-            7034: -11,-37
-            7035: -11,-38
-            7039: -33,1
-            7040: -33,1
-            7042: -43,1
-            7043: -46,1
+            3055: 4,-31
+            3056: 0,-31
+            3057: -4,-31
+            3058: -8,-31
+            3059: -10,-31
+            3060: -13,-31
+            3061: -17,-31
+            3062: -18,-31
+            3063: -21,-31
+            3064: -25,-31
+            3065: -25,-27
+            3066: -25,-24
+            3067: -25,-22
+            3068: -25,-19
+            3069: -25,-18
+            3070: -25,-13
+            3071: -25,-11
+            3072: -24,-10
+            3073: -24,-8
+            3074: -22,-2
+            3075: -22,0
+            3076: -22,3
+            3077: -20,8
+            3078: -22,9
+            3079: -24,8
+            3080: -25,9
+            3081: -26,8
+            3082: -26,12
+            3083: -26,15
+            3084: -26,17
+            3085: -25,20
+            3086: -23,19
+            3087: -20,19
+            3088: -18,20
+            3089: -15,20
+            3090: -12,20
+            3091: -7,20
+            3092: -3,20
+            3093: -1,20
+            3094: 2,20
+            3095: 6,20
+            3096: 9,20
+            3097: 11,20
+            3098: 14,20
+            3099: 17,20
+            3100: 20,19
+            3101: 20,17
+            3102: 20,15
+            3103: 20,11
+            3104: 20,9
+            3105: 20,6
+            3106: 20,3
+            3107: 22,3
+            3108: 25,3
+            3109: 27,3
+            3110: 30,3
+            3111: 33,3
+            3112: 36,3
+            3113: 41,3
+            3114: 42,2
+            3115: 42,0
+            3116: 42,-3
+            3117: 42,-6
+            3118: 42,-9
+            3119: 42,-11
+            3120: 42,-15
+            3121: 42,-18
+            3122: 42,-20
+            3123: 44,-20
+            3124: 42,-13
+            3125: 42,-10
+            3126: 42,-7
+            3127: 42,-5
+            3128: 42,-2
+            3129: 42,1
+            3130: 39,3
+            3131: 37,3
+            3132: 35,3
+            3133: 32,3
+            3134: 31,3
+            3135: 26,3
+            3136: 22,3
+            3137: 20,6
+            3138: 20,9
+            3139: 20,12
+            3140: 20,15
+            3141: 20,19
+            3142: 19,20
+            3143: 12,20
+            3144: 8,20
+            3145: 5,20
+            3146: 2,20
+            3147: -1,20
+            3148: -5,20
+            3149: -9,20
+            3150: -12,20
+            3151: -16,20
+            3153: -19,19
+            3154: -26,20
+            3155: -26,16
+            3156: -26,11
+            3157: -26,8
+            3158: -23,8
+            3159: -22,9
+            3160: -21,8
+            3161: -20,9
+            3162: -22,3
+            3163: -22,0
+            3164: -22,-3
+            3165: -22,-5
+            3166: -23,-7
+            3167: -25,-7
+            3168: -23,-8
+            3169: -25,-10
+            3170: -25,-10
+            3171: -25,-14
+            3172: -25,-18
+            3173: -25,-21
+            3174: -25,-25
+            3175: -25,-28
+            3176: -23,-31
+            3177: -20,-31
+            3178: -15,-31
+            3179: -9,-31
+            3180: -5,-31
+            3181: 1,-31
+            3182: 1,-32
+            3183: 7,-31
+            3184: 5,-31
+            3185: 8,-32
+            3186: 9,-33
+            3187: 12,-33
+            3188: 15,-33
+            3189: 18,-33
+            3190: 19,-33
+            3191: 20,-29
+            3192: 20,-27
+            3193: 21,-26
+            3194: 24,-26
+            3195: 27,-26
+            3196: 28,-26
+            3197: 28,-22
+            3198: 28,-21
+            3199: 28,-20
+            3200: 32,-20
+            3201: 35,-20
+            3202: 39,-20
+            3203: 42,-20
+            3204: 40,-20
+            3205: 42,-17
+            3206: 42,-19
+            3207: 49,-20
+            3208: 52,-20
+            3209: 47,-20
+            3210: 53,-20
+            3211: 54,-20
+            3212: 56,-20
+            3213: 58,-20
+            3214: 58,-20
+            3215: 58,-22
+            3216: 58,-22
+            3217: 49,-20
+            3218: 50,-20
+            3219: 44,-13
+            3220: 41,-13
+            3221: 39,-1
+            3222: 37,-1
+            3223: 36,-1
+            3224: 50,6
+            3225: 50,2
+            3226: 50,14
+            3227: 46,-7
+            3228: 45,-8
+            3229: 46,-4
+            3230: 46,-5
+            3231: 45,-1
+            3232: 46,-2
+            3233: 54,-1
+            3234: 55,-1
+            3235: 55,-7
+            3236: 62,-6
+            3237: 61,-6
+            3238: 55,7
+            3239: 54,7
+            3240: 59,15
+            3241: 58,15
+            3242: 60,16
+            3243: 60,3
+            3244: 60,1
+            3245: 63,1
+            3246: 62,1
+            3247: 62,0
+            3248: 62,3
+            3249: 62,4
+            3250: 28,3
+            3251: 28,3
+            3252: 24,8
+            3253: 24,6
+            3254: 23,8
+            3255: 25,7
+            3256: 24,7
+            3257: 24,6
+            3258: 25,11
+            3259: 25,13
+            3260: 25,14
+            3261: 23,15
+            3262: 22,12
+            3263: 23,12
+            3264: 23,14
+            3265: 23,11
+            3266: 26,19
+            3267: 24,20
+            3268: 25,21
+            3269: 26,19
+            3270: 25,20
+            3271: 29,20
+            3272: 29,19
+            3273: 30,19
+            3274: 29,21
+            3275: -19,26
+            3276: -21,28
+            3277: -20,26
+            3278: -20,28
+            3279: -7,40
+            3280: 3,40
+            3281: -26,19
+            3282: -17,11
+            3283: -16,11
+            3284: -16,13
+            3285: -17,13
+            3286: -30,3
+            3287: -32,3
+            3288: -37,3
+            3289: -36,2
+            3290: -35,2
+            3291: -37,1
+            3292: -32,2
+            3293: -32,1
+            3294: -31,2
+            3295: -33,2
+            3296: -38,0
+            3297: -37,0
+            3298: -34,0
+            3299: -33,0
+            3300: -31,0
+            3301: -30,0
+            3302: -55,6
+            3303: -54,6
+            3304: -54,4
+            3305: -54,2
+            3306: -56,5
+            3307: -55,4
+            3308: -53,1
+            3309: -51,1
+            3310: -49,1
+            3311: -47,1
+            3312: -45,1
+            3313: -44,1
+            3314: -54,1
+            3315: -54,-4
+            3316: -55,-4
+            3317: -54,-8
+            3318: -54,-10
+            3319: -54,-12
+            3320: -54,-14
+            3321: -54,-16
+            3322: -54,-19
+            3323: -53,-21
+            3324: -51,-21
+            3325: -54,-21
+            3326: -54,-20
+            3327: -54,-18
+            3328: -48,-21
+            3329: -48,-23
+            3330: -48,-24
+            3331: -50,-25
+            3332: -47,-25
+            3333: -45,-25
+            3334: -45,-26
+            3335: -45,-29
+            3336: -44,-28
+            3337: -43,-28
+            3338: -45,-31
+            3339: -48,-32
+            3340: -49,-32
+            3341: -51,-32
+            3342: -51,-30
+            3343: -51,-28
+            3344: -51,-26
+            3345: -48,-33
+            3346: -54,-26
+            3347: -56,-25
+            3348: -55,-25
+            3349: -56,-26
+            3350: -57,-26
+            3351: -55,-26
+            3352: -56,-25
+            3353: -48,-36
+            3354: -48,-38
+            3355: -48,-40
+            3356: -48,-42
+            3357: -48,-44
+            3358: -48,-47
+            3359: -49,-47
+            3360: -51,-47
+            3361: -53,-47
+            3362: -54,-47
+            3363: -45,-47
+            3364: -45,-47
+            3365: -43,-47
+            3366: -41,-47
+            3367: -41,-47
+            3368: -41,-50
+            3369: -41,-51
+            3370: -41,-54
+            3371: -36,-58
+            3372: -36,-60
+            3373: -36,-63
+            3374: -36,-64
+            3375: -36,-56
+            3376: -37,-56
+            3377: -41,-61
+            3378: -42,-62
+            3379: -41,-64
+            3380: -41,-64
+            3381: -42,-62
+            3382: -41,-48
+            3383: -53,-47
+            3384: -55,-47
+            3385: -55,-49
+            3386: -55,-52
+            3387: -55,-54
+            3388: -60,-58
+            3389: -60,-60
+            3390: -60,-62
+            3391: -60,-63
+            3392: -60,-64
+            3393: -58,-56
+            3394: -60,-56
+            3395: -55,-64
+            3396: -55,-62
+            3397: -54,-61
+            3398: -54,-63
+            3399: -54,-64
+            3400: -8,-28
+            3401: -7,-26
+            3402: -8,-27
+            3403: -8,-27
+            3404: 7,-22
+            3405: 5,-22
+            3406: 4,-23
+            3407: 4,-20
+            3408: 4,-19
+            3409: 7,-20
+            3410: 7,-21
+            3411: 7,-24
+            3412: 7,-25
+            3413: 10,-16
+            3414: 10,-18
+            3415: 10,-18
+            3416: 12,-29
+            3417: 12,-28
+            3418: 12,-26
+            3419: 13,-25
+            3420: 14,-25
+            3421: 14,-26
+            3422: 15,-25
+            3423: 16,-26
+            3424: 16,-29
+            3425: -4,-36
+            3426: -4,-37
+            3427: -6,-37
+            3428: 34,-3
+            3429: 32,-2
+            3430: 32,-3
+            3431: 31,-2
+            3432: 31,-3
+            3433: 31,-35
+            3434: 33,-35
+            3435: 32,-37
+            3436: 33,-36
+            3437: 33,-38
+            3438: 32,-36
+            3439: 31,-38
+            3440: 47,-36
+            3441: 47,-35
+            3442: 49,-35
+            3443: 49,-37
+            3444: 47,-37
+            3445: 47,-38
+            3446: 49,-38
+            3447: 47,-39
+            3448: 24,-29
+            3449: 26,-29
+            3450: 27,-29
+            3451: 28,-29
+            3452: 25,-34
+            3453: 27,-34
+            3454: 28,-34
+            3455: 26,-34
+            3456: 28,-43
+            3457: 29,-43
+            3458: 28,-45
+            3459: 29,-45
+            3460: 28,-46
+            3461: 29,-46
+            3462: 19,-46
+            3463: 18,-46
+            3464: 18,-47
+            3465: 19,-49
+            3466: 19,-49
+            3467: 18,-50
+            3468: 19,-50
+            3469: 18,-48
+            3470: 16,-48
+            3471: 14,-48
+            3472: 12,-47
+            3473: 10,-40
+            3474: 11,-39
+            3475: 11,-40
+            3476: 11,-40
+            3477: 8,-31
+            3478: 8,-31
+            3479: 5,-14
+            3480: 6,-14
+            3481: 6,-15
+            3482: 5,-15
+            3483: 4,-15
+            3484: 4,-15
+            3485: 25,7
+            3486: 20,16
+            3487: 20,18
+            3488: 15,26
+            3489: 14,26
+            3490: 13,26
+            3491: 13,26
+            3492: -44,10
+            3493: -45,10
+            3494: -46,10
+            3495: -47,10
+            3496: -49,10
+            3497: -50,10
+            3498: -50,12
+            3499: -47,12
+            3500: -48,1
+            3501: -47,1
+            3502: -48,-41
+            3503: -38,-56
+            3504: -38,-56
+            3505: -42,-57
+            3506: -55,-57
+            3638: -50,0
+            3639: -50,2
+            3640: -48,2
+            3641: -46,2
+            3642: -45,2
+            3643: -44,0
+            3644: -46,0
+            3645: -48,0
+            3677: -51,3
+            3678: -49,3
+            3679: -47,3
+            3680: -45,3
+            3681: -44,5
+            3682: -46,5
+            3683: -48,5
+            3684: -50,5
+            3685: -50,-1
+            3686: -49,-1
+            3687: -47,-1
+            3688: -46,-1
+            3689: -44,-1
+            3690: -44,-3
+            3691: -46,-3
+            3692: -47,-3
+            3693: -49,-3
+            3694: -50,-3
+            3695: -48,-3
+            3696: -46,-3
+            3697: -48,3
+            3698: -46,3
+            3776: -21,6
+            3777: -21,7
+            3778: -22,6
+            3779: -21,7
+            3957: 19,1
+            3958: 21,1
+            3959: 22,1
+            3960: 23,1
+            3961: 23,1
+            4015: 40,-22
+            4016: 41,-22
+            4017: 43,-22
+            4018: 44,-22
+            4070: 61,-25
+            4071: 62,-25
+            4072: 62,-26
+            4077: 68,-23
+            4100: 68,-15
+            4101: 68,-13
+            4102: 68,-14
+            4103: 67,-12
+            4104: 70,-12
+            4105: 70,-14
+            4106: 68,-11
+            4107: 71,-12
+            4108: 70,-14
+            4109: 70,-15
+            4110: 71,-13
+            4111: 69,-13
+            4112: 69,-12
+            4113: 68,-10
+            4114: 67,-10
+            4115: 68,-8
+            4116: 69,-8
+            4117: 70,-9
+            4118: 70,-10
+            4212: 39,-34
+            4213: 40,-34
+            4214: 39,-34
+            4215: 42,-34
+            4216: 40,-34
+            4217: 41,-33
+            4218: 34,-36
+            4219: 34,-35
+            4220: 35,-36
+            4221: 38,-37
+            4222: 43,-37
+            4223: 43,-37
+            4224: 46,-37
+            4225: 46,-35
+            4226: 46,-37
+            4227: 47,-37
+            4228: 48,-36
+            4229: 48,-37
+            4230: 46,-39
+            4231: 44,-39
+            4232: 41,-39
+            4233: 37,-39
+            4234: 35,-39
+            4235: 39,-38
+            4236: 33,-38
+            4535: -20,6
+            4536: -20,7
+            4537: -21,6
+            4538: -20,7
+            4539: -20,6
+            4540: -21,12
+            4541: -25,29
+            4542: -25,28
+            4543: -26,30
+            4544: -26,28
+            4545: -26,29
+            4569: -16,40
+            4570: -17,41
+            4571: -15,39
+            4572: -13,41
+            4573: -12,39
+            4624: -2,46
+            4625: -4,46
+            4626: -1,48
+            4627: 0,47
+            4628: -3,50
+            4629: 0,51
+            4630: 2,47
+            4631: 2,45
+            4632: 2,43
+            4633: 2,40
+            4634: -6,40
+            4635: -7,40
+            4636: -7,40
+            4637: -4,46
+            4638: -5,45
+            4639: -6,46
+            4640: 7,41
+            4641: 6,42
+            4642: 9,40
+            4643: 6,39
+            4644: 8,40
+            4645: 6,39
+            4646: 8,39
+            4647: 7,42
+            4648: 7,41
+            4649: 5,41
+            4680: 14,34
+            4681: 13,36
+            4682: 14,37
+            4683: 16,37
+            4684: 14,36
+            4685: 5,30
+            4686: 4,30
+            4687: 3,32
+            4688: 5,32
+            4689: 5,32
+            4690: 4,31
+            4691: 4,31
+            4692: 3,32
+            4693: 3,28
+            4694: 2,27
+            4695: 1,28
+            4696: 3,27
+            4697: 4,26
+            4698: 3,25
+            4699: 4,24
+            4700: 3,23
+            4701: 1,24
+            4702: 2,23
+            4720: -3,25
+            4721: -4,23
+            4722: -2,23
+            4723: -3,24
+            4724: 0,24
+            4725: 0,23
+            4726: -16,29
+            4727: -15,26
+            4728: -15,28
+            4729: -13,28
+            4730: -13,29
+            4731: -9,28
+            4732: -10,26
+            4733: -9,27
+            4734: -11,28
+            4735: -8,29
+            4736: -9,26
+            4737: -6,27
+            4738: -6,26
+            4739: -6,28
+            4740: -3,29
+            4741: -4,27
+            4742: -1,28
+            4743: -3,29
+            4744: -2,30
+            4745: -3,32
+            4746: -2,33
+            4747: -2,34
+            4748: -8,33
+            4749: -7,32
+            4750: -8,32
+            4751: -9,33
+            4752: -6,34
+            4753: -6,33
+            4754: -13,34
+            4822: -17,-28
+            4823: -19,-28
+            4824: -20,-27
+            4825: -20,-26
+            4826: -20,-27
+            4827: -15,-28
+            4828: -14,-28
+            4829: -14,-27
+            4830: -14,-29
+            4831: -17,-29
+            4890: -6,-37
+            4891: -5,-37
+            4892: -4,-37
+            5078: 78,-28
+            5079: 79,-28
+            5080: 78,-28
+            5081: 78,-27
+            5082: 78,-29
+            5144: 13,-45
+            5145: 12,-45
+            5146: 12,-50
+            5147: 12,-49
+            5148: 16,-49
+            5149: 15,-49
+            5937: 81,-34
+            5938: 82,-35
+            5939: 81,-35
+            5940: 81,-35
+            5966: -2,41
+            5967: -2,42
+            5968: -3,42
+            5969: -3,42
+            5970: -1,43
+            6179: 49,-1
+            6180: 51,-1
+            6181: 50,-2
+            6182: 49,-3
+            6183: 49,-5
+            6184: 51,-5
+            6185: 51,-3
+            6186: 50,-8
+            6187: 49,-8
+            6188: 48,-7
+            6189: 52,-8
+            6190: 54,-7
+            6191: 49,-10
+            6192: 50,-11
+            6193: 48,-11
+            6194: 51,-10
+            6195: 51,-11
+            6196: 52,-11
+            6197: 53,-11
+            6222: 50,2
+            6223: 50,4
+            6224: 50,9
+            6225: 50,12
+            6226: 50,13
+            6227: 47,9
+            6228: 47,7
+            6229: 41,8
+            6230: 41,7
+            6231: 40,8
+            6232: 40,7
+            6233: 44,8
+            6255: 46,4
+            6256: 45,4
+            6257: 46,2
+            6258: 45,2
+            6259: 45,1
+            6260: 46,5
+            6261: 40,5
+            6262: 44,4
+            6263: 44,7
+            6264: 55,3
+            6265: 54,2
+            6266: 53,3
+            6267: 55,4
+            6268: 57,4
+            6269: 56,2
+            6270: 55,1
+            6271: 55,6
+            6272: 53,7
+            6273: 53,6
+            6274: 55,8
+            6275: 56,10
+            6276: 55,10
+            6277: 53,12
+            6278: 53,11
+            6279: 57,14
+            6289: -1,-23
+            6290: 0,-23
+            6291: -4,-23
+            6292: -5,-23
+            6293: 35,19
+            6294: 34,19
+            6295: 35,20
+            6296: -8,27
+            6297: -12,27
+            6298: -10,27
+            6299: -14,27
+            6300: -15,27
+            6301: -15,27
+            6335: 88,-18
+            6336: 87,-18
+            6337: 91,-19
+            6338: 91,-18
+            6339: 92,-19
+            6418: 51,-36
+            6419: 51,-37
+            6420: 53,-39
+            6421: 54,-40
+            6422: 51,-35
+            6429: 51,-29
+            6435: 51,-26
+            6436: 52,-27
+            6452: -32,-12
+            6453: -34,-11
+            6454: -32,-10
+            6455: -33,-9
+            6456: -34,-9
+            6460: 61,-21
+            6461: -24,-42
+            6463: -25,-42
+            6464: -22,-42
+            6465: -22,-42
+            6472: -37,-45
+            6473: -38,-44
+            6474: -38,-46
+            6475: -37,-46
+            6564: 13,41
+            6565: 15,39
+            6566: 16,41
+            6602: 33,-2
+            6603: 34,-2
+            6604: 34,-2
+            6622: 7,-47
+            6715: -20,10
+            6716: -24,13
+            6780: -35,12
+            6781: -33,11
+            6782: -32,13
+            6783: -31,13
+            6784: -32,16
+            6785: -34,16
+            6786: -34,17
+            6787: -32,17
+            6788: -30,17
+            6789: -29,16
+            6790: -29,13
+            6791: -29,11
+            6792: -32,12
+            6793: -37,14
+            6794: -38,13
+            6795: -39,14
+            6805: -35,17
+            6806: -35,11
+            6807: -34,11
+            6808: -31,11
+            6809: -30,11
+            6810: -33,16
+            6811: -38,10
+            6812: -29,15
+            6813: -29,15
+            6814: -29,16
+            6815: -29,17
+            6816: -32,17
+            6859: 44,11
+            6860: 45,12
+            6861: 44,14
+            6862: 43,15
+            6863: 44,16
+            6864: 47,14
+            6865: 41,12
+            6866: 41,13
+            6867: 41,11
+            6868: 41,11
+            6869: 47,11
+            6870: 47,12
+            6882: 44,15
+            6883: 44,15
+            6923: 58,-7
+            6924: 59,-6
+            6925: 58,-5
+            6926: 60,-5
+            6927: 60,-6
+            6928: 60,-7
+            6929: 60,-6
+            6942: 59,-4
+            6943: 58,-4
+            6944: 58,-4
+            6949: -15,-37
+            6950: -14,-37
+            6956: -11,-37
+            6957: -11,-38
+            6961: -33,1
+            6962: -33,1
+            6964: -43,1
+            6965: -46,1
+            6981: 52,-21
+            6982: 56,-21
+            6983: 57,-23
+            6984: 56,-24
+            6985: 57,-24
+            6986: 57,-22
+            6994: 53,-22
+            7002: 66,-25
+            7003: 66,-24
+            7004: 66,-24
+            7005: 54,-24
+            7006: 53,-24
+            7007: 52,-24
+            7008: 52,-24
+            7012: 79,-7
+            7020: 53,-23
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            2930: -44,17
-            6450: 13,-30
-            6451: 16,-30
-            6452: 12,-30
-            6453: 12,-30
+            2895: -44,17
+            6386: 13,-30
+            6387: 16,-30
+            6388: 12,-30
+            6389: 12,-30
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6425: 89,-21
-            6426: 90,-20
+            6361: 89,-21
+            6362: 90,-20
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            6344: 57,4
-            6345: 57,2
-            6346: 54,3
-            6347: 56,1
-            6348: 49,-15
-            6349: 52,-15
-            6350: 43,4
-            6535: -36,-44
-            6631: 14,42
-            6632: 14,40
-            6633: 16,42
-            6872: -34,13
-            6873: -32,13
-            6874: -31,15
-            6875: -30,16
-            6876: -29,11
-            6877: -35,13
-            6878: -33,13
-            6954: 44,13
-            6955: 46,13
-            6956: 46,12
-            6957: 42,11
-            7006: 57,-4
-            7007: 57,-6
-            7008: 61,-7
-            7009: 61,-5
-            7029: -15,-38
-            7030: -13,-37
-            7031: -13,-38
+            6280: 57,4
+            6281: 57,2
+            6282: 54,3
+            6283: 56,1
+            6284: 49,-15
+            6285: 52,-15
+            6286: 43,4
+            6471: -36,-44
+            6567: 14,42
+            6568: 14,40
+            6569: 16,42
+            6796: -34,13
+            6797: -32,13
+            6798: -31,15
+            6799: -30,16
+            6800: -29,11
+            6801: -35,13
+            6802: -33,13
+            6878: 44,13
+            6879: 46,13
+            6880: 46,12
+            6881: 42,11
+            6930: 57,-4
+            6931: 57,-6
+            6932: 61,-7
+            6933: 61,-5
+            6951: -15,-38
+            6952: -13,-37
+            6953: -13,-38
+            6987: 54,-21
+            6988: 56,-21
+            6989: 58,-21
+            6990: 58,-23
+            6991: 57,-24
+            7021: 54,-23
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            2929: -44,16
+            2894: -44,16
         - node:
             cleanable: True
             color: '#FFFFFF47'
             id: DirtMedium
           decals:
-            6458: 11,-29
-            6459: 11,-29
+            6394: 11,-29
+            6395: 11,-29
         - node:
             cleanable: True
             angle: -6.283185307179586 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            6428: 91,-21
-            6429: 90,-21
+            6364: 91,-21
+            6365: 90,-21
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            3848: -16,11
-            3849: -17,12
-            6494: 52,-30
-            6521: -32,-9
-            6522: -34,-12
-            6534: -36,-46
-            6634: 13,39
-            6635: 13,42
-            6636: 16,40
-            6637: 13,38
-            6638: 13,38
-            6688: 9,-47
-            6790: -33,15
-            6879: -30,13
-            6880: -38,14
-            6949: 42,12
-            6950: 42,13
-            6951: 46,11
-            6952: 47,13
-            6953: 46,14
-            7010: 60,-8
-            7011: 61,-8
-            7012: 61,-8
-            7013: 57,-8
-            7014: 58,-8
-            7032: -14,-38
-            7033: -12,-39
+            3806: -16,11
+            3807: -17,12
+            6430: 52,-30
+            6457: -32,-9
+            6458: -34,-12
+            6470: -36,-46
+            6570: 13,39
+            6571: 13,42
+            6572: 16,40
+            6573: 13,38
+            6574: 13,38
+            6624: 9,-47
+            6714: -33,15
+            6803: -30,13
+            6804: -38,14
+            6873: 42,12
+            6874: 42,13
+            6875: 46,11
+            6876: 47,13
+            6877: 46,14
+            6934: 60,-8
+            6935: 61,-8
+            6936: 61,-8
+            6937: 57,-8
+            6938: 58,-8
+            6954: -14,-38
+            6955: -12,-39
+            6992: 52,-21
+            6993: 57,-22
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            2928: -44,15
+            2893: -44,15
         - node:
             color: '#FFFFFFFF'
             id: FlowersBROne
           decals:
             855: -47,-2
             882: -50,-7
-            1876: 56,-22
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRThree
@@ -6618,7 +6611,7 @@ entities:
             color: '#FFFFFFFF'
             id: FlowersBRThree
           decals:
-            2957: 80.70172,-6.173584
+            2922: 80.70172,-6.173584
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
@@ -6632,7 +6625,6 @@ entities:
             886: -45,-7
             907: -49,-29
             1448: -51,-49
-            6716: 57.036556,-21.73806
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr3
@@ -6650,7 +6642,7 @@ entities:
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            2958: 80.04127,-7.0725327
+            2923: 80.04127,-7.0725327
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv3
@@ -6660,11 +6652,6 @@ entities:
             884: -48,-9
             1082: 42,-30
             1695: 57,18
-        - node:
-            color: '#FFFFFFFF'
-            id: Flowersy1
-          decals:
-            1875: 55,-23
         - node:
             color: '#FFFFFFFF'
             id: Flowersy2
@@ -6678,14 +6665,14 @@ entities:
             color: '#FFFFFFFF'
             id: Flowersy2
           decals:
-            2959: 81.08699,-7.6962934
+            2924: 81.08699,-7.6962934
         - node:
             color: '#FFFFFFFF'
             id: Flowersy3
           decals:
             852: -50,4
             883: -47,-7
-            2172: 25,1
+            2142: 25,1
         - node:
             color: '#FFFFFFFF'
             id: Flowersy4
@@ -6697,7 +6684,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassa2
           decals:
-            2947: 80,-6
+            2912: 80,-6
         - node:
             color: '#FFFFFFFF'
             id: Grassa3
@@ -6708,20 +6695,18 @@ entities:
             id: Grassa4
           decals:
             1442: -47,-49
-            1882: 53.52114,-21.634073
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            2946: 80,-8
+            2911: 80,-8
         - node:
             color: '#FFFFFFFF'
             id: Grassa5
           decals:
             873: -49,-7
             1443: -45,-49
-            1883: 57.536766,-22.899698
         - node:
             color: '#FFFFFFFF'
             id: Grassb1
@@ -6745,13 +6730,11 @@ entities:
           decals:
             872: -48,-9
             1441: -50,-49
-            1881: 54.661766,-23.446573
         - node:
             color: '#FFFFFFFF'
             id: Grassb5
           decals:
             878: -50,-9
-            6714: 56.88979,-22.312899
         - node:
             color: '#FFFFFFFF'
             id: Grassc1
@@ -6762,7 +6745,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
-            2949: 79.637665,-6.118546
+            2914: 79.637665,-6.118546
         - node:
             color: '#FFFFFFFF'
             id: Grassc2
@@ -6773,7 +6756,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassc2
           decals:
-            2950: 81.362175,-7.1642623
+            2915: 81.362175,-7.1642623
         - node:
             color: '#FFFFFFFF'
             id: Grassc4
@@ -6785,7 +6768,7 @@ entities:
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
-            2948: 79.56428,-7.366067
+            2913: 79.56428,-7.366067
         - node:
             color: '#FFFFFFFF'
             id: Grassd1
@@ -6797,28 +6780,25 @@ entities:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            2951: 79.14232,-8.063211
+            2916: 79.14232,-8.063211
         - node:
             color: '#FFFFFFFF'
             id: Grassd2
           decals:
             866: -45,-9
-            1885: 53.52114,-22.368448
-            6715: 57.379013,-21.12653
         - node:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
             865: -48,-7
             910: -48,-27
-            1886: 57.73989,-21.884073
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            2952: 79.05059,-6.320351
-            2953: 80.53661,-6.6872687
+            2917: 79.05059,-6.320351
+            2918: 80.53661,-6.6872687
         - node:
             color: '#FFFFFFFF'
             id: Grasse1
@@ -6830,13 +6810,13 @@ entities:
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            2956: 81.784134,-6.4304266
+            2921: 81.784134,-6.4304266
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse2
           decals:
-            2954: 80.518265,-8.02652
+            2919: 80.518265,-8.02652
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
@@ -6844,18 +6824,17 @@ entities:
             862: -50,-7
             909: -47,-30
             1696: 57,19
-            1884: 55.95864,-23.352823
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            2955: 80.72007,-6.0451627
+            2920: 80.72007,-6.0451627
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
           decals:
-            6077: 44,7
+            6013: 44,7
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
@@ -6895,7 +6874,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
-            6078: 44,9
+            6014: 44,9
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
@@ -6913,7 +6892,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            6079: 45,8
+            6015: 45,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
@@ -6928,7 +6907,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            6080: 43,8
+            6016: 43,8
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
@@ -6964,35 +6943,35 @@ entities:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            6417: 89,-20
-            6418: 90,-20
+            6353: 89,-20
+            6354: 90,-20
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1729: 58,-24
-            1730: 58,-23
-            2105: -4,-36
-            2123: -56,-59
-            2124: -56,-66
+            2075: -4,-36
+            2093: -56,-59
+            2094: -56,-66
+            6974: 58,-24
+            6975: 58,-23
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             352: 39,-22
-            3080: 25,22
-            3081: 29,22
-            6014: -44,24
-            6893: 44,11
+            3045: 25,22
+            3046: 29,22
+            5950: -44,24
+            6817: 44,11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            2139: -40,-59
-            2140: -40,-66
-            6015: -45,23
+            2109: -40,-59
+            2110: -40,-66
+            5951: -45,23
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -7000,43 +6979,43 @@ entities:
           decals:
             351: 45,-22
             1710: 63,-26
-            6016: -44,22
+            5952: -44,22
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
             1246: 23,12
-            6017: -43,23
+            5953: -43,23
         - node:
             color: '#52B4E996'
             id: MiniTileCheckerAOverlay
           decals:
-            2157: 13,25
-            2158: 14,25
-            2159: 15,25
-            2160: 15,24
-            2161: 15,23
-            2162: 14,23
-            2163: 14,24
-            2164: 13,24
-            2165: 13,23
+            2127: 13,25
+            2128: 14,25
+            2129: 15,25
+            2130: 15,24
+            2131: 15,23
+            2132: 14,23
+            2133: 14,24
+            2134: 13,24
+            2135: 13,23
         - node:
             color: '#EFB34196'
             id: MiniTileCheckerBOverlay
           decals:
-            6912: 42,11
-            6913: 42,12
-            6914: 46,11
-            6915: 46,12
+            6836: 42,11
+            6837: 42,12
+            6838: 46,11
+            6839: 46,12
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            6562: 9,39
-            6563: 9,40
-            6564: 9,41
-            6565: 9,42
+            6498: 9,39
+            6499: 9,40
+            6500: 9,41
+            6501: 9,42
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
@@ -7051,7 +7030,7 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
           decals:
-            3187: -19,20
+            3152: -19,20
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
@@ -7066,679 +7045,683 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineW
           decals:
-            6566: 5,39
-            6567: 5,40
-            6568: 5,41
-            6569: 5,42
+            6502: 5,39
+            6503: 5,40
+            6504: 5,41
+            6505: 5,42
         - node:
             color: '#C6FF917F'
             id: MiniTileInnerOverlayNW
           decals:
-            6802: -29,12
+            6726: -29,12
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayE
           decals:
-            6794: -35,13
-            6795: -35,14
-            6796: -35,15
+            6718: -35,13
+            6719: -35,14
+            6720: -35,15
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayN
           decals:
-            6793: -32,12
+            6717: -32,12
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayS
           decals:
-            6797: -32,16
-            6798: -31,16
-            6799: -30,16
+            6721: -32,16
+            6722: -31,16
+            6723: -30,16
         - node:
             color: '#C6FF917F'
             id: MiniTileLineOverlayW
           decals:
-            6800: -29,13
-            6801: -29,14
+            6724: -29,13
+            6725: -29,14
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNe
           decals:
-            2343: -43,-25
-            2429: -40,-46
+            2312: -43,-25
+            2398: -40,-46
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerNw
           decals:
-            2243: -26,-9
-            2287: -55,7
-            2428: -56,-46
-            2529: 27,-19
-            2739: -27,21
+            2213: -26,-9
+            2256: -55,7
+            2397: -56,-46
+            2498: 27,-19
+            2704: -27,21
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSe
           decals:
-            2231: -23,-11
-            2355: -46,-33
-            2359: -43,-32
+            2201: -23,-11
+            2324: -46,-33
+            2328: -43,-32
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteCornerSw
           decals:
-            2351: -52,-32
-            2354: -50,-33
-            2505: 7,-34
-            2609: 40,1
-            2638: 19,2
+            2320: -52,-32
+            2323: -50,-33
+            2474: 7,-34
+            2574: 40,1
+            2603: 19,2
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNe
           decals:
-            2206: -23,-30
-            2255: -25,9
-            2344: -44,-25
-            2474: -28,-30
-            2757: 77,-19
-            2758: 77,-15
+            2176: -23,-30
+            2225: -25,9
+            2313: -44,-25
+            2443: -28,-30
+            2722: 77,-19
+            2723: 77,-15
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerNw
           decals:
-            2244: -25,-9
-            2473: -41,-30
-            2521: 27,-25
-            2573: 57,-19
+            2214: -25,-9
+            2442: -41,-30
+            2490: 27,-25
+            2542: 57,-19
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSe
           decals:
-            2230: -24,-11
-            2356: -46,-32
-            2362: -47,-33
-            2427: -54,-48
-            2472: -28,-27
-            2577: 59,-21
-            2755: 77,-13
-            2756: 77,-17
+            2200: -24,-11
+            2325: -46,-32
+            2331: -47,-33
+            2396: -54,-48
+            2441: -28,-27
+            2546: 59,-21
+            2720: 77,-13
+            2721: 77,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteInnerSw
           decals:
-            2353: -50,-32
-            2363: -49,-33
-            2426: -42,-48
-            2471: -41,-27
-            2503: 7,-32
-            2582: 52,-21
-            2608: 41,1
-            2610: 40,2
-            2678: 19,19
+            2322: -50,-32
+            2332: -49,-33
+            2395: -42,-48
+            2440: -41,-27
+            2472: 7,-32
+            2573: 41,1
+            2575: 40,2
+            2643: 19,19
+            6968: 56,-21
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineE
           decals:
-            2207: -23,-29
-            2208: -24,-25
-            2209: -24,-24
-            2210: -24,-23
-            2211: -24,-23
-            2212: -24,-20
-            2213: -24,-20
-            2214: -24,-20
-            2215: -24,-21
-            2216: -24,-21
-            2217: -24,-20
-            2218: -24,-19
-            2219: -24,-19
-            2220: -24,-19
-            2221: -24,-17
-            2222: -24,-17
-            2223: -24,-16
-            2224: -24,-16
-            2225: -24,-16
-            2226: -24,-15
-            2227: -24,-14
-            2228: -24,-14
-            2229: -24,-13
-            2232: -23,-10
-            2233: -23,-9
-            2234: -23,-8
-            2245: -25,4
-            2246: -25,5
-            2247: -25,6
-            2248: -25,7
-            2260: -43,0
-            2262: -43,2
-            2263: -43,3
-            2264: -43,-1
-            2303: -53,-6
-            2304: -53,-7
-            2305: -53,-7
-            2306: -53,-8
-            2307: -53,-9
-            2308: -53,-9
-            2309: -53,-10
-            2310: -53,-12
-            2318: -53,-13
-            2319: -53,-13
-            2320: -53,-15
-            2321: -53,-15
-            2322: -53,-15
-            2324: -53,-14
-            2325: -53,-16
-            2326: -53,-17
-            2327: -53,-18
-            2333: -44,-20
-            2334: -44,-21
-            2335: -44,-22
-            2336: -44,-22
-            2337: -44,-23
-            2338: -44,-23
-            2339: -44,-24
-            2340: -43,-25
-            2341: -43,-26
-            2342: -43,-27
-            2360: -43,-31
-            2361: -43,-30
-            2366: -47,-35
-            2367: -47,-36
-            2368: -47,-36
-            2369: -47,-38
-            2370: -47,-39
-            2371: -47,-40
-            2382: -47,-41
-            2383: -47,-42
-            2384: -47,-42
-            2385: -47,-43
-            2386: -47,-44
-            2387: -47,-44
-            2438: -40,-47
-            2439: -40,-48
-            2440: -40,-50
-            2441: -40,-50
-            2442: -40,-51
-            2443: -40,-51
-            2444: -40,-51
-            2445: -40,-52
-            2446: -40,-53
-            2447: -40,-53
-            2448: -40,-53
-            2449: -40,-54
-            2450: -54,-51
-            2451: -54,-51
-            2452: -54,-52
-            2453: -54,-52
-            2454: -54,-53
-            2455: -54,-53
-            2456: -54,-54
-            2467: -28,-29
-            2468: -28,-28
-            2578: 59,-22
-            2583: 43,-17
-            2584: 43,-16
-            2585: 43,-15
-            2586: 43,-15
-            2592: 43,-12
-            2593: 43,-11
-            2658: 21,10
-            2659: 21,11
-            2660: 21,11
-            2661: 21,12
-            2662: 21,12
-            2663: 21,12
-            2664: 21,13
-            2665: 21,14
-            2666: 21,15
-            2753: 77,-14
-            2754: 77,-18
-            3079: -54,-50
-            6651: -24,-18
-            7041: -43,1
+            2177: -23,-29
+            2178: -24,-25
+            2179: -24,-24
+            2180: -24,-23
+            2181: -24,-23
+            2182: -24,-20
+            2183: -24,-20
+            2184: -24,-20
+            2185: -24,-21
+            2186: -24,-21
+            2187: -24,-20
+            2188: -24,-19
+            2189: -24,-19
+            2190: -24,-19
+            2191: -24,-17
+            2192: -24,-17
+            2193: -24,-16
+            2194: -24,-16
+            2195: -24,-16
+            2196: -24,-15
+            2197: -24,-14
+            2198: -24,-14
+            2199: -24,-13
+            2202: -23,-10
+            2203: -23,-9
+            2204: -23,-8
+            2215: -25,4
+            2216: -25,5
+            2217: -25,6
+            2218: -25,7
+            2230: -43,0
+            2231: -43,2
+            2232: -43,3
+            2233: -43,-1
+            2272: -53,-6
+            2273: -53,-7
+            2274: -53,-7
+            2275: -53,-8
+            2276: -53,-9
+            2277: -53,-9
+            2278: -53,-10
+            2279: -53,-12
+            2287: -53,-13
+            2288: -53,-13
+            2289: -53,-15
+            2290: -53,-15
+            2291: -53,-15
+            2293: -53,-14
+            2294: -53,-16
+            2295: -53,-17
+            2296: -53,-18
+            2302: -44,-20
+            2303: -44,-21
+            2304: -44,-22
+            2305: -44,-22
+            2306: -44,-23
+            2307: -44,-23
+            2308: -44,-24
+            2309: -43,-25
+            2310: -43,-26
+            2311: -43,-27
+            2329: -43,-31
+            2330: -43,-30
+            2335: -47,-35
+            2336: -47,-36
+            2337: -47,-36
+            2338: -47,-38
+            2339: -47,-39
+            2340: -47,-40
+            2351: -47,-41
+            2352: -47,-42
+            2353: -47,-42
+            2354: -47,-43
+            2355: -47,-44
+            2356: -47,-44
+            2407: -40,-47
+            2408: -40,-48
+            2409: -40,-50
+            2410: -40,-50
+            2411: -40,-51
+            2412: -40,-51
+            2413: -40,-51
+            2414: -40,-52
+            2415: -40,-53
+            2416: -40,-53
+            2417: -40,-53
+            2418: -40,-54
+            2419: -54,-51
+            2420: -54,-51
+            2421: -54,-52
+            2422: -54,-52
+            2423: -54,-53
+            2424: -54,-53
+            2425: -54,-54
+            2436: -28,-29
+            2437: -28,-28
+            2547: 59,-22
+            2548: 43,-17
+            2549: 43,-16
+            2550: 43,-15
+            2551: 43,-15
+            2557: 43,-12
+            2558: 43,-11
+            2623: 21,10
+            2624: 21,11
+            2625: 21,11
+            2626: 21,12
+            2627: 21,12
+            2628: 21,12
+            2629: 21,13
+            2630: 21,14
+            2631: 21,15
+            2718: 77,-14
+            2719: 77,-18
+            3044: -54,-50
+            6587: -24,-18
+            6963: -43,1
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineN
           decals:
-            2200: -22,-30
-            2201: -21,-30
-            2202: -20,-30
-            2203: -20,-30
-            2204: -18,-30
-            2205: -19,-30
-            2249: -19,9
-            2250: -20,9
-            2251: -21,9
-            2252: -22,9
-            2253: -24,9
-            2254: -23,9
-            2274: -51,7
-            2275: -50,7
-            2276: -49,7
-            2277: -48,7
-            2278: -47,7
-            2279: -47,7
-            2280: -46,7
-            2281: -45,7
-            2282: -42,7
-            2283: -43,7
-            2284: -54,7
-            2285: -55,7
-            2286: -53,7
-            2388: -54,-46
-            2389: -51,-46
-            2390: -50,-46
-            2391: -50,-46
-            2392: -51,-46
-            2393: -53,-46
-            2394: -54,-46
-            2395: -54,-46
-            2396: -53,-46
-            2397: -52,-46
-            2398: -54,-46
-            2399: -55,-46
-            2400: -46,-46
-            2401: -45,-46
-            2402: -45,-46
-            2403: -44,-46
-            2404: -44,-46
-            2405: -43,-46
-            2406: -43,-46
-            2407: -42,-46
-            2408: -42,-46
-            2409: -41,-46
-            2493: -11,-30
-            2494: -10,-30
-            2495: -10,-30
-            2519: 25,-25
-            2520: 26,-25
-            2530: 28,-19
-            2531: 29,-19
-            2532: 29,-19
-            2533: 31,-19
-            2534: 31,-19
-            2535: 32,-19
-            2536: 32,-19
-            2537: 32,-19
-            2538: 34,-19
-            2539: 34,-19
-            2540: 34,-19
-            2541: 33,-19
-            2542: 35,-19
-            2543: 35,-19
-            2544: 36,-19
-            2545: 36,-19
-            2546: 37,-19
-            2547: 37,-19
-            2548: 39,-19
-            2549: 39,-19
-            2550: 40,-19
-            2551: 40,-19
-            2552: 40,-19
-            2553: 41,-19
-            2554: 42,-19
-            2555: 42,-19
-            2556: 43,-19
-            2557: 44,-19
-            2558: 44,-19
-            2559: 45,-19
-            2560: 47,-19
-            2561: 47,-19
-            2562: 48,-19
-            2563: 49,-19
-            2564: 49,-19
-            2565: 50,-19
-            2566: 51,-19
-            2567: 52,-19
-            2568: 52,-19
-            2569: 54,-19
-            2570: 55,-19
-            2571: 56,-19
-            2572: 53,-19
-            2615: 37,4
-            2616: 35,4
-            2617: 34,4
-            2618: 33,4
-            2619: 32,4
-            2620: 32,4
-            2621: 31,4
-            2681: 20,21
-            2682: 19,21
-            2683: 19,21
-            2684: 18,21
-            2685: 16,21
-            2686: 16,21
-            2687: 16,21
-            2688: 16,21
-            2689: 15,21
-            2690: 13,21
-            2691: 13,21
-            2692: 12,21
-            2693: 11,21
-            2694: 10,21
-            2695: 10,21
-            2696: 9,21
-            2697: 8,21
-            2736: -26,21
-            2746: 66,-17
-            2747: 68,-17
-            2748: 67,-17
-            2749: 69,-17
-            2750: 70,-17
-            2751: 70,-17
-            2752: 71,-17
+            2170: -22,-30
+            2171: -21,-30
+            2172: -20,-30
+            2173: -20,-30
+            2174: -18,-30
+            2175: -19,-30
+            2219: -19,9
+            2220: -20,9
+            2221: -21,9
+            2222: -22,9
+            2223: -24,9
+            2224: -23,9
+            2243: -51,7
+            2244: -50,7
+            2245: -49,7
+            2246: -48,7
+            2247: -47,7
+            2248: -47,7
+            2249: -46,7
+            2250: -45,7
+            2251: -42,7
+            2252: -43,7
+            2253: -54,7
+            2254: -55,7
+            2255: -53,7
+            2357: -54,-46
+            2358: -51,-46
+            2359: -50,-46
+            2360: -50,-46
+            2361: -51,-46
+            2362: -53,-46
+            2363: -54,-46
+            2364: -54,-46
+            2365: -53,-46
+            2366: -52,-46
+            2367: -54,-46
+            2368: -55,-46
+            2369: -46,-46
+            2370: -45,-46
+            2371: -45,-46
+            2372: -44,-46
+            2373: -44,-46
+            2374: -43,-46
+            2375: -43,-46
+            2376: -42,-46
+            2377: -42,-46
+            2378: -41,-46
+            2462: -11,-30
+            2463: -10,-30
+            2464: -10,-30
+            2488: 25,-25
+            2489: 26,-25
+            2499: 28,-19
+            2500: 29,-19
+            2501: 29,-19
+            2502: 31,-19
+            2503: 31,-19
+            2504: 32,-19
+            2505: 32,-19
+            2506: 32,-19
+            2507: 34,-19
+            2508: 34,-19
+            2509: 34,-19
+            2510: 33,-19
+            2511: 35,-19
+            2512: 35,-19
+            2513: 36,-19
+            2514: 36,-19
+            2515: 37,-19
+            2516: 37,-19
+            2517: 39,-19
+            2518: 39,-19
+            2519: 40,-19
+            2520: 40,-19
+            2521: 40,-19
+            2522: 41,-19
+            2523: 42,-19
+            2524: 42,-19
+            2525: 43,-19
+            2526: 44,-19
+            2527: 44,-19
+            2528: 45,-19
+            2529: 47,-19
+            2530: 47,-19
+            2531: 48,-19
+            2532: 49,-19
+            2533: 49,-19
+            2534: 50,-19
+            2535: 51,-19
+            2536: 52,-19
+            2537: 52,-19
+            2538: 54,-19
+            2539: 55,-19
+            2540: 56,-19
+            2541: 53,-19
+            2580: 37,4
+            2581: 35,4
+            2582: 34,4
+            2583: 33,4
+            2584: 32,4
+            2585: 32,4
+            2586: 31,4
+            2646: 20,21
+            2647: 19,21
+            2648: 19,21
+            2649: 18,21
+            2650: 16,21
+            2651: 16,21
+            2652: 16,21
+            2653: 16,21
+            2654: 15,21
+            2655: 13,21
+            2656: 13,21
+            2657: 12,21
+            2658: 11,21
+            2659: 10,21
+            2660: 10,21
+            2661: 9,21
+            2662: 8,21
+            2701: -26,21
+            2711: 66,-17
+            2712: 68,-17
+            2713: 67,-17
+            2714: 69,-17
+            2715: 70,-17
+            2716: 70,-17
+            2717: 71,-17
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineS
           decals:
-            2190: -25,-32
-            2191: -23,-32
-            2192: -24,-32
-            2193: -22,-32
-            2194: -22,-32
-            2195: -21,-32
-            2196: -19,-32
-            2197: -19,-32
-            2198: -18,-32
-            2199: -18,-32
-            2265: -45,-5
-            2266: -46,-5
-            2267: -47,-5
-            2268: -48,-5
-            2269: -48,-5
-            2270: -50,-5
-            2271: -50,-5
-            2272: -49,-5
-            2273: -51,-5
-            2352: -51,-32
-            2357: -45,-32
-            2358: -44,-32
-            2410: -53,-48
-            2411: -52,-48
-            2412: -51,-48
-            2413: -50,-48
-            2414: -50,-48
-            2415: -49,-48
-            2416: -50,-48
-            2417: -50,-48
-            2418: -48,-48
-            2419: -48,-48
-            2420: -47,-48
-            2421: -47,-48
-            2422: -46,-48
-            2423: -45,-48
-            2424: -44,-48
-            2425: -43,-48
-            2475: -16,-32
-            2476: -14,-32
-            2477: -14,-32
-            2478: -14,-32
-            2479: -15,-32
-            2480: -14,-32
-            2481: -14,-32
-            2482: -13,-32
-            2483: -12,-32
-            2484: -12,-32
-            2485: -11,-32
-            2486: -11,-32
-            2487: -10,-32
-            2488: -10,-32
-            2489: -7,-32
-            2490: -6,-32
-            2491: -5,-32
-            2492: -5,-32
-            2496: -4,-32
-            2497: -3,-32
-            2498: -3,-32
-            2499: -3,-32
-            2500: -2,-32
-            2501: 3,-32
-            2502: 6,-32
-            2506: 8,-34
-            2507: 9,-34
-            2508: 9,-34
-            2509: 11,-34
-            2510: 11,-34
-            2511: 12,-34
-            2512: 12,-34
-            2513: 13,-34
-            2514: 13,-34
-            2515: 14,-34
-            2516: 15,-34
-            2517: 15,-34
-            2518: 16,-34
-            2576: 60,-21
-            2611: 38,2
-            2612: 36,2
-            2613: 37,2
-            2614: 38,2
-            2622: 34,2
-            2623: 33,2
-            2624: 32,2
-            2625: 31,2
-            2626: 31,2
-            2627: 27,2
-            2628: 26,2
-            2629: 26,2
-            2630: 25,2
-            2631: 24,2
-            2632: 23,2
-            2633: 23,2
-            2634: 21,2
-            2635: 21,2
-            2636: 22,2
-            2637: 20,2
-            2679: 18,19
-            2680: 16,19
-            2698: 14,19
-            2699: 13,19
-            2700: 12,19
-            2701: 11,19
-            2702: 10,19
-            2703: 10,19
-            2704: 9,19
-            2705: 9,19
-            2706: 8,19
-            2707: 6,19
-            2708: 6,19
-            2709: 7,19
-            2710: 5,19
-            2711: 0,19
-            2712: 0,19
-            2713: -1,19
-            2714: -1,19
-            2715: -2,19
-            2716: -3,19
-            2717: -3,19
-            2718: -4,19
-            2719: -5,19
-            2720: -6,19
-            2721: -6,19
-            2722: -7,19
-            2723: -7,19
-            2724: -8,19
-            2725: -8,19
-            2726: -8,19
-            2727: -11,19
-            2728: -11,19
-            2729: -13,19
-            2730: -13,19
-            2731: -14,19
-            2732: -12,19
-            2733: -16,19
-            2734: -16,19
-            2735: -18,19
-            2740: 66,-19
-            2741: 67,-19
-            2742: 68,-19
-            2743: 69,-19
-            2744: 70,-19
-            2745: 71,-19
-            2976: 1,19
-            2977: 2,19
+            2160: -25,-32
+            2161: -23,-32
+            2162: -24,-32
+            2163: -22,-32
+            2164: -22,-32
+            2165: -21,-32
+            2166: -19,-32
+            2167: -19,-32
+            2168: -18,-32
+            2169: -18,-32
+            2234: -45,-5
+            2235: -46,-5
+            2236: -47,-5
+            2237: -48,-5
+            2238: -48,-5
+            2239: -50,-5
+            2240: -50,-5
+            2241: -49,-5
+            2242: -51,-5
+            2321: -51,-32
+            2326: -45,-32
+            2327: -44,-32
+            2379: -53,-48
+            2380: -52,-48
+            2381: -51,-48
+            2382: -50,-48
+            2383: -50,-48
+            2384: -49,-48
+            2385: -50,-48
+            2386: -50,-48
+            2387: -48,-48
+            2388: -48,-48
+            2389: -47,-48
+            2390: -47,-48
+            2391: -46,-48
+            2392: -45,-48
+            2393: -44,-48
+            2394: -43,-48
+            2444: -16,-32
+            2445: -14,-32
+            2446: -14,-32
+            2447: -14,-32
+            2448: -15,-32
+            2449: -14,-32
+            2450: -14,-32
+            2451: -13,-32
+            2452: -12,-32
+            2453: -12,-32
+            2454: -11,-32
+            2455: -11,-32
+            2456: -10,-32
+            2457: -10,-32
+            2458: -7,-32
+            2459: -6,-32
+            2460: -5,-32
+            2461: -5,-32
+            2465: -4,-32
+            2466: -3,-32
+            2467: -3,-32
+            2468: -3,-32
+            2469: -2,-32
+            2470: 3,-32
+            2471: 6,-32
+            2475: 8,-34
+            2476: 9,-34
+            2477: 9,-34
+            2478: 11,-34
+            2479: 11,-34
+            2480: 12,-34
+            2481: 12,-34
+            2482: 13,-34
+            2483: 13,-34
+            2484: 14,-34
+            2485: 15,-34
+            2486: 15,-34
+            2487: 16,-34
+            2545: 60,-21
+            2576: 38,2
+            2577: 36,2
+            2578: 37,2
+            2579: 38,2
+            2587: 34,2
+            2588: 33,2
+            2589: 32,2
+            2590: 31,2
+            2591: 31,2
+            2592: 27,2
+            2593: 26,2
+            2594: 26,2
+            2595: 25,2
+            2596: 24,2
+            2597: 23,2
+            2598: 23,2
+            2599: 21,2
+            2600: 21,2
+            2601: 22,2
+            2602: 20,2
+            2644: 18,19
+            2645: 16,19
+            2663: 14,19
+            2664: 13,19
+            2665: 12,19
+            2666: 11,19
+            2667: 10,19
+            2668: 10,19
+            2669: 9,19
+            2670: 9,19
+            2671: 8,19
+            2672: 6,19
+            2673: 6,19
+            2674: 7,19
+            2675: 5,19
+            2676: 0,19
+            2677: 0,19
+            2678: -1,19
+            2679: -1,19
+            2680: -2,19
+            2681: -3,19
+            2682: -3,19
+            2683: -4,19
+            2684: -5,19
+            2685: -6,19
+            2686: -6,19
+            2687: -7,19
+            2688: -7,19
+            2689: -8,19
+            2690: -8,19
+            2691: -8,19
+            2692: -11,19
+            2693: -11,19
+            2694: -13,19
+            2695: -13,19
+            2696: -14,19
+            2697: -12,19
+            2698: -16,19
+            2699: -16,19
+            2700: -18,19
+            2705: 66,-19
+            2706: 67,-19
+            2707: 68,-19
+            2708: 69,-19
+            2709: 70,-19
+            2710: 71,-19
+            2941: 1,19
+            2942: 2,19
+            6969: 54,-21
+            6970: 55,-21
+            6971: 53,-21
+            6972: 52,-21
         - node:
             color: '#9D9D97FF'
             id: MiniTileWhiteLineW
           decals:
-            2173: -26,-21
-            2174: -26,-20
-            2175: -26,-18
-            2176: -26,-19
-            2177: -26,-17
-            2182: -26,-25
-            2183: -26,-24
-            2184: -26,-27
-            2185: -26,-26
-            2186: -26,-28
-            2187: -26,-29
-            2188: -26,-30
-            2189: -26,-31
-            2235: -25,-8
-            2236: -26,-10
-            2237: -26,-11
-            2238: -26,-16
-            2239: -26,-15
-            2240: -26,-15
-            2241: -26,-14
-            2242: -26,-13
-            2256: -27,7
-            2257: -27,8
-            2258: -27,6
-            2259: -27,5
-            2288: -55,5
-            2289: -55,3
-            2290: -55,2
-            2291: -55,1
-            2292: -55,0
-            2293: -55,-1
-            2294: -55,-3
-            2295: -55,-6
-            2296: -55,-6
-            2297: -55,-7
-            2298: -55,-7
-            2299: -55,-8
-            2300: -55,-9
-            2301: -55,-9
-            2302: -55,-11
-            2311: -55,-10
-            2312: -55,-11
-            2313: -55,-12
-            2314: -55,-13
-            2315: -55,-13
-            2316: -55,-15
-            2317: -55,-15
-            2323: -55,-14
-            2328: -55,-16
-            2329: -55,-17
-            2330: -55,-18
-            2331: -55,-20
-            2332: -55,-21
-            2345: -52,-28
-            2346: -52,-29
-            2347: -52,-30
-            2348: -52,-30
-            2349: -52,-31
-            2350: -52,-32
-            2364: -49,-35
-            2365: -49,-36
-            2372: -49,-38
-            2373: -49,-38
-            2374: -49,-39
-            2375: -49,-40
-            2376: -49,-40
-            2377: -49,-41
-            2378: -49,-42
-            2379: -49,-43
-            2380: -49,-43
-            2381: -49,-44
-            2430: -42,-50
-            2431: -42,-50
-            2432: -42,-51
-            2433: -42,-51
-            2434: -42,-52
-            2435: -42,-52
-            2436: -42,-53
-            2437: -42,-54
-            2457: -56,-54
-            2458: -56,-53
-            2459: -56,-52
-            2460: -56,-52
-            2461: -56,-51
-            2462: -56,-51
-            2463: -56,-48
-            2464: -56,-48
-            2465: -56,-47
-            2466: -56,-50
-            2469: -41,-29
-            2470: -41,-28
-            2504: 7,-33
-            2522: 27,-23
-            2523: 27,-23
-            2524: 27,-23
-            2525: 27,-22
-            2526: 27,-24
-            2527: 27,-21
-            2528: 27,-20
-            2574: 57,-18
-            2575: 57,-17
-            2579: 52,-24
-            2580: 52,-23
-            2581: 52,-22
-            2587: 41,-17
-            2588: 41,-16
-            2589: 41,-15
-            2590: 41,-12
-            2591: 41,-11
-            2594: 41,-9
-            2595: 41,-8
-            2596: 41,-7
-            2597: 41,-7
-            2598: 41,-6
-            2599: 41,-5
-            2600: 41,-5
-            2601: 41,-4
-            2602: 41,-3
-            2603: 41,-3
-            2604: 41,-1
-            2605: 41,-1
-            2606: 41,-1
-            2607: 41,-2
-            2639: 19,3
-            2640: 19,4
-            2641: 19,4
-            2642: 19,4
-            2643: 19,5
-            2644: 19,5
-            2645: 19,7
-            2646: 19,8
-            2647: 19,8
-            2648: 19,8
-            2649: 19,10
-            2650: 19,10
-            2651: 19,11
-            2652: 19,10
-            2653: 19,10
-            2654: 19,12
-            2655: 19,10
-            2656: 19,9
-            2657: 19,9
-            2667: 19,13
-            2668: 19,14
-            2669: 19,14
-            2670: 19,14
-            2671: 19,15
-            2672: 19,15
-            2673: 19,15
-            2674: 19,16
-            2675: 19,16
-            2676: 19,18
-            2677: 19,18
-            2737: -27,20
-            2738: -27,18
+            2143: -26,-21
+            2144: -26,-20
+            2145: -26,-18
+            2146: -26,-19
+            2147: -26,-17
+            2152: -26,-25
+            2153: -26,-24
+            2154: -26,-27
+            2155: -26,-26
+            2156: -26,-28
+            2157: -26,-29
+            2158: -26,-30
+            2159: -26,-31
+            2205: -25,-8
+            2206: -26,-10
+            2207: -26,-11
+            2208: -26,-16
+            2209: -26,-15
+            2210: -26,-15
+            2211: -26,-14
+            2212: -26,-13
+            2226: -27,7
+            2227: -27,8
+            2228: -27,6
+            2229: -27,5
+            2257: -55,5
+            2258: -55,3
+            2259: -55,2
+            2260: -55,1
+            2261: -55,0
+            2262: -55,-1
+            2263: -55,-3
+            2264: -55,-6
+            2265: -55,-6
+            2266: -55,-7
+            2267: -55,-7
+            2268: -55,-8
+            2269: -55,-9
+            2270: -55,-9
+            2271: -55,-11
+            2280: -55,-10
+            2281: -55,-11
+            2282: -55,-12
+            2283: -55,-13
+            2284: -55,-13
+            2285: -55,-15
+            2286: -55,-15
+            2292: -55,-14
+            2297: -55,-16
+            2298: -55,-17
+            2299: -55,-18
+            2300: -55,-20
+            2301: -55,-21
+            2314: -52,-28
+            2315: -52,-29
+            2316: -52,-30
+            2317: -52,-30
+            2318: -52,-31
+            2319: -52,-32
+            2333: -49,-35
+            2334: -49,-36
+            2341: -49,-38
+            2342: -49,-38
+            2343: -49,-39
+            2344: -49,-40
+            2345: -49,-40
+            2346: -49,-41
+            2347: -49,-42
+            2348: -49,-43
+            2349: -49,-43
+            2350: -49,-44
+            2399: -42,-50
+            2400: -42,-50
+            2401: -42,-51
+            2402: -42,-51
+            2403: -42,-52
+            2404: -42,-52
+            2405: -42,-53
+            2406: -42,-54
+            2426: -56,-54
+            2427: -56,-53
+            2428: -56,-52
+            2429: -56,-52
+            2430: -56,-51
+            2431: -56,-51
+            2432: -56,-48
+            2433: -56,-48
+            2434: -56,-47
+            2435: -56,-50
+            2438: -41,-29
+            2439: -41,-28
+            2473: 7,-33
+            2491: 27,-23
+            2492: 27,-23
+            2493: 27,-23
+            2494: 27,-22
+            2495: 27,-24
+            2496: 27,-21
+            2497: 27,-20
+            2543: 57,-18
+            2544: 57,-17
+            2552: 41,-17
+            2553: 41,-16
+            2554: 41,-15
+            2555: 41,-12
+            2556: 41,-11
+            2559: 41,-9
+            2560: 41,-8
+            2561: 41,-7
+            2562: 41,-7
+            2563: 41,-6
+            2564: 41,-5
+            2565: 41,-5
+            2566: 41,-4
+            2567: 41,-3
+            2568: 41,-3
+            2569: 41,-1
+            2570: 41,-1
+            2571: 41,-1
+            2572: 41,-2
+            2604: 19,3
+            2605: 19,4
+            2606: 19,4
+            2607: 19,4
+            2608: 19,5
+            2609: 19,5
+            2610: 19,7
+            2611: 19,8
+            2612: 19,8
+            2613: 19,8
+            2614: 19,10
+            2615: 19,10
+            2616: 19,11
+            2617: 19,10
+            2618: 19,10
+            2619: 19,12
+            2620: 19,10
+            2621: 19,9
+            2622: 19,9
+            2632: 19,13
+            2633: 19,14
+            2634: 19,14
+            2635: 19,14
+            2636: 19,15
+            2637: 19,15
+            2638: 19,15
+            2639: 19,16
+            2640: 19,16
+            2641: 19,18
+            2642: 19,18
+            2702: -27,20
+            2703: -27,18
+            6966: 56,-23
+            6967: 56,-22
+            6973: 56,-24
         - node:
             color: '#52B4E996'
             id: MonoOverlay
           decals:
-            6072: 44,8
+            6008: 44,8
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
@@ -7748,7 +7731,7 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
-            6074: 43,9
+            6010: 43,9
         - node:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale
@@ -7809,17 +7792,17 @@ entities:
             1647: 27,4
             1648: 23,4
             1649: 22,4
-            1855: 57,-17
-            1856: 58,-17
-            1857: 59,-17
-            1858: 60,-17
-            1859: 61,-17
-            2088: -1,-33
-            6053: 38,4
-            6054: 40,4
-            6055: 41,4
-            6056: 42,4
-            6057: 43,4
+            1853: 57,-17
+            1854: 58,-17
+            1855: 59,-17
+            1856: 60,-17
+            1857: 61,-17
+            2060: -1,-33
+            5989: 38,4
+            5990: 40,4
+            5991: 41,4
+            5992: 42,4
+            5993: 43,4
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
@@ -7861,34 +7844,34 @@ entities:
             1660: 34,-21
             1661: 36,-21
             1662: 35,-21
-            1865: 51,-21
-            1961: 29,-21
-            1962: 29,-22
-            1963: 29,-23
-            1964: 29,-24
-            1965: 29,-25
-            1966: 29,-26
-            1967: 29,-27
-            1968: 28,-27
-            1969: 27,-27
-            1970: 26,-27
-            1971: 25,-27
-            1972: 24,-27
-            1973: 23,-27
-            1974: 21,-27
-            1975: 21,-29
-            1976: 21,-30
-            1977: 21,-31
-            1978: 21,-32
-            1979: 21,-33
-            1980: 21,-34
-            1981: 20,-34
-            1982: 19,-34
+            1863: 51,-21
+            1933: 29,-21
+            1934: 29,-22
+            1935: 29,-23
+            1936: 29,-24
+            1937: 29,-25
+            1938: 29,-26
+            1939: 29,-27
+            1940: 28,-27
+            1941: 27,-27
+            1942: 26,-27
+            1943: 25,-27
+            1944: 24,-27
+            1945: 23,-27
+            1946: 21,-27
+            1947: 21,-29
+            1948: 21,-30
+            1949: 21,-31
+            1950: 21,-32
+            1951: 21,-33
+            1952: 21,-34
+            1953: 20,-34
+            1954: 19,-34
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            6075: 45,7
+            6011: 45,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale180
@@ -7908,28 +7891,28 @@ entities:
             1655: 21,18
             1656: 21,19
             1657: 21,20
-            1860: 61,-17
-            1861: 61,-18
-            1862: 61,-19
-            1863: 61,-20
-            2084: -1,-33
-            2085: 0,-33
-            2086: 1,-33
-            2087: 2,-33
-            6058: 43,4
-            6059: 43,3
-            6060: 43,2
-            6061: 43,1
-            6062: 43,-1
-            6063: 43,-2
-            6064: 43,-3
-            6065: 43,-4
-            6066: 43,-5
-            6067: 43,-6
-            6068: 43,-7
-            6069: 43,-8
-            6070: 43,-9
-            6071: 43,-10
+            1858: 61,-17
+            1859: 61,-18
+            1860: 61,-19
+            1861: 61,-20
+            2056: -1,-33
+            2057: 0,-33
+            2058: 1,-33
+            2059: 2,-33
+            5994: 43,4
+            5995: 43,3
+            5996: 43,2
+            5997: 43,1
+            5998: 43,-1
+            5999: 43,-2
+            6000: 43,-3
+            6001: 43,-4
+            6002: 43,-5
+            6003: 43,-6
+            6004: 43,-7
+            6005: 43,-8
+            6006: 43,-9
+            6007: 43,-10
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
@@ -7952,7 +7935,7 @@ entities:
             1547: 19,-27
             1548: 19,-29
             1549: 19,-30
-            6076: 43,7
+            6012: 43,7
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale270
@@ -7975,17 +7958,17 @@ entities:
             1665: 36,-21
             1666: 37,-21
             1667: 50,-21
-            1866: 51,-21
-            1983: 19,-34
-            1984: 20,-34
-            1985: 21,-34
-            1992: 23,-27
-            1993: 24,-27
-            1994: 25,-27
-            1995: 26,-27
-            1996: 27,-27
-            1997: 28,-27
-            1998: 29,-27
+            1864: 51,-21
+            1955: 19,-34
+            1956: 20,-34
+            1957: 21,-34
+            1964: 23,-27
+            1965: 24,-27
+            1966: 25,-27
+            1967: 26,-27
+            1968: 27,-27
+            1969: 28,-27
+            1970: 29,-27
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
@@ -7998,10 +7981,10 @@ entities:
             1515: 5,-29
             1516: 5,-28
             1517: 5,-27
-            2079: -1,-33
-            2080: 1,-33
-            2081: 0,-33
-            2082: 2,-33
+            2051: -1,-33
+            2052: 1,-33
+            2053: 0,-33
+            2054: 2,-33
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
@@ -8016,25 +7999,25 @@ entities:
             1542: 21,-25
             1543: 22,-25
             1544: 23,-25
-            6035: 40,4
-            6036: 38,4
-            6037: 41,4
-            6038: 42,4
-            6039: 43,4
-            6040: 43,3
-            6041: 43,2
-            6042: 43,1
-            6043: 43,-1
-            6044: 43,-2
-            6045: 43,-3
-            6046: 43,-4
-            6047: 43,-5
-            6048: 43,-6
-            6049: 43,-7
-            6050: 43,-10
-            6051: 43,-9
-            6052: 43,-8
-            6073: 45,9
+            5971: 40,4
+            5972: 38,4
+            5973: 41,4
+            5974: 42,4
+            5975: 43,4
+            5976: 43,3
+            5977: 43,2
+            5978: 43,1
+            5979: 43,-1
+            5980: 43,-2
+            5981: 43,-3
+            5982: 43,-4
+            5983: 43,-5
+            5984: 43,-6
+            5985: 43,-7
+            5986: 43,-10
+            5987: 43,-9
+            5988: 43,-8
+            6009: 45,9
         - node:
             color: '#79150096'
             id: QuarterTileOverlayGreyscale90
@@ -8075,14 +8058,14 @@ entities:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            1848: 61,-17
-            1849: 60,-17
-            1850: 59,-17
-            1851: 58,-17
-            1852: 61,-18
-            1853: 61,-19
-            1854: 61,-20
-            1864: 57,-17
+            1846: 61,-17
+            1847: 60,-17
+            1848: 59,-17
+            1849: 58,-17
+            1850: 61,-18
+            1851: 61,-19
+            1852: 61,-20
+            1862: 57,-17
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale90
@@ -8105,18 +8088,18 @@ entities:
             1596: -48,-20
             1597: -52,-20
             1598: -62,-22
-            1986: 21,-34
-            1987: 21,-33
-            1988: 21,-32
-            1989: 21,-31
-            1990: 21,-30
-            1991: 21,-29
-            1999: 29,-27
-            2000: 29,-26
-            2001: 29,-25
-            2002: 29,-24
-            2003: 29,-23
-            2004: 29,-22
+            1958: 21,-34
+            1959: 21,-33
+            1960: 21,-32
+            1961: 21,-31
+            1962: 21,-30
+            1963: 21,-29
+            1971: 29,-27
+            1972: 29,-26
+            1973: 29,-25
+            1974: 29,-24
+            1975: 29,-23
+            1976: 29,-22
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
@@ -8155,7 +8138,7 @@ entities:
             1512: 1,-30
             1513: 2,-30
             1514: 3,-30
-            2083: 2,-33
+            2055: 2,-33
         - node:
             color: '#FFFFFFFF'
             id: Rock01
@@ -8198,12 +8181,12 @@ entities:
             color: '#FFFFFFFF'
             id: Rust
           decals:
-            2871: -5,-39
-            2872: -7,-40
-            2873: -6,-41
-            2874: -7,-41
-            2875: -8,-39
-            2876: -8,-42
+            2836: -5,-39
+            2837: -7,-40
+            2838: -6,-41
+            2839: -7,-41
+            2840: -8,-39
+            2841: -8,-42
         - node:
             color: '#FFFFFFFF'
             id: SpaceStationSign1
@@ -8243,8 +8226,8 @@ entities:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            6973: 57.998478,-4.7559896
-            6974: 60.004295,-4.7682204
+            6897: 57.998478,-4.7559896
+            6898: 60.004295,-4.7682204
         - node:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
@@ -8289,19 +8272,19 @@ entities:
             color: '#FFFFFFB1'
             id: VentSmall
           decals:
-            2805: -36,22
+            2770: -36,22
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
             1157: 6,32
-            6387: 91,-13
+            6323: 91,-13
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
             1156: 3,32
-            6388: 88,-13
+            6324: 88,-13
         - node:
             color: '#EFB34196'
             id: WarnCornerSE
@@ -8311,7 +8294,7 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            6386: 91,-16
+            6322: 91,-16
         - node:
             color: '#EFB34196'
             id: WarnCornerSW
@@ -8321,49 +8304,49 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            6385: 88,-16
-            6897: 46,15
+            6321: 88,-16
+            6821: 46,15
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            6810: -35,12
+            6734: -35,12
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            6543: 49,-11
-            6544: 52,-11
+            6479: 49,-11
+            6480: 52,-11
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            6809: -35,16
+            6733: -35,16
         - node:
             color: '#52B4E996'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            6541: 49,-11
-            6542: 52,-11
+            6477: 49,-11
+            6478: 52,-11
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNE
           decals:
-            6465: 12,-30
-            6466: 12,-30
+            6401: 12,-30
+            6402: 12,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNE
           decals:
-            6610: 14,39
-            6611: 14,39
-            6612: 14,39
-            6613: 14,39
+            6546: 14,39
+            6547: 14,39
+            6548: 14,39
+            6549: 14,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNE
           decals:
-            6464: 12,-30
+            6400: 12,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNE
@@ -8375,30 +8358,30 @@ entities:
           decals:
             1290: 25,23
             1291: 29,23
-            2013: 11,-47
-            6122: 51,13
-            6210: 51,-11
-            6900: 46,15
-            6998: 57,-5
+            1985: 11,-47
+            6058: 51,13
+            6146: 51,-11
+            6824: 46,15
+            6922: 57,-5
         - node:
             color: '#EFB34118'
             id: WarnCornerSmallNW
           decals:
-            6467: 16,-30
-            6468: 16,-30
+            6403: 16,-30
+            6404: 16,-30
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallNW
           decals:
-            6606: 16,39
-            6607: 16,39
-            6608: 16,39
-            6609: 16,39
+            6542: 16,39
+            6543: 16,39
+            6544: 16,39
+            6545: 16,39
         - node:
             color: '#EFB3416C'
             id: WarnCornerSmallNW
           decals:
-            6463: 16,-30
+            6399: 16,-30
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallNW
@@ -8412,16 +8395,16 @@ entities:
             1055: 39,-1
             1292: 25,23
             1293: 29,23
-            2014: 14,-47
-            6977: 61,-5
+            1986: 14,-47
+            6901: 61,-5
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSE
           decals:
-            6602: 14,42
-            6603: 14,42
-            6604: 14,42
-            6605: 14,42
+            6538: 14,42
+            6539: 14,42
+            6540: 14,42
+            6541: 14,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSE
@@ -8435,15 +8418,15 @@ entities:
             id: WarnCornerSmallSE
           decals:
             1412: 55,-33
-            6121: 51,15
+            6057: 51,15
         - node:
             color: '#EFB34131'
             id: WarnCornerSmallSW
           decals:
-            6598: 16,42
-            6599: 16,42
-            6600: 16,42
-            6601: 16,42
+            6534: 16,42
+            6535: 16,42
+            6536: 16,42
+            6537: 16,42
         - node:
             color: '#EFB34196'
             id: WarnCornerSmallSW
@@ -8454,14 +8437,14 @@ entities:
             color: '#EFB34131'
             id: WarnLineE
           decals:
-            6574: 14,40
-            6575: 14,40
-            6576: 14,41
-            6577: 14,41
-            6586: 14,40
-            6587: 14,40
-            6588: 14,41
-            6589: 14,41
+            6510: 14,40
+            6511: 14,40
+            6512: 14,41
+            6513: 14,41
+            6522: 14,40
+            6523: 14,40
+            6524: 14,41
+            6525: 14,41
         - node:
             color: '#EFB34196'
             id: WarnLineE
@@ -8498,84 +8481,91 @@ entities:
             1407: 55,-36
             1408: 55,-34
             1409: 55,-35
-            1790: 73,-14
-            1791: 73,-15
-            1792: 73,-17
-            1793: 73,-16
-            1794: 73,-18
-            1795: 73,-19
-            6013: -45,23
-            6119: 51,14
-            6209: 51,-10
-            6383: 91,-15
-            6384: 91,-14
-            6511: -33,-11
-            6512: -33,-10
-            6898: 46,16
-            6997: 57,-4
+            1788: 73,-14
+            1789: 73,-15
+            1790: 73,-17
+            1791: 73,-16
+            1792: 73,-18
+            1793: 73,-19
+            5949: -45,23
+            6055: 51,14
+            6145: 51,-10
+            6319: 91,-15
+            6320: 91,-14
+            6447: -33,-11
+            6448: -33,-10
+            6822: 46,16
+            6921: 57,-4
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleE
           decals:
-            6211: 52,-12
-            6212: 52,-13
-            6213: 52,-14
-            6214: 52,-15
-            6215: 49,-12
-            6216: 49,-13
-            6217: 49,-14
-            6218: 49,-15
+            6147: 52,-12
+            6148: 52,-13
+            6149: 52,-14
+            6150: 52,-15
+            6151: 49,-12
+            6152: 49,-13
+            6153: 49,-14
+            6154: 49,-15
         - node:
             color: '#EFB34196'
             id: WarnLineGreyscaleN
           decals:
-            6910: 42,13
-            6911: 46,13
+            6834: 42,13
+            6835: 46,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
           decals:
-            6803: -34,12
-            6804: -33,12
-            6805: -31,12
-            6806: -30,12
+            6727: -34,12
+            6728: -33,12
+            6729: -31,12
+            6730: -30,12
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleS
           decals:
-            6993: 59,-8
+            6917: 59,-8
+        - node:
+            color: '#D381C996'
+            id: WarnLineGreyscaleS
+          decals:
+            7013: 54,-23
+            7014: 52,-23
+            7015: 53,-23
         - node:
             color: '#EFB34196'
             id: WarnLineGreyscaleS
           decals:
-            6908: 42,13
-            6909: 46,13
+            6832: 42,13
+            6833: 46,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
           decals:
-            6807: -34,16
-            6808: -33,16
+            6731: -34,16
+            6732: -33,16
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleW
           decals:
-            6219: 49,-15
-            6220: 49,-14
-            6221: 49,-13
-            6222: 49,-12
-            6223: 52,-12
-            6224: 52,-13
-            6225: 52,-14
-            6226: 52,-15
+            6155: 49,-15
+            6156: 49,-14
+            6157: 49,-13
+            6158: 49,-12
+            6159: 52,-12
+            6160: 52,-13
+            6161: 52,-14
+            6162: 52,-15
         - node:
             color: '#EFB34131'
             id: WarnLineN
           decals:
-            6594: 15,42
-            6595: 15,42
-            6596: 15,42
-            6597: 15,42
+            6530: 15,42
+            6531: 15,42
+            6532: 15,42
+            6533: 15,42
         - node:
             color: '#EFB34196'
             id: WarnLineN
@@ -8599,44 +8589,44 @@ entities:
           decals:
             1410: 56,-33
             1411: 57,-33
-            1835: 69,-30
-            1836: 68,-30
-            1837: 70,-30
-            1838: 71,-30
-            1908: 23,-38
-            1909: 24,-38
-            1910: 25,-38
-            2005: 11,-48
-            2006: 12,-48
-            2007: 14,-48
-            2008: 13,-48
-            2009: 15,-48
-            2010: 16,-48
-            2062: 0,-38
-            2063: 1,-38
-            2064: 2,-38
-            6010: -44,24
-            6377: 89,-16
-            6378: 90,-16
-            6639: 33,-14
-            6640: 34,-14
-            6641: 35,-14
-            6683: 7,-47
-            6684: 8,-47
-            6685: 9,-47
-            6896: 47,15
+            1833: 69,-30
+            1834: 68,-30
+            1835: 70,-30
+            1836: 71,-30
+            1880: 23,-38
+            1881: 24,-38
+            1882: 25,-38
+            1977: 11,-48
+            1978: 12,-48
+            1979: 14,-48
+            1980: 13,-48
+            1981: 15,-48
+            1982: 16,-48
+            2034: 0,-38
+            2035: 1,-38
+            2036: 2,-38
+            5946: -44,24
+            6313: 89,-16
+            6314: 90,-16
+            6575: 33,-14
+            6576: 34,-14
+            6577: 35,-14
+            6619: 7,-47
+            6620: 8,-47
+            6621: 9,-47
+            6820: 47,15
         - node:
             color: '#EFB34131'
             id: WarnLineS
           decals:
-            6578: 16,40
-            6579: 16,40
-            6580: 16,41
-            6581: 16,41
-            6582: 16,41
-            6583: 16,40
-            6584: 16,41
-            6585: 16,40
+            6514: 16,40
+            6515: 16,40
+            6516: 16,41
+            6517: 16,41
+            6518: 16,41
+            6519: 16,40
+            6520: 16,41
+            6521: 16,40
         - node:
             color: '#EFB34196'
             id: WarnLineS
@@ -8670,41 +8660,41 @@ entities:
           decals:
             1709: 61,-24
             1722: 61,-23
-            1936: 26,-43
-            1937: 26,-46
-            6011: -43,23
-            6120: 57,14
-            6381: 88,-15
-            6382: 88,-14
-            6509: -33,-10
-            6510: -33,-11
-            6895: 46,16
-            6976: 61,-4
+            1908: 26,-43
+            1909: 26,-46
+            5947: -43,23
+            6056: 57,14
+            6317: 88,-15
+            6318: 88,-14
+            6445: -33,-10
+            6446: -33,-11
+            6819: 46,16
+            6900: 61,-4
         - node:
             color: '#EFB34118'
             id: WarnLineW
           decals:
-            6469: 13,-30
-            6470: 13,-30
-            6471: 14,-30
-            6472: 14,-30
-            6473: 15,-30
-            6474: 15,-30
+            6405: 13,-30
+            6406: 13,-30
+            6407: 14,-30
+            6408: 14,-30
+            6409: 15,-30
+            6410: 15,-30
         - node:
             color: '#EFB34131'
             id: WarnLineW
           decals:
-            6590: 15,39
-            6591: 15,39
-            6592: 15,39
-            6593: 15,39
+            6526: 15,39
+            6527: 15,39
+            6528: 15,39
+            6529: 15,39
         - node:
             color: '#EFB3416C'
             id: WarnLineW
           decals:
-            6460: 13,-30
-            6461: 14,-30
-            6462: 15,-30
+            6396: 13,-30
+            6397: 14,-30
+            6398: 15,-30
         - node:
             color: '#EFB34196'
             id: WarnLineW
@@ -8732,42 +8722,42 @@ entities:
             1287: 24,23
             1288: 26,23
             1289: 28,23
-            1740: 68,-11
-            1741: 69,-11
-            1742: 70,-11
-            1831: 68,-29
-            1832: 70,-29
-            1833: 69,-29
-            1834: 71,-29
-            1905: 23,-37
-            1906: 25,-37
-            1907: 24,-37
-            1956: 28,-38
-            1957: 29,-38
-            2011: 12,-47
-            2012: 13,-47
-            2072: 9,-39
-            2073: 10,-39
-            2074: 8,-39
-            2075: 11,-39
-            2089: -5,-35
-            2103: -6,-35
-            2104: -4,-35
-            6012: -44,22
-            6207: 52,-11
-            6208: 53,-11
-            6379: 89,-13
-            6380: 90,-13
-            6642: 33,-11
-            6643: 34,-11
-            6644: 35,-11
-            6899: 47,15
-            6975: 59,-5
+            1738: 68,-11
+            1739: 69,-11
+            1740: 70,-11
+            1829: 68,-29
+            1830: 70,-29
+            1831: 69,-29
+            1832: 71,-29
+            1877: 23,-37
+            1878: 25,-37
+            1879: 24,-37
+            1928: 28,-38
+            1929: 29,-38
+            1983: 12,-47
+            1984: 13,-47
+            2044: 9,-39
+            2045: 10,-39
+            2046: 8,-39
+            2047: 11,-39
+            2061: -5,-35
+            2073: -6,-35
+            2074: -4,-35
+            5948: -44,22
+            6143: 52,-11
+            6144: 53,-11
+            6315: 89,-13
+            6316: 90,-13
+            6578: 33,-11
+            6579: 34,-11
+            6580: 35,-11
+            6823: 47,15
+            6899: 59,-5
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinBox
           decals:
-            6009: -44,23
+            5945: -44,23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
@@ -8780,7 +8770,7 @@ entities:
           decals:
             379: -22,7
             970: 40,-29
-            6652: -19,-13
+            6588: -19,-13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
@@ -8808,7 +8798,7 @@ entities:
             833: -52,5
             1153: -15,31
             1683: 60,18
-            6705: 76,-25
+            6641: 76,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNw
@@ -8821,7 +8811,7 @@ entities:
             831: -43,-1
             832: -43,5
             1072: -59,-29
-            6704: 80,-25
+            6640: 80,-25
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSe
@@ -8831,8 +8821,8 @@ entities:
             384: -22,-1
             629: -39,-13
             830: -52,-3
-            6662: -22,-20
-            6663: -20,-20
+            6598: -22,-20
+            6599: -20,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
@@ -8846,8 +8836,8 @@ entities:
             940: -45.158802,-25.282345
             941: -50.020466,-25.282345
             1071: -59,-25
-            6660: -20,-20
-            6661: -18,-20
+            6596: -20,-20
+            6597: -18,-20
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
@@ -8900,14 +8890,14 @@ entities:
             1352: 33,13
             1353: 33,14
             1682: 60,19
-            1810: 69,-24
-            1811: 69,-23
-            1812: 69,-22
-            1813: 69,-21
-            6654: -20,-21
-            6656: -22,-21
-            6700: 76,-24
-            6701: 76,-23
+            1808: 69,-24
+            1809: 69,-23
+            1810: 69,-22
+            1811: 69,-21
+            6590: -20,-21
+            6592: -22,-21
+            6636: 76,-24
+            6637: 76,-23
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -9005,8 +8995,8 @@ entities:
             1150: -14,31
             1151: -13,31
             1152: -12,31
-            5948: -35,3
-            6007: 36,-24
+            5884: -35,3
+            5943: 36,-24
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
@@ -9086,16 +9076,16 @@ entities:
             1672: 58,19
             1673: 59,19
             1674: 60,19
-            2973: 65,-52
-            2974: 66,-52
-            2975: 67,-52
-            6006: 36,-24
-            6026: -38,-17
-            6658: -21,-20
-            6659: -19,-20
-            6822: -37,13
-            6823: -38,13
-            6824: -39,13
+            2938: 65,-52
+            2939: 66,-52
+            2940: 67,-52
+            5942: 36,-24
+            5962: -38,-17
+            6594: -21,-20
+            6595: -19,-20
+            6746: -37,13
+            6747: -38,13
+            6748: -39,13
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
@@ -9145,44 +9135,44 @@ entities:
             1064: -59,-27
             1065: -59,-26
             1692: 58,19
-            2178: -27,-16
-            2179: -27,-15
-            2180: -27,-14
-            2181: -27,-13
-            6655: -20,-21
-            6657: -18,-21
-            6702: 80,-24
-            6703: 80,-23
+            2148: -27,-16
+            2149: -27,-15
+            2150: -27,-14
+            2151: -27,-13
+            6591: -20,-21
+            6593: -18,-21
+            6638: 80,-24
+            6639: 80,-23
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa1
           decals:
-            5964: 80.134224,-34.739353
+            5900: 80.134224,-34.739353
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa2
           decals:
-            5965: 81.98104,-35.791183
+            5901: 81.98104,-35.791183
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowa3
           decals:
-            5966: 80.43999,-36.158104
+            5902: 80.43999,-36.158104
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb1
           decals:
-            5967: 83.2041,-35.583263
+            5903: 83.2041,-35.583263
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: bushsnowb3
           decals:
-            5968: 83.020645,-36.060257
+            5904: 83.020645,-36.060257
         - node:
             color: '#FFFFFFFF'
             id: e
@@ -9193,113 +9183,113 @@ entities:
             color: '#FFFFFFFF'
             id: grasssnow01
           decals:
-            5981: 83.460945,-36.10918
-            5982: 80.01192,-34.201206
+            5917: 83.460945,-36.10918
+            5918: 80.01192,-34.201206
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow03
           decals:
-            5978: 81.7242,-35.840107
+            5914: 81.7242,-35.840107
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow05
           decals:
-            5983: 81.07172,-34.84943
+            5919: 81.07172,-34.84943
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow06
           decals:
-            5987: 80.39903,-34.335743
+            5923: 80.39903,-34.335743
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow07
           decals:
-            5976: 80.04861,-36.219257
+            5912: 80.04861,-36.219257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow08
           decals:
-            5977: 80.8436,-35.974644
+            5913: 80.8436,-35.974644
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow09
           decals:
-            5979: 82.201195,-35.974644
-            5986: 81.98901,-35.155193
+            5915: 82.201195,-35.974644
+            5922: 81.98901,-35.155193
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow10
           decals:
-            5974: 80.02415,-34.922813
+            5910: 80.02415,-34.922813
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow11
           decals:
-            5975: 80.42776,-35.546574
-            5980: 83.24079,-35.7178
+            5911: 80.42776,-35.546574
+            5916: 83.24079,-35.7178
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow12
           decals:
-            5984: 82.99192,-34.910583
+            5920: 82.99192,-34.910583
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnow13
           decals:
-            5985: 82.56385,-34.88612
+            5921: 82.56385,-34.88612
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa1
           decals:
-            5971: 82.82495,-35.571033
+            5907: 82.82495,-35.571033
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa2
           decals:
-            5990: 83.059845,-34.91084
+            5926: 83.059845,-34.91084
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowa3
           decals:
-            5969: 79.9263,-35.46096
+            5905: 79.9263,-35.46096
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb2
           decals:
-            5970: 81.369514,-35.70557
-            5988: 80.8828,-34.87415
+            5906: 81.369514,-35.70557
+            5924: 80.8828,-34.87415
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowb3
           decals:
-            5989: 79.87989,-33.993546
+            5925: 79.87989,-33.993546
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc2
           decals:
-            5973: 79.79176,-36.060257
+            5909: 79.79176,-36.060257
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: grasssnowc3
           decals:
-            5972: 81.10044,-36.13364
+            5908: 81.10044,-36.13364
         - node:
             color: '#FFFFFFFF'
             id: h
@@ -9309,9 +9299,9 @@ entities:
             color: '#FFFF0066'
             id: shop
           decals:
-            2967: 50.31763,23.128677
-            2968: 51.239506,23.738052
-            2969: 52.00513,23.034927
+            2932: 50.31763,23.128677
+            2933: 51.239506,23.738052
+            2934: 52.00513,23.034927
         - node:
             color: '#FFFFFFFF'
             id: w
@@ -9681,7 +9671,7 @@ entities:
             0: 59528
           7,-2:
             0: 254
-            1: 28672
+            1: 53248
           7,-1:
             1: 56785
           7,0:
@@ -10153,22 +10143,22 @@ entities:
           -5,8:
             1: 61661
           -4,-11:
-            0: 199
-            1: 40992
+            0: 224
+            1: 24576
           -5,-11:
-            0: 8
             1: 36659
+            0: 8
+          -4,-10:
+            1: 61166
           -5,-10:
             1: 48059
-          -4,-10:
-            1: 61160
           -4,-9:
             1: 3808
           -3,-11:
-            0: 120
-            1: 28672
+            0: 62
+            1: 28736
           -3,-10:
-            1: 48951
+            1: 62327
           -3,-9:
             1: 2040
           -3,-12:
@@ -10207,7 +10197,7 @@ entities:
           13,-7:
             1: 2456
           13,-6:
-            1: 65535
+            1: 62071
           13,-5:
             1: 61695
           13,-9:
@@ -10818,7 +10808,7 @@ entities:
           15,7:
             0: 3968
           16,5:
-            1: 254
+            1: 239
             0: 61440
           16,6:
             0: 4369
@@ -10925,7 +10915,8 @@ entities:
           16,3:
             0: 17476
           16,4:
-            0: 1092
+            0: 228
+            1: 57344
           17,0:
             1: 2039
           17,1:
@@ -10973,6 +10964,9 @@ entities:
             1: 4080
           20,-2:
             1: 1911
+          17,4:
+            0: 16
+            1: 4096
           17,5:
             1: 16
             0: 4096
@@ -11774,6 +11768,7 @@ entities:
       - 19842
       - 19841
       - 19840
+      - 7455
   - uid: 8384
     components:
     - type: Transform
@@ -13665,11 +13660,6 @@ entities:
     - type: Transform
       pos: 39.5,-10.5
       parent: 2
-  - uid: 14788
-    components:
-    - type: Transform
-      pos: -29.5,-43.5
-      parent: 2
   - uid: 14855
     components:
     - type: Transform
@@ -13690,11 +13680,6 @@ entities:
     - type: Transform
       pos: 68.5,4.5
       parent: 2
-  - uid: 16066
-    components:
-    - type: Transform
-      pos: 67.5,20.5
-      parent: 2
   - uid: 21243
     components:
     - type: Transform
@@ -13704,6 +13689,8 @@ entities:
   entities:
   - uid: 6
     components:
+    - type: MetaData
+      name: Dorms airlock
     - type: Transform
       pos: -36.5,-11.5
       parent: 2
@@ -13712,6 +13699,8 @@ entities:
       - 2077
   - uid: 7
     components:
+    - type: MetaData
+      name: Dorms airlock
     - type: Transform
       pos: -28.5,-11.5
       parent: 2
@@ -13728,7 +13717,7 @@ entities:
   - uid: 8242
     components:
     - type: MetaData
-      name: Toilet Stall Airlock
+      name: Toilet stall door
     - type: Transform
       pos: 16.5,25.5
       parent: 2
@@ -13738,7 +13727,7 @@ entities:
   - uid: 8243
     components:
     - type: MetaData
-      name: Toilet Stall Airlock
+      name: Toilet stall door
     - type: Transform
       pos: 16.5,23.5
       parent: 2
@@ -13759,6 +13748,8 @@ entities:
   entities:
   - uid: 4316
     components:
+    - type: MetaData
+      name: Warden's office airlock
     - type: Transform
       pos: 0.5,28.5
       parent: 2
@@ -13780,6 +13771,8 @@ entities:
   entities:
   - uid: 8
     components:
+    - type: MetaData
+      name: Atmospherics airlock
     - type: Transform
       pos: 22.5,-21.5
       parent: 2
@@ -13787,16 +13780,22 @@ entities:
   entities:
   - uid: 9
     components:
+    - type: MetaData
+      name: Atmospherics airlock
     - type: Transform
       pos: 13.5,-19.5
       parent: 2
   - uid: 10
     components:
+    - type: MetaData
+      name: Atmospherics airlock
     - type: Transform
       pos: 23.5,-23.5
       parent: 2
   - uid: 11
     components:
+    - type: MetaData
+      name: Atmospherics airlock
     - type: Transform
       pos: 20.5,-19.5
       parent: 2
@@ -13812,6 +13811,8 @@ entities:
   entities:
   - uid: 13
     components:
+    - type: MetaData
+      name: Barkeep's room airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,4.5
@@ -13820,16 +13821,22 @@ entities:
   entities:
   - uid: 74
     components:
+    - type: MetaData
+      name: Security airlock
     - type: Transform
       pos: -1.5,26.5
       parent: 2
   - uid: 180
     components:
+    - type: MetaData
+      name: Security airlock
     - type: Transform
       pos: -2.5,26.5
       parent: 2
   - uid: 3782
     components:
+    - type: MetaData
+      name: Lawyer's office airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -46.5,-14.5
@@ -13838,6 +13845,8 @@ entities:
   entities:
   - uid: 3927
     components:
+    - type: MetaData
+      name: Captain's office airlock
     - type: Transform
       pos: 34.5,-29.5
       parent: 2
@@ -13845,6 +13854,8 @@ entities:
   entities:
   - uid: 3918
     components:
+    - type: MetaData
+      name: Captain's office airlock
     - type: Transform
       pos: 38.5,-29.5
       parent: 2
@@ -13852,16 +13863,22 @@ entities:
   entities:
   - uid: 5425
     components:
+    - type: MetaData
+      name: Cargo airlock
     - type: Transform
       pos: 26.5,16.5
       parent: 2
   - uid: 5492
     components:
+    - type: MetaData
+      name: Cargo break room airlock
     - type: Transform
       pos: 30.5,11.5
       parent: 2
   - uid: 5571
     components:
+    - type: MetaData
+      name: Cargo secure storage airlock
     - type: Transform
       pos: 29.5,7.5
       parent: 2
@@ -13869,12 +13886,16 @@ entities:
   entities:
   - uid: 4342
     components:
+    - type: MetaData
+      name: Cargo secure storage airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,9.5
       parent: 2
   - uid: 5452
     components:
+    - type: MetaData
+      name: Cargo airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,10.5
@@ -13883,11 +13904,15 @@ entities:
   entities:
   - uid: 14
     components:
+    - type: MetaData
+      name: Chaplain's office airlock
     - type: Transform
       pos: -29.5,-39.5
       parent: 2
   - uid: 21387
     components:
+    - type: MetaData
+      name: Confession airlock
     - type: Transform
       pos: -24.5,-40.5
       parent: 2
@@ -13895,6 +13920,8 @@ entities:
   entities:
   - uid: 6039
     components:
+    - type: MetaData
+      name: Chemistry airlock
     - type: Transform
       pos: 48.5,13.5
       parent: 2
@@ -13902,6 +13929,8 @@ entities:
   entities:
   - uid: 15
     components:
+    - type: MetaData
+      name: CE's office airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,-24.5
@@ -13910,6 +13939,8 @@ entities:
   entities:
   - uid: 16
     components:
+    - type: MetaData
+      name: CE's room airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-26.5
@@ -13918,6 +13949,8 @@ entities:
   entities:
   - uid: 6693
     components:
+    - type: MetaData
+      name: CMO's office airlock
     - type: Transform
       pos: 52.5,11.5
       parent: 2
@@ -13925,6 +13958,8 @@ entities:
   entities:
   - uid: 6638
     components:
+    - type: MetaData
+      name: CMO's room airlock
     - type: Transform
       pos: 57.5,10.5
       parent: 2
@@ -13932,33 +13967,45 @@ entities:
   entities:
   - uid: 17
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 33.5,-26.5
       parent: 2
   - uid: 18
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 32.5,-26.5
       parent: 2
   - uid: 19
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 47.5,-26.5
       parent: 2
   - uid: 20
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 48.5,-26.5
       parent: 2
   - uid: 3951
     components:
+    - type: MetaData
+      name: Conference room airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 30.5,-29.5
       parent: 2
   - uid: 7952
     components:
+    - type: MetaData
+      name: Camera room airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 17.5,-46.5
@@ -13967,31 +14014,43 @@ entities:
   entities:
   - uid: 21
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 32.5,-22.5
       parent: 2
   - uid: 22
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 33.5,-22.5
       parent: 2
   - uid: 23
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 47.5,-22.5
       parent: 2
   - uid: 24
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       pos: 48.5,-22.5
       parent: 2
   - uid: 512
     components:
+    - type: MetaData
+      name: Telecommunications airlock
     - type: Transform
       pos: 28.5,-40.5
       parent: 2
   - uid: 645
     components:
+    - type: MetaData
+      name: Telecommunications airlock
     - type: Transform
       pos: 29.5,-40.5
       parent: 2
@@ -14005,6 +14064,8 @@ entities:
       parent: 2
   - uid: 7583
     components:
+    - type: MetaData
+      name: Bridge airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,-36.5
@@ -14027,6 +14088,8 @@ entities:
   entities:
   - uid: 4930
     components:
+    - type: MetaData
+      name: Detective's office airlock
     - type: Transform
       pos: -23.5,26.5
       parent: 2
@@ -14043,41 +14106,57 @@ entities:
   entities:
   - uid: 25
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       pos: 11.5,-21.5
       parent: 2
   - uid: 26
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       pos: 11.5,-22.5
       parent: 2
   - uid: 27
     components:
+    - type: MetaData
+      name: SMES airlock
     - type: Transform
       pos: -10.5,-16.5
       parent: 2
   - uid: 28
     components:
+    - type: MetaData
+      name: SMES airlock
     - type: Transform
       pos: -10.5,-15.5
       parent: 2
   - uid: 29
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       pos: -8.5,-26.5
       parent: 2
   - uid: 30
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       pos: 3.5,-21.5
       parent: 2
   - uid: 31
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       pos: 7.5,-25.5
       parent: 2
   - uid: 848
     components:
+    - type: MetaData
+      name: Shuttle storage airlock
     - type: Transform
       pos: -30.5,36.5
       parent: 2
@@ -14089,6 +14168,8 @@ entities:
       parent: 2
   - uid: 8170
     components:
+    - type: MetaData
+      name: Shuttle storage airlock
     - type: Transform
       pos: -30.5,37.5
       parent: 2
@@ -14096,33 +14177,45 @@ entities:
   entities:
   - uid: 32
     components:
+    - type: MetaData
+      name: AME airlock
     - type: Transform
       pos: 14.5,-23.5
       parent: 2
   - uid: 33
     components:
+    - type: MetaData
+      name: Singularity setup airlock
     - type: Transform
       pos: -2.5,-13.5
       parent: 2
   - uid: 34
     components:
+    - type: MetaData
+      name: Singularity setup airlock
     - type: Transform
       pos: -2.5,-14.5
       parent: 2
   - uid: 35
     components:
+    - type: MetaData
+      name: Engineering supplies airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-20.5
       parent: 2
   - uid: 36
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-24.5
       parent: 2
   - uid: 37
     components:
+    - type: MetaData
+      name: Engineering airlock
     - type: Transform
       pos: -9.5,-28.5
       parent: 2
@@ -14160,6 +14253,8 @@ entities:
       parent: 2
   - uid: 3491
     components:
+    - type: MetaData
+      name: Substation airlock
     - type: Transform
       pos: 62.5,-29.5
       parent: 2
@@ -14189,6 +14284,8 @@ entities:
       parent: 2
   - uid: 6976
     components:
+    - type: MetaData
+      name: Substation airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -38.5,-52.5
@@ -14211,14 +14308,14 @@ entities:
   - uid: 8073
     components:
     - type: MetaData
-      name: South Solars airlock
+      name: South solars airlock
     - type: Transform
       pos: 0.5,-33.5
       parent: 2
   - uid: 8074
     components:
     - type: MetaData
-      name: South Solars airlock
+      name: South solars airlock
     - type: Transform
       pos: 1.5,-33.5
       parent: 2
@@ -14246,6 +14343,8 @@ entities:
       parent: 2
   - uid: 12604
     components:
+    - type: MetaData
+      name: North solars airlock
     - type: Transform
       pos: -25.5,33.5
       parent: 2
@@ -14259,13 +14358,26 @@ entities:
   entities:
   - uid: 7575
     components:
+    - type: MetaData
+      name: EVA airlock
     - type: Transform
       pos: 20.5,-34.5
       parent: 2
+- proto: AirlockExternal
+  entities:
+  - uid: 16076
+    components:
+    - type: MetaData
+      name: Maintenance external airlock
+    - type: Transform
+      pos: 64.5,20.5
+      parent: 2
 - proto: AirlockExternalCargoLocked
   entities:
   - uid: 5663
     components:
+    - type: MetaData
+      name: Salvage external airlock
     - type: Transform
       pos: 37.5,18.5
       parent: 2
@@ -14280,6 +14392,8 @@ entities:
   entities:
   - uid: 41
     components:
+    - type: MetaData
+      name: Singularity external airlock
     - type: Transform
       pos: -6.5,-12.5
       parent: 2
@@ -14292,6 +14406,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 15050
     components:
+    - type: MetaData
+      name: Engineering external airlock
     - type: Transform
       pos: -23.5,37.5
       parent: 2
@@ -14306,74 +14422,100 @@ entities:
   entities:
   - uid: 3607
     components:
+    - type: MetaData
+      name: Evacuation external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,-1.5
       parent: 2
   - uid: 3608
     components:
+    - type: MetaData
+      name: Evacuation external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,-3.5
       parent: 2
   - uid: 3609
     components:
+    - type: MetaData
+      name: Evacuation external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,4.5
       parent: 2
   - uid: 3610
     components:
+    - type: MetaData
+      name: Evacuation external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,6.5
       parent: 2
   - uid: 5784
     components:
+    - type: MetaData
+      name: Evacuation pod external airlock
     - type: Transform
       pos: -22.5,-45.5
       parent: 2
   - uid: 6295
     components:
+    - type: MetaData
+      name: Arrivals external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -40.5,-58.5
       parent: 2
   - uid: 6324
     components:
+    - type: MetaData
+      name: Arrivals external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -40.5,-65.5
       parent: 2
   - uid: 6325
     components:
+    - type: MetaData
+      name: Arrivals external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -54.5,-65.5
       parent: 2
   - uid: 6326
     components:
+    - type: MetaData
+      name: Arrivals external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -54.5,-58.5
       parent: 2
   - uid: 15198
     components:
+    - type: MetaData
+      name: Evacuation pod external airlock
     - type: Transform
       pos: 71.5,5.5
       parent: 2
   - uid: 15206
     components:
+    - type: MetaData
+      name: Evacuation pod external airlock
     - type: Transform
       pos: 71.5,1.5
       parent: 2
   - uid: 15214
     components:
+    - type: MetaData
+      name: Evacuation pod external airlock
     - type: Transform
       pos: 71.5,-2.5
       parent: 2
   - uid: 17259
     components:
+    - type: MetaData
+      name: Hermit room airlock
     - type: Transform
       pos: 64.5,-53.5
       parent: 2
@@ -14382,6 +14524,8 @@ entities:
       - 17526
   - uid: 20571
     components:
+    - type: MetaData
+      name: Evacuation pod external airlock
     - type: Transform
       pos: -18.5,-45.5
       parent: 2
@@ -14399,6 +14543,8 @@ entities:
   entities:
   - uid: 42
     components:
+    - type: MetaData
+      name: Atmospherics external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-15.5
@@ -14412,6 +14558,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 43
     components:
+    - type: MetaData
+      name: Atmospherics external airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,-15.5
@@ -14427,6 +14575,8 @@ entities:
   entities:
   - uid: 6067
     components:
+    - type: MetaData
+      name: Salvage external airlock
     - type: Transform
       pos: 39.5,19.5
       parent: 2
@@ -14439,6 +14589,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 7407
     components:
+    - type: MetaData
+      name: Cargo external airlock
     - type: Transform
       pos: 28.5,24.5
       parent: 2
@@ -14447,6 +14599,8 @@ entities:
       - 5516
   - uid: 15606
     components:
+    - type: MetaData
+      name: Cargo external airlock
     - type: Transform
       pos: 26.5,24.5
       parent: 2
@@ -14454,6 +14608,8 @@ entities:
   entities:
   - uid: 44
     components:
+    - type: MetaData
+      name: Singularity external airlock
     - type: Transform
       pos: -6.5,-10.5
       parent: 2
@@ -14468,6 +14624,8 @@ entities:
   entities:
   - uid: 8082
     components:
+    - type: MetaData
+      name: Engineering external airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-41.5
@@ -14484,6 +14642,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 8083
     components:
+    - type: MetaData
+      name: Engineering external airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-41.5
@@ -14500,6 +14660,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 15057
     components:
+    - type: MetaData
+      name: Engineering external airlock
     - type: Transform
       pos: -21.5,39.5
       parent: 2
@@ -14512,6 +14674,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 15890
     components:
+    - type: MetaData
+      name: Maintenance external airlock
     - type: Transform
       pos: -8.5,41.5
       parent: 2
@@ -14522,13 +14686,10 @@ entities:
       linkedPorts:
         15889:
         - DoorStatus: DoorBolt
-  - uid: 16057
-    components:
-    - type: Transform
-      pos: 64.5,21.5
-      parent: 2
   - uid: 16688
     components:
+    - type: MetaData
+      name: Maintenance external airlock
     - type: Transform
       pos: 72.5,-33.5
       parent: 2
@@ -14541,6 +14702,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 16696
     components:
+    - type: MetaData
+      name: Maintenance external airlock
     - type: Transform
       pos: -58.5,-20.5
       parent: 2
@@ -14555,24 +14718,32 @@ entities:
   entities:
   - uid: 6327
     components:
+    - type: MetaData
+      name: Arrivals docking airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -52.5,-65.5
       parent: 2
   - uid: 6328
     components:
+    - type: MetaData
+      name: Arrivals docking airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -52.5,-58.5
       parent: 2
   - uid: 6329
     components:
+    - type: MetaData
+      name: Arrivals docking airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -42.5,-58.5
       parent: 2
   - uid: 6330
     components:
+    - type: MetaData
+      name: Arrivals docking airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -42.5,-65.5
@@ -14581,24 +14752,32 @@ entities:
   entities:
   - uid: 3561
     components:
+    - type: MetaData
+      name: Evacuation docking airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,-3.5
       parent: 2
   - uid: 3611
     components:
+    - type: MetaData
+      name: Evacuation docking airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,-1.5
       parent: 2
   - uid: 3612
     components:
+    - type: MetaData
+      name: Evacuation docking airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,4.5
       parent: 2
   - uid: 3613
     components:
+    - type: MetaData
+      name: Evacuation docking airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -57.5,6.5
@@ -14607,29 +14786,39 @@ entities:
   entities:
   - uid: 15228
     components:
+    - type: MetaData
+      name: Evacuation pod docking airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 73.5,-2.5
       parent: 2
   - uid: 15229
     components:
+    - type: MetaData
+      name: Evacuation pod docking airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 73.5,1.5
       parent: 2
   - uid: 15230
     components:
+    - type: MetaData
+      name: Evacuation pod docking airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 73.5,5.5
       parent: 2
   - uid: 17525
     components:
+    - type: MetaData
+      name: Evacuation pod docking airlock
     - type: Transform
       pos: -22.5,-48.5
       parent: 2
   - uid: 21378
     components:
+    - type: MetaData
+      name: Evacuation pod docking airlock
     - type: Transform
       pos: -18.5,-48.5
       parent: 2
@@ -14637,20 +14826,42 @@ entities:
   entities:
   - uid: 15604
     components:
+    - type: MetaData
+      name: Cargo docking airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 26.5,27.5
       parent: 2
   - uid: 15607
     components:
+    - type: MetaData
+      name: Cargo docking airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,27.5
       parent: 2
+  - uid: 16553
+    components:
+    - type: MetaData
+      name: Maintenance docking airlock
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,21.5
+      parent: 2
+  - uid: 21670
+    components:
+    - type: MetaData
+      name: Maintenance docking airlock
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,19.5
+      parent: 2
 - proto: AirlockExternalLocked
   entities:
   - uid: 8080
     components:
+    - type: MetaData
+      name: Engineering external airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-38.5
@@ -14667,6 +14878,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 8081
     components:
+    - type: MetaData
+      name: Engineering external airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-38.5
@@ -14683,6 +14896,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 15889
     components:
+    - type: MetaData
+      name: Maintenance external airlock
     - type: Transform
       pos: -10.5,39.5
       parent: 2
@@ -14695,6 +14910,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 16687
     components:
+    - type: MetaData
+      name: Maintenance external airlock
     - type: Transform
       pos: 72.5,-36.5
       parent: 2
@@ -14707,6 +14924,8 @@ entities:
         - DoorStatus: DoorBolt
   - uid: 16695
     components:
+    - type: MetaData
+      name: Maintenance external airlock
     - type: Transform
       pos: -58.5,-18.5
       parent: 2
@@ -14731,346 +14950,479 @@ entities:
   entities:
   - uid: 46
     components:
+    - type: MetaData
+      name: Library airlock
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
   - uid: 47
     components:
+    - type: MetaData
+      name: Library airlock
     - type: Transform
       pos: -22.5,-17.5
       parent: 2
   - uid: 849
     components:
+    - type: MetaData
+      name: Library airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,-18.5
       parent: 2
   - uid: 1661
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 29.5,4.5
       parent: 2
   - uid: 3211
     components:
+    - type: MetaData
+      name: Recharging station airlock
     - type: Transform
       pos: 12.5,24.5
       parent: 2
   - uid: 4181
     components:
+    - type: MetaData
+      name: Medical entrance airlock
     - type: Transform
       pos: 44.5,6.5
       parent: 2
   - uid: 4195
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -16.5,19.5
       parent: 2
-    - type: Door
-      secondsUntilStateChange: -52402.332
-      state: Opening
   - uid: 4196
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -16.5,20.5
       parent: 2
   - uid: 4275
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -16.5,21.5
       parent: 2
   - uid: 4351
     components:
+    - type: MetaData
+      name: Tool room airlock
     - type: Transform
       pos: 40.5,-3.5
       parent: 2
   - uid: 5253
     components:
+    - type: MetaData
+      name: Perma hydroponics airlock
     - type: Transform
       pos: -2.5,49.5
       parent: 2
   - uid: 5254
     components:
+    - type: MetaData
+      name: Perma hydroponics airlock
     - type: Transform
       pos: -1.5,49.5
       parent: 2
   - uid: 5304
     components:
+    - type: MetaData
+      name: Security entrance airlock
     - type: Transform
       pos: -1.5,22.5
       parent: 2
   - uid: 5305
     components:
+    - type: MetaData
+      name: Security entrance airlock
     - type: Transform
       pos: -2.5,22.5
       parent: 2
   - uid: 5309
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 3.5,21.5
       parent: 2
   - uid: 5310
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 3.5,20.5
       parent: 2
   - uid: 5311
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 3.5,19.5
       parent: 2
   - uid: 5312
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -8.5,21.5
       parent: 2
   - uid: 5313
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -8.5,20.5
       parent: 2
   - uid: 5314
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -8.5,19.5
       parent: 2
   - uid: 5315
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 17.5,19.5
       parent: 2
   - uid: 5316
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 17.5,20.5
       parent: 2
   - uid: 5317
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 17.5,21.5
       parent: 2
   - uid: 5318
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 21.5,17.5
       parent: 2
   - uid: 5319
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 20.5,17.5
       parent: 2
   - uid: 5320
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 19.5,17.5
       parent: 2
   - uid: 5321
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 19.5,6.5
       parent: 2
   - uid: 5322
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 21.5,6.5
       parent: 2
   - uid: 5323
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 20.5,6.5
       parent: 2
   - uid: 5324
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 29.5,3.5
       parent: 2
   - uid: 5325
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 29.5,2.5
       parent: 2
   - uid: 5327
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 39.5,2.5
       parent: 2
   - uid: 5328
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 39.5,3.5
       parent: 2
   - uid: 5329
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 39.5,4.5
       parent: 2
   - uid: 5330
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 43.5,0.5
       parent: 2
   - uid: 5331
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 42.5,0.5
       parent: 2
   - uid: 5332
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 41.5,0.5
       parent: 2
   - uid: 5333
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 43.5,-13.5
       parent: 2
   - uid: 5334
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 42.5,-13.5
       parent: 2
   - uid: 5335
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 41.5,-13.5
       parent: 2
   - uid: 5336
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 38.5,-20.5
       parent: 2
   - uid: 5337
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 38.5,-19.5
       parent: 2
   - uid: 5338
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 38.5,-18.5
       parent: 2
   - uid: 5339
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 46.5,-20.5
       parent: 2
   - uid: 5340
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 46.5,-19.5
       parent: 2
   - uid: 5341
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 46.5,-18.5
       parent: 2
   - uid: 5342
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 30.5,-20.5
       parent: 2
   - uid: 5343
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 30.5,-19.5
       parent: 2
   - uid: 5344
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 30.5,-18.5
       parent: 2
   - uid: 5345
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 21.5,-27.5
       parent: 2
   - uid: 5346
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 20.5,-27.5
       parent: 2
   - uid: 5347
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 19.5,-27.5
       parent: 2
   - uid: 5348
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 18.5,-33.5
       parent: 2
   - uid: 5349
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 18.5,-32.5
       parent: 2
   - uid: 5350
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 18.5,-31.5
       parent: 2
   - uid: 5351
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 10.5,-33.5
       parent: 2
   - uid: 5352
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 10.5,-32.5
       parent: 2
   - uid: 5353
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 10.5,-31.5
       parent: 2
   - uid: 5354
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 4.5,-31.5
       parent: 2
   - uid: 5355
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 4.5,-30.5
       parent: 2
   - uid: 5356
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: 4.5,-29.5
       parent: 2
   - uid: 5357
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -8.5,-31.5
       parent: 2
   - uid: 5358
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -8.5,-30.5
       parent: 2
   - uid: 5359
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -8.5,-29.5
       parent: 2
   - uid: 5360
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -19.5,-31.5
       parent: 2
   - uid: 5361
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -19.5,-30.5
       parent: 2
   - uid: 5362
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -19.5,-29.5
       parent: 2
   - uid: 5363
     components:
+    - type: MetaData
+      name: Boxing ring airlock
     - type: Transform
       pos: -26.5,-28.5
       parent: 2
@@ -15081,71 +15433,99 @@ entities:
       parent: 2
   - uid: 5365
     components:
+    - type: MetaData
+      name: Boxing ring airlock
     - type: Transform
       pos: -41.5,-28.5
       parent: 2
   - uid: 5366
     components:
+    - type: MetaData
+      name: Boxing ring airlock
     - type: Transform
       pos: -41.5,-27.5
       parent: 2
   - uid: 5367
     components:
+    - type: MetaData
+      name: Reporter's office airlock
     - type: Transform
       pos: -52.5,-25.5
       parent: 2
   - uid: 5368
     components:
+    - type: MetaData
+      name: Reporter's office airlock
     - type: Transform
       pos: -52.5,-24.5
       parent: 2
   - uid: 5375
     components:
+    - type: MetaData
+      name: Lawyer's office airlock
     - type: Transform
       pos: -48.5,-18.5
       parent: 2
   - uid: 5376
     components:
+    - type: MetaData
+      name: Lawyer's office airlock
     - type: Transform
       pos: -49.5,-18.5
       parent: 2
   - uid: 5377
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -54.5,-18.5
       parent: 2
   - uid: 5379
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -52.5,-18.5
       parent: 2
   - uid: 5380
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -52.5,-4.5
       parent: 2
   - uid: 5381
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -53.5,-4.5
       parent: 2
   - uid: 5382
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -54.5,-4.5
       parent: 2
   - uid: 5383
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -41.5,2.5
       parent: 2
   - uid: 5384
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -41.5,1.5
       parent: 2
   - uid: 5385
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -41.5,0.5
       parent: 2
@@ -15158,180 +15538,246 @@ entities:
       parent: 2
   - uid: 5387
     components:
+    - type: MetaData
+      name: Service airlock
     - type: Transform
       pos: -24.5,10.5
       parent: 2
   - uid: 5388
     components:
+    - type: MetaData
+      name: Service airlock
     - type: Transform
       pos: -25.5,10.5
       parent: 2
   - uid: 5389
     components:
+    - type: MetaData
+      name: Service airlock
     - type: Transform
       pos: -26.5,10.5
       parent: 2
   - uid: 5758
     components:
+    - type: MetaData
+      name: Medical entrance airlock
     - type: Transform
       pos: 43.5,6.5
       parent: 2
   - uid: 5776
     components:
+    - type: MetaData
+      name: Medical entrance airlock
     - type: Transform
       pos: 42.5,6.5
       parent: 2
   - uid: 6070
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -53.5,-18.5
       parent: 2
   - uid: 6071
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -48.5,-33.5
       parent: 2
   - uid: 6072
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -47.5,-33.5
       parent: 2
   - uid: 6073
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -46.5,-33.5
       parent: 2
   - uid: 6364
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -48.5,-44.5
       parent: 2
   - uid: 6365
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -47.5,-44.5
       parent: 2
   - uid: 6366
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -46.5,-44.5
       parent: 2
   - uid: 6367
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -41.5,-48.5
       parent: 2
   - uid: 6368
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -40.5,-48.5
       parent: 2
   - uid: 6369
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -39.5,-48.5
       parent: 2
   - uid: 6370
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-48.5
       parent: 2
   - uid: 6371
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -54.5,-48.5
       parent: 2
   - uid: 6375
     components:
+    - type: MetaData
+      name: Arrivals airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,-48.5
       parent: 2
   - uid: 7385
     components:
+    - type: MetaData
+      name: Science airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 72.5,-16.5
       parent: 2
   - uid: 7386
     components:
+    - type: MetaData
+      name: Science airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 72.5,-17.5
       parent: 2
   - uid: 7387
     components:
+    - type: MetaData
+      name: Science airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 72.5,-18.5
       parent: 2
   - uid: 8220
     components:
+    - type: MetaData
+      name: Recharging station airlock
     - type: Transform
       pos: 12.5,23.5
       parent: 2
   - uid: 8631
     components:
+    - type: MetaData
+      name: Chapel airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-32.5
       parent: 2
   - uid: 8632
     components:
+    - type: MetaData
+      name: Chapel airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -24.5,-32.5
       parent: 2
   - uid: 9520
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -25.5,-21.5
       parent: 2
   - uid: 9521
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -24.5,-21.5
       parent: 2
   - uid: 9522
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -23.5,-21.5
       parent: 2
   - uid: 9523
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -25.5,-11.5
       parent: 2
   - uid: 9524
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -24.5,-11.5
       parent: 2
   - uid: 9525
     components:
+    - type: MetaData
+      name: Hallway airlock
     - type: Transform
       pos: -23.5,-11.5
       parent: 2
   - uid: 9526
     components:
+    - type: MetaData
+      name: Service airlock
     - type: Transform
       pos: -22.5,-5.5
       parent: 2
   - uid: 9527
     components:
+    - type: MetaData
+      name: Service airlock
     - type: Transform
       pos: -23.5,-5.5
       parent: 2
   - uid: 9528
     components:
+    - type: MetaData
+      name: Service airlock
     - type: Transform
       pos: -24.5,-5.5
       parent: 2
@@ -15343,12 +15789,6 @@ entities:
       parent: 21128
 - proto: AirlockGlassShuttle
   entities:
-  - uid: 16058
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,21.5
-      parent: 2
   - uid: 21190
     components:
     - type: Transform
@@ -15359,6 +15799,8 @@ entities:
   entities:
   - uid: 49
     components:
+    - type: MetaData
+      name: HOP's room airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 38.5,-24.5
@@ -15370,12 +15812,16 @@ entities:
   entities:
   - uid: 50
     components:
+    - type: MetaData
+      name: HOP's room airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 34.5,-24.5
       parent: 2
   - uid: 3958
     components:
+    - type: MetaData
+      name: EVA airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 27.5,-36.5
@@ -15384,6 +15830,8 @@ entities:
   entities:
   - uid: 4809
     components:
+    - type: MetaData
+      name: HOS's office airlock
     - type: Transform
       pos: -12.5,30.5
       parent: 2
@@ -15391,6 +15839,8 @@ entities:
   entities:
   - uid: 4846
     components:
+    - type: MetaData
+      name: HOS's room airlock
     - type: Transform
       pos: -15.5,32.5
       parent: 2
@@ -15398,6 +15848,8 @@ entities:
   entities:
   - uid: 51
     components:
+    - type: MetaData
+      name: Hydroponics airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -27.5,11.5
@@ -15413,6 +15865,8 @@ entities:
   entities:
   - uid: 53
     components:
+    - type: MetaData
+      name: Janitorials airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,-28.5
@@ -15421,6 +15875,8 @@ entities:
   entities:
   - uid: 54
     components:
+    - type: MetaData
+      name: Kitchen airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,11.5
@@ -15429,6 +15885,8 @@ entities:
   entities:
   - uid: 55
     components:
+    - type: MetaData
+      name: Freezer maintenance access
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,11.5
@@ -15454,6 +15912,8 @@ entities:
   entities:
   - uid: 56
     components:
+    - type: MetaData
+      name: Atmospherics maintenance access
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 15.5,-11.5
@@ -15462,6 +15922,8 @@ entities:
   entities:
   - uid: 1910
     components:
+    - type: MetaData
+      name: Barkeep's room maintenance access
     - type: Transform
       pos: -14.5,8.5
       parent: 2
@@ -15469,6 +15931,8 @@ entities:
   entities:
   - uid: 5501
     components:
+    - type: MetaData
+      name: Cargo break room maintenance access
     - type: Transform
       pos: 35.5,9.5
       parent: 2
@@ -15476,6 +15940,8 @@ entities:
   entities:
   - uid: 57
     components:
+    - type: MetaData
+      name: Chapel maintenance access
     - type: Transform
       pos: -27.5,-40.5
       parent: 2
@@ -15483,6 +15949,8 @@ entities:
   entities:
   - uid: 21373
     components:
+    - type: MetaData
+      name: Chemistry maintenance access
     - type: Transform
       pos: 42.5,15.5
       parent: 2
@@ -15490,17 +15958,23 @@ entities:
   entities:
   - uid: 58
     components:
+    - type: MetaData
+      name: SMES maintenance access
     - type: Transform
       pos: -12.5,-19.5
       parent: 2
   - uid: 59
     components:
+    - type: MetaData
+      name: Engineering maintenance access
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 8.5,-16.5
       parent: 2
   - uid: 7908
     components:
+    - type: MetaData
+      name: South solars maintenance access
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-35.5
@@ -15582,6 +16056,8 @@ entities:
   entities:
   - uid: 63
     components:
+    - type: MetaData
+      name: Hydroponics maintenance access
     - type: Transform
       pos: -37.5,10.5
       parent: 2
@@ -15589,6 +16065,8 @@ entities:
   entities:
   - uid: 65
     components:
+    - type: MetaData
+      name: Janitorials maintenance access
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-21.5
@@ -15613,12 +16091,16 @@ entities:
       parent: 2
   - uid: 70
     components:
+    - type: MetaData
+      name: Bar maintenance access
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-5.5
       parent: 2
   - uid: 71
     components:
+    - type: MetaData
+      name: Library maintenance access
     - type: Transform
       pos: -16.5,-14.5
       parent: 2
@@ -15678,11 +16160,15 @@ entities:
       parent: 2
   - uid: 82
     components:
+    - type: MetaData
+      name: Dorms maintenance access
     - type: Transform
       pos: -39.5,-15.5
       parent: 2
   - uid: 83
     components:
+    - type: MetaData
+      name: Boxing ring maintenance access
     - type: Transform
       pos: -34.5,-34.5
       parent: 2
@@ -15696,6 +16182,11 @@ entities:
     - type: Transform
       pos: 45.5,-12.5
       parent: 2
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -34.5,-41.5
+      parent: 2
   - uid: 933
     components:
     - type: Transform
@@ -15745,11 +16236,15 @@ entities:
       parent: 2
   - uid: 5018
     components:
+    - type: MetaData
+      name: Security maintenance passageway
     - type: Transform
       pos: -3.5,37.5
       parent: 2
   - uid: 5019
     components:
+    - type: MetaData
+      name: Security maintenance passageway
     - type: Transform
       pos: 0.5,37.5
       parent: 2
@@ -15802,11 +16297,15 @@ entities:
       parent: 2
   - uid: 7466
     components:
+    - type: MetaData
+      name: Evacuation pod maintenance access
     - type: Transform
       pos: 66.5,-2.5
       parent: 2
   - uid: 7474
     components:
+    - type: MetaData
+      name: Evacuation pod maintenance access
     - type: Transform
       pos: 66.5,1.5
       parent: 2
@@ -15828,6 +16327,8 @@ entities:
       parent: 2
   - uid: 8209
     components:
+    - type: MetaData
+      name: Evacuation pod maintenance access
     - type: Transform
       pos: 66.5,5.5
       parent: 2
@@ -15843,6 +16344,8 @@ entities:
       parent: 2
   - uid: 12804
     components:
+    - type: MetaData
+      name: Disposals airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,-36.5
@@ -15862,11 +16365,6 @@ entities:
     - type: Transform
       pos: 7.5,-35.5
       parent: 2
-  - uid: 14914
-    components:
-    - type: Transform
-      pos: -34.5,-41.5
-      parent: 2
   - uid: 14915
     components:
     - type: Transform
@@ -15896,12 +16394,16 @@ entities:
   entities:
   - uid: 7766
     components:
+    - type: MetaData
+      name: Cryogenics maintenance access
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 59.5,-8.5
       parent: 2
   - uid: 14757
     components:
+    - type: MetaData
+      name: Surgery maintenance access
     - type: Transform
       pos: 60.5,-0.5
       parent: 2
@@ -15909,16 +16411,22 @@ entities:
   entities:
   - uid: 7130
     components:
+    - type: MetaData
+      name: Robotics maintenance access
     - type: Transform
       pos: 62.5,-27.5
       parent: 2
   - uid: 7305
     components:
+    - type: MetaData
+      name: Xenoarchaeology maintenance access
     - type: Transform
       pos: 74.5,-19.5
       parent: 2
   - uid: 14214
     components:
+    - type: MetaData
+      name: Anomaly room maintenance access
     - type: Transform
       pos: 68.5,-6.5
       parent: 2
@@ -15926,6 +16434,8 @@ entities:
   entities:
   - uid: 5007
     components:
+    - type: MetaData
+      name: Interrogation maintenance access
     - type: Transform
       pos: -18.5,24.5
       parent: 2
@@ -15933,6 +16443,8 @@ entities:
   entities:
   - uid: 15071
     components:
+    - type: MetaData
+      name: Arcade maintenance access
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,11.5
@@ -15941,16 +16453,22 @@ entities:
   entities:
   - uid: 84
     components:
+    - type: MetaData
+      name: Musician room maintenance access
     - type: Transform
       pos: -38.5,-21.5
       parent: 2
   - uid: 85
     components:
+    - type: MetaData
+      name: Mime room maintenance access
     - type: Transform
       pos: -31.5,-21.5
       parent: 2
   - uid: 86
     components:
+    - type: MetaData
+      name: Clown room maintenance access
     - type: Transform
       pos: -28.5,-21.5
       parent: 2
@@ -15958,21 +16476,29 @@ entities:
   entities:
   - uid: 5990
     components:
+    - type: MetaData
+      name: Medical airlock
     - type: Transform
       pos: 48.5,8.5
       parent: 2
   - uid: 5994
     components:
+    - type: MetaData
+      name: Medical airlock
     - type: Transform
       pos: 48.5,9.5
       parent: 2
   - uid: 6011
     components:
+    - type: MetaData
+      name: Medical airlock
     - type: Transform
       pos: 48.5,7.5
       parent: 2
   - uid: 6514
     components:
+    - type: MetaData
+      name: Examination airlock
     - type: Transform
       pos: 49.5,0.5
       parent: 2
@@ -15981,6 +16507,8 @@ entities:
       - 21867
   - uid: 6515
     components:
+    - type: MetaData
+      name: Examination airlock
     - type: Transform
       pos: 50.5,0.5
       parent: 2
@@ -15989,6 +16517,8 @@ entities:
       - 6514
   - uid: 6516
     components:
+    - type: MetaData
+      name: Examination airlock
     - type: Transform
       pos: 51.5,0.5
       parent: 2
@@ -15997,16 +16527,22 @@ entities:
       - 21867
   - uid: 6705
     components:
+    - type: MetaData
+      name: Paramedic's office airlock
     - type: Transform
       pos: 52.5,7.5
       parent: 2
   - uid: 6706
     components:
+    - type: MetaData
+      name: Medical supplies airlock
     - type: Transform
       pos: 52.5,3.5
       parent: 2
   - uid: 6707
     components:
+    - type: MetaData
+      name: Medical supplies airlock
     - type: Transform
       pos: 52.5,2.5
       parent: 2
@@ -16014,6 +16550,8 @@ entities:
   entities:
   - uid: 6626
     components:
+    - type: MetaData
+      name: Surgery airlock
     - type: Transform
       pos: 58.5,2.5
       parent: 2
@@ -16037,16 +16575,22 @@ entities:
   entities:
   - uid: 546
     components:
+    - type: MetaData
+      name: Morgue maintenance access
     - type: Transform
       pos: 47.5,-10.5
       parent: 2
   - uid: 549
     components:
+    - type: MetaData
+      name: Morgue airlock
     - type: Transform
       pos: 49.5,-8.5
       parent: 2
   - uid: 550
     components:
+    - type: MetaData
+      name: Morgue airlock
     - type: Transform
       pos: 51.5,-8.5
       parent: 2
@@ -16054,6 +16598,8 @@ entities:
   entities:
   - uid: 5468
     components:
+    - type: MetaData
+      name: QM's room airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 32.5,13.5
@@ -16062,6 +16608,8 @@ entities:
   entities:
   - uid: 7109
     components:
+    - type: MetaData
+      name: RD's office airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 67.5,-20.5
@@ -16079,6 +16627,8 @@ entities:
   entities:
   - uid: 5544
     components:
+    - type: MetaData
+      name: Salvage airlock
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 32.5,18.5
@@ -16087,21 +16637,29 @@ entities:
   entities:
   - uid: 7106
     components:
+    - type: MetaData
+      name: Science airlock
     - type: Transform
       pos: 62.5,-12.5
       parent: 2
   - uid: 7135
     components:
+    - type: MetaData
+      name: Anomaly room airlock
     - type: Transform
       pos: 66.5,-12.5
       parent: 2
   - uid: 7163
     components:
+    - type: MetaData
+      name: Robotics airlock
     - type: Transform
       pos: 63.5,-21.5
       parent: 2
   - uid: 7164
     components:
+    - type: MetaData
+      name: Robotics airlock
     - type: Transform
       pos: 65.5,-21.5
       parent: 2
@@ -16115,15 +16673,26 @@ entities:
     - type: Transform
       pos: 78.5,-17.5
       parent: 2
+  - uid: 16218
+    components:
+    - type: MetaData
+      name: Recharging room airlock
+    - type: Transform
+      pos: 53.5,-21.5
+      parent: 2
 - proto: AirlockScienceLocked
   entities:
   - uid: 7103
     components:
+    - type: MetaData
+      name: Science airlock
     - type: Transform
       pos: 62.5,-17.5
       parent: 2
   - uid: 7104
     components:
+    - type: MetaData
+      name: Science airlock
     - type: Transform
       pos: 62.5,-19.5
       parent: 2
@@ -16131,6 +16700,8 @@ entities:
   entities:
   - uid: 4665
     components:
+    - type: MetaData
+      name: Brig airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -9.5,25.5
@@ -16140,6 +16711,8 @@ entities:
       - 4690
   - uid: 4671
     components:
+    - type: MetaData
+      name: Brig airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -5.5,25.5
@@ -16149,6 +16722,8 @@ entities:
       - 4803
   - uid: 4703
     components:
+    - type: MetaData
+      name: Brig airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,25.5
@@ -16158,16 +16733,22 @@ entities:
       - 4683
   - uid: 4784
     components:
+    - type: MetaData
+      name: Security storage airlock
     - type: Transform
       pos: -6.5,30.5
       parent: 2
   - uid: 4868
     components:
+    - type: MetaData
+      name: Security storage airlock
     - type: Transform
       pos: -7.5,30.5
       parent: 2
   - uid: 5015
     components:
+    - type: MetaData
+      name: Security airlock
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,35.5
@@ -16176,6 +16757,8 @@ entities:
   entities:
   - uid: 5016
     components:
+    - type: MetaData
+      name: Perma airlock
     - type: Transform
       pos: -1.5,39.5
       parent: 2
@@ -16188,11 +16771,15 @@ entities:
       parent: 2
   - uid: 5147
     components:
+    - type: MetaData
+      name: Perma airlock
     - type: Transform
       pos: -2.5,44.5
       parent: 2
   - uid: 5148
     components:
+    - type: MetaData
+      name: Perma airlock
     - type: Transform
       pos: -0.5,44.5
       parent: 2
@@ -16200,13 +16787,15 @@ entities:
   entities:
   - uid: 87
     components:
+    - type: MetaData
+      name: Librarian's office airlock
     - type: Transform
       pos: -18.5,-11.5
       parent: 2
   - uid: 8625
     components:
     - type: MetaData
-      name: News room airlock
+      name: News station airlock
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -57.5,-27.5
@@ -17430,11 +18019,15 @@ entities:
       parent: 2
   - uid: 10242
     components:
+    - type: MetaData
+      name: Evacuation APC
     - type: Transform
       pos: -54.5,8.5
       parent: 2
   - uid: 10248
     components:
+    - type: MetaData
+      name: Evacuation APC
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -43.5,-4.5
@@ -17562,6 +18155,8 @@ entities:
       parent: 2
   - uid: 20615
     components:
+    - type: MetaData
+      name: Medical APC
     - type: Transform
       pos: 43.5,17.5
       parent: 2
@@ -18828,6 +19423,12 @@ entities:
     - type: Transform
       pos: -14.5,11.5
       parent: 2
+  - uid: 1668
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,19.5
+      parent: 2
   - uid: 3578
     components:
     - type: Transform
@@ -19306,6 +19907,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -28.5,9.5
       parent: 2
+  - uid: 7566
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
   - uid: 8252
     components:
     - type: Transform
@@ -20005,6 +20611,8 @@ entities:
       - 2076
   - uid: 159
     components:
+    - type: MetaData
+      name: Singularity supplies blast door
     - type: Transform
       pos: 3.5,-14.5
       parent: 2
@@ -20013,6 +20621,8 @@ entities:
       - 2075
   - uid: 160
     components:
+    - type: MetaData
+      name: Singularity supplies blast door
     - type: Transform
       pos: 3.5,-13.5
       parent: 2
@@ -20065,6 +20675,8 @@ entities:
       - 12913
   - uid: 7121
     components:
+    - type: MetaData
+      name: Robotics blast door
     - type: Transform
       pos: 60.5,-22.5
       parent: 2
@@ -20073,6 +20685,8 @@ entities:
       - 20319
   - uid: 7123
     components:
+    - type: MetaData
+      name: Robotics blast door
     - type: Transform
       pos: 60.5,-23.5
       parent: 2
@@ -20129,6 +20743,8 @@ entities:
       - 12916
   - uid: 7934
     components:
+    - type: MetaData
+      name: Disposals blast door
     - type: Transform
       pos: -9.5,-41.5
       parent: 2
@@ -20401,17 +21017,10 @@ entities:
     - type: Transform
       pos: 36.5,-1.5
       parent: 2
-  - uid: 7179
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-23.5
-      parent: 2
-  - uid: 7180
+  - uid: 7552
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-24.5
+      pos: 52.5,-23.5
       parent: 2
   - uid: 8237
     components:
@@ -20423,6 +21032,16 @@ entities:
     - type: Transform
       pos: 9.5,23.5
       parent: 2
+  - uid: 16067
+    components:
+    - type: Transform
+      pos: 54.5,-23.5
+      parent: 2
+  - uid: 16219
+    components:
+    - type: Transform
+      pos: 53.5,-23.5
+      parent: 2
 - proto: BoxBodyBag
   entities:
   - uid: 20286
@@ -20997,6 +21616,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,10.5
       parent: 2
+  - uid: 21878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-36.5
+      parent: 2
+  - uid: 21879
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-28.5
+      parent: 2
 - proto: ButtonFrameJanitor
   entities:
   - uid: 16220
@@ -21435,6 +22066,11 @@ entities:
     - type: Transform
       pos: -1.5,-15.5
       parent: 2
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -18.5,25.5
+      parent: 2
   - uid: 765
     components:
     - type: Transform
@@ -21625,6 +22261,21 @@ entities:
     - type: Transform
       pos: -19.5,-43.5
       parent: 2
+  - uid: 4257
+    components:
+    - type: Transform
+      pos: 57.5,-23.5
+      parent: 2
+  - uid: 5020
+    components:
+    - type: Transform
+      pos: 56.5,-23.5
+      parent: 2
+  - uid: 5092
+    components:
+    - type: Transform
+      pos: 54.5,-23.5
+      parent: 2
   - uid: 5520
     components:
     - type: Transform
@@ -21660,6 +22311,11 @@ entities:
     - type: Transform
       pos: 28.5,25.5
       parent: 2
+  - uid: 5862
+    components:
+    - type: Transform
+      pos: 65.5,20.5
+      parent: 2
   - uid: 5894
     components:
     - type: Transform
@@ -21700,6 +22356,11 @@ entities:
     - type: Transform
       pos: -46.5,-36.5
       parent: 2
+  - uid: 6760
+    components:
+    - type: Transform
+      pos: 66.5,20.5
+      parent: 2
   - uid: 6800
     components:
     - type: Transform
@@ -21710,6 +22371,16 @@ entities:
     - type: Transform
       pos: 57.5,-27.5
       parent: 2
+  - uid: 7011
+    components:
+    - type: Transform
+      pos: 64.5,20.5
+      parent: 2
+  - uid: 7180
+    components:
+    - type: Transform
+      pos: 67.5,20.5
+      parent: 2
   - uid: 7370
     components:
     - type: Transform
@@ -22935,11 +23606,6 @@ entities:
     - type: Transform
       pos: -25.5,1.5
       parent: 2
-  - uid: 10923
-    components:
-    - type: Transform
-      pos: -24.5,1.5
-      parent: 2
   - uid: 10924
     components:
     - type: Transform
@@ -27753,7 +28419,7 @@ entities:
   - uid: 11927
     components:
     - type: Transform
-      pos: -18.5,25.5
+      pos: -23.5,29.5
       parent: 2
   - uid: 11928
     components:
@@ -27955,11 +28621,6 @@ entities:
     - type: Transform
       pos: -18.5,23.5
       parent: 2
-  - uid: 11968
-    components:
-    - type: Transform
-      pos: -18.5,24.5
-      parent: 2
   - uid: 11969
     components:
     - type: Transform
@@ -31315,26 +31976,11 @@ entities:
     - type: Transform
       pos: 58.5,-23.5
       parent: 2
-  - uid: 12667
-    components:
-    - type: Transform
-      pos: 57.5,-23.5
-      parent: 2
-  - uid: 12668
-    components:
-    - type: Transform
-      pos: 56.5,-23.5
-      parent: 2
   - uid: 12669
     components:
     - type: Transform
       pos: 55.5,-23.5
       parent: 2
-  - uid: 12670
-    components:
-    - type: Transform
-      pos: 54.5,-23.5
-      parent: 2
   - uid: 12671
     components:
     - type: Transform
@@ -32520,16 +33166,6 @@ entities:
     - type: Transform
       pos: -22.5,29.5
       parent: 2
-  - uid: 13670
-    components:
-    - type: Transform
-      pos: -22.5,30.5
-      parent: 2
-  - uid: 13671
-    components:
-    - type: Transform
-      pos: -22.5,31.5
-      parent: 2
   - uid: 13672
     components:
     - type: Transform
@@ -36185,25 +36821,10 @@ entities:
     - type: Transform
       pos: 72.5,5.5
       parent: 2
-  - uid: 16070
-    components:
-    - type: Transform
-      pos: 65.5,21.5
-      parent: 2
-  - uid: 16072
-    components:
-    - type: Transform
-      pos: 64.5,21.5
-      parent: 2
-  - uid: 16073
-    components:
-    - type: Transform
-      pos: 67.5,21.5
-      parent: 2
-  - uid: 16074
+  - uid: 16102
     components:
     - type: Transform
-      pos: 66.5,21.5
+      pos: 68.5,20.5
       parent: 2
   - uid: 16127
     components:
@@ -48194,26 +48815,6 @@ entities:
     - type: Transform
       pos: 35.5,15.5
       parent: 2
-  - uid: 7558
-    components:
-    - type: Transform
-      pos: 56.5,-21.5
-      parent: 2
-  - uid: 7562
-    components:
-    - type: Transform
-      pos: 56.5,-20.5
-      parent: 2
-  - uid: 7565
-    components:
-    - type: Transform
-      pos: 55.5,-21.5
-      parent: 2
-  - uid: 7566
-    components:
-    - type: Transform
-      pos: 55.5,-20.5
-      parent: 2
   - uid: 9171
     components:
     - type: Transform
@@ -49245,38 +49846,25 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,2.5
       parent: 2
-  - uid: 579
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,0.5
-      parent: 2
   - uid: 580
     components:
     - type: Transform
-      pos: -23.5,1.5
-      parent: 2
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -25.5,1.5
+      pos: -23.5,0.5
       parent: 2
   - uid: 584
     components:
     - type: Transform
-      pos: -24.5,1.5
+      pos: -25.5,1.5
       parent: 2
   - uid: 585
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -24.5,0.5
+      pos: -25.5,0.5
       parent: 2
   - uid: 586
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.5,0.5
+      pos: -24.5,1.5
       parent: 2
   - uid: 587
     components:
@@ -49468,24 +50056,31 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-35.5
       parent: 2
-  - uid: 20198
+  - uid: 9102
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -23.5,2.5
       parent: 2
-  - uid: 20199
+  - uid: 10923
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -24.5,2.5
       parent: 2
-  - uid: 20200
+  - uid: 11968
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 2
+  - uid: 13670
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -25.5,2.5
       parent: 2
+  - uid: 13671
+    components:
+    - type: Transform
+      pos: -23.5,1.5
+      parent: 2
 - proto: CarpetPink
   entities:
   - uid: 16608
@@ -50342,6 +50937,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 74.5,-29.5
       parent: 2
+  - uid: 1665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,19.5
+      parent: 2
   - uid: 2017
     components:
     - type: Transform
@@ -50706,6 +51307,12 @@ entities:
     - type: Transform
       pos: 55.5,15.5
       parent: 2
+  - uid: 7008
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,20.5
+      parent: 2
   - uid: 7080
     components:
     - type: Transform
@@ -50822,6 +51429,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,37.5
       parent: 2
+  - uid: 7557
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,20.5
+      parent: 2
   - uid: 7592
     components:
     - type: Transform
@@ -52425,12 +53038,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 65.5,0.5
       parent: 2
-  - uid: 14039
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-0.5
-      parent: 2
   - uid: 14041
     components:
     - type: Transform
@@ -54050,6 +54657,12 @@ entities:
     - type: Transform
       pos: -9.5,42.5
       parent: 2
+  - uid: 16059
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,20.5
+      parent: 2
   - uid: 16261
     components:
     - type: Transform
@@ -54738,24 +55351,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 53.5,22.5
       parent: 2
-  - uid: 21670
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,21.5
-      parent: 2
-  - uid: 21671
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,21.5
-      parent: 2
-  - uid: 21672
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,21.5
-      parent: 2
   - uid: 21673
     components:
     - type: Transform
@@ -56604,16 +57199,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 68.5,-26.5
       parent: 2
-  - uid: 7560
-    components:
-    - type: Transform
-      pos: 55.5,-20.5
-      parent: 2
-  - uid: 7561
-    components:
-    - type: Transform
-      pos: 56.5,-20.5
-      parent: 2
   - uid: 7570
     components:
     - type: Transform
@@ -56877,6 +57462,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -29.5,-15.5
       parent: 2
+  - uid: 14788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-45.5
+      parent: 2
   - uid: 14864
     components:
     - type: Transform
@@ -56975,12 +57566,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,-44.5
       parent: 2
-  - uid: 16068
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,20.5
-      parent: 2
   - uid: 16107
     components:
     - type: Transform
@@ -58000,6 +58585,11 @@ entities:
       parent: 2
 - proto: ClosetEmergencyN2FilledRandom
   entities:
+  - uid: 7096
+    components:
+    - type: Transform
+      pos: 56.5,-21.5
+      parent: 2
   - uid: 14756
     components:
     - type: Transform
@@ -58477,6 +59067,11 @@ entities:
       parent: 2
 - proto: ClosetWallEmergencyFilledRandom
   entities:
+  - uid: 7555
+    components:
+    - type: Transform
+      pos: 50.5,-17.5
+      parent: 2
   - uid: 8276
     components:
     - type: Transform
@@ -58545,12 +59140,6 @@ entities:
     - type: Transform
       pos: 39.5,-17.5
       parent: 2
-  - uid: 8303
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 53.5,-24.5
-      parent: 2
   - uid: 8306
     components:
     - type: Transform
@@ -58713,12 +59302,6 @@ entities:
     - type: Transform
       pos: 40.5,-17.5
       parent: 2
-  - uid: 8304
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-24.5
-      parent: 2
   - uid: 8305
     components:
     - type: Transform
@@ -58814,6 +59397,11 @@ entities:
     - type: Transform
       pos: 41.5,14.5
       parent: 2
+  - uid: 16062
+    components:
+    - type: Transform
+      pos: 51.5,-17.5
+      parent: 2
   - uid: 16213
     components:
     - type: Transform
@@ -59137,10 +59725,10 @@ entities:
     - type: InsideEntityStorage
 - proto: ClothingHeadHatPirateTricord
   entities:
-  - uid: 16219
+  - uid: 8303
     components:
     - type: Transform
-      pos: 56.18452,-27.19633
+      pos: 55.618607,-27.245544
       parent: 2
 - proto: ClothingHeadHatRedwizard
   entities:
@@ -59203,6 +59791,13 @@ entities:
     - type: Transform
       pos: 21.504559,-47.81257
       parent: 2
+- proto: ClothingHeadsetMining
+  entities:
+  - uid: 7563
+    components:
+    - type: Transform
+      pos: -63.405163,-19.56893
+      parent: 2
 - proto: ClothingMaskBee
   entities:
   - uid: 16410
@@ -59388,10 +59983,10 @@ entities:
     - type: InsideEntityStorage
 - proto: ClothingOuterCoatPirate
   entities:
-  - uid: 16202
+  - uid: 7554
     components:
     - type: Transform
-      pos: 56.698204,-27.318634
+      pos: 56.243607,-27.370544
       parent: 2
 - proto: ClothingOuterHardsuitAncientEVA
   entities:
@@ -59607,10 +60202,10 @@ entities:
       canCollide: False
 - proto: ClothingUniformJumpsuitPirate
   entities:
-  - uid: 16218
+  - uid: 16072
     components:
     - type: Transform
-      pos: 56.257904,-27.587708
+      pos: 55.66548,-27.57367
       parent: 2
 - proto: Cobweb1
   entities:
@@ -59677,6 +60272,11 @@ entities:
     - type: Transform
       pos: 58.5,8.5
       parent: 2
+  - uid: 16069
+    components:
+    - type: Transform
+      pos: 65.5,21.5
+      parent: 2
   - uid: 17438
     components:
     - type: Transform
@@ -60970,11 +61570,6 @@ entities:
     - type: Transform
       pos: 75.55236,-11.471784
       parent: 2
-  - uid: 16069
-    components:
-    - type: Transform
-      pos: 65.51561,20.528181
-      parent: 2
 - proto: CrowbarRed
   entities:
   - uid: 21391
@@ -61338,11 +61933,6 @@ entities:
     - type: Transform
       pos: -11.5,-38.5
       parent: 2
-  - uid: 21452
-    components:
-    - type: Transform
-      pos: 66.5,-52.5
-      parent: 2
   - uid: 21453
     components:
     - type: Transform
@@ -62378,6 +62968,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,25.5
       parent: 2
+  - uid: 21672
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-40.5
+      parent: 2
   - uid: 21787
     components:
     - type: Transform
@@ -66689,11 +67285,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-46.5
       parent: 2
-  - uid: 7947
+  - uid: 7558
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-40.5
       parent: 2
   - uid: 8350
     components:
@@ -67542,13 +68138,6 @@ entities:
     - type: Transform
       pos: -22.667652,21.796803
       parent: 2
-- proto: DrinkVodkaBottleFull
-  entities:
-  - uid: 7568
-    components:
-    - type: Transform
-      pos: 56.12146,-21.136745
-      parent: 2
 - proto: DrinkWaterBottleFull
   entities:
   - uid: 6921
@@ -67615,6 +68204,12 @@ entities:
     - type: Transform
       pos: 51.5,-38.5
       parent: 2
+  - uid: 2871
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-24.5
+      parent: 2
   - uid: 4732
     components:
     - type: Transform
@@ -67644,6 +68239,12 @@ entities:
     - type: Transform
       pos: 7.5,-46.5
       parent: 2
+  - uid: 16066
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-20.5
+      parent: 2
   - uid: 17356
     components:
     - type: Transform
@@ -67671,12 +68272,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 76.5,-18.5
       parent: 2
-  - uid: 17362
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-24.5
-      parent: 2
   - uid: 17364
     components:
     - type: Transform
@@ -68296,12 +68891,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,12.5
       parent: 2
-  - uid: 21127
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-23.5
-      parent: 2
   - uid: 21369
     components:
     - type: Transform
@@ -68753,11 +69342,6 @@ entities:
       - 8737
       - 8738
       - 12369
-  - uid: 9102
-    components:
-    - type: Transform
-      pos: -11.5,-35.5
-      parent: 2
   - uid: 9188
     components:
     - type: Transform
@@ -70209,6 +70793,7 @@ entities:
       - 1038
       - 1039
       - 19842
+      - 7455
   - uid: 17674
     components:
     - type: Transform
@@ -70523,6 +71108,15 @@ entities:
     - type: Transform
       pos: -14.5,8.5
       parent: 2
+  - uid: 7455
+    components:
+    - type: Transform
+      pos: 53.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17673
+      - 8383
   - uid: 7459
     components:
     - type: Transform
@@ -72491,10 +73085,11 @@ entities:
       deviceLists:
       - 17618
       - 9188
-  - uid: 7455
+  - uid: 7549
     components:
     - type: Transform
-      pos: 63.5,19.5
+      rot: 3.141592653589793 rad
+      pos: 64.5,20.5
       parent: 2
   - uid: 8536
     components:
@@ -73105,6 +73700,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -44.5,13.5
       parent: 2
+  - uid: 14722
+    components:
+    - type: Transform
+      pos: 65.5,-0.5
+      parent: 2
   - uid: 14934
     components:
     - type: Transform
@@ -73134,12 +73734,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.5,6.5
       parent: 2
-  - uid: 15111
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-1.5
-      parent: 2
   - uid: 15112
     components:
     - type: Transform
@@ -73319,11 +73913,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.5,-12.5
       parent: 2
-  - uid: 16102
-    components:
-    - type: Transform
-      pos: 64.5,21.5
-      parent: 2
   - uid: 16354
     components:
     - type: Transform
@@ -73372,6 +73961,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,-24.5
       parent: 2
+  - uid: 21127
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,18.5
+      parent: 2
 - proto: Fireplace
   entities:
   - uid: 1067
@@ -73995,10 +74590,10 @@ entities:
       parent: 2
 - proto: GasCanisterBrokenBase
   entities:
-  - uid: 14722
+  - uid: 14039
     components:
     - type: Transform
-      pos: 65.5,-2.5
+      pos: 63.5,-5.5
       parent: 2
 - proto: GasFilter
   entities:
@@ -91242,18 +91837,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 21105
-    components:
-    - type: Transform
-      anchored: False
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-34.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
 - proto: GasPort
   entities:
   - uid: 1198
@@ -96005,6 +96588,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 57.5,-15.5
       parent: 2
+  - uid: 7125
+    components:
+    - type: Transform
+      pos: 54.5,-21.5
+      parent: 2
   - uid: 7176
     components:
     - type: Transform
@@ -96251,12 +96839,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-39.5
       parent: 2
-  - uid: 8222
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,20.5
-      parent: 2
   - uid: 8272
     components:
     - type: Transform
@@ -96272,6 +96854,11 @@ entities:
     - type: Transform
       pos: -4.5,-42.5
       parent: 2
+  - uid: 8304
+    components:
+    - type: Transform
+      pos: 52.5,-21.5
+      parent: 2
   - uid: 8343
     components:
     - type: Transform
@@ -96660,11 +97247,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 68.5,20.5
       parent: 2
-  - uid: 16077
+  - uid: 16075
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 66.5,18.5
+      pos: 64.5,13.5
       parent: 2
   - uid: 16078
     components:
@@ -96819,11 +97405,6 @@ entities:
     - type: Transform
       pos: 70.5,-33.5
       parent: 2
-  - uid: 16553
-    components:
-    - type: Transform
-      pos: 64.5,17.5
-      parent: 2
   - uid: 16554
     components:
     - type: Transform
@@ -98206,6 +98787,11 @@ entities:
     - type: Transform
       pos: 91.5,-16.5
       parent: 2
+  - uid: 21870
+    components:
+    - type: Transform
+      pos: 68.5,17.5
+      parent: 2
 - proto: GrilleBroken
   entities:
   - uid: 15037
@@ -99079,6 +99665,16 @@ entities:
     - type: Transform
       pos: -26.5,-45.5
       parent: 2
+  - uid: 21871
+    components:
+    - type: Transform
+      pos: 65.5,17.5
+      parent: 2
+  - uid: 21872
+    components:
+    - type: Transform
+      pos: 67.5,17.5
+      parent: 2
 - proto: GunSafeDisabler
   entities:
   - uid: 16916
@@ -99086,6 +99682,24 @@ entities:
     - type: Transform
       pos: 6.5,33.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: GunSafeRifleLecter
   entities:
   - uid: 16915
@@ -99093,6 +99707,24 @@ entities:
     - type: Transform
       pos: 7.5,33.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: GyroscopeUnanchored
   entities:
   - uid: 15146
@@ -100131,11 +100763,6 @@ entities:
     - type: Transform
       pos: 79.52929,-24.226149
       parent: 2
-  - uid: 14224
-    components:
-    - type: Transform
-      pos: 55.496395,-29.241953
-      parent: 2
   - uid: 15032
     components:
     - type: Transform
@@ -101994,6 +102621,11 @@ entities:
     - type: Transform
       pos: -54.5,-45.5
       parent: 2
+  - uid: 7210
+    components:
+    - type: Transform
+      pos: 65.5,19.5
+      parent: 2
   - uid: 7613
     components:
     - type: Transform
@@ -102004,6 +102636,11 @@ entities:
     - type: Transform
       pos: -0.5,-34.5
       parent: 2
+  - uid: 8222
+    components:
+    - type: Transform
+      pos: 56.5,-29.5
+      parent: 2
   - uid: 14696
     components:
     - type: Transform
@@ -102199,6 +102836,11 @@ entities:
     - type: Transform
       pos: 22.5,-16.5
       parent: 2
+  - uid: 3095
+    components:
+    - type: Transform
+      pos: 65.5,21.5
+      parent: 2
   - uid: 6387
     components:
     - type: Transform
@@ -102304,6 +102946,11 @@ entities:
     - type: Transform
       pos: -8.5,38.5
       parent: 2
+  - uid: 16182
+    components:
+    - type: Transform
+      pos: 55.5,-29.5
+      parent: 2
 - proto: Paper
   entities:
   - uid: 1521
@@ -102855,13 +103502,6 @@ entities:
     - type: Transform
       pos: 15.6345825,29.64872
       parent: 2
-- proto: PirateHandyFlag
-  entities:
-  - uid: 16192
-    components:
-    - type: Transform
-      pos: 55.487377,-27.4654
-      parent: 2
 - proto: PlaqueAtmos
   entities:
   - uid: 1548
@@ -103008,11 +103648,6 @@ entities:
     - type: Transform
       pos: 3.467857,52.5848
       parent: 2
-  - uid: 7567
-    components:
-    - type: Transform
-      pos: 55.52771,-21.365911
-      parent: 2
 - proto: PlushieCarp
   entities:
   - uid: 6473
@@ -103113,11 +103748,6 @@ entities:
     - type: Transform
       pos: -39.569736,-8.840944
       parent: 2
-  - uid: 1567
-    components:
-    - type: Transform
-      pos: -39.325127,-9.232323
-      parent: 2
   - uid: 1568
     components:
     - type: Transform
@@ -103163,6 +103793,11 @@ entities:
     - type: Transform
       pos: -40.180298,-10.129335
       parent: 2
+  - uid: 16077
+    components:
+    - type: Transform
+      pos: -39.212326,-8.996875
+      parent: 2
 - proto: PlushieMoth
   entities:
   - uid: 897
@@ -103421,6 +104056,14 @@ entities:
     - type: Transform
       pos: 60.5,-2.5
       parent: 2
+- proto: PosterLegitScience
+  entities:
+  - uid: 16202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-21.5
+      parent: 2
 - proto: PotatoAI
   entities:
   - uid: 21374
@@ -104457,19 +105100,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1665
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 36.5,-26.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: DeviceLinkSink
-      links:
-      - 15610
   - uid: 1666
     components:
     - type: Transform
@@ -104489,15 +105119,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1668
-    components:
-    - type: Transform
-      pos: 50.5,-18.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 1669
     components:
     - type: Transform
@@ -104851,18 +105472,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 2871
-    components:
-    - type: Transform
-      pos: 43.5,-27.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: DeviceLinkSink
-      links:
-      - 7054
   - uid: 2907
     components:
     - type: Transform
@@ -105060,19 +105669,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 4257
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,14.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: DeviceLinkSink
-      links:
-      - 7032
   - uid: 4276
     components:
     - type: Transform
@@ -105336,16 +105932,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 5020
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,31.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 5021
     components:
     - type: Transform
@@ -105817,16 +106403,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 6760
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-23.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 6889
     components:
     - type: Transform
@@ -105891,16 +106467,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7096
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-16.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 7124
     components:
     - type: Transform
@@ -105911,16 +106477,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7125
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-18.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 7160
     components:
     - type: Transform
@@ -105930,15 +106486,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7165
-    components:
-    - type: Transform
-      pos: 64.5,-22.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 7224
     components:
     - type: Transform
@@ -105958,19 +106505,6 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 7289
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-21.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: DeviceLinkSink
-      links:
-      - 7039
   - uid: 7421
     components:
     - type: Transform
@@ -105991,6 +106525,12 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 7561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-24.5
+      parent: 2
   - uid: 7584
     components:
     - type: Transform
@@ -106224,6 +106764,11 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 12668
+    components:
+    - type: Transform
+      pos: 50.5,-18.5
+      parent: 2
   - uid: 13666
     components:
     - type: Transform
@@ -106252,6 +106797,24 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 15884
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-16.5
+      parent: 2
+  - uid: 15886
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-18.5
+      parent: 2
+  - uid: 16070
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-23.5
+      parent: 2
   - uid: 17538
     components:
     - type: Transform
@@ -106454,6 +107017,12 @@ entities:
       powerLoad: 0
 - proto: PoweredSmallLight
   entities:
+  - uid: 1567
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,19.5
+      parent: 2
   - uid: 3272
     components:
     - type: Transform
@@ -106463,6 +107032,12 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 7560
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-23.5
+      parent: 2
   - uid: 8752
     components:
     - type: Transform
@@ -106483,11 +107058,46 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 12667
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,-26.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 15610
+  - uid: 12670
+    components:
+    - type: Transform
+      pos: 43.5,-27.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 7054
   - uid: 12922
     components:
     - type: Transform
       pos: -12.5,-36.5
       parent: 2
+  - uid: 14224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,14.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 7032
+  - uid: 14851
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,31.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 21875
   - uid: 15005
     components:
     - type: Transform
@@ -106567,16 +107177,15 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 16076
+  - uid: 16058
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 65.5,20.5
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-21.5
       parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ApcPowerReceiver
-      powerLoad: 0
+    - type: DeviceLinkSink
+      links:
+      - 7039
   - uid: 16125
     components:
     - type: Transform
@@ -106807,6 +107416,22 @@ entities:
       enabled: False
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 21874
+    components:
+    - type: Transform
+      pos: 59.5,12.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 21873
+  - uid: 21877
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 21876
 - proto: PoweredSmallLightEmpty
   entities:
   - uid: 16926
@@ -108223,18 +108848,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 74.5,-15.5
       parent: 2
-  - uid: 7553
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-20.5
-      parent: 2
-  - uid: 7554
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-20.5
-      parent: 2
   - uid: 8263
     components:
     - type: Transform
@@ -108383,18 +108996,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -36.5,-26.5
       parent: 2
-  - uid: 7552
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-20.5
-      parent: 2
-  - uid: 7555
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-20.5
-      parent: 2
   - uid: 8261
     components:
     - type: Transform
@@ -108559,17 +109160,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 74.5,-16.5
       parent: 2
-  - uid: 7556
-    components:
-    - type: Transform
-      pos: 54.5,-21.5
-      parent: 2
-  - uid: 7557
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-21.5
-      parent: 2
   - uid: 14900
     components:
     - type: Transform
@@ -110121,12 +110711,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 34.5,-23.5
       parent: 2
-  - uid: 8884
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-24.5
-      parent: 2
   - uid: 8885
     components:
     - type: Transform
@@ -110758,11 +111342,6 @@ entities:
     - type: Transform
       pos: 65.5,-11.5
       parent: 2
-  - uid: 7549
-    components:
-    - type: Transform
-      pos: 52.5,-23.5
-      parent: 2
   - uid: 8216
     components:
     - type: Transform
@@ -110773,6 +111352,11 @@ entities:
     - type: Transform
       pos: 20.5,21.5
       parent: 2
+  - uid: 15111
+    components:
+    - type: Transform
+      pos: 56.5,-23.5
+      parent: 2
 - proto: RandomVendingSnacks
   entities:
   - uid: 1931
@@ -110800,11 +111384,6 @@ entities:
     - type: Transform
       pos: -30.5,-33.5
       parent: 2
-  - uid: 3095
-    components:
-    - type: Transform
-      pos: 52.5,-22.5
-      parent: 2
   - uid: 3631
     components:
     - type: Transform
@@ -110845,11 +111424,21 @@ entities:
     - type: Transform
       pos: 63.5,-11.5
       parent: 2
+  - uid: 7507
+    components:
+    - type: Transform
+      pos: 56.5,-22.5
+      parent: 2
   - uid: 8265
     components:
     - type: Transform
       pos: 19.5,21.5
       parent: 2
+  - uid: 16068
+    components:
+    - type: Transform
+      pos: 56.5,-22.5
+      parent: 2
 - proto: RCD
   entities:
   - uid: 1085
@@ -110893,7 +111482,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 14851
+      - 7940
 - proto: ReinforcedGirder
   entities:
   - uid: 14964
@@ -112623,11 +113212,6 @@ entities:
     - type: Transform
       pos: -54.5,-33.5
       parent: 2
-  - uid: 7507
-    components:
-    - type: Transform
-      pos: 64.5,17.5
-      parent: 2
   - uid: 7508
     components:
     - type: Transform
@@ -113015,11 +113599,10 @@ entities:
     - type: Transform
       pos: -17.5,-43.5
       parent: 2
-  - uid: 16075
+  - uid: 16074
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,20.5
+      pos: 52.5,-21.5
       parent: 2
   - uid: 16089
     components:
@@ -113076,6 +113659,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 84.5,-29.5
       parent: 2
+  - uid: 16192
+    components:
+    - type: Transform
+      pos: 54.5,-21.5
+      parent: 2
   - uid: 16310
     components:
     - type: Transform
@@ -113224,6 +113812,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 93.5,-15.5
       parent: 2
+  - uid: 21105
+    components:
+    - type: Transform
+      pos: 64.5,13.5
+      parent: 2
   - uid: 21377
     components:
     - type: Transform
@@ -113389,6 +113982,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -39.5,-34.5
       parent: 2
+  - uid: 16057
+    components:
+    - type: Transform
+      pos: 55.5,-22.5
+      parent: 2
   - uid: 16166
     components:
     - type: Transform
@@ -113546,11 +114144,6 @@ entities:
     - type: Transform
       pos: -38.5,-11.5
       parent: 2
-  - uid: 20864
-    components:
-    - type: Transform
-      pos: 51.5,-22.5
-      parent: 2
   - uid: 21033
     components:
     - type: Transform
@@ -114712,7 +115305,7 @@ entities:
   - uid: 2074
     components:
     - type: MetaData
-      name: rad shutters button
+      name: Radiation shutters button
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-11.5
@@ -114745,6 +115338,8 @@ entities:
         - Pressed: Toggle
   - uid: 2076
     components:
+    - type: MetaData
+      name: Blast chamber doors button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-14.5
@@ -114759,6 +115354,8 @@ entities:
         - Pressed: Toggle
   - uid: 2077
     components:
+    - type: MetaData
+      name: Door bolt button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -35.5,-11.5
@@ -114769,6 +115366,8 @@ entities:
         - Pressed: DoorBolt
   - uid: 2079
     components:
+    - type: MetaData
+      name: Door bolt button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -27.5,-11.5
@@ -114780,17 +115379,19 @@ entities:
   - uid: 15610
     components:
     - type: MetaData
-      name: lights off button
+      name: Lights off button
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 34.5,-25.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        1665:
+        12667:
         - Pressed: Toggle
   - uid: 20353
     components:
+    - type: MetaData
+      name: Radiation shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-24.5
@@ -114805,6 +115406,8 @@ entities:
         - Pressed: Toggle
   - uid: 21867
     components:
+    - type: MetaData
+      name: Medical exit button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 50.5,-2.5
@@ -114817,7 +115420,7 @@ entities:
   - uid: 2100
     components:
     - type: MetaData
-      name: shutters button
+      name: Shutters button
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 48.5,12.5
@@ -114834,6 +115437,8 @@ entities:
         - Pressed: Toggle
   - uid: 4520
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -42.5,-16.5
@@ -114848,6 +115453,8 @@ entities:
         - Pressed: Toggle
   - uid: 4548
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 30.5,-31.5
@@ -114870,6 +115477,8 @@ entities:
         - Pressed: Toggle
   - uid: 5653
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,21.5
@@ -114884,6 +115493,8 @@ entities:
         - Pressed: Toggle
   - uid: 5757
     components:
+    - type: MetaData
+      name: Secure storage doors button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 27.5,5.5
@@ -114913,41 +115524,43 @@ entities:
   - uid: 7032
     components:
     - type: MetaData
-      name: lights off button
+      name: Lights off button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 37.5,11.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        4257:
+        14224:
         - Pressed: Toggle
   - uid: 7039
     components:
     - type: MetaData
-      name: lights off button
+      name: Lights off button
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 72.5,-22.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7289:
+        16058:
         - Pressed: Toggle
   - uid: 7054
     components:
     - type: MetaData
-      name: lights off button
+      name: Lights off button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 45.5,-31.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        2871:
+        12670:
         - Pressed: Toggle
   - uid: 8185
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 44.5,-26.5
@@ -114964,6 +115577,8 @@ entities:
         - Pressed: Toggle
   - uid: 8530
     components:
+    - type: MetaData
+      name: Door bolt button
     - type: Transform
       pos: 17.5,26.5
       parent: 2
@@ -114973,6 +115588,8 @@ entities:
         - Pressed: DoorBolt
   - uid: 8532
     components:
+    - type: MetaData
+      name: Door bolt button
     - type: Transform
       pos: 17.5,24.5
       parent: 2
@@ -114982,6 +115599,8 @@ entities:
         - Pressed: DoorBolt
   - uid: 12911
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-1.5
@@ -115000,6 +115619,8 @@ entities:
         - Pressed: Toggle
   - uid: 12913
     components:
+    - type: MetaData
+      name: Blast doors button
     - type: Transform
       pos: 27.5,24.5
       parent: 2
@@ -115048,20 +115669,10 @@ entities:
       linkedPorts:
         20777:
         - Pressed: Toggle
-  - uid: 14851
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.499018,-37.179466
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        1456:
-        - Pressed: Forward
   - uid: 14879
     components:
     - type: MetaData
-      name: lights off button
+      name: Lights off button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-11.5
@@ -115082,6 +115693,8 @@ entities:
         - Pressed: Toggle
   - uid: 15913
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -23.5,15.5
@@ -115103,7 +115716,7 @@ entities:
   - uid: 16121
     components:
     - type: MetaData
-      name: lights off button
+      name: Lights off button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -29.5,-11.5
@@ -115198,6 +115811,8 @@ entities:
         - Pressed: Toggle
   - uid: 17491
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -20.5,-16.5
@@ -115214,6 +115829,8 @@ entities:
         - Pressed: Toggle
   - uid: 17499
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -18.5,-28.5
@@ -115228,6 +115845,8 @@ entities:
         - Pressed: Toggle
   - uid: 17505
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,22.5
@@ -115242,6 +115861,8 @@ entities:
         - Pressed: Toggle
   - uid: 17507
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,53.5
@@ -115262,6 +115883,8 @@ entities:
         - Pressed: Toggle
   - uid: 17516
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 28.5,9.5
@@ -115279,7 +115902,7 @@ entities:
   - uid: 17517
     components:
     - type: MetaData
-      name: shutters button
+      name: Shutters button
     - type: Transform
       pos: 46.5,-5.5
       parent: 2
@@ -115292,7 +115915,7 @@ entities:
   - uid: 17518
     components:
     - type: MetaData
-      name: shutters button
+      name: Shutters button
     - type: Transform
       pos: 46.5,-2.5
       parent: 2
@@ -115305,7 +115928,7 @@ entities:
   - uid: 17519
     components:
     - type: MetaData
-      name: shutters button
+      name: Shutters button
     - type: Transform
       pos: 46.5,0.5
       parent: 2
@@ -115317,6 +115940,8 @@ entities:
         - Pressed: Toggle
   - uid: 17520
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       pos: 61.5,-10.5
       parent: 2
@@ -115344,6 +115969,8 @@ entities:
         - Pressed: Toggle
   - uid: 18465
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       pos: 35.5,16.5
       parent: 2
@@ -115439,6 +116066,8 @@ entities:
         - Pressed: AutoClose
   - uid: 21844
     components:
+    - type: MetaData
+      name: Shutters button
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,10.5
@@ -115451,6 +116080,42 @@ entities:
         - Pressed: Toggle
         17479:
         - Pressed: Toggle
+  - uid: 21873
+    components:
+    - type: MetaData
+      name: Lights off button
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,11.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        21874:
+        - Pressed: Toggle
+  - uid: 21875
+    components:
+    - type: MetaData
+      name: Lights off button
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,32.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        14851:
+        - Pressed: Toggle
+  - uid: 21876
+    components:
+    - type: MetaData
+      name: Lights off button
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-26.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        21877:
+        - Pressed: Toggle
 - proto: SignAnomaly
   entities:
   - uid: 8366
@@ -115707,6 +116372,11 @@ entities:
     - type: Transform
       pos: -25.510857,-5.767983
       parent: 2
+  - uid: 20864
+    components:
+    - type: Transform
+      pos: 16.5,1.5
+      parent: 2
 - proto: SignDirectionalEvac
   entities:
   - uid: 13613
@@ -115851,6 +116521,12 @@ entities:
       parent: 2
 - proto: SignDirectionalSci
   entities:
+  - uid: 7179
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-21.5
+      parent: 2
   - uid: 13631
     components:
     - type: Transform
@@ -118205,6 +118881,11 @@ entities:
       parent: 2
 - proto: StationMap
   entities:
+  - uid: 7556
+    components:
+    - type: Transform
+      pos: 48.5,-17.5
+      parent: 2
   - uid: 13592
     components:
     - type: Transform
@@ -119358,6 +120039,17 @@ entities:
       id: West substation
 - proto: SurveillanceCameraGeneral
   entities:
+  - uid: 7289
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-39.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Disposals
   - uid: 8420
     components:
     - type: Transform
@@ -121469,12 +122161,6 @@ entities:
     - type: Transform
       pos: -42.5,17.5
       parent: 2
-  - uid: 16067
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,20.5
-      parent: 2
   - uid: 16110
     components:
     - type: Transform
@@ -121777,12 +122463,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,-15.5
       parent: 2
-  - uid: 16182
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-29.5
-      parent: 2
   - uid: 16197
     components:
     - type: Transform
@@ -123170,16 +123850,6 @@ entities:
     - type: Transform
       pos: 71.5,-20.5
       parent: 2
-  - uid: 7563
-    components:
-    - type: Transform
-      pos: 55.5,-21.5
-      parent: 2
-  - uid: 7564
-    components:
-    - type: Transform
-      pos: 56.5,-21.5
-      parent: 2
   - uid: 9159
     components:
     - type: Transform
@@ -123708,6 +124378,10 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
+        1456:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
   - uid: 15603
     components:
     - type: Transform
@@ -123953,11 +124627,6 @@ entities:
     - type: Transform
       pos: -38.5,-13.5
       parent: 2
-  - uid: 7210
-    components:
-    - type: Transform
-      pos: 52.5,-21.5
-      parent: 2
   - uid: 20610
     components:
     - type: Transform
@@ -127180,12 +127849,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 53.5,-24.5
       parent: 2
-  - uid: 5862
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-24.5
-      parent: 2
   - uid: 5863
     components:
     - type: Transform
@@ -128223,6 +128886,12 @@ entities:
     - type: Transform
       pos: 66.5,-10.5
       parent: 2
+  - uid: 7165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-21.5
+      parent: 2
   - uid: 7182
     components:
     - type: Transform
@@ -128553,6 +129222,23 @@ entities:
     - type: Transform
       pos: 64.5,-31.5
       parent: 2
+  - uid: 7562
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-23.5
+      parent: 2
+  - uid: 7565
+    components:
+    - type: Transform
+      pos: 64.5,19.5
+      parent: 2
+  - uid: 7568
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,18.5
+      parent: 2
   - uid: 7574
     components:
     - type: Transform
@@ -129051,6 +129737,12 @@ entities:
     - type: Transform
       pos: 13.5,-40.5
       parent: 2
+  - uid: 7947
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,17.5
+      parent: 2
   - uid: 7963
     components:
     - type: Transform
@@ -129632,16 +130324,6 @@ entities:
     - type: Transform
       pos: -20.5,-45.5
       parent: 2
-  - uid: 16059
-    components:
-    - type: Transform
-      pos: 68.5,19.5
-      parent: 2
-  - uid: 16062
-    components:
-    - type: Transform
-      pos: 65.5,19.5
-      parent: 2
   - uid: 16090
     components:
     - type: Transform
@@ -130163,6 +130845,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-49.5
       parent: 2
+  - uid: 21671
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,18.5
+      parent: 2
   - uid: 21748
     components:
     - type: Transform
@@ -134207,24 +134895,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 64.5,12.5
       parent: 2
-  - uid: 7008
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,13.5
-      parent: 2
   - uid: 7010
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 64.5,18.5
       parent: 2
-  - uid: 7011
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,19.5
-      parent: 2
   - uid: 7012
     components:
     - type: Transform
@@ -134781,6 +135457,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 27.5,-39.5
       parent: 2
+  - uid: 7553
+    components:
+    - type: Transform
+      pos: 54.5,-24.5
+      parent: 2
+  - uid: 7567
+    components:
+    - type: Transform
+      pos: 64.5,21.5
+      parent: 2
   - uid: 7580
     components:
     - type: Transform
@@ -135609,6 +136295,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,28.5
       parent: 2
+  - uid: 8884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,18.5
+      parent: 2
   - uid: 9105
     components:
     - type: Transform
@@ -136065,18 +136757,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 68.5,22.5
       parent: 2
-  - uid: 15884
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,19.5
-      parent: 2
-  - uid: 15886
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,19.5
-      parent: 2
   - uid: 15888
     components:
     - type: Transform
@@ -136137,6 +136817,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 78.5,-32.5
       parent: 2
+  - uid: 16073
+    components:
+    - type: Transform
+      pos: 55.5,-22.5
+      parent: 2
   - uid: 16087
     components:
     - type: Transform
@@ -136575,6 +137260,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 81.5,-36.5
       parent: 2
+  - uid: 17362
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,18.5
+      parent: 2
   - uid: 17434
     components:
     - type: Transform
@@ -142376,10 +143067,10 @@ entities:
     - type: Transform
       pos: 2.523613,33.586533
       parent: 2
-  - uid: 5092
+  - uid: 7564
     components:
     - type: Transform
-      pos: 2.523613,33.367783
+      pos: 2.5417395,33.683712
       parent: 2
   - uid: 20305
     components:
@@ -142702,12 +143393,16 @@ entities:
       parent: 2
   - uid: 16941
     components:
+    - type: MetaData
+      name: Theatre windoor
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -37.5,4.5
       parent: 2
   - uid: 18471
     components:
+    - type: MetaData
+      name: Theatre windoor
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -29.5,4.5

From 2c7598fd5b1197674c98a56c1b7bb167c33b1cca Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 8 Jun 2024 20:48:23 +1200
Subject: [PATCH 359/568] Fix flatpacker (#28736)

* Fix flatpacker

* a
---
 .../UI/FlatpackCreatorMenu.xaml.cs            |  4 +-
 Content.Server/Construction/FlatpackSystem.cs | 50 +++++++++------
 .../Construction/SharedFlatpackSystem.cs      | 63 +++++++++----------
 3 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
index eae70d536792..9f3d5695bb60 100644
--- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
+++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs
@@ -68,7 +68,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (_entityManager.TryGetComponent<MachineBoardComponent>(_currentBoard, out var machineBoardComp))
                 cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), (_currentBoard.Value, machineBoardComp));
             else
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker));
+                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), null);
 
             PackButton.Disabled = !_materialStorage.CanChangeMaterialAmount(_owner, cost);
         }
@@ -93,7 +93,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             else if (_entityManager.TryGetComponent<ComputerBoardComponent>(_currentBoard, out var computerBoard))
             {
                 prototype = computerBoard.Prototype;
-                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker));
+                cost = _flatpack.GetFlatpackCreationCost((_owner, flatpacker), null);
             }
 
             if (prototype is not null && cost is not null)
diff --git a/Content.Server/Construction/FlatpackSystem.cs b/Content.Server/Construction/FlatpackSystem.cs
index be082eba3072..af2132723cd1 100644
--- a/Content.Server/Construction/FlatpackSystem.cs
+++ b/Content.Server/Construction/FlatpackSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Construction;
 using Content.Shared.Construction.Components;
 using Content.Shared.Containers.ItemSlots;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Construction;
@@ -30,21 +31,24 @@ private void OnStartPack(Entity<FlatpackCreatorComponent> ent, ref FlatpackCreat
         if (!this.IsPowered(ent, EntityManager) || comp.Packing)
             return;
 
-        if (!_itemSlots.TryGetSlot(uid, comp.SlotId, out var itemSlot) || itemSlot.Item is not { } machineBoard)
+        if (!_itemSlots.TryGetSlot(uid, comp.SlotId, out var itemSlot) || itemSlot.Item is not { } board)
             return;
 
-        Dictionary<string, int>? cost = null;
-        if (TryComp<MachineBoardComponent>(machineBoard, out var machineBoardComponent))
-            cost = GetFlatpackCreationCost(ent, (machineBoard, machineBoardComponent));
-        if (HasComp<ComputerBoardComponent>(machineBoard))
-            cost = GetFlatpackCreationCost(ent);
-
-        if (cost is null)
+        Dictionary<string, int> cost;
+        if (TryComp<MachineBoardComponent>(board, out var machine))
+            cost = GetFlatpackCreationCost(ent, (board, machine));
+        else if (TryComp<ComputerBoardComponent>(board, out var computer) && computer.Prototype != null)
+            cost = GetFlatpackCreationCost(ent, null);
+        else
+        {
+            Log.Error($"Encountered invalid flatpack board while packing: {ToPrettyString(board)}");
             return;
+        }
 
         if (!MaterialStorage.CanChangeMaterialAmount(uid, cost))
             return;
 
+        _itemSlots.SetLock(uid, comp.SlotId, true);
         comp.Packing = true;
         comp.PackEndTime = _timing.CurTime + comp.PackDuration;
         Appearance.SetData(uid, FlatpackCreatorVisuals.Packing, true);
@@ -63,6 +67,7 @@ private void FinishPacking(Entity<FlatpackCreatorComponent> ent, bool interrupte
     {
         var (uid, comp) = ent;
 
+        _itemSlots.SetLock(uid, comp.SlotId, false);
         comp.Packing = false;
         Appearance.SetData(uid, FlatpackCreatorVisuals.Packing, false);
         _ambientSound.SetAmbience(uid, false);
@@ -71,24 +76,33 @@ private void FinishPacking(Entity<FlatpackCreatorComponent> ent, bool interrupte
         if (interrupted)
             return;
 
-        if (!_itemSlots.TryGetSlot(uid, comp.SlotId, out var itemSlot) || itemSlot.Item is not { } machineBoard)
+        if (!_itemSlots.TryGetSlot(uid, comp.SlotId, out var itemSlot) || itemSlot.Item is not { } board)
             return;
 
-        Dictionary<string, int>? cost = null;
-        if (TryComp<MachineBoardComponent>(machineBoard, out var machineBoardComponent))
-            cost = GetFlatpackCreationCost(ent, (machineBoard, machineBoardComponent));
-        if (HasComp<ComputerBoardComponent>(machineBoard))
-            cost = GetFlatpackCreationCost(ent);
-
-        if (cost is null)
+        Dictionary<string, int> cost;
+        EntProtoId proto;
+        if (TryComp<MachineBoardComponent>(board, out var machine))
+        {
+            cost = GetFlatpackCreationCost(ent, (board, machine));
+            proto = machine.Prototype;
+        }
+        else if (TryComp<ComputerBoardComponent>(board, out var computer) && computer.Prototype != null)
+        {
+            cost = GetFlatpackCreationCost(ent, null);
+            proto = computer.Prototype;
+        }
+        else
+        {
+            Log.Error($"Encountered invalid flatpack board while packing: {ToPrettyString(board)}");
             return;
+        }
 
         if (!MaterialStorage.TryChangeMaterialAmount((ent, null), cost))
             return;
 
         var flatpack = Spawn(comp.BaseFlatpackPrototype, Transform(ent).Coordinates);
-        SetupFlatpack(flatpack, machineBoard);
-        Del(machineBoard);
+        SetupFlatpack(flatpack, proto, board);
+        Del(board);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index 62d2089fb7c3..a83948b16741 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Construction.Components;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
@@ -10,7 +11,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Construction;
@@ -37,7 +37,21 @@ public override void Initialize()
         SubscribeLocalEvent<FlatpackComponent, InteractUsingEvent>(OnFlatpackInteractUsing);
         SubscribeLocalEvent<FlatpackComponent, ExaminedEvent>(OnFlatpackExamined);
 
-        SubscribeLocalEvent<FlatpackCreatorComponent, ContainerIsRemovingAttemptEvent>(OnCreatorRemovingAttempt);
+        SubscribeLocalEvent<FlatpackCreatorComponent, ItemSlotInsertAttemptEvent>(OnInsertAttempt);
+    }
+
+    private void OnInsertAttempt(Entity<FlatpackCreatorComponent> ent, ref ItemSlotInsertAttemptEvent args)
+    {
+        if (args.Slot.ID != ent.Comp.SlotId || args.Cancelled)
+            return;
+
+        if (HasComp<MachineBoardComponent>(args.Item))
+            return;
+
+        if (TryComp<ComputerBoardComponent>(args.Item, out var computer) && computer.Prototype != null)
+            return;
+
+        args.Cancelled = true;
     }
 
     private void OnFlatpackInteractUsing(Entity<FlatpackComponent> ent, ref InteractUsingEvent args)
@@ -65,19 +79,12 @@ private void OnFlatpackInteractUsing(Entity<FlatpackComponent> ent, ref Interact
         var buildPos = _map.TileIndicesFor(grid, gridComp, xform.Coordinates);
         var coords = _map.ToCenterCoordinates(grid, buildPos);
 
-        var intersecting = _entityLookup.GetEntitiesIntersecting(coords, LookupFlags.Dynamic | LookupFlags.Static);
-
-        // todo make this logic smarter.
-        // This should eventually allow for shit like building microwaves on tables and such.
-        foreach (var intersect in intersecting)
+        // TODO FLATPAK
+        // Make this logic smarter. This should eventually allow for shit like building microwaves on tables and such.
+        // Also: make it ignore ghosts
+        if (_entityLookup.AnyEntitiesIntersecting(coords, LookupFlags.Dynamic | LookupFlags.Static))
         {
-            if (!TryComp<PhysicsComponent>(intersect, out var intersectBody))
-                continue;
-
-            if (!intersectBody.Hard || !intersectBody.CanCollide)
-                continue;
-
-            // this popup is on the server because the mispredicts on the intersection is crazy
+            // this popup is on the server because the predicts on the intersection is crazy
             if (_net.IsServer)
                 _popup.PopupEntity(Loc.GetString("flatpack-unpack-no-room"), uid, args.User);
             return;
@@ -102,38 +109,24 @@ private void OnFlatpackExamined(Entity<FlatpackComponent> ent, ref ExaminedEvent
         args.PushMarkup(Loc.GetString("flatpack-examine"));
     }
 
-    private void OnCreatorRemovingAttempt(Entity<FlatpackCreatorComponent> ent, ref ContainerIsRemovingAttemptEvent args)
-    {
-        if (args.Container.ID == ent.Comp.SlotId && ent.Comp.Packing)
-            args.Cancel();
-    }
-
-    public void SetupFlatpack(Entity<FlatpackComponent?> ent, EntityUid? board)
+    protected void SetupFlatpack(Entity<FlatpackComponent?> ent, EntProtoId proto, EntityUid board)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
 
-        var machinePrototypeId = new EntProtoId();
-        if (TryComp<ComputerBoardComponent>(board, out var computerBoard) && computerBoard.Prototype is not null)
-            machinePrototypeId = computerBoard.Prototype;
-
-        var comp = ent.Comp!;
-        var machinePrototype = PrototypeManager.Index(machinePrototypeId);
+        ent.Comp.Entity = proto;
+        var machinePrototype = PrototypeManager.Index<EntityPrototype>(proto);
 
         var meta = MetaData(ent);
         _metaData.SetEntityName(ent, Loc.GetString("flatpack-entity-name", ("name", machinePrototype.Name)), meta);
         _metaData.SetEntityDescription(ent, Loc.GetString("flatpack-entity-description", ("name", machinePrototype.Name)), meta);
 
-        comp.Entity = machinePrototypeId;
-        Dirty(ent, comp);
-
-        if (board is null)
-            return;
-
-        Appearance.SetData(ent, FlatpackVisuals.Machine, MetaData(board.Value).EntityPrototype?.ID ?? string.Empty);
+        Dirty(ent, meta);
+        Appearance.SetData(ent, FlatpackVisuals.Machine, MetaData(board).EntityPrototype?.ID ?? string.Empty);
     }
 
-    public Dictionary<string, int> GetFlatpackCreationCost(Entity<FlatpackCreatorComponent> entity, Entity<MachineBoardComponent>? machineBoard = null)
+    /// <param name="machineBoard">The machine board to pack. If null, this implies we are packing a computer board</param>
+    public Dictionary<string, int> GetFlatpackCreationCost(Entity<FlatpackCreatorComponent> entity, Entity<MachineBoardComponent>? machineBoard)
     {
         Dictionary<string, int> cost = new();
         Dictionary<ProtoId<MaterialPrototype>, int> baseCost;

From b50faffcc310dbd4bd49b591d107c2619bbffbb1 Mon Sep 17 00:00:00 2001
From: MerrytheManokit <167581110+MerrytheManokit@users.noreply.github.com>
Date: Sat, 8 Jun 2024 04:48:49 -0400
Subject: [PATCH 360/568] rn, atp (#28674)

* Update speech-chatsan.ftl

* Update word_replacements.yml

* Atm-at the moment

* Atm

* Update Resources/Locale/en-US/speech/speech-chatsan.ftl

* Update Resources/Prototypes/Accents/word_replacements.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---
 Resources/Locale/en-US/speech/speech-chatsan.ftl   | 8 +++++++-
 Resources/Prototypes/Accents/word_replacements.yml | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index ef9450729522..df6cde00a2cf 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -128,4 +128,10 @@ chatsan-word-46 = tyvm
 chatsan-replacement-46 = thank you very much
 
 chatsan-word-47 = cya
-chatsan-replacement-47 = see ya
\ No newline at end of file
+chatsan-replacement-47 = see ya
+
+chatsan-word-48 = rn
+chatsan-replacement-48 = right now
+
+chatsan-word-49 = atm
+chatsan-replacement-49 = at the moment
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 40cc94e4537f..61462944e44d 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -428,6 +428,8 @@
     chatsan-word-45: chatsan-replacement-45
     chatsan-word-46: chatsan-replacement-46
     chatsan-word-47: chatsan-replacement-47
+    chatsan-word-48: chatsan-replacement-48
+    chatsan-word-49: chatsan-replacement-49
 
 - type: accent
   id: liar

From 45015188cd5d6c0df9da9b63c7d54de48ec2009c Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 8 Jun 2024 20:03:54 +1000
Subject: [PATCH 361/568] Add loadout group check for role proto (#28731)

MFW same bug twice at 2 layers because I'm stupid.
---
 Content.Shared/Preferences/Loadouts/RoleLoadout.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index 479974893ceb..b9d3a88338e8 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -64,6 +64,13 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
 
         foreach (var (group, groupLoadouts) in SelectedLoadouts)
         {
+            // Check the group is even valid for this role.
+            if (!roleProto.Groups.Contains(group))
+            {
+                groupRemove.Add(group);
+                continue;
+            }
+
             // Dump if Group doesn't exist
             if (!protoManager.TryIndex(group, out var groupProto))
             {

From 74ed68b2d5f3aad6be270b8a7fd316abefe25b7a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 10:05:00 +0000
Subject: [PATCH 362/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 585e10a22d5f..f2938fa3bab3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Killerqu00
-  changes:
-  - message: Airlock wires are now different between departments.
-    type: Tweak
-  id: 6198
-  time: '2024-03-20T16:07:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26247
 - author: Tayrtahn
   changes:
   - message: Pizza is no longer considered a fruit.
@@ -3849,3 +3842,10 @@
   id: 6697
   time: '2024-06-08T05:49:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28709
+- author: metalgearsloth
+  changes:
+  - message: Fix some loadout groups not getting validated properly.
+    type: Fix
+  id: 6698
+  time: '2024-06-08T10:03:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28731

From 7ef7fe6761dcbf541785210ff361d79bf4080dcc Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 8 Jun 2024 22:27:21 +1200
Subject: [PATCH 363/568] Try fix RGBee (#28741)

---
 Content.Client/Light/RgbLightControllerSystem.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs
index 7d55bcebf113..85b611483061 100644
--- a/Content.Client/Light/RgbLightControllerSystem.cs
+++ b/Content.Client/Light/RgbLightControllerSystem.cs
@@ -207,8 +207,11 @@ public override void FrameUpdate(float frameTime)
 
         public static Color GetCurrentRgbColor(TimeSpan curTime, TimeSpan offset, Entity<RgbLightControllerComponent> rgb)
         {
+            var delta = (float)(curTime - offset).TotalSeconds;
+            var entOffset = Math.Abs(rgb.Owner.Id * 0.09817f);
+            var hue = (delta * rgb.Comp.CycleRate + entOffset) % 1;
             return Color.FromHsv(new Vector4(
-                (float) (((curTime.TotalSeconds - offset.TotalSeconds) * rgb.Comp.CycleRate + Math.Abs(rgb.Owner.Id * 0.1)) % 1),
+                MathF.Abs(hue),
                 1.0f,
                 1.0f,
                 1.0f

From c4966e51776eca4582b7391be1d4f7dd2f6071bd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 10:28:27 +0000
Subject: [PATCH 364/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f2938fa3bab3..87413276dc81 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Pizza is no longer considered a fruit.
-    type: Tweak
-  id: 6199
-  time: '2024-03-20T19:03:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26293
 - author: jamessimo
   changes:
   - message: Ratkings and Rat servants eyes now glow in the dark
@@ -3849,3 +3842,10 @@
   id: 6698
   time: '2024-06-08T10:03:54.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28731
+- author: ElectroJr
+  changes:
+  - message: Fixed RGB lights & eswords sometimes not working and showing up as black.
+    type: Fix
+  id: 6699
+  time: '2024-06-08T10:27:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28741

From db6548bc99d66cc5cd7f67ed6bd194601b1c241a Mon Sep 17 00:00:00 2001
From: Vasilis <vasilis@pikachu.systems>
Date: Sat, 8 Jun 2024 13:33:51 +0300
Subject: [PATCH 365/568] Ensure packager creates a release folder (#28426)

I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.
---
 Content.Packaging/Program.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Content.Packaging/Program.cs b/Content.Packaging/Program.cs
index 65c0e0131a4f..9457e9dacc9b 100644
--- a/Content.Packaging/Program.cs
+++ b/Content.Packaging/Program.cs
@@ -11,6 +11,11 @@
 
 if (parsed.WipeRelease)
     WipeRelease();
+else
+{
+    // Ensure the release directory exists. Otherwise, the packaging will fail.
+    Directory.CreateDirectory("release");
+}
 
 if (!parsed.SkipBuild)
     WipeBin();

From 123dfee3a37da657633381990c50d8fb81d21b79 Mon Sep 17 00:00:00 2001
From: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Date: Sat, 8 Jun 2024 06:37:55 -0400
Subject: [PATCH 366/568] allow ' in character names (#28652)

---
 Content.Shared/Preferences/HumanoidCharacterProfile.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 20c54cd2687b..3ee162fe7251 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -25,7 +25,7 @@ namespace Content.Shared.Preferences
     [Serializable, NetSerializable]
     public sealed partial class HumanoidCharacterProfile : ICharacterProfile
     {
-        private static readonly Regex RestrictedNameRegex = new("[^A-Z,a-z,0-9, -]");
+        private static readonly Regex RestrictedNameRegex = new("[^A-Z,a-z,0-9, ,\\-,']");
         private static readonly Regex ICNameCaseRegex = new(@"^(?<word>\w)|\b(?<word>\w)(?=\w*$)");
 
         public const int MaxNameLength = 32;

From 511336beb8a47fd12c2e5e42522f670308ed5bf9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 10:39:01 +0000
Subject: [PATCH 367/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 87413276dc81..7570e21aa0b3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: jamessimo
-  changes:
-  - message: Ratkings and Rat servants eyes now glow in the dark
-    type: Tweak
-  id: 6200
-  time: '2024-03-21T13:16:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26300
 - author: nikthechampiongr
   changes:
   - message: Scram! implant no longer allows for someone to keep pulling you when
@@ -3849,3 +3842,11 @@
   id: 6699
   time: '2024-06-08T10:27:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28741
+- author: Whisper, DrSmugleaf
+  changes:
+  - message: Players can now add ' to their character names. Please ensure your character
+      names still follow server naming conventions.
+    type: Add
+  id: 6700
+  time: '2024-06-08T10:37:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28652

From 8cf903727313e7e6ce2fe4c172146f6cae8659a2 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Sat, 8 Jun 2024 10:40:33 +0000
Subject: [PATCH 368/568] Make freeze, freeze & mute, and unmute verbs work on
 disconnected players. (#28664)

---
 .../Administration/Systems/AdminVerbSystem.cs | 107 +++++++++---------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 7aa4c8b400a5..d7888b491c36 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -131,59 +131,6 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                     prayerVerb.Impact = LogImpact.Low;
                     args.Verbs.Add(prayerVerb);
 
-                    // Freeze
-                    var frozen = TryComp<AdminFrozenComponent>(args.Target, out var frozenComp);
-                    var frozenAndMuted = frozenComp?.Muted ?? false;
-
-                    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-freeze"),
-                            Category = VerbCategory.Admin,
-                            Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
-                            Act = () =>
-                            {
-                                EnsureComp<AdminFrozenComponent>(args.Target);
-                            },
-                            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
                     {
@@ -263,6 +210,60 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                     });
                 }
 
+                // Freeze
+                var frozen = TryComp<AdminFrozenComponent>(args.Target, out var frozenComp);
+                var frozenAndMuted = frozenComp?.Muted ?? false;
+
+                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-freeze"),
+                        Category = VerbCategory.Admin,
+                        Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")),
+                        Act = () =>
+                        {
+                            EnsureComp<AdminFrozenComponent>(args.Target);
+                        },
+                        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,
+                    });
+                }
+
+
                 // Admin Logs
                 if (_adminManager.HasAdminFlag(player, AdminFlags.Logs))
                 {

From 33e68dc51f4502142fd03e40999bc3040a0727ad Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 10:41:39 +0000
Subject: [PATCH 369/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 16d4e1fe297f..82dada2fd289 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -290,5 +290,13 @@ Entries:
   id: 35
   time: '2024-06-06T06:41:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28609
+- author: nikthechampiongr
+  changes:
+  - message: Freeze, freeze & mute, and unfreeze verbs now work on any entity. Not
+      just connected players.
+    type: Tweak
+  id: 36
+  time: '2024-06-08T10:40:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28664
 Name: Admin
 Order: 1

From 4089d6a664948e3a90f67f964fbd69f33594c7a9 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 8 Jun 2024 10:36:47 -0400
Subject: [PATCH 370/568] fix singulo decay (#28743)

---
 .../ParticleAcceleratorSystem.Emitter.cs      |  2 +-
 .../EntitySystems/SingularitySystem.cs        | 64 ++-----------------
 .../Components/SingularityComponent.cs        | 22 -------
 3 files changed, 7 insertions(+), 81 deletions(-)

diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
index 06f1b6b154c5..78aca15bca47 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
@@ -49,7 +49,7 @@ private void FireEmitter(EntityUid uid, ParticleAcceleratorPowerState strength,
                 ParticleAcceleratorPowerState.Level0 => 1,
                 ParticleAcceleratorPowerState.Level1 => 2,
                 ParticleAcceleratorPowerState.Level2 => 3,
-                ParticleAcceleratorPowerState.Level3 => 10,
+                ParticleAcceleratorPowerState.Level3 => 6,
                 _ => 0,
             } * 10;
         }
diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index b273b2099d3b..6b9182fb4dfb 100644
--- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -55,14 +55,12 @@ public override void Initialize()
 
         var vvHandle = Vvm.GetTypeHandler<SingularityComponent>();
         vvHandle.AddPath(nameof(SingularityComponent.Energy), (_, comp) => comp.Energy, SetEnergy);
-        vvHandle.AddPath(nameof(SingularityComponent.TargetUpdatePeriod), (_, comp) => comp.TargetUpdatePeriod, SetUpdatePeriod);
     }
 
     public override void Shutdown()
     {
         var vvHandle = Vvm.GetTypeHandler<SingularityComponent>();
         vvHandle.RemovePath(nameof(SingularityComponent.Energy));
-        vvHandle.RemovePath(nameof(SingularityComponent.TargetUpdatePeriod));
         base.Shutdown();
     }
 
@@ -78,39 +76,10 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<SingularityComponent>();
         while (query.MoveNext(out var uid, out var singularity))
         {
-            var curTime = _timing.CurTime;
-            if (singularity.NextUpdateTime <= curTime)
-                Update(uid, curTime - singularity.LastUpdateTime, singularity);
+            AdjustEnergy(uid, -singularity.EnergyDrain * frameTime, singularity: singularity);
         }
     }
 
-    /// <summary>
-    /// Handles the gradual energy loss and dissipation of singularity.
-    /// </summary>
-    /// <param name="uid">The uid of the singularity to update.</param>
-    /// <param name="singularity">The state of the singularity to update.</param>
-    public void Update(EntityUid uid, SingularityComponent? singularity = null)
-    {
-        if (Resolve(uid, ref singularity))
-            Update(uid, _timing.CurTime - singularity.LastUpdateTime, singularity);
-    }
-
-    /// <summary>
-    /// Handles the gradual energy loss and dissipation of a singularity.
-    /// </summary>
-    /// <param name="uid">The uid of the singularity to update.</param>
-    /// <param name="frameTime">The amount of time that has elapsed since the last update.</param>
-    /// <param name="singularity">The state of the singularity to update.</param>
-    public void Update(EntityUid uid, TimeSpan frameTime, SingularityComponent? singularity = null)
-    {
-        if(!Resolve(uid, ref singularity))
-            return;
-
-        singularity.LastUpdateTime = _timing.CurTime;
-        singularity.NextUpdateTime = singularity.LastUpdateTime + singularity.TargetUpdatePeriod;
-        AdjustEnergy(uid, -singularity.EnergyDrain * (float)frameTime.TotalSeconds, singularity: singularity);
-    }
-
 #region Getters/Setters
 
     /// <summary>
@@ -166,28 +135,6 @@ public void AdjustEnergy(EntityUid uid, float delta, float min = float.MinValue,
         SetEnergy(uid, MathHelper.Clamp(newValue, min, max), singularity);
     }
 
-    /// <summary>
-    /// Setter for <see cref="SingularityComponent.TargetUpdatePeriod"/>.
-    /// If the new target time implies that the singularity should have updated it does so immediately.
-    /// </summary>
-    /// <param name="uid">The uid of the singularity to set the update period for.</param>
-    /// <param name="value">The new update period for the singularity.</param>
-    /// <param name="singularity">The state of the singularity to set the update period for.</param>
-    public void SetUpdatePeriod(EntityUid uid, TimeSpan value, SingularityComponent? singularity = null)
-    {
-        if(!Resolve(uid, ref singularity))
-            return;
-
-        if (MathHelper.CloseTo(singularity.TargetUpdatePeriod.TotalSeconds, value.TotalSeconds))
-            return;
-
-        singularity.TargetUpdatePeriod = value;
-        singularity.NextUpdateTime = singularity.LastUpdateTime + singularity.TargetUpdatePeriod;
-
-        var curTime = _timing.CurTime;
-        if (singularity.NextUpdateTime <= curTime)
-            Update(uid, curTime - singularity.LastUpdateTime, singularity);
-    }
 
 #endregion Getters/Setters
 
@@ -203,9 +150,6 @@ public void SetUpdatePeriod(EntityUid uid, TimeSpan value, SingularityComponent?
     /// <param name="args">The event arguments.</param>
     protected override void OnSingularityStartup(EntityUid uid, SingularityComponent comp, ComponentStartup args)
     {
-        comp.LastUpdateTime = _timing.CurTime;
-        comp.NextUpdateTime = comp.LastUpdateTime + comp.TargetUpdatePeriod;
-
         MetaDataComponent? metaData = null;
         if (Resolve(uid, ref metaData) && metaData.EntityLifeStage <= EntityLifeStage.Initializing)
             _audio.PlayPvs(comp.FormationSound, uid);
@@ -223,7 +167,7 @@ protected override void OnSingularityStartup(EntityUid uid, SingularityComponent
     /// <param name="args">The event arguments.</param>
     public void OnDistortionStartup(EntityUid uid, SingularityDistortionComponent comp, ComponentStartup args)
     {
-        _pvs.AddGlobalOverride(GetNetEntity(uid));
+        _pvs.AddGlobalOverride(uid);
     }
 
     /// <summary>
@@ -269,6 +213,10 @@ private void HandleSingularityState(EntityUid uid, SingularityComponent comp, re
     /// <param name="args">The event arguments.</param>
     public void OnConsumedEntity(EntityUid uid, SingularityComponent comp, ref EntityConsumedByEventHorizonEvent args)
     {
+        // Don't double count singulo food
+        if (HasComp<SinguloFoodComponent>(args.Entity))
+            return;
+
         AdjustEnergy(uid, BaseEntityEnergy, singularity: comp);
     }
 
diff --git a/Content.Shared/Singularity/Components/SingularityComponent.cs b/Content.Shared/Singularity/Components/SingularityComponent.cs
index 3bab8d80b095..dd4eb8c1ab2b 100644
--- a/Content.Shared/Singularity/Components/SingularityComponent.cs
+++ b/Content.Shared/Singularity/Components/SingularityComponent.cs
@@ -81,26 +81,4 @@ public sealed partial class SingularityComponent : Component
     );
 
     #endregion Audio
-
-    #region Update Timing
-
-    /// <summary>
-    /// The amount of time that should elapse between automated updates to this singularity.
-    /// </summary>
-    [DataField("updatePeriod")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan TargetUpdatePeriod = TimeSpan.FromSeconds(1.0);
-
-    /// <summary>
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public TimeSpan NextUpdateTime = default!;
-
-    /// <summary>
-    /// The last time this singularity was updated.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public TimeSpan LastUpdateTime = default!;
-
-    #endregion Update Timing
 }

From c79384c5fd0156cea5db6db9576674fab28e534c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 14:37:53 +0000
Subject: [PATCH 371/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7570e21aa0b3..fb1a4bad31f5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: Scram! implant no longer allows for someone to keep pulling you when
-      it teleports you.
-    type: Fix
-  id: 6201
-  time: '2024-03-21T17:42:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26309
 - author: Plykiya
   changes:
   - message: Door remote UI now shows the mode it is in.
@@ -3850,3 +3842,11 @@
   id: 6700
   time: '2024-06-08T10:37:55.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28652
+- author: EmoGarbage404
+  changes:
+  - message: Fixed singularity decay being underpowered, leading to continuous growth
+      on higher PA strengths.
+    type: Fix
+  id: 6701
+  time: '2024-06-08T14:36:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28743

From 1fdbf9403a6d28ffefc867aeb21db3db017a6404 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 9 Jun 2024 04:43:21 +1000
Subject: [PATCH 372/568] Don't use invalid defaults for loadouts (#28729)

At the time it made more sense but now with species specific stuff it's better to have nothing.
---
 Content.Shared/Preferences/Loadouts/RoleLoadout.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index b9d3a88338e8..18c3501ea61e 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -127,7 +127,10 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
                     if (loadouts.Contains(defaultLoadout))
                         continue;
 
-                    // Still need to apply the effects even if validation is ignored.
+                    // Not valid so don't default to it anyway.
+                    if (!IsValid(profile, session, defaultLoadout.Prototype, collection, out _))
+                        continue;
+
                     loadouts.Add(defaultLoadout);
                     Apply(loadoutProto);
                 }

From e3c37f6e9b14a901d2ec0b04194d24ddea660717 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 9 Jun 2024 04:48:09 +1000
Subject: [PATCH 373/568] Maybe fix invalid loadout prototypes (#28734)

* Maybe fix invalid loadout prototypes

So if we have existing data SetDefault is not normally called iirc. So what I think is happening is that if we have old loadout groups that get saved to DB and loaded these get dropped entirely and nothing is used to replace the group unless the person specifically looks at their loadout.

Need someone affected to send me their loadout to confirm it's fixed.

* Better fix
---
 .../Preferences/HumanoidCharacterProfile.cs           |  4 ++--
 Content.Shared/Preferences/Loadouts/RoleLoadout.cs    | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 3ee162fe7251..fd95848d2c6b 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -467,10 +467,10 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
             var configManager = collection.Resolve<IConfigurationManager>();
             var prototypeManager = collection.Resolve<IPrototypeManager>();
 
-            if (!prototypeManager.TryIndex<SpeciesPrototype>(Species, out var speciesPrototype) || speciesPrototype.RoundStart == false)
+            if (!prototypeManager.TryIndex(Species, out var speciesPrototype) || speciesPrototype.RoundStart == false)
             {
                 Species = SharedHumanoidAppearanceSystem.DefaultSpecies;
-                speciesPrototype = prototypeManager.Index<SpeciesPrototype>(Species);
+                speciesPrototype = prototypeManager.Index(Species);
             }
 
             var sex = Sex switch
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index 18c3501ea61e..5f8e24621a97 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -59,6 +59,16 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
             return;
         }
 
+        // In some instances we might not have picked up a new group for existing data.
+        foreach (var groupProto in roleProto.Groups)
+        {
+            if (SelectedLoadouts.ContainsKey(groupProto))
+                continue;
+
+            // Data will get set below.
+            SelectedLoadouts[groupProto] = new List<Loadout>();
+        }
+
         // Reset points to recalculate.
         Points = roleProto.Points;
 
@@ -156,6 +166,7 @@ private void Apply(LoadoutPrototype loadoutProto)
     /// <summary>
     /// Resets the selected loadouts to default if no data is present.
     /// </summary>
+    /// <param name="force">Clear existing data first</param>
     public void SetDefault(IPrototypeManager protoManager, bool force = false)
     {
         if (force)

From cce50da1707153599d89292a8118ffb05f1b3956 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 18:49:15 +0000
Subject: [PATCH 374/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fb1a4bad31f5..c0130a9015e1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: Door remote UI now shows the mode it is in.
-    type: Add
-  id: 6202
-  time: '2024-03-22T00:19:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26162
 - author: metalgearsloth
   changes:
   - message: Fix some shuttle console stuff surrounding the Map screen.
@@ -3850,3 +3843,10 @@
   id: 6701
   time: '2024-06-08T14:36:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28743
+- author: metalgearsloth
+  changes:
+  - message: Fix sometimes spawning without bags.
+    type: Fix
+  id: 6702
+  time: '2024-06-08T18:48:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28734

From 7f686a6ae58e2fc73d9f6649527259d6fee7f2cd Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Sat, 8 Jun 2024 14:50:20 -0400
Subject: [PATCH 375/568] Fix null ref exception in PrayerSystem (#28712)

* Fix null ref exception in PrayerSystem

* Also check that prayable ent/comp still exist
---
 Content.Server/Prayer/PrayerSystem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs
index 3b1ec3fa0838..59fd9a5d6931 100644
--- a/Content.Server/Prayer/PrayerSystem.cs
+++ b/Content.Server/Prayer/PrayerSystem.cs
@@ -56,7 +56,9 @@ private void AddPrayVerb(EntityUid uid, PrayableComponent comp, GetVerbsEvent<Ac
 
                 _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString(comp.Verb), Loc.GetString("prayer-popup-notify-pray-ui-message"), (string message) =>
                 {
-                    Pray(actor.PlayerSession, comp, message);
+                    // Make sure the player's entity and the Prayable entity+component still exist
+                    if (actor?.PlayerSession != null && HasComp<PrayableComponent>(uid))
+                        Pray(actor.PlayerSession, comp, message);
                 });
             },
             Impact = LogImpact.Low,

From c6ff1e44fb5cc6771be6781d2946587934cc6a0d Mon Sep 17 00:00:00 2001
From: UBlueberry <161545003+UBlueberry@users.noreply.github.com>
Date: Sat, 8 Jun 2024 19:00:43 -0400
Subject: [PATCH 376/568] Guidebook Updates for the Amateur Spessman (#28603)

* Created NewPlayer.xml

* Created NewPlayer.yml and added it to guides.ftl

* shifted some controls from Space Station 14 to New? Start here!, as well as made a character creation xml to be written later

* switched some stuff between the New? entry and the Space Station 14 entry

* Made everything so nice!!!!!!!!!!!!!!

* fixed formatting inconsistencies

* added a How to use this guidebook section

* build correction and guidebook clarification for other servers

* wrote character creation ig probs fo shizzle

* added new terms to the glossary and alphabetized it

* meh this seems important enough to add

* okay no more shitsec bad idea

* I HATED Roleplaying.xml ANYWAY!!!

* I REALLY REALLY HATED IT ACTUALLYLLL

* Moved Controls and Radio into newplayer.yml, making meta.yml and radio.yml obsolete

* Separated the character creation bits that are just cosmetic from the ones that matter

* also put all the related new player xml files in their own folder

* expanded Radio.xml, kinda fixed survival.xml

* removed the line that mighta maybe sorta possibly could encourage self antag

* thought about this randomly but ICK OCK

* talking is no longer a key part of this game

* moves stuff around, a lot of stuff. basically moves everything but the jobs themselves around

* ah probably should make sure this works first also me when i lie on the internet

* don't be such a grammar nukie

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

* okay nevermind that's justified

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

* prepare. it is coming. the great reorganization...

* yesyes that's all well and goo- THE REORG IS COMING. THE REORG IS COMING. WAKE UP.

* rename that real quick

* step one begins. first, consolidate existing service entries into their own yaml. this makes botany.yml obsolete.

* update shiftandcrew.yml to only have departments as children also fuck it alphabetization

* consolidated salvage into cargo

* made a new entry for command

* gave salvage a home and service an existence

* made some XML files to be filled out later

* quick rename...

* took some stuff from Intro.txt and i think Gameplay.txt and put it in NewPlayer.xml

* The Great Writing about Departments (25XX, black and white)

* added a bunch of links everywhere

* biochemical is no longer a thing

* service formatinaaaaaaa

* shiny...,,,,,,,,, colo(u)rz..,,,,,,,,,,,,,

* let's get that fixed

* second time i made a typo there as well

* we hate fun around here

* grammar?!???/

* various fixes and more linkings

* oops

* wewlad lol!!

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
---
 .../Locale/en-US/guidebook/guidebook.ftl      |   4 +-
 Resources/Locale/en-US/guidebook/guides.ftl   |  35 +++---
 Resources/Prototypes/Guidebook/botany.yml     |   4 -
 Resources/Prototypes/Guidebook/cargo.yml      |   6 +
 Resources/Prototypes/Guidebook/command.yml    |   4 +
 Resources/Prototypes/Guidebook/meta.yml       |   6 -
 Resources/Prototypes/Guidebook/newplayer.yml  |  32 +++++
 Resources/Prototypes/Guidebook/radio.yml      |   4 -
 Resources/Prototypes/Guidebook/references.yml |  26 +++++
 Resources/Prototypes/Guidebook/salvage.yml    |   4 -
 Resources/Prototypes/Guidebook/service.yml    |  31 +++++
 .../Prototypes/Guidebook/shiftandcrew.yml     |  39 +------
 .../Guidebook/{ss14.yml => station.yml}       |  13 +--
 .../Guidebook/Antagonist/Traitors.xml         |   6 +-
 .../ServerInfo/Guidebook/Cargo/Cargo.xml      |  37 +++---
 Resources/ServerInfo/Guidebook/Command.xml    |  56 +++++++++
 .../ServerInfo/Guidebook/Controls/Radio.xml   |  28 -----
 .../Guidebook/Engineering/Engineering.xml     |  32 +++--
 Resources/ServerInfo/Guidebook/Glossary.xml   | 109 +++++++++++++-----
 Resources/ServerInfo/Guidebook/Jobs.xml       |  20 ++--
 .../ServerInfo/Guidebook/Medical/Chemist.xml  |  45 ++++----
 .../ServerInfo/Guidebook/Medical/Medical.xml  |  36 +++---
 .../Guidebook/Medical/MedicalDoctor.xml       |  15 ++-
 .../Guidebook/NewPlayer/CharacterCreation.xml |  70 +++++++++++
 .../{ => NewPlayer}/Controls/Controls.xml     |   0
 .../Guidebook/NewPlayer/Controls/Radio.xml    |  64 ++++++++++
 .../Guidebook/NewPlayer/NewPlayer.xml         |  28 +++++
 .../NewPlayer/YourFirstCharacter.xml          |  54 +++++++++
 .../Guidebook/ReferenceTables/Drinks.xml      |   6 +
 Resources/ServerInfo/Guidebook/References.xml |   4 +
 .../ServerInfo/Guidebook/Science/Science.xml  |  52 +++++----
 .../Guidebook/Security/Security.xml           |  46 +++++---
 .../Guidebook/Service/Bartender.xml           |   7 +-
 .../ServerInfo/Guidebook/Service/Botany.xml   |   4 +-
 .../ServerInfo/Guidebook/Service/Chef.xml     |   3 +
 .../ServerInfo/Guidebook/Service/Service.xml  |  34 ++++++
 .../ServerInfo/Guidebook/SpaceStation14.xml   |  20 ++--
 Resources/ServerInfo/Guidebook/Survival.xml   |  27 +++--
 38 files changed, 738 insertions(+), 273 deletions(-)
 delete mode 100644 Resources/Prototypes/Guidebook/botany.yml
 create mode 100644 Resources/Prototypes/Guidebook/command.yml
 delete mode 100644 Resources/Prototypes/Guidebook/meta.yml
 create mode 100644 Resources/Prototypes/Guidebook/newplayer.yml
 delete mode 100644 Resources/Prototypes/Guidebook/radio.yml
 create mode 100644 Resources/Prototypes/Guidebook/references.yml
 delete mode 100644 Resources/Prototypes/Guidebook/salvage.yml
 create mode 100644 Resources/Prototypes/Guidebook/service.yml
 rename Resources/Prototypes/Guidebook/{ss14.yml => station.yml} (71%)
 create mode 100644 Resources/ServerInfo/Guidebook/Command.xml
 delete mode 100644 Resources/ServerInfo/Guidebook/Controls/Radio.xml
 create mode 100644 Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
 rename Resources/ServerInfo/Guidebook/{ => NewPlayer}/Controls/Controls.xml (100%)
 create mode 100644 Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
 create mode 100644 Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml
 create mode 100644 Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
 create mode 100644 Resources/ServerInfo/Guidebook/ReferenceTables/Drinks.xml
 create mode 100644 Resources/ServerInfo/Guidebook/References.xml
 create mode 100644 Resources/ServerInfo/Guidebook/Service/Service.xml

diff --git a/Resources/Locale/en-US/guidebook/guidebook.ftl b/Resources/Locale/en-US/guidebook/guidebook.ftl
index 24ce789ea124..f7f37948f5a4 100644
--- a/Resources/Locale/en-US/guidebook/guidebook.ftl
+++ b/Resources/Locale/en-US/guidebook/guidebook.ftl
@@ -1,8 +1,8 @@
 guidebook-window-title = Guidebook
 guidebook-placeholder-text = Select an entry.
-guidebook-placeholder-text-2 = If you're new, select the topmost entry to get started.
+guidebook-placeholder-text-2 = If you're new, head over to "New? Start here!"
 guidebook-filter-placeholder-text = Filter items
 
 
 guidebook-monkey-unspin = Unspin Monkey
-guidebook-monkey-disco = Disco Monkey
\ No newline at end of file
+guidebook-monkey-disco = Disco Monkey
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 5b99ea2bbe90..838d2ce4a620 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -1,3 +1,4 @@
+guide-entry-ss14 = Station and Shifts
 guide-entry-engineering = Engineering
 guide-entry-construction = Construction
 guide-entry-airlock-security = Airlock Upgrades
@@ -14,27 +15,14 @@ guide-entry-ame = Antimatter Engine (AME)
 guide-entry-singularity = Singularity / Tesla
 guide-entry-teg = Thermo-electric Generator (TEG)
 guide-entry-rtg = RTG
-guide-entry-controls = Controls
-guide-entry-radio = Radio
 guide-entry-jobs = Jobs
 guide-entry-cargo = Cargo
 guide-entry-cargo-bounties = Cargo Bounties
 guide-entry-salvage = Salvage
 guide-entry-survival = Survival
-guide-entry-chemicals = Chemicals
-guide-entry-elements = Elements
-guide-entry-narcotics = Narcotics
-guide-entry-pyrotechnics = Pyrotechnic
-guide-entry-toxins = Toxins
-guide-entry-foods = Foods
-guide-entry-biological = Biological
-guide-entry-others = Others
-guide-entry-botanical = Botanicals
-guide-entry-ss14 = Space Station 14
 guide-entry-janitorial = Janitorial
 guide-entry-bartender = Bartender
 guide-entry-chef = Chef
-guide-entry-foodrecipes = Food Recipes
 guide-entry-medical = Medical
 guide-entry-medicaldoctor = Medical Doctor
 guide-entry-chemist = Chemist
@@ -58,7 +46,28 @@ guide-entry-security = Security
 guide-entry-forensics = Forensics
 guide-entry-defusal = Large Bomb Defusal
 guide-entry-criminal-records = Criminal Records
+guide-entry-command = Command
+guide-entry-service = Service
+
+guide-entry-newplayer = New? Start here!
+guide-entry-charactercreation = Character Creation
 guide-entry-species = Species
+guide-entry-yourfirstcharacter = Your First Character
+guide-entry-controls = Controls
+guide-entry-radio = Radio and Speech
+
+guide-entry-references = Tables and References
+guide-entry-drinks = Drinks
+guide-entry-foodrecipes = Food Recipes
+guide-entry-chemicals = Chemicals
+guide-entry-elements = Elements
+guide-entry-narcotics = Narcotics
+guide-entry-pyrotechnics = Pyrotechnic
+guide-entry-toxins = Toxins
+guide-entry-foods = Foods
+guide-entry-biological = Biological
+guide-entry-botanical = Botanicals
+guide-entry-others = Others
 
 guide-entry-antagonists = Antagonists
 guide-entry-nuclear-operatives = Nuclear Operatives
diff --git a/Resources/Prototypes/Guidebook/botany.yml b/Resources/Prototypes/Guidebook/botany.yml
deleted file mode 100644
index 4e0e4e9956d6..000000000000
--- a/Resources/Prototypes/Guidebook/botany.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: guideEntry
-  id: Botany
-  name: guide-entry-botany
-  text: "/ServerInfo/Guidebook/Service/Botany.xml"
diff --git a/Resources/Prototypes/Guidebook/cargo.yml b/Resources/Prototypes/Guidebook/cargo.yml
index b2a8012e05cc..7f9f6388644d 100644
--- a/Resources/Prototypes/Guidebook/cargo.yml
+++ b/Resources/Prototypes/Guidebook/cargo.yml
@@ -4,8 +4,14 @@
   text: "/ServerInfo/Guidebook/Cargo/Cargo.xml"
   children:
   - CargoBounties
+  - Salvage
 
 - type: guideEntry
   id: CargoBounties
   name: guide-entry-cargo-bounties
   text: "/ServerInfo/Guidebook/Cargo/CargoBounties.xml"
+
+- type: guideEntry
+  id: Salvage
+  name: guide-entry-salvage
+  text: "/ServerInfo/Guidebook/Cargo/Salvage.xml"
diff --git a/Resources/Prototypes/Guidebook/command.yml b/Resources/Prototypes/Guidebook/command.yml
new file mode 100644
index 000000000000..246bb6d0bfd1
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/command.yml
@@ -0,0 +1,4 @@
+- type: guideEntry
+  id: Command
+  name: guide-entry-command
+  text: "/ServerInfo/Guidebook/Command.xml"
diff --git a/Resources/Prototypes/Guidebook/meta.yml b/Resources/Prototypes/Guidebook/meta.yml
deleted file mode 100644
index 08349f2d0ae4..000000000000
--- a/Resources/Prototypes/Guidebook/meta.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: guideEntry
-  id: Controls
-  name: guide-entry-controls
-  text: "/ServerInfo/Guidebook/Controls/Controls.xml"
-  children:
-  - Radio  
diff --git a/Resources/Prototypes/Guidebook/newplayer.yml b/Resources/Prototypes/Guidebook/newplayer.yml
new file mode 100644
index 000000000000..c4d38ab28a7f
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/newplayer.yml
@@ -0,0 +1,32 @@
+- type: guideEntry
+  id: NewPlayer
+  name: guide-entry-newplayer
+  text: "/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml"
+  children:
+  - Controls
+  - CharacterCreation
+
+- type: guideEntry
+  id: Controls
+  name: guide-entry-controls
+  text: "/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml"
+  children:
+  - Radio
+
+- type: guideEntry
+  id: Radio
+  name: guide-entry-radio
+  text: "/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml" 
+
+- type: guideEntry
+  id: CharacterCreation
+  name: guide-entry-charactercreation
+  text: "/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml"
+  children:
+  - YourFirstCharacter
+  - Species 
+
+- type: guideEntry
+  id: YourFirstCharacter
+  name: guide-entry-yourfirstcharacter
+  text: "/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml"
diff --git a/Resources/Prototypes/Guidebook/radio.yml b/Resources/Prototypes/Guidebook/radio.yml
deleted file mode 100644
index 8ed39bf427f6..000000000000
--- a/Resources/Prototypes/Guidebook/radio.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: guideEntry
-  id: Radio
-  name: guide-entry-radio
-  text: "/ServerInfo/Guidebook/Controls/Radio.xml"
diff --git a/Resources/Prototypes/Guidebook/references.yml b/Resources/Prototypes/Guidebook/references.yml
new file mode 100644
index 000000000000..19f490001ba1
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/references.yml
@@ -0,0 +1,26 @@
+- type: guideEntry
+  id: References
+  name: guide-entry-references
+  text: "/ServerInfo/Guidebook/References.xml"
+  children:
+  - Chemicals
+  - Drinks
+  - FoodRecipes
+  - Writing
+
+- type: guideEntry
+  id: Drinks
+  name: guide-entry-drinks
+  text: "/ServerInfo/Guidebook/ReferenceTables/Drinks.xml"
+
+- type: guideEntry
+  id: FoodRecipes
+  name: guide-entry-foodrecipes
+  text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
+
+- type: guideEntry
+  id: Writing
+  name: guide-entry-writing
+  text: "/ServerInfo/Guidebook/Writing.xml"
+
+
diff --git a/Resources/Prototypes/Guidebook/salvage.yml b/Resources/Prototypes/Guidebook/salvage.yml
deleted file mode 100644
index a628ccf447b8..000000000000
--- a/Resources/Prototypes/Guidebook/salvage.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: guideEntry
-  id: Salvage
-  name: guide-entry-salvage
-  text: "/ServerInfo/Guidebook/Cargo/Salvage.xml"
diff --git a/Resources/Prototypes/Guidebook/service.yml b/Resources/Prototypes/Guidebook/service.yml
new file mode 100644
index 000000000000..583cfafb2a27
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/service.yml
@@ -0,0 +1,31 @@
+- type: guideEntry
+  id: Service
+  name: guide-entry-service
+  text: "/ServerInfo/Guidebook/Service/Service.xml"
+  filterEnabled: True
+  children:
+  - Bartender
+  - Botany
+  - Chef
+  - Janitorial
+  
+- type: guideEntry
+  id: Bartender
+  name: guide-entry-bartender
+  text: "/ServerInfo/Guidebook/Service/Bartender.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  id: Botany
+  name: guide-entry-botany
+  text: "/ServerInfo/Guidebook/Service/Botany.xml"
+
+- type: guideEntry
+  id: Chef
+  name: guide-entry-chef
+  text: "/ServerInfo/Guidebook/Service/Chef.xml"
+
+- type: guideEntry
+  id: Janitorial
+  name: guide-entry-janitorial
+  text: "/ServerInfo/Guidebook/Service/Janitorial.xml"
diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml
index 3c4618902e65..0707e23b1092 100644
--- a/Resources/Prototypes/Guidebook/shiftandcrew.yml
+++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml
@@ -3,41 +3,10 @@
   name: guide-entry-jobs
   text: "/ServerInfo/Guidebook/Jobs.xml"
   children:
-  - Bartender
-  - Chef
-  - Botany
+  - Cargo
+  - Command
   - Engineering
+  - Medical
   - Science
   - Security
-  - Janitorial
-  - Cargo
-  - Salvage
-  - Medical
-
-- type: guideEntry
-  id: Survival
-  name: guide-entry-survival
-  text: "/ServerInfo/Guidebook/Survival.xml"
-
-- type: guideEntry
-  id: Janitorial
-  name: guide-entry-janitorial
-  text: "/ServerInfo/Guidebook/Service/Janitorial.xml"
-
-- type: guideEntry
-  id: Bartender
-  name: guide-entry-bartender
-  text: "/ServerInfo/Guidebook/Service/Bartender.xml"
-  filterEnabled: True
-
-- type: guideEntry
-  id: Chef
-  name: guide-entry-chef
-  text: "/ServerInfo/Guidebook/Service/Chef.xml"
-  children:
-  - Food Recipes
-
-- type: guideEntry
-  id: Food Recipes
-  name: guide-entry-foodrecipes
-  text: "/ServerInfo/Guidebook/Service/FoodRecipes.xml"
+  - Service
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/station.yml
similarity index 71%
rename from Resources/Prototypes/Guidebook/ss14.yml
rename to Resources/Prototypes/Guidebook/station.yml
index f0b72b90b43a..9570b617c0c3 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/station.yml
@@ -6,18 +6,15 @@
   - Controls
   - Jobs
   - Survival
-  - Chemicals
   - Antagonists
-  - Species
-  - Writing
   - Glossary
 
-- type: guideEntry
-  id: Writing
-  name: guide-entry-writing
-  text: "/ServerInfo/Guidebook/Writing.xml"
-
 - type: guideEntry
   id: Glossary
   name: guide-entry-glossary
   text: "/ServerInfo/Guidebook/Glossary.xml"
+
+- type: guideEntry
+  id: Survival
+  name: guide-entry-survival
+  text: "/ServerInfo/Guidebook/Survival.xml"
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index a8fe4cef1805..38183a7c9780 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -1,6 +1,8 @@
 <Document>
   # Traitors
-
+  
+  WHISKEY. ECHO. WHISKEY. LIMA. ALPHA. DELTA.
+  
   - A Traitor is an antagonist employed by the Syndicate. They have access to various Syndicate tools and weapons through their [color=#a4885c]Uplink[/color].
   - Traitors can use codewords to identify themselves to one another in order to cooperate.
   - In a Traitor round, any player can be a Traitor aside from department heads, the captain, or any security officers.
@@ -86,4 +88,4 @@
   <GuideEntityEmbed Entity="FoodMeatCorgi" Caption="Corgi Meat"/>
   </Box>
 
-</Document>
\ No newline at end of file
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
index f1443ac3e7cc..6c74d02d2152 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
@@ -1,30 +1,41 @@
 <Document>
-  # Cargo
-  The supply department, more commonly known simply as Cargo, is in charge of keeping the station stocked up on necessary resources, such as fuel and raw materials. Though, they are not restricted to simple goods, and can order a wide variety of different items from off-station. The point is, it's Cargo's job to get the rest of the station what they need.
+# Cargo
+The supply department, more commonly known simply as [color=#b18644]Cargo[/color], is in charge of keeping the station stocked up on necessary resources, such as fuel and raw materials. Though, they are not restricted to simple goods, and can order a wide variety of different items from off-station. The point is, it's [color=#b18644]Cargo[/color]'s job to get the rest of the station what they need.
+
+## Personnel
+[color=#b18644]Cargo[/color]'s staff is made up of Cargo Technicians and Salvage Technicans. Cargo is run by the Quartermaster.
 
-  ## Ordering
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineCargoTech" Caption="Cargo Tech"/>
+    <GuideEntityEmbed Entity="ToyFigurineSalvage" Caption="Salvage"/>
+    <GuideEntityEmbed Entity="ToyFigurineQuartermaster" Caption="QM"/>
+  </Box>
+
+## Ordering
   <Box>
     <GuideEntityEmbed Entity="ComputerCargoOrders"/>
   </Box>
-  Every transaction you make will begin at a [color=#a4885c]cargo request computer[/color], from which you can make orders for specific products. Making any order requires [color=#118C4F]spesos[/color], the currency of the station. To make an order, click the "request" button next to whatever you need, type an appropriate reason for why you're ordering it, and hit "approve" when it appears below the request list.
+Every transaction you make will begin at a [color=#a4885c]cargo request computer[/color], from which you can make orders for specific products. Making any order requires [color=#118C4F]spesos[/color], the currency of the station. To make an order, click the "request" button next to whatever you need, type an appropriate reason for why you're ordering it, and hit "approve" when it appears below the request list.
 
-  ## Piloting
-  Orders are shipped to the station via the [color=#a4885c]Trade Station[/color], and then transported with the cargo shuttle, a remotely piloted shuttle that cargo uses to transport goods back and forth from the trade station. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color] either on the station, or the shuttle itself.
+## Piloting
+Orders are shipped to the station via the [color=#a4885c]Trade Station[/color], and then transported with the cargo shuttle, a remotely piloted shuttle that cargo uses to transport goods back and forth from the trade station. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color] either on the station, or the shuttle itself.
   <Box>
     <GuideEntityEmbed Entity="ComputerCargoShuttle"/>
   </Box>
-  After clicking the computer, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
+After clicking the computer, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
 
-  - First, disconnect any airlocks that are connected to the dock.
-  - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
-  - Then pilot the shuttle to the [textlink="Trade Station" link="TradeStation"].
+- First, disconnect any airlocks that are connected to the dock.
+- Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
+- Then pilot the shuttle to the [textlink="Trade Station" link="TradeStation"].
 
-  ## Selling
-  So, you want to order something, but don't have the money for it? You just need to sell something! Almost everything on the station has economic value, which an [color=#a4885c]appraisal tool[/color] can read out to you.
+## Making Money
+So, you want to order something, but don't have the money for it? You just need to sell something! Almost everything on the station has economic value, which an [color=#a4885c]appraisal tool[/color] can read out to you.
   <Box>
     <GuideEntityEmbed Entity="AppraisalTool"/>
     <GuideEntityEmbed Entity="CargoPallet"/>
   </Box>
-  After finding something worth selling, place it on the cargo shuttle, and then fly it to the [textlink="Trade Station" link="TradeStation"]. Then sell the item and collect the spesos from the terminal. You can also make even more money by completing [textlink="bounties" link="CargoBounties"] or selling valuable items from [textlink="salvage" link="Salvage"].
+After finding something worth selling, place it on the cargo shuttle, and then fly it to the [textlink="Trade Station" link="TradeStation"]. Then sell the item and collect the spesos from the terminal. You can also make even more money by completing [textlink="bounties" link="CargoBounties"] or selling valuable items from [textlink="salvage" link="Salvage"].
+
+[textlink="Still broke? Click here to learn about bounties, another source of income." link="CargoBounties"]
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Command.xml b/Resources/ServerInfo/Guidebook/Command.xml
new file mode 100644
index 000000000000..11696e42757c
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Command.xml
@@ -0,0 +1,56 @@
+<Document>
+# Command
+The heads of each department come together to form the [color=#1b67a5]Command[/color] department, a force to be reckoned with and the handlers of the station. They usually have access to special equipment and their own rooms. They are often wanted dead.
+
+## Personnel
+[color=#1b67a5]Command[/color] is made up of the heads of each department, being the [color=#9fed58]Head of Personnel[/color], the [color=#cb0000]Head of Security[/color], the [color=#5b97bc]Chief Medical Officer[/color], the [color=#f39f27]Chief Engineer[/color], the [color=#c96dbf]Research Director[/color], the [color=#b18644]Quartermaster[/color] and above all else, the [color=#1b67a5]Captain[/color].
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineCaptain" Caption="Captain"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineHeadOfPersonnel" Caption="HoP"/>
+    <GuideEntityEmbed Entity="ToyFigurineHeadOfSecurity" Caption="HoS"/>
+    <GuideEntityEmbed Entity="ToyFigurineChiefMedicalOfficer" Caption="CMO"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineChiefEngineer" Caption="CE"/>
+    <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="RD"/>
+    <GuideEntityEmbed Entity="ToyFigurineQuartermaster" Caption="QM"/>
+  </Box>
+
+## Taking Charge
+Congratulations on your promotion! Besides all the extra paperwork, your new [color=#a4885c]responsibilities[/color] include running your department, making changes and choosing priorities, keeping personnel and equipment safe as well as slacking off while your cronies do all the work.
+
+Don't forget, you still have a job! Your fancy tools don't earn you a day off, you still have to fill in for any staffing shortages, helping out struggling workers and teaching the newbies.
+
+You might get away with just sitting around and letting people resent you, but it's wiser to get active and work alongside them.
+Remember to move your workers around to have them do what they like doing or what they do best.
+
+## Your Locker
+
+To deal with your new soul-crushing tasks, every head is given special items to lead your subordinates. Most of your new shiny tools can be found in your [color=#a4885c]locker[/color].
+  <Box>
+    <GuideEntityEmbed Entity="LockerCaptain"/>
+  </Box>
+
+Your [color=#a4885c]remote[/color] is very simple but profoundly underestimated. A small but mighty force, your remote can open and close [color=#a4885c]airlocks[/color], spin the [color=#a4885c]bolts[/color] to lock them, or toggle [color=#a4885c]emergency access[/color]. It can do this from a distance.
+  <Box>
+    <GuideEntityEmbed Entity="DoorRemoteCommand"/>
+  </Box>
+The remote influences where people move around. Heads can lock personnel out of dangerous areas or let people in to grab something really quickly.
+
+You also have access to your very own [color=#1b67a5]Command[/color] channel, like every other department. However, yours is particularly special as the people who can hear you have [color=#a4885c]entire departments[/color] at their fingertips.
+Use this to communicate with other heads and be a representative of what your workers want or need.
+
+The [color=#1b67a5]Captain[/color] and the [color=#9fed58]Head of Personnel[/color] get access to the lucrative [color=#a4885c]master encryption key[/color], letting them tune into every radio channel on the station. This is extremly valuable, as you can coordinate between departments yourself.
+[color=#a4885c]Don't waste this vital advantage![/color]
+  <Box>
+    <GuideEntityEmbed Entity="ClothingHeadsetCommand"/>
+    <GuideEntityEmbed Entity="EncryptionKeyStationMaster"/>
+  </Box>
+
+To make the swamp of paperwork (that will definitely overwhelm you) even harder to deal with, you have generously been given a [color=#a4885c]stamp[/color] in your locker. Use this to sign paperwork. After you stamp it, it can't be edited. Look it over first.
+  <Box>
+    <GuideEntityEmbed Entity="RubberStampCaptain"/>
+  </Box>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Controls/Radio.xml b/Resources/ServerInfo/Guidebook/Controls/Radio.xml
deleted file mode 100644
index b46668914bd5..000000000000
--- a/Resources/ServerInfo/Guidebook/Controls/Radio.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Document>
-  # Radio
-
-  Your radio allows you to communicate across the entire station and to your specific [color=#a4885c]department[/color].
-
-  <Box>
-    <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
-  </Box>
-
-  To send a station-wide message over the radio preface your text with [color=#a4885c]semi-colon (;)[/color].
-
-  ## Departmental Radio
-
-  You are able to send messages over your departmental radio channels using [color=#a4885c]colon (:)[/color] followed by the
-  department letter as long as you're wearing a headset with your department's encryption key.
-
-  Examine your headset to see the department channels available to you.
-
-<Box>
-  <GuideEntityEmbed Entity="ClothingHeadsetEngineering"/>
-</Box>
-
-  Examining a default engineering headset would show you the prefixes for the [color=#32cd32]Common[/color] and [color=#f37746]Engineering[/color]
-  channels.
-  
-  It is also possible to use [color=#a4885c]:h[/color]. This hotkey will automatically default to your department radio channel. For an example if you're Captain, then [color=#a4885c]:h[/color] will default to [color=#a4885c]:c[/color]
-
-</Document>
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Engineering.xml b/Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
index ab48ed1d8271..fb5bf03cf5ec 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
@@ -1,21 +1,29 @@
 <Document>
-  # Engineering
+# Engineering
+[color=#f39f27]Engineering[/color] is a combination of construction work, repair work, maintaining a death machine that happens to produce power, and making sure the station contains breathable air.
 
-  Engineering is a combination of construction work, repair work, maintaining a death machine that happens to produce power, and making sure the station contains breathable air.
+## Personnel
+[color=#f39f27]Engineering[/color]'s staff is made up of Technical Asssistants, Station Engineers and Atmospheric Technicians. Engineering is run by the Chief Engineer.
 
-  ## Tools
   <Box>
-  <GuideEntityEmbed Entity="Wrench"/>
-  <GuideEntityEmbed Entity="Crowbar"/>
-  <GuideEntityEmbed Entity="Screwdriver"/>
-  <GuideEntityEmbed Entity="Wirecutter"/>
+    <GuideEntityEmbed Entity="ToyFigurineEngineer" Caption="Engineer"/>
+    <GuideEntityEmbed Entity="ToyFigurineAtmosTech" Caption="Atmosian"/>
+    <GuideEntityEmbed Entity="ToyFigurineChiefEngineer" Caption="CE"/>
   </Box>
+  
+## Tools
   <Box>
-  <GuideEntityEmbed Entity="Welder"/>
-  <GuideEntityEmbed Entity="Multitool"/>
-  <GuideEntityEmbed Entity="NetworkConfigurator"/>
+    <GuideEntityEmbed Entity="Wrench"/>
+    <GuideEntityEmbed Entity="Crowbar"/>
+    <GuideEntityEmbed Entity="Screwdriver"/>
+    <GuideEntityEmbed Entity="Wirecutter"/>
   </Box>
-  Your core toolset is a small variety of tools. If you're an engineer, then you should have a belt on your waist containing one of each; if not, you can likely find them in maintenance shafts and in tool storage within assorted toolboxes and vending machines.
+    <Box>
+    <GuideEntityEmbed Entity="Welder"/>
+    <GuideEntityEmbed Entity="Multitool"/>
+    <GuideEntityEmbed Entity="NetworkConfigurator"/>
+  </Box>
+Your core toolset is a small variety of tools. If you're an engineer, then you should have a belt on your waist containing one of each; if not, you can likely find them in maintenance shafts and in tool storage within assorted toolboxes and vending machines.
 
-  Most tasks will have explainers for how to perform them on examination; for example, if you're constructing a wall, it'll tell you the next step if you look at it a bit closer.
+Most tasks will have explainers for how to perform them on examination; for example, if you're constructing a wall, it'll tell you the next step if you look at it a bit closer.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml
index d93b7c404252..3186737d3a64 100644
--- a/Resources/ServerInfo/Guidebook/Glossary.xml
+++ b/Resources/ServerInfo/Guidebook/Glossary.xml
@@ -10,12 +10,21 @@ These are terms you might encounter in-game.
 ## AOS
 Arrest on sight.
 
+## AA
+All Access, or an ID which has every access on the station. The captain is the only person who will have this kind of access under normal circumstances.
+
 ## Atmos
 Short for Atmospherics.
 
 ## Atmosian
 A term for Atmospheric Technicians, or generally anyone who spends most of their time or is particularly skilled with Atmospherics.
 
+## Bolted
+An airlock that will never change states. It will stay permanently open or permanently closed until it is unbolted. Closed and bolted airlocks have solid red lights.
+
+## Borg
+Short for cyborgs, player-controlled robots.
+
 ## Braindead
 Refers to a user who has disconnected from the game. Disconnected users may still reconnect to the server and assume control of their character again.
 
@@ -28,87 +37,117 @@ Short for Captain.
 ## Cargonia
 Reference to cargo declaring independance. Against the rules.
 
-## CentCom/Central Command
-An administrative agency which oversees the Nanotrasen space station you inhabit.
-
 ## CE
 Short for Chief Engineer, the head of the Engineering Department.
 
+## CentCom/Central Command
+An administrative agency which oversees the Nanotrasen space station you inhabit.
+
 ## CMO
 Short for Chief Medical Officer, the head of the Medical Department.
 
 ## Crit/Critical
 Refers to the health state at which you fall unconscious and unable to move. While in critical, your health slowly decays until you die, unless you happen to get outside assistance.
 
+## Emag
+  Refers to the Syndicate cryptographic sequencer. "Emagged" usually refers to airlocks or lockers that are bolted open, but also any other device hacked into by an Emag.
+
+## Emergency Access/EA
+  An airlock that can be opened by anyone, even without access or an ID at all. Airlocks that are set to emergency access have blinking yellow lights.
+
 ## ERT
 An Emergency Response Team. These may be dispatched by Central Command for a number of purposes.
 
+## Flukie
+A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops".
+
+## God(s)
+An IC term representing a Server Administrator. CentCom is also sometimes used in this manner.
+
+## Greytide/Greyshirt/Tider/Assistant
+Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes.
+
 ## HoP
-Short for Head of Personnel, head of the Service Department.
+Short for Head of Personnel, head of the Service Department. Can also refer to the HoP's office, where IDs are given or changed.
 
 ## HoS
-Short for Head of Security.
+Short for Head of Security, head of the Security Department.
 
 ## Insuls
 Short for Insulated Gloves. These are the yellow gloves most often worn by Engineers. They are offer complete protection from getting electrocuted from shocked things. Vastily more effective than their budget variety.
 
+## Jani
+Short for Janitor.
+
 ## KOS
 Kill on sight. Someone has commited such a serious crime that they are deemed not even worth arresting.
 
+## Mats
+Materials. Usually steel, plastic, plasteel, glass, silver and gold.
+
+## Nanotrasen/NT
+Nanotrasen is the company which owns the space station you inhabit.
+
+## Newkie
+A portmanteau of "New" and "Nukie" used to refer to an inexperienced player in the role of a Nuclear Operative.
+
+## Nukie
+A slang/shorthand term of a Nuclear Operative. May sometimes also appear as "Nuke Op".
+
 ## Perma
 Short for Permanent Brig. This is for the most serious crime and means that a prisoner will never be released. Most stations have a dedicated, seperate area of security for the permanent brig.
 
+## QM
+Short for Quartermaster, the head of the Cargo department.
+
 ## RD
 Short for Research Director, the head of the Science Department.
 
-## QM
-Short for Quartermaster, the head of the Cargo department.
+## Robust
+A word used to describe someone who is particularly adept in combat, or endured through a tough fight.
 
-## Greytide/Greyshirt/Tider/Assistant
-Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes.
+## Salv
+Short for Salvage tech.
 
-## God
-An IC term representing a Server Administrator. CentCom is also sometimes used in this manner.
+## Sci
+Short for Science.
 
-## Nukie
-A slang/shorthand term of a Nuclear Operative. May sometimes also appear as "Nuke Op".
+## Sec
+Short for Security.
 
-## Newkie
-A portmanteau of "New" and "Nukie" used to refer to an inexperienced player in the role of a Nuclear Operative.
+## Secoff
+Short for Security Officer.
 
 ## Shift
 In-Character way to refer to rounds.
-
+  
 ## Singulo
 A shortening of the Singularity Engine. A Singulo can create infinite power for the station but is very dangerous.
 
 ## Singuloose
 A Singularity that has grownth too much and breached it's containment. It will rip through the station causing massive damage.
 
+## Spacing
+An event which causes an area to lose air pressure, i.e. a hull breach.
+
+## Spess
+An intentional mis-spelling of "Space", sometimes used as a portmanteau of "space" and "mess". May also appear in words such as "Spessmen".
+
 ## SSD
 Short for Sudden Sleep Disorder or Space Sleep Disorder. This is an in-character way to refer to a player who has disconnected and is no longer responding.
 
 ## Syndie/Syndi/Syndicate
 A catch-all reference to anyone employed by the Syndicate. This ranges from (suspected) Syndicate Agents to Nuclear Operatives.
 
-## Flukie
-A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops".
-
-## Nanotrasen/NT
-Nanotrasen is the company which owns the space station you inhabit.
-
-## Spess
-An intentional mis-spelling of "Space", sometimes used as a portmanteau of "space" and "mess". May also appear in words such as "Spessmen".
-
-## Spacing
-An event which causes an area to lose air pressure, i.e. a hull breach.
-
 ## TC
 A telecrystal, which is a currency used by Syndicate Agents to purchase restricted contraband such as weapons and other illegal equipment.
 
 ## Wardenloose
 A joke term referencing a Singuloose. A wardenloose is when the Warden is seen outside of the brig.
 
+## Xenoarchaeology
+Study of artifacts, usually performed by science.
+
 # Out-Of-Character Slang
 
 These are terms you should only be using in OOC chat or outside the game.
@@ -125,9 +164,12 @@ Short for Antagonists, which are specifically picked individuals designed to dri
 ## Bwoink
 The noise made when an admin-help is received. Pray this isn't a ban.
 
-## Upstream
-The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream.
+## Ick Ock
+A phrase usually shouted in OOC when somebody reveals IC current round information, or "in-character, out-of-character".
 
+## LOOC/OOC
+Local out-of-character and (global) out-of-character respectively. They are text channels that allow players to talk to other players outside of roleplay. LOOC is enabled during rounds, while OOC is typically only on after the round ends.
+  
 ## LRP
 Low Roleplay. Servers marked LRP typically have relaxed roleplaying rules.
 
@@ -137,10 +179,13 @@ Medium Roleplay. Servers marked MRP usually have a decent basis of roleplaying r
 ## HRP
 High Roleplay. Servers marked HRP generally have extensive rules on what is and is not constituted while playing a character. You are generally required to act as your character would, have a character backstory, and follow protocol on the station. Some HRP servers may create their own lore or settings to further facilitate the type of server they wish to host.
 
-##Self-Antag
+## Self-Antag
 A term for a player who engages in antagonist-like activity without actually being an antagonist. This encompasses a wide variety of behavior, but is typically used to describe annoying behavior or actions which are greatly detrimental to other players for no purpose. Self-antagonism is a bannable offense. Sometimes used in IC. DO NOT DO THIS.
 
-## Validhunting
+## Upstream
+The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream.
+  
+## Validhunter
 A player who hunts down "valids", as in people that are valid to kill, even though this person isn't security.
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Jobs.xml b/Resources/ServerInfo/Guidebook/Jobs.xml
index 0db0f035a1ad..1bfd88c8f4bf 100644
--- a/Resources/ServerInfo/Guidebook/Jobs.xml
+++ b/Resources/ServerInfo/Guidebook/Jobs.xml
@@ -1,41 +1,45 @@
-<Document>
+<Document>
 # Jobs
 
 SS14 has a large number of jobs, divided into seven major departments:
 
 ## Service
-This department includes the janitor, passengers, clown, mime, musician, chef, bartender, the head of personnel, and other jobs who exist to serve the station.
+[color=#9fed58]Service[/color] is a diverse department that includes the head of personnel and other jobs who exist to serve the station.
 
 It primarily functions as folks who entertain, clean, and serve the rest of the crew, with the exception of passengers who have no particular job beyond getting lost in maintenance.
 
 ## Cargo
-Cargo consists of the cargo technicians, salvage specialists, and the quartermaster. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
+[color=#b18644]Cargo[/color] consists of the cargo technicians, salvage specialists, and the quartermaster. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
 
 For the most part, this means they scrounge around the station and assorted wrecks to find materials to sell and redistribute, and purchase materials other departments request.
 
 ## Security
-Security consists of the security cadets, lawyers, detective, security officers, warden, and the head of security. As a department it is responsible for dealing with troublemakers and non-humanoid threats like giant rats and carp.
+[color=#cb0000]Security[/color] consists of the security cadets, lawyers, detective, security officers, warden, and the head of security. As a department it is responsible for dealing with troublemakers and non-humanoid threats like giant rats and carp.
 
 As a result of this, and the need to walk a fine line, security sometimes is overwhelmed by angry crew (don't kill the clown), and it is important for its members to try and stay on their best behavior.
 
 ## Medical
-Medical consists of the medical interns, chemists, medical doctors, and the chief medical officer. As a department it is responsible for taking care of the crew, treat and/or clone the wounded and dead, treat disease, and prevent everyone from dying a horrible, bloody death in a closet somewhere.
+[color=#5b97bc]Medical[/color] consists of the medical interns, chemists, medical doctors, and the chief medical officer. As a department it is responsible for taking care of the crew, treat and/or clone the wounded and dead, treat disease, and prevent everyone from dying a horrible, bloody death in a closet somewhere.
 
 Medical is one of the more well-equipped departments, with the ability to locate injured crew using the crew monitor, a nigh infinite supply of chems should chemistry be on-par, and the ability to rapidly diagnose and vaccinate contagious diseases.
 
 ## Science
-Science consists of research assistants, scientists, and the research director. As a department it is responsible for researching technologies and artifacts, upgrading machines, and printing new and useful devices.
+[color=#c96dbf]Science[/color] consists of research assistants, scientists, and the research director. As a department it is responsible for researching technologies and artifacts, upgrading machines, and printing new and useful devices.
 
 Scientists should seek out new artifacts to study, as well as solicit departments to help upgrade their machines.
 
 ## Engineering
-Engineering consists of technical assistants, station engineers, atmospheric technicians, and the chief engineer. As a department it is responsible for keeping the station powered, its structure intact and its air supply working.
+[color=#f39f27]Engineering[/color] consists of technical assistants, station engineers, atmospheric technicians, and the chief engineer. As a department it is responsible for keeping the station powered, its structure intact and its air supply working.
 
 Engineering is readily equipped to go safely into space, and as such they should always attempt to repair uninhabitable parts of the station.
 
 ## Command
-Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the research director, and the quartermaster. As a department it is responsible for keeping the station and its departments running efficiently.
+[color=#1b67a5]Command[/color] consists of every department head. It is responsible for keeping the station and its departments running efficiently.
 
 Command members should always be relatively competent in their respective departments and attempt to delegate responsibility and direct work.
 
+# Getting Your Job Changed
+The [color=#9fed58]Head of Personnel[/color] is the person in charge of changing ID accesses and handing out encryption keys. Head over to their office and let them know what job you'd like to work instead.
+
+Often, they'll want you to go get a paper [color=#a4885c]stamped[/color] by a department head. Don't sweat it, just find them and hand them the paper.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Medical/Chemist.xml b/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
index caced42bdf92..8a27894c1a45 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Chemist.xml
@@ -1,24 +1,26 @@
 <Document>
 # Chemist
-Now you've done it, you picked the one job where -math- is mandatory. Grab your beaker, pull up a chair, and get cracking, it's time to cook up some chems.
+Now you've done it. You picked the one job where -math- is mandatory. Grab your beaker, pull up a chair, and get cracking, it's time to cook up some chems.
 
-While chemists primarily make medications, there's a very wide variety of chemicals that can be made, all of which are showcased in the Chemicals section of the Guidebook.
+While chemists primarily make medications, there's a very wide variety of chemicals that can be made, all of which are showcased in the Chemicals entry of the Guidebook.
+
+[textlink="Click here to see a complete list of chemicals." link="Chemicals"]
 
 ## Equipment:
 
-<Box>
-<GuideEntityEmbed Entity="ChemDispenser"/>
-<GuideEntityEmbed Entity="ChemBag"/>
-<GuideEntityEmbed Entity="KitchenReagentGrinder"/>
-<GuideEntityEmbed Entity="ChemMaster"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="LargeBeaker"/>
-<GuideEntityEmbed Entity="ChemistryEmptyBottle01"/>
-<GuideEntityEmbed Entity="HandLabeler"/>
-<GuideEntityEmbed Entity="Syringe"/>
-<GuideEntityEmbed Entity="PillCanister"/>
-</Box>
+  <Box>
+    <GuideEntityEmbed Entity="ChemDispenser"/>
+    <GuideEntityEmbed Entity="ChemBag"/>
+    <GuideEntityEmbed Entity="KitchenReagentGrinder"/>
+    <GuideEntityEmbed Entity="ChemMaster"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="LargeBeaker"/>
+    <GuideEntityEmbed Entity="ChemistryEmptyBottle01"/>
+    <GuideEntityEmbed Entity="HandLabeler"/>
+    <GuideEntityEmbed Entity="Syringe"/>
+    <GuideEntityEmbed Entity="PillCanister"/>
+  </Box>
 
 ## The Basics:
 Chemistry is fairly straightforward once you know what to expect. Here's a simple, step-by-step process on how to begin.
@@ -40,11 +42,10 @@ You can also use the hand labeler to organize individual bottles or bags without
 
 Speaking of experimentation, there are a few more toy you can use when it comes to chemistry. This job requires a lot of trial and error, but it was worth mentioning that these things exist! It's up to you to figure out what to make with them.
 
-<Box>
-<GuideEntityEmbed Entity="ModularGrenade"/>
-<GuideEntityEmbed Entity="CableApcStack"/>
-<GuideEntityEmbed Entity="ChemicalPayload"/>
-<GuideEntityEmbed Entity="TimerTrigger"/>
-</Box>
-
+  <Box>
+    <GuideEntityEmbed Entity="ModularGrenade"/>
+    <GuideEntityEmbed Entity="CableApcStack"/>
+    <GuideEntityEmbed Entity="ChemicalPayload"/>
+    <GuideEntityEmbed Entity="TimerTrigger"/>
+  </Box>
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Medical/Medical.xml b/Resources/ServerInfo/Guidebook/Medical/Medical.xml
index 5924a569eb54..fceb58fd253e 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Medical.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Medical.xml
@@ -2,21 +2,31 @@
 # Medical
 This is the department where people go to when they're hurt, it's up to the folks working here to fix them.
 
+## Personnel
+[color=#5b97bc]Medical[/color]'s staff is made up of Medical Interns, Medical Doctors, Paramedics and Chemists. [color=#5b97bc]Medical[/color] is run by the Chief Medical Officer.
+
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineMedicalDoctor" Caption="Doctor"/>
+    <GuideEntityEmbed Entity="ToyFigurineParamedic" Caption="Paramedic"/>
+    <GuideEntityEmbed Entity="ToyFigurineChemist" Caption="Chemist"/>
+    <GuideEntityEmbed Entity="ToyFigurineChiefMedicalOfficer" Caption="CMO"/>
+  </Box>
+  
 Right now, medbay is divided into two different sets of care:
 
 ## Medical Treatment
-<Box>
-<GuideEntityEmbed Entity="Brutepack"/>
-<GuideEntityEmbed Entity="Bloodpack"/>
-<GuideEntityEmbed Entity="Ointment"/>
-<GuideEntityEmbed Entity="Gauze"/>
-<GuideEntityEmbed Entity="HandheldHealthAnalyzer"/>
-</Box>
+  <Box>
+    <GuideEntityEmbed Entity="Brutepack"/>
+    <GuideEntityEmbed Entity="Bloodpack"/>
+    <GuideEntityEmbed Entity="Ointment"/>
+    <GuideEntityEmbed Entity="Gauze"/>
+    <GuideEntityEmbed Entity="HandheldHealthAnalyzer"/>
+  </Box>
 ## Chemical Production
-<Box>
-<GuideEntityEmbed Entity="ChemDispenser"/>
-<GuideEntityEmbed Entity="LargeBeaker"/>
-<GuideEntityEmbed Entity="PillCanister"/>
-<GuideEntityEmbed Entity="ChemMaster"/>
-</Box>
+  <Box>
+    <GuideEntityEmbed Entity="ChemDispenser"/>
+    <GuideEntityEmbed Entity="LargeBeaker"/>
+    <GuideEntityEmbed Entity="PillCanister"/>
+    <GuideEntityEmbed Entity="ChemMaster"/>
+  </Box>
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml b/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
index 72bdfcad6b74..95c898b8e01c 100644
--- a/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
@@ -7,7 +7,7 @@ This guide will give you a basic outline of the treatment options you have avail
 ## The Basics
 There are two ways to tell what's ailing someone: Taking a scan (with a health analyzer or a medical PDA), or examining them, with a shift-click, and clicking the heart symbol.
 
-It's best to do both, if possible, as some things (such as poison, or radiation) don't show up on examination, while others (such as blood levels) don't show up on an analyzer.
+Using a health analyzer is often more powerful than examination, as some things (such as poison, or radiation) don't show up on examination. However, using an analyzer has its drawbacks, as it makes noise and uses up a battery.
 <Box>
 <GuideEntityEmbed Entity="SignExamroom" Caption="examine patient"/>
 <GuideEntityEmbed Entity="MedicalPDA"/>
@@ -16,7 +16,7 @@ It's best to do both, if possible, as some things (such as poison, or radiation)
 </Box>
 
 ## Medication and Treatment Options
-Before we go any further, it's probably a good idea to go over damage types, and what will heal them The wiki has more extensive info available, but these are commonly used.
+Before we go any further, it's probably a good idea to go over damage types, and what will heal them. The wiki has more extensive info available, but these are commonly used.
 
 An important note: Most medication has an overdose level, which will cause harm to your patient. Chemicals also take time to metabolise in pill form, if you want things to act quickly, use a syringe.
 
@@ -56,14 +56,17 @@ If possible, buckle them to a medical bed, if you need time to treat them, strap
 <GuideEntityEmbed Entity="MedicalBed"/>
 <GuideEntityEmbed Entity="StasisBed"/>
 </Box>
-## Death and Revival
-You can't save them all, sometimes, death happens. Depending on the status of the body, if there's a soul present, and if the body has started rotting, there are a few things that can be done.
+## Assessing Corpses
+You can't save them all, sometimes, death happens. Depending on the [color=#a4885c]status[/color] of the body, there are a few things that can be done.
 
-1. Do they have a soul attached? You can tell if, when examining, the following phrase is displayed: "Their soul has departed." If this isn't displayed, consider storing the body in a morgue tray, or using them for biomass.
+1. Do they have a soul attached? You can tell if, when examining, the following phrase is displayed: "Their soul has departed." If this isn't displayed, there is still a player who can be revived.
 
 2. Is the body rotting? If it is, sadly, they'll have to be cloned. A rotting body can't be brought back with a defibrillator. (See Cloning)
 
-3. If they have a soul, and aren't rotten, it's possible to revive them. Not counting airloss, Defibrillator's can be used to revive patients under 200 total damage. Chemicals don't metabolise in the dead, but brute packs and ointment can still patch them up. Use them to bring their numbers down enough for revival.
+3. If they have a soul, and aren't rotten, it's possible to revive them. Consider storing the body in a morgue tray if you don't have enough time to revive someone, as the body will rot if you wait too long.
+
+## Revival
+Not counting airloss, Defibrillator's can be used to revive patients under 200 total damage. Chemicals don't metabolise in the dead, but brute packs and ointment can still patch them up. Use them to bring their numbers down enough for revival.
 
 <Box>
 <GuideEntityEmbed Entity="Brutepack"/>
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml b/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
new file mode 100644
index 000000000000..b1582a9786d4
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
@@ -0,0 +1,70 @@
+<Document>
+# Important Character Creation Tips
+This is a guide for the parts of character creation that effect gameplay.
+
+[textlink="For a guide on making cosmetic changes, click here." link="YourFirstCharacter"]
+
+## Spawn Priority
+This affects where you spawn in upon joining the game after the round has already started.
+
+Choosing "Arrivals" will spawn you on a separate station where you wait for a shuttle to arrive to ship you to the main station.
+
+Choosing "Cryosleep" will have you wake up in a cryosleep chamber already on the station.
+
+Choosing "None" will either pick for you or choose the only spawn option available for the current station.
+
+This is a mostly arbitrary choice. You can safely leave this on "None" and you won't suffer any real inconveniences.
+
+## Jobs
+You can set your job preferences in the lobby. While these don't [color=#a4885c]guarantee[/color] your position, someone who wants the job will be [color=#a4885c]randomly[/color] selected at the start of the round.
+You are given a chance at being chosen for your high priority job first, then your medium priorities, then your low priorities.
+You also given an option to automatically be a passenger or to be sent back to the lobby if you don't get chosen for any of your preferred jobs.
+
+Some jobs are locked until you've played long enough as other entry level jobs.
+
+[textlink="For more infomation about jobs, click here." link="Jobs"]
+
+## Job Loadouts
+You may also choose [color=#a4885c]loadouts[/color] for each job. Loadouts are the clothing items and trinkets that you spawn with upon joining the game. Some loadout items are locked behind playtime restrictions.
+This may have various effects on gameplay, as some clothing items have [color=#a4885c]armor protection[/color] or [color=#a4885c]slow down your movement speed[/color]. This applies especially to Command and Security.
+
+You may also choose what bag you spawn in with.
+[color=#a4885c]Backpacks[/color] are medium sized but can carry large items easier. [color=#a4885c]Satchels[/color] have more total space than backpacks but have trouble carrying large items. [color=#a4885c]Duffel bags[/color] are large but incur a movement penalty.
+
+## Antags
+Turning on an [color=#a4885c]antagonist[/color] toggle will put you on the list of potentional antags at the start of the round. They do not guarantee your antagonist role, don't use this as an excuse to self-antag!
+Instead, like job priorities, a handful of players are chosen randomly from eligible players. If you are a command member or security officer, you cannot be chosen for an antag role.
+
+[textlink="For more information about antagonists, click here." link="Antagonists"]
+
+Joining multiple games or ghosting/disconnecting/commiting suicide upon not being chosen for an antag role is referred to as "antag-rolling" and it is against the rules.
+Plenty of people patiently wait for their turn to be antagonists, so [color=#a4885c]we kindly ask you to refrain from opting-in to an antagonist role if you aren't ready[/color].
+
+## Traits
+Speech traits alter your speech, sometimes to an extreme degree.
+
+They include:
+- Accentless (disables the accent of your selected species)
+- Cowboy accent (word replacement, partner)
+- Frontal lisp ("s" is replaced with "th")
+- Italian accent (Mamma-mia, word replacement)
+- Pathological liar (word replacement, changes words like "yes" to "no")
+- Pirate accent (Arrgh, word replacement)
+- Social anxiety (s-s-stutter)
+- Southern Drawl (replaces "-ing" with "-in'" and similar changes)
+
+You should be comfortable with talking normally or with a minor accent such as Social anxiety or Southern drawl before taking heavy accents like Italian or Cowboy.
+
+There are also disabilty traits. Familiarize yourself with the game and the game's flow before taking one of these, as some may become difficult for beginners to deal with.
+
+They include:
+- Blindness (severely limits your vision)
+- Lightweight drunk (you get drunk faster and you suffer more from the ill-effects of alcohol)
+- Muted (you cannot talk or whisper, but you can still communicate via emotes and pen and paper)
+- Narcolepsy (you randomly fall asleep at unpredictable and often inconvenient times)
+- Pacifist (you cannot hit, shoot, or throw sharp objects at people)
+- Paracusia (you sometimes hear noises that aren't real)
+- Short-sighted (somewhat limits your vision without prescription glasses)
+- Snoring (you make loud snoring sounds when asleep)
+- Unrevivable (you cannot be resusitated when you meet your untimely demise)
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Controls/Controls.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
similarity index 100%
rename from Resources/ServerInfo/Guidebook/Controls/Controls.xml
rename to Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
new file mode 100644
index 000000000000..39ee8ae3ff44
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
@@ -0,0 +1,64 @@
+<Document>
+# Speech and Text Channels
+Talking is a key part of Space Station 14. You can press [keybind="FocusChatInputWindow"/] to jump to the text box.
+
+The word next to the text box is the [color=#a4885c]text channel[/color] you're about to send the message to, or rather how you're about to say what you've typed.
+
+Local is normal speech at normal volume.
+
+Whisper can only be heard when nearby somebody. You automatically whisper into your radio to send messages over it.
+
+Emotes are gestures that you make. Can be recieved by anyone who is not blinded. You will often see mimes do many emotes.
+
+Whisper messages can be sent by starting your message with [color=#a4885c][keybind="FocusWhisperChatWindow"/][/color] and Emotes can be sent by starting your message with ([color=#a4885c]@[/color]).
+You can also cycle through all of these text channels by pressing [keybind="CycleChatChannelForward"/].
+
+People may not be able to make out all of what you're saying if you're standing too far away from them. This is especially important if you're whispering.
+
+## Radio
+
+Your radio allows you to communicate across the entire station and to your specific [color=#a4885c]department[/color].
+
+<Box>
+  <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
+</Box>
+
+To send a [color=#a4885c]station-wide[/color] message over the radio preface, use the [color=#32cd32]Common[/color] channel by beginning your text with [color=#32cd32]semi-colon (;)[/color].
+People standing right next to you might catch bits of your radio message, even if they don't have the access to the relevant radio channel. Watch for eavesdroppers.
+
+## Departmental Radio
+
+You are able to send messages over your departmental radio channels using [color=#32cd32]colon (:)[/color] followed by the department letter as long as you're wearing a headset with your department's encryption key.
+
+Examine your headset to see the department channels available to you.
+
+<Box>
+  <GuideEntityEmbed Entity="ClothingHeadsetEngineering"/>
+</Box>
+
+Examining an unmodified engineering headset would show you the prefixes for the [color=#32cd32]Common[/color] and [color=#f37746]Engineering[/color] channels.
+
+It is also possible to use [color=#a4885c]:h[/color]. This hotkey will automatically default to your department radio channel.
+For example, if you're a Station Engineer then [color=#a4885c]:h[/color] will default to [color=#f37746]:e[/color].
+
+## Encryption Keys
+[color=#a4885c]Encryption keys[/color] give you access to their respective channel.
+  
+Examining our engineering headset from earlier shows us [color=#32cd32]Common[/color] and [color=#f37746]Engineering[/color] because an engineer's headset starts with those [color=#a4885c]encryption keys[/color].
+  
+<Box>
+  <GuideEntityEmbed Entity="EncryptionKeyCommon"/>
+  <GuideEntityEmbed Entity="EncryptionKeyEngineering"/>
+</Box>
+  
+You can take out encryption keys by using a [color=#a4885c]screwdriver[/color] on a headset. New encryption keys are put into headsets by clicking on one with an encryption key in your hand.
+
+All command members have extras of their relevant encryption key, but you can also request one at the HoP's office when you're getting your job changed.
+
+## OOC Channels
+OOC (out-of-character) channels exist outside of the game world. They are LOOC, OOC and Dead chat.
+
+LOOC is on during the rounds, OOC is typically off until the round ends and you can only see and talk in Dead chat when you are, well, dead.
+
+Do not discuss the current round in the Discord or in OOC if it's on during the round.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml b/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml
new file mode 100644
index 000000000000..303230593bd2
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml
@@ -0,0 +1,28 @@
+<Document>
+# Welcome!
+
+Welcome to the alpha build of Space Station 14!
+You have just started your shift aboard a Nanotrasen space station. You and your crewmates should cooperate, perform your jobs the best you can and have fun.
+
+We hope you enjoy the game, and this entry will serve to guide you on how to learn to play.
+
+There's quite a bit to read, but SS14 is in itself a very large and in-depth game, and hopefully these guides help you enjoy it to its fullest.
+
+This entry and its subentries contain simple and broad information new players need to play the game on most servers.
+
+Some information given here may be repeated or further touched upon in the Station and Shifts entry, [textlink="which can be found here." link="SS14"]
+
+## How to use this guidebook
+This guidebook contains [color=#a4885c]step-by-step instructions[/color] on how to perform tasks, [color=#a4885c]tables of components[/color] one might require,
+or simply [color=#a4885c]tips, tricks and guidelines[/color] on how to perform your job.
+
+You can refresh yourself on your job before starting your shift or reference certain pages as needed, [textlink="such as recipes for cocktails" link="Drinks"].
+
+## Wait, what's Space Station 14?
+Space Station 14 is a free (forever) open source remake of the infamous Space Station 13, hoping to provide an improved experience for both newcomers and old players alike. Space Station 14 is designed as a fully moddable experience that you can modify to your liking with custom servers, adding entire swaths of new content for people to explore.
+
+Please make sure you understand the server rules (F1) and if you have any questions, consult this guide, your colleagues on shift in person or over radio or via discord. You can also ask admins for help (ahelp) by hitting the escape key > admin help and typing a message to any online admins. Especially do this if you witness someone breaking rules.
+
+[color=#a4885c]To reiterate, you are all a crew of people who work together[/color] and you should not be harming each other unless you have an extremely good reason (such as self-defence) and even then, you should call security over radio.
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml b/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
new file mode 100644
index 000000000000..d8d2f588422b
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
@@ -0,0 +1,54 @@
+<Document>
+# The Captains and the Clowns
+This is a guide for editing your character's appearance. Make sure you read Character Creation first.
+Upon creating your character, you may be intimidated by your vast range of options.
+  
+It's okay to make your first character [color=#a4885c]randomized[/color] and roll with it, even experienced players do it.
+Making your first character doesn't have to be precise, either. You can [color=#a4885c]wing it[/color] and see what happens.
+  
+If you'd like to be [color=#a4885c]methodical[/color], though, creating a character is easy to do one step at a time.
+
+## Choosing a Species
+Most species have minor differences, which you can read about under the [color=#a4885c]Species[/color] entry.
+However, you may find that it's easier to make your first character as a human, moth, dwarf or reptilian.
+
+This shouldn't discourage you from getting creative with your character, though.
+
+This guide will assume you are creating a human, but the process is similar across all species.
+
+## Minor Characteristics
+These include:
+- Age (18-29 for young, 30-59 for middle-aged, 60+ for old)
+- Sex (your sprite, as seen by toggling "Show clothing")
+- Pronouns (what the game will refer to you as)
+- Skin color (may be a slider or RGB depending on species)
+- Eye color (RGB)
+- Hair color (RGB)
+
+These are minor changes and have little effect on gameplay. This is what players will read when they [color=#a4885c]examine you[/color]. ("young man")
+
+## Hair and Facial Hair
+Again, you may be intimidated by the vast range of options. That's okay.
+
+[color=#a4885c]Take your time with it.[/color] You can skim or click through each of the options and find which one you like.
+Sometimes it's easier to set your desired hair color before looking at the options.
+
+If you really can't decide, some popular haircut options include Floorlength Bedhead, Modern, Buisness, CIA or simply bald.
+Alternatively, [color=#a4885c]randomize[/color] a separate character and see what kind of haircuts they're rocking with. Suprise yourself.
+
+Don't feel obligated to use any of these, though.
+  
+## Markings
+Markings range from [color=#a4885c]scars and snouts[/color] to [color=#a4885c]tattoos and tails[/color].
+Think of them like [color=#a4885c]accessories[/color] that are a part of your body, for giving your character some extra flair and uniqueness. They cannot be changed during the round.
+
+Some species have more marking options than others. Humans are more limited in terms of markings than moths or reptilians.
+
+You can have a set number of markings in each '[color=#a4885c]category[/color]', as seen at the top. For example, reptilians can have one chest marking but two markings on the top of their heads.
+These are [color=#a4885c]cosmetic[/color] and have no effect on gameplay.
+
+## How to stand out
+Memorable characters are usually remembered for their personality, their deeds and their [color=#a4885c]robustness[/color], but that doesn't mean you have to be some sort of hotshot.
+
+Don't sweat having a big, flashy and memorable character. Make your own story that you'll be remembered for.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/ReferenceTables/Drinks.xml b/Resources/ServerInfo/Guidebook/ReferenceTables/Drinks.xml
new file mode 100644
index 000000000000..5ed3a583295e
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/ReferenceTables/Drinks.xml
@@ -0,0 +1,6 @@
+<Document>
+# Drinks
+Knowing how to make a requested drink is important. Here are the different drinks in the game, including their recipes:
+
+<GuideReagentGroupEmbed Group="Drinks"/>
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/References.xml b/Resources/ServerInfo/Guidebook/References.xml
new file mode 100644
index 000000000000..1994b463b346
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/References.xml
@@ -0,0 +1,4 @@
+<Document>
+  # Reference Tables
+  This entry is made to contain information that you might have to come back to over and over again. Use as necessary.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml
index c886daf4d531..6e0183fc5f8c 100644
--- a/Resources/ServerInfo/Guidebook/Science/Science.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Science.xml
@@ -1,28 +1,34 @@
 <Document>
 # Science
+[color=#c96dbf]Science[/color], often called Research and Development, is a job made up of both generating research points to unlock new technologies as well as using said technologies to produce new items at lathes to help out the station.
 
-Science, often called Research and Development, is a job made up of both generating research points to unlock new technologies as well as using said technologies to produce new items at lathes to help out the station.
+## Personnel
+[color=#c96dbf]Science[/color]'s staff is made up of Research Assistants and Scientists. [color=#c96dbf]Science[/color] is run by the Research Director.
 
+  <Box>
+   <GuideEntityEmbed Entity="ToyFigurineScientist" Caption="Scientist"/>
+   <GuideEntityEmbed Entity="ToyFigurineResearchDirector" Caption="RD"/>
+  </Box>
+  
 ## Technologies
-<Box>
-<GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/>
-<GuideEntityEmbed Entity="ResearchAndDevelopmentServer"/>
-</Box>
-The most important thing inside your department is the R&D server, which stores unlocked technologies, and the R&D computer, which allows you to unlock technologies.
+  <Box>
+    <GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/>
+    <GuideEntityEmbed Entity="ResearchAndDevelopmentServer"/>
+  </Box>
+The most important thing inside your department is the R&D server, which stores unlocked technologies, and the R&D computer, which allows you to unlock [color=#a4885c]technologies[/color].
 
 Each technology costs [color=#a4885c]Research Points[/color] and unlocks recipes at lathes. Some technologies will also have prerequisites you have to unlock before you can research them.
 
-Information about the different technologies can be viewed [textlink="on the technology guidebook page" link="Technologies"].
+[textlink="Click here to see a list of technologies." link="Technologies"].
 
 ## Disciplines
 Technologies are spread over 5 different Disciplines:
-<Box>
-<GuideEntityEmbed Entity="Wrench" Caption="Industrial"/>
-<GuideEntityEmbed Entity="Syringe" Caption="Biochemical"/>
-<GuideEntityEmbed Entity="WeaponTetherGun" Caption="Experimental"/>
-<GuideEntityEmbed Entity="ComputerTelevision" Caption="Civil Services"/>
-<GuideEntityEmbed Entity="WeaponXrayCannon" Caption="Arsenal"/>
-</Box>
+  <Box>
+    <GuideEntityEmbed Entity="Wrench" Caption="Industrial"/>
+    <GuideEntityEmbed Entity="WeaponTetherGun" Caption="Experimental"/>
+    <GuideEntityEmbed Entity="ComputerTelevision" Caption="Civil Services"/>
+    <GuideEntityEmbed Entity="WeaponXrayCannon" Caption="Arsenal"/>
+  </Box>
 
 <GuideEntityEmbed Entity="ComputerResearchAndDevelopment"/> Use your nearest R&D console to take note of which kind of research is locked behind each Discipline tree.
 
@@ -34,15 +40,15 @@ In order to progress further, you have to research up to [color=brown]75%[/color
 Now [color=green]Tier 3[/color] is where it gets interesting. If you research a T3 tech, you [color=brown]lock out[/color] T3 techs from other Discipline trees. That is, unless... you find some other way around it, probably should ask your [color=purple]Research Director[/color].
 
 ## Lathes
-<Box>
-<GuideEntityEmbed Entity="Protolathe"/>
-<GuideEntityEmbed Entity="CircuitImprinter"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="ExosuitFabricator"/>
-<GuideEntityEmbed Entity="MedicalTechFab"/>
-<GuideEntityEmbed Entity="SecurityTechFab"/>
-</Box>
+  <Box>
+    <GuideEntityEmbed Entity="Protolathe"/>
+    <GuideEntityEmbed Entity="CircuitImprinter"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ExosuitFabricator"/>
+    <GuideEntityEmbed Entity="MedicalTechFab"/>
+    <GuideEntityEmbed Entity="SecurityTechFab"/>
+  </Box>
 At a lathe, you can choose a server to allow it print whatever recipes you have unlocked. Recipes require various materials (steel, glass, plastic, gold, plasma) which can be acquired at Cargo or Salvage.
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Security/Security.xml b/Resources/ServerInfo/Guidebook/Security/Security.xml
index 47c357a40989..7306e3f76138 100644
--- a/Resources/ServerInfo/Guidebook/Security/Security.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Security.xml
@@ -1,31 +1,43 @@
-<Document>
-  # Security
-  Ensuring the safety of both station and crew is number one for Security. Be it Syndicate Agents, Nuclear Operatives, Infestations or just unruly staff. Security are on hand to maintain order and control crowds.
+<Document>
+# Security
+Ensuring the safety of both station and crew is number one for [color=#cb0000]Security[/color]. They are ready for any situation, and [color=#cb0000]Security[/color] are on hand to maintain order and control crowds.
 
-  ## Gear
-  First we have non-lethals a step above simply telling someone to cooperate with instructions. Both the stunbaton and disabler are capable of limiting the movement of an assailant, whereas handcuffs can be applied to deny a criminal free movement and access to their hands.
+They face [textlink="Syndicate Agents" link="Traitors"], [textlink="Nuclear Operatives" link="NuclearOperatives"], [textlink="Zombies" link="Zombies"] and unruly staff.
+
+## Personnel
+[color=#cb0000]Security[/color]'s staff is made up of Security Cadets, Security Officers, and the Detective. [color=#cb0000]Security[/color] is run by the Warden and Head of Security.
+
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineSecurity" Caption="Secoff"/>
+    <GuideEntityEmbed Entity="ToyFigurineDetective" Caption="Detective"/>
+    <GuideEntityEmbed Entity="ToyFigurineWarden" Caption="Warden"/>
+    <GuideEntityEmbed Entity="ToyFigurineHeadOfSecurity" Caption="HoS"/>
+  </Box>
+
+## Gear
+First we have non-lethals a step above simply telling someone to cooperate with instructions. Both the stunbaton and disabler are capable of limiting the movement of an assailant, whereas handcuffs can be applied to deny a criminal free movement and access to their hands.
   <Box>
     <GuideEntityEmbed Entity="Stunbaton"/>
     <GuideEntityEmbed Entity="Handcuffs"/>
-    <GuideEntityEmbed Entity="WeaponDisabler"/>
+   <GuideEntityEmbed Entity="WeaponDisabler"/>
   </Box>
 
-  ## Flashes
-  Flashes are an effective tool for dispersing crowds and apprehending particularly evasive targets, with a large area of effect blinding all those without protection.
-  It is worth noting that flashes can be both used in a large area 	([color=yellow]Z[/color] hotkey) and if you attack somebody with it while [color=red]harm mode[/color] is active. Important to note that localized flashes last [color=yellow]2.5[/color] times as long as large area ones.
-  Security and [color=#a4885c]some[/color] other members of staff have eye protection from flashbangs and flashes.
+## Flashes
+[color=#a4885c]Flashes[/color] are an effective tool for dispersing crowds and apprehending particularly evasive targets, with a large area of effect blinding all those without protection.
+It is worth noting that flashes can be both used in a large area ([color=yellow]Z[/color] hotkey) and if you attack somebody with it while [color=red]harm mode[/color] is active. Important to note that localized flashes last [color=yellow]2.5[/color] times as long as large area ones.
+[color=#cb0000]Security[/color] and [color=#a4885c]some[/color] other members of staff have eye protection from flashbangs and flashes.
   <Box>
     <GuideEntityEmbed Entity="Flash"/>
     <GuideEntityEmbed Entity="ClothingEyesGlassesSecurity"/>
     <GuideEntityEmbed Entity="GrenadeFlashBang"/>
-
   </Box>
-  ## Lethals
-  Should the situation dictate, Security have access to laser rifles, shotguns, handguns and automatic rifles able to put down substancial fire against any who would stand against the station.
+  
+## Lethals
+Should the situation dictate, [color=#cb0000]Security[/color] have access to laser rifles, shotguns, handguns and automatic rifles able to put down substancial fire against any who would stand against the station.
   <Box>
-  <GuideEntityEmbed Entity="WeaponLaserCarbine"/>
-  <GuideEntityEmbed Entity="WeaponShotgunKammerer"/>
-  <GuideEntityEmbed Entity="WeaponPistolMk58"/>
-  <GuideEntityEmbed Entity="WeaponRifleLecter"/>
+    <GuideEntityEmbed Entity="WeaponLaserCarbine"/>
+    <GuideEntityEmbed Entity="WeaponShotgunKammerer"/>
+    <GuideEntityEmbed Entity="WeaponPistolMk58"/>
+    <GuideEntityEmbed Entity="WeaponRifleLecter"/>
   </Box>
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Service/Bartender.xml b/Resources/ServerInfo/Guidebook/Service/Bartender.xml
index fd54bdeef0d3..f4c5cedf99dc 100644
--- a/Resources/ServerInfo/Guidebook/Service/Bartender.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Bartender.xml
@@ -2,6 +2,8 @@
 # Bartender
 The bartender has a pretty simple job: serve drinks. People will come up to you and request drinks, and your job is just to hand it to them.
 
+[textlink="Click here to see a complete list of drinks." link="Drinks"]
+
 <Box>
 The materials for these drinks can be found in various places:
 </Box>
@@ -21,8 +23,5 @@ Don't forget containers to serve them in!
 <GuideEntityEmbed Entity="DrinkJigger"/>
 </Box>
 
-## Drinks
-Knowing how to make a requested drink is important. Here are the different drinks in the game, including their recipes:
-
-<GuideReagentGroupEmbed Group="Drinks"/>
+You can find a list of every drink that can be requested under the Reference Tables entry.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Service/Botany.xml b/Resources/ServerInfo/Guidebook/Service/Botany.xml
index de841dc8acad..7d1da19aba8b 100644
--- a/Resources/ServerInfo/Guidebook/Service/Botany.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Botany.xml
@@ -78,10 +78,12 @@ You can use a [color=cyan]sterile swab[/color] to transfer pollen from one plant
 ## Chemicals
 Some chemicals have special effects on plants.
 
+[textlink="Click here to see all botanical chemicals." link="Botanical"]
+
 <GuideReagentEmbed Reagent="Dylovene"/>
 <GuideReagentEmbed Reagent="Cryoxadone"/>
 <GuideReagentEmbed Reagent="Necrosol"/>
 <GuideReagentEmbed Reagent="Phalanximine"/>
 <GuideReagentGroupEmbed Group="Botanical"/>
-
+  
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Service/Chef.xml b/Resources/ServerInfo/Guidebook/Service/Chef.xml
index 7d077ca269b4..e0692b889b42 100644
--- a/Resources/ServerInfo/Guidebook/Service/Chef.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Chef.xml
@@ -2,6 +2,9 @@
 # Chef
 A fella has gotta eat, and it's the chef's job to make sure folks have something other than junk to munch on.
 
+
+[textlink="Click here to see a list of food recipes." link="FoodRecipes"]
+
 First and foremost, you'll need to familiarize yourself with the kitchen, and the tools available to you.
 
 <Box>
diff --git a/Resources/ServerInfo/Guidebook/Service/Service.xml b/Resources/ServerInfo/Guidebook/Service/Service.xml
new file mode 100644
index 000000000000..7fe9b55a77d7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Service/Service.xml
@@ -0,0 +1,34 @@
+<Document>
+# Service
+[color=#9fed58]Service[/color] keeps the station clean, efficient and sane so that all other departments can do their jobs better and keep their staff happy. They also end up doing most of the paperwork on the station.
+
+## Personnel
+[color=#9fed58]Service[/color]'s staff is made up of Service Workers, Chefs, Botanists, Bartenders, Janitors, Chaplains, Clowns, Mimes, Musicians, Lawyers, Librarians and Passengers. Service is run by the Head of Personnel.
+
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineChef" Caption="Chef"/>
+    <GuideEntityEmbed Entity="ToyFigurineBotanist" Caption="Botanist"/>
+    <GuideEntityEmbed Entity="ToyFigurineBartender" Caption="Bartender"/>
+    <GuideEntityEmbed Entity="ToyFigurineJanitor" Caption="Janitor"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineChaplain" Caption="Chaplain"/>
+    <GuideEntityEmbed Entity="ToyFigurineClown" Caption="Clown"/>
+    <GuideEntityEmbed Entity="ToyFigurineMime" Caption="Mime"/>
+    <GuideEntityEmbed Entity="ToyFigurineMusician" Caption="Musician"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ToyFigurineLawyer" Caption="Lawyer"/>
+    <GuideEntityEmbed Entity="ToyFigurineLibrarian" Caption="Librarian"/>
+    <GuideEntityEmbed Entity="ToyFigurinePassenger" Caption="Passenger"/>
+    <GuideEntityEmbed Entity="ToyFigurineHeadOfPersonnel" Caption="HoP"/>
+  </Box>
+
+## Working Together
+[color=#9fed58]Service[/color], despite being the most diverse, tends to be the most [color=#a4885c]interlinked[/color] department by far.
+Most [color=#9fed58]Service[/color] jobs require [color=#a4885c]cooperation[/color] between workers.
+Chefs often need ingredients that only botanists can grow efficiently. The bartender may request bananas that only clowns carry in abundance.
+The lawyer may invite the mime to play charades to convince the judge that their client is innocent.
+
+A lot of [color=#a4885c]collaboration[/color] is necessary within and without [color=#9fed58]Service[/color]. Often times, [color=#9fed58]Service[/color] is required by other departments, so be on your toes.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/SpaceStation14.xml b/Resources/ServerInfo/Guidebook/SpaceStation14.xml
index 56325107d86a..5d449032a164 100644
--- a/Resources/ServerInfo/Guidebook/SpaceStation14.xml
+++ b/Resources/ServerInfo/Guidebook/SpaceStation14.xml
@@ -1,14 +1,20 @@
-<Document>
+<Document>
 # Space Station 14
 
-Welcome to the pre-alpha of Space Station 14! We hope you enjoy the game, and this entry will serve to guide you on how to learn to play. There's quite a bit to read, but SS14 is in itself a very large and in-depth game, and hopefully these guides help you enjoy it to it's fullest.
+This entry marks the beginning of the advanced guidebook entries. Most information found here only applies to offical Wizard's Den servers, or servers that are similar to it.
+Other servers may have their own guidebooks that you should read for relevant information.
 
-## What this is
-Space Station 14 is a free (forever) open source remake of the infamous Space Station 13, hoping to provide an improved experience for both newcomers and old players alike. Space Station 14 is designed as a fully moddable experience that you can modify to your liking with custom servers, adding entire swaths of new content for people to explore.
+If you're just here to play, that's great! The [color=#a4885c]Still new?[/color] section of this entry will help you out.
 
-If you're just here to play, that's great! The [color=#a4885c]Where to start[/color] section of this entry will help you out, if you're looking to do a bit more with the game, you can join our discord and find our github page in the lobby.
+## Still new?
+[textlink="Completely lost? Click here to start at the beginning." link="NewPlayer"]
 
-## Where to start
-It's recommended to start with the [color=#a4885c]Controls[/color] guide, and then read the [color=#a4885c]Character Creation[/color], [color=#a4885c]Roleplaying[/color], and [color=#a4885c]Jobs[/color] guides. Not all jobs or concepts will have guides yet, and it's strongly encouraged to help us write them if you're an experienced player!
+[textlink="Don't know how to perform a job? Click here to jump to a list of departments." link="Jobs"]
 
+[textlink="Keep dying? Click here to see a survival guide." link="Survival"]
+
+## Contributing
+If you're looking to do a bit more with the game, you can join our [color=#5865f2]Discord[/color] server and find our [color=#627597]GitHub[/color] page in the lobby.
+
+Not all jobs or concepts will have guides yet, so if you're an experienced player we strongly encourage you to [color=#a4885c]contribute[/color]!
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Survival.xml b/Resources/ServerInfo/Guidebook/Survival.xml
index 6f8f9d82962e..7c0ae7d4e455 100644
--- a/Resources/ServerInfo/Guidebook/Survival.xml
+++ b/Resources/ServerInfo/Guidebook/Survival.xml
@@ -1,24 +1,33 @@
 <Document>   
 # Survival 
 It is generally wise to avoid situations that will cause you harm, because medical can only heal you so much with limited chemicals and medical items and especially when there's nuclear operatives on your doorstep. 
+
 ## Identifying your situation 
 Your PDA contains both a vessel name and list of crew currently active in your vessel, a reminder for your name if needed, and your assigned job for the shift, allowing you to quickly assess the situation. 
+
 ## Emergency Treatment 
 In the event of a serious emergency, there're a few things you can do to help ensure your long-term survival, including: 
 - If entering critical condition, use the emergency medipen from your emergency box, it'll make sure you don't end up unable to do anything. Emergency medipens can also be used to revive people currently in crit on the floor, and to prolong the amount of time you have to deal with poisons/etc. 
+
 <Box> 
-<GuideEntityEmbed Entity="EmergencyMedipen"/> 
-</Box> 
+  <GuideEntityEmbed Entity="EmergencyMedipen"/> 
+</Box>
+
 - Your emergency box contains a breath mask and oxygen tank, which can help you survive longer in a spacing situation. If you're one of the slimepeople, be aware that nitrogen replaces oxygen for you and that your emergency box will start with a red tank of nitrogen replacing the standard blue/yellow oxygen tank. 
+
 <Box> 
-<GuideEntityEmbed Entity="ClothingMaskBreath"/> 
-<GuideEntityEmbed Entity="EmergencyOxygenTankFilled"/> 
-</Box> 
+  <GuideEntityEmbed Entity="ClothingMaskBreath"/> 
+  <GuideEntityEmbed Entity="EmergencyOxygenTankFilled"/> 
+</Box>
+
 - If actively bleeding out, or simply wishing to prepare, it's possible to slice up cloth items with a knife or other sharp object and use the resulting cloth to create gauze in the crafting menu to stem bleeding with, however cloth alone can be used to less of a degree in emergencys. 
-<Box> 
-<GuideEntityEmbed Entity="Gauze"/> 
-<GuideEntityEmbed Entity="MaterialCloth"/> 
-</Box> 
+
+<Box>
+  <GuideEntityEmbed Entity="Gauze"/>
+  <GuideEntityEmbed Entity="MaterialCloth"/>
+</Box>
+
+## Other Various Tips
 - In lieu of an actual health analyzer, simply examining yourself and using the detailed examine is a good way to figure out what wounds you have. 
 - If going blind, carrots are another way to treat the issue (as they contain Oculine, the chemistry drug used to treat blindness) should they be available. 
 - Well-made meals (cooked food not from a vending machine) is generally much better for your overall health and can help heal smaller wounds more quickly. 

From 6a8892f930c476e715b2a5567e6a60bb915fb4b5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 23:01:50 +0000
Subject: [PATCH 377/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c0130a9015e1..c9b2aa7b89fe 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fix some shuttle console stuff surrounding the Map screen.
-    type: Fix
-  id: 6203
-  time: '2024-03-22T01:57:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26305
 - author: nikthechampiongr
   changes:
   - message: You can now move again if you stop being pulled while in cuffs.
@@ -3850,3 +3843,11 @@
   id: 6702
   time: '2024-06-08T18:48:09.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28734
+- author: UBlueberry
+  changes:
+  - message: The guidebook has been heavily reorganized to improve convenience for
+      all types of users.
+    type: Tweak
+  id: 6703
+  time: '2024-06-08T23:00:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28603

From c061d9c2481c37bc04f9cc4a8be7775b6637c8a4 Mon Sep 17 00:00:00 2001
From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date: Sun, 9 Jun 2024 01:26:12 +0200
Subject: [PATCH 378/568] Add suffixes to excap survival boxes (#28755)

Update emergency.yml
---
 Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index de7ac62f4c41..7e89af3320cd 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -22,6 +22,7 @@
   parent: BoxCardboard
   id: BoxSurvivalEngineering
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+  suffix: Engineering
   components:
   - type: StorageFill
     contents:
@@ -106,6 +107,7 @@
   parent: BoxCardboard
   id: BoxSurvivalSyndicate
   description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+  suffix: Syndicate
   components:
   - type: StorageFill
     contents:

From 182fe2993fe069db69b9bc976e5e64327405a1a8 Mon Sep 17 00:00:00 2001
From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Date: Sun, 9 Jun 2024 01:29:51 +0200
Subject: [PATCH 379/568] Add Jani lobby background (#28724)

* Add jani lobby background

* Actually make new lobby screen functional

* Fix license
---
 Resources/Prototypes/lobbyscreens.yml          |   6 +++++-
 .../Textures/LobbyScreens/attributions.yml     |   5 +++++
 .../Textures/LobbyScreens/janishootout.webp    | Bin 0 -> 201216 bytes
 .../LobbyScreens/janishootout.webp.yml         |   2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/LobbyScreens/janishootout.webp
 create mode 100644 Resources/Textures/LobbyScreens/janishootout.webp.yml

diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index decee65b2436..e83cfaf4854e 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -44,4 +44,8 @@
 
 - type: lobbyBackground
   id: JustAWeekAway
-  background: /Textures/LobbyScreens/justaweekaway.webp
\ No newline at end of file
+  background: /Textures/LobbyScreens/justaweekaway.webp
+
+- type: lobbyBackground
+  id: JaniShootout
+  background: /Textures/LobbyScreens/janishootout.webp
\ No newline at end of file
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index 1e35162cbfb3..52a3ee77731d 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -46,4 +46,9 @@
 - files: ["justaweekaway.webp"]
   license: "CC-BY-SA-3.0"
   copyright: "plantyfern on discord"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["janishootout.webp"]
+  license: "CC0-1.0"
+  copyright: "psychpsyo on Github/Twitter"
   source: "https://github.com/space-wizards/space-station-14"
\ No newline at end of file
diff --git a/Resources/Textures/LobbyScreens/janishootout.webp b/Resources/Textures/LobbyScreens/janishootout.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5dbca0a8cd1a7d8d0659ed24a94e1d811376011b
GIT binary patch
literal 201216
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%0A&exM}CgZ0w;IT|vi?
zS~_v_Ix15Hr^SUDxsq%fyZ?J5i85ZNakPIS#(B;v7tE)ek(Oe0P={<xN8$cc`W>H{
zM{DCfo;$n#QV*kBbS*oq%ae;H3RZxrKD)EpUN!uF#FMTC{NsQ~XO^v9U?uu4@}=h#
z1mDbEcz6|~8C*Rw5MZ!4`p2j<Ix#&F$(x0G3_?9^aXA9I7dB6C@Dodagbhze(E%-Q
zm4N*H$`>$@>-I&0DGl19lT~*w223&1Sg9u^z^og$cj9>abpT_{%-LqM70U!C7ZDL8
zWT%`KI>)Fx#RDRM*)IRjW3^3r?+Tn5&2%>#t6?T!LdoYh=uApTE<F>>EL^?53B0Rz
zsTs)Jh^&0r0^7G5fVwWq(gIhI%}X(fxf&mjT4*a9BZ%?qfhEodB{g}|anQ@g$9rLi
zi}MbUV<a@CkMLAqU0Zbm`sKM&Hn5au3aZGRtTa826aAa6Ea(KrqiR&nI4ivQlR@i?
z=OD9d814VeIDkR7iRriXxItH`ohd+H*pz3dk@Md#uh?6QW-KoytJujtU{OI$gvq!H
z_eOQ_t_H~JJjvyyRLdh#U`VmIYwDA3ij3|%OFgc69Dgp4C!P5qNwJ%hKNTCfIY6%6
z5)O00?j;rznwZhrz}^~*B$aaR9vdg@_7Rt~{Lp$8`qL~p^jWk6naZZ0#Hvx6#Nt;W
zA<<4dUIme4)k}R6L~Yc9Lvtm_rz<V4hZOS47^Rdnd;po~-&sNYMU<LS0AoSGK({(x
zNiw|!k^9LI&=@xm;bQ_=Sb(RbUFZo@PI1i8^<*j2KA<}^#^GN*Mx=CYzcAx|4xGGr
zhrR$AS2t;1A&$@JUO0T+DuOi8#J(}$)9m{+Xz@p18~xnbxemOP$OonJIz-T+x87(x
zYpZs74fqxV+jqvy1ECo;9Zu1Brf;TBn`jMZ)ru;k2|N|lcF;Id)Y`Tm54HyEpZ2e3
z0_UnSJv^m7d_H2IOl5G&$C9?yO@aL;cC7OOLEWqGwBE|xCijFnE5$Y?T7D~Jk#k8i
zr2z&IP?sTt<7zA_3|Milk$56l0K0>j>#@rsLPw=oDoh5eK8EXY6m857PZp+}^7=0?
zW*iz9Gl(F95^rr8#a2M3>eIeYFQGaW>SgTu?SSIS?@)qogY)4<a+6bD;h0L4)iL<u
z!qa;&0*&>URPMUnBl_J{ARSre2DBYBsXUU}FuLAe?g_SPMPodnCh@D8(EOeLw!3ip
zV2LF8IsV?2i`%SL6Dh1R+%oLVl!hvEI;?)_JiSyZ8&;f5;zA3e{Y7&$jiw_v4!3qI
zh&?%2^A|j8YI|7CLsM+W{90OWw&28t9RRmMvlc|~S@Qg&3HUobCT^k*reD^q$n%a_
zHykqmT_LgHRpzBB=^cOrY~e07JK?J{bLJN_<Hz$VC1z_^8aV~?t)-b87c*jqe`zyo
zGRt7&kGV7&ip|r5`u+u>hCm1F<St{w*bJa%s7!*DAXH*SzdIinvF|=qbF{Q=4iBNA
zKp^3wx}aVR0y5+3jvXZiy<!=1bfPnke>O7bF)?|*y`b94AZovz+S-&~cveF_a6aab
zN~33L>;~v&f1#+iJus*U3yQTfdban%B|n{qD9mU`!3C!997f2h0ad!Xy~jem(ZOt9
z2R;(PO2KVhLW1RzEOpRX3sMc15TTAMm3^udb2h0S?RB^aQK0TTV!89852vNGLVoc!
z@It(5xSi5{0~s$JlL#N0ii`-zY_*>%AnSWx`j-`G@T&KFTvn}m?XSb6vXZ3C=&;D>
zw8!^tD1y5cVSgk=8xRgfjd8JsQlpHD(-8??C^Dt0>Zu?BD-<-m*O<mlIl8is%@b3K
zf?=;UvzRn?oUDgTVwYI>JwX<F^8_jh;o3q#ALdj>0p-vd^YFg&h5m4@*B;H-K)f*+
zkk|*85||}MqZkukB$i{Yl%N{FI?Okei6Z%HA#k@HSi=X4CMKQ0ytA`t#K3JX7Etq(
zinhHp{9n@P^MV=K&*E`>%iy>2x!Buo2afE+ji7>vF%zP6h}3!+i|`B+;1{&==M$}@
zQ!62}W=;qSmciptk(b<;QUf`WO>;h#av?eCjmouZaA25oWK;cvFhO9cx8;f6F}{ni
zdLd5%^c#zPx|H55i8H@98t%v(2Zp*VLR&~I^yrlnF{8#;sd@rLnI@<Z;GF$f;J!5G
z%5~FR2}VGMr)cU*qHV~yrHs=M7rpq##AMj~pfIg$oASL0T9|j;M1hQJ7Xznh4LaLu
zUujw)t1i3fGeN3mPyCKs=}SkmD`lBf=zaX<#75_?|4!G*v<#_gZ{G900EQL}%bllB
z1I&reIT()KpxC^Bld>B7XZGCma6&5K^5kbTjU3?KAGFMMKPP}S0|Ds`Td-oxH)F+{
z(4N?;4&1`9oI;Q8tM|e2J+-RA1Fjc#pl7E&19hC<Dr(4=31IHY^_x-Ld>=V!?=nKb
zHBp1vPV`)fz_>Un-A-PXDH>Zs{sPe2;1<e4N!|<g6Ln{CUhHVv46(7<LA*(2@yQxi
zHSn`|xILR<B8*Hi&{%O?JP2|N{*uMi0BIVPYh{$BRIKJ3s@*^SY{>hy)}jR~gkaP7
zK}S#pAd_0V4FX#n>NH3JI_j<xDl-SC+Sj5!h;BfR@6r!QD9H~x4)c+zYLj4LRtx;S
zA3wVFBDmkjvC2txTk$bK_z74+@eFe@nL?IwU0nT~=@h3nP?KR0_b|GeQwQQ&e@h}W
z@#dYTt)R&%P-lm=F~490(GVnPb@oAdzV#08CaVkX<pRKz_U^86HyTnT;jR=7cskPk
z|9XKt7;ItIoSt&@J-usTxM|8P$^@NbFZ)zfYX%}-27K(+180X+ouJY`z)$KvAeROD
z@{IN;Pj!(@!wQAgtpMMFdgLT}12xkIVSXW!Mj(>{sY2Z(i6YI2<Yqv3L6Y^mXly+n
zVSe$fE9i#=dxBGM6Y5{{uOu>7MA1s5kuc0HToHARvy|65r#VRmDQX;T>gY>!R;VRd
z{;B22+5QV1&oyiha<*v?8maarV7=T<by9rYrP|XcpfaUSDf15+1!=+NGj|`U9Ya*R
z(wZlOT%!AO^Zk4^4=-;po$UMh??+Xvr%TJcde164JKgH$qu^gn|MXizeW>+ybO%0y
zs<9NSpigN<(xXAza&+srp<B9+b{p<^NoBw-&IM-!-oXx}*(WE#9&4|ZDkW|S^Im;>
z3U?bN4BtLj71)r1<A_hQ+iy|fgGmr}@8-2flGbG7?2NP&VNL6AjEJj9CufM6a<raL
zV|HC94YA32F)?!yj-!t|?ww<=q7Z;trav-FxKaBCG6~)mXAU4Cw*L*Jy#{PWz|=LA
z@6Pod0Wp0os0%;<BCjCY-%w7=cZ+#v<lhX9Sfu1ftJx?dW|dxu;vRA<7^;<~v{7@>
z3#u|Mkpjg0@T>v~=^u&E8R$USlCP}9X*rX0<D8?8@HI``7nAVO=_W(#9~cw2VZpR>
z>lQ2SW2;*&X3sDBe`8HX-%F4Uz#q>C{CT18#$1dyCFXy=w~>E}FMZK+8|cbn1wa)9
zuhwWQLP`SJqzzGB^ycx_MWXPma;dvqp@e@o7c*{all6A{;C*$&rI`c3<HK*Idl;dk
zrIZt&a35ZoIW=147QxeGOGf=*?Yh)ueP29!km~i$gQz-)LEU-3FpuOLFAz8j2RuTZ
z_Ah}#PD>dz<Q#rOX2}f)7tpiihGXLngKlNZ%BRf*m{QM)8d4IX$=}O~k`l1tdoFfX
z!GAJ~CDh3^+ED^G9V^ZsBFUrNzJz@BP=7As9Z|XiJ-^r3GSOz4ao`VcxUs!}j_C7i
zRV??iwz6{N2k|~b@XKo1r6fSYre+?v47~RlFikagf%ZIDG><`)2Q@1EF+^SUp%Zr@
zzJZ(l&`9ZC=DEp7<J7!WSHVvSy{|pUJ{@u^(BUbQmwCRxTVZ25T{QxFDWhE5m)vgn
z#%W7_?6Fq;)k+_D?Pf3-voL5+21zE0%2f>`G2Ivg;@BOqjzd=X=TU*M8la{ZBYRxK
z^pMPB0cFZc;Wb$5U@)*D<?`hP+`Z(JF({lN{I+F=2sXrKC^FZ?4MkV$in8k9nWaX4
zYiv+WH|$RTxVcg*SD3Nz1e1kG$<jf3!Q_}QlMpJpE<hYNEyDZ_NwFW7>ZYudF9M~5
z+PPKL1Ggqv)d(GY!+5+3z1pb;28uciS@|@}>&J55$PB?vCJR8FJ`XxmBnNLFWZ-Ky
zAS^;LdEaAe{Z_MGSm3)Zx1%GzmWk2!&ICKMx8$nX6mL%edgjsj?sRG<39ndX=*}ff
z-?{8;R9Y1ke{S<n?OTL>i5lqqWq;mKR+;9Vr*hsYGf`iG2pg@bAqf*BefR_K^AN65
zFMhuPEKp_JVOUUUPzB_H@(N}&IvscNh^52urDt{DyqT4!ilFx<gB!t(1D0UxlL;KZ
zudJ?KB4I6V!lRd5(C#;Kxr9IeNla#WP$NnFfC;M?HsVa_+%}TWFjG?N!9YmXOj;+q
zy|Ixx{WPYt{o!b*t3$ojP-kH?{b<4}#^_438W#sePexV5giTVa(kPClKv$p&go^6q
zl4ihe9iB%27^zYlF1Ms%@*u?_BOq)b=PK;iyl|;{+u^qhmDq`w_i|m7wRP@$NqbeC
zr_g0$pg9QKiE`AfFI@EGT5l07uVktEQ9;RC>Y}+L4G4-U9rb?d^iH#=B%)sz86?Pz
z@tS<5VaA>Zf_^DK-#1he-)`p{fGGy?`I_XEtBnTh>Py^gIo!7zU`uBn$*z60Dzv_)
z&C6)08LCl_SdR9V2_AbpVPLff?x4GyxtCg$jE@8PD&|+^ER4H(3$dKmrUEZR3i!A<
zrgN9{-OonPATF9Z&sic{7?9)U(mTtqS&!ab9bhPg9F5W4IK%?Oh);g3Me=>Ly1r};
zgt|a0M3i>MsF?(tL`}b33IJ`Cz*kx0OAFC7y*)c8Pya4AMua6;2bq;kubi#*h^aEp
zwqD{$87d(qb)ullw0jy?1Ru!^vX6sq1Thb#7bc!bDP&`|lB1{044yD5@xCIb!Ae5Y
z7h!@)4OpP-ZelW)N^g!=K<VB|RN?zaI=~hxdykp?5|HCnMb{S-m!kkYX!FEln=Dm=
zY0~7y9_F8}usuv-lz2xRt4i(}2*-De6*VxJ!-**1>UGZ0jqMK`=>Ty)28%F+olBk0
ztf(mF>b{XuXLy;)jJ$_Ww;&8Mdy}LTTTK<=oX@^~c`4Z67|R008r&_|&4%9cRGP@K
znD~LnhZ2vINK9_}FxD+6cuk!C!3y^}%hg`sspP;&5&DAl@@74b6txl~oy$%7Ch~q_
ze%Xa=o=Yc%=;aVp9<U36VO+Y_;)*=P-~WBO*~SDkWUMtxhvc5huQfl8W^a$Z8(Q)3
zfJ$Y$MdgV9U1F}XV91$l#%D46W<deZd6|BijBcsvVTA(l%QP-e$5|#Hvq`$BdeHN;
z^^dyc3F9EXIGC^|M5bZ|!n7LKj1MM!{5MN?7#%2?T4}4Nd=kS*E}{eA5^qbKK|VaB
z1o0R}{Lxq45LE?ILmj4Y>J4zm$&)5~@Lk%OSqw!uuf?vwlTy{xgV_q*Q5mciJ3mY#
z$5ZYY$>^fT6uf@1Gu<-1$(s)wVuU_KF%Q8!J(|;Z-9@1%!yO$LEHQh3lU6qn!?K6V
z$2|gET7$fZc;(RziFDI4q#~Zi?#cY_{=WJ@?!;aXY#IakyLB@j|FM*8aAsa!5v)z>
zel}HuGMpBN`tBr!*~$8Nw}^0|_K4e%Bz+|UoO>9}KYV|n)=itPm&G9)2taUOz_<%X
zlpQ!%21P%yU1**HWR9`9I*W7I(KRO&_)f-LWilD^5>f%csA8lWDCJ92dAYjj{rsx|
zjd%?@uP<Wgrthtdv(`ycqIMQM<r%ECH4LVe$LQBuT}E_}U=Q42bg5rPmBQNU=OQNz
zVW&;4$9&zSdO^QF_AU|UxU2t!xTFjL@;pnP*O$$gRxR$7OVYz_`8?^;9b$@t<dj!!
z`I)K~QL^1rlGs+I)y2o4RnD(cjkU@mH}ntD6t$$*;O(l&cM9)*<(!5U(`#>-W=J6<
zf@Tb@zTWE`Gwfln9^YWi26BZ%mNKGf1?cSNQr58TBdwaR*mnvGHsiZjGZEe139d32
z=elo{E3UmEjrD&lo$<}2I9?5D4UK8s4Ey>JNslSs`1EPM{HI8vn_BiyDv;(4`voSz
zod^D^BO2Vc&8h3)<vPLHiEG=*0c?uQKu9RLU^~s)PY?RJ>7WNM1QqV5NwY>AaZ#vU
z0Sv!HZZP%{IOFCsFXnf0DwOOeeKYQyOo0@?xYattBxmL8q`iJOrlYRyjSO<5SGaRX
z{`adO)~<&5tX$8aD#<nLIF$%RtrtB_omL*&YD((Xo*|&7d}XtRK}+x{y*Ltw*SIU>
zEtp9Sk%o+g5AEtj#>@R=L59$4(i4p52w7`?drB-JOv$L5+irUBLU<enQnXKbdAgcS
z!8}5kDd%?^HvJu3QH4ssLZ!e1n7Sy&+Xbj6#FOYN#8Nl()GM1}i<ZBybXRZ+)Zp`X
z1OOhpXg~r0z?>)tXagQxA6+n2oN0%Ve$Sr8*^etE&qNRhxe;0V>`+xU>^HV(mg=(%
z)?#L3P9<AqX#Fyfs@UOCNRNu@@D=UTqkyFh!|Gq-eHCqE$Wc3rKz9@H7ke37V7JXE
zSiT&y&mFJp(U=`cn)|QWr<XEsI}>i$y^vn{Y;~fIjJ{7;=*19zeRL~SrOmtSZ8Zt2
zwKyPMx0?tCZV(B<1anu}z4DQg(^Nk*Fn{L(82{ytoJKgH-SqI_{De|LdkI*&H9224
zVmJ_>>=n5QN+EMSiP3916zqr0Eh(gXGP~H+FkGk>z_ng%Pm&(QiP9Ddeox&Pl6V@+
zWVNEPo`9gI*ex#`J_wt=znbZ!faq2CL<y4B?DaTHsT?lM)Z+R#XILeik(c`v^F7L!
zO^Xol_t3!O_bu*awrE_FZQ>(8TZTXERzd7_%aI(%4N<Qm!1DqFosAiHn%#gthJQH$
zbm|#Zl`hPCQ!L~EZyxgy8DpH9n=R)p?Zwb?G{|CEvDEC-o$C1WCMKw&&ApA|;ros-
zZsEAeEOZRtE;GNRgyk*LcBA+b4)}JuuCavq#l*9F3bVU&2{LH_6v&$61)oX*DUWjP
z1f;g0PwaZKTV3N*krlr+lqH^3v1P0bvH#3JcTa6tK~Opvdxpvgd8GG2Xjy)x=;Ois
zn$^RDuiH>VP!O>O!E@B=t#8O{+G@%+Nyo)_78D)Q4~yTKZ!TiRR)>3F&}n#DHrYk|
zokz25|0^{N)7m`j)P=@S-WeoOieAw7&r96!4=6DR&wKylJnJFushwKOSwrd1!ei)A
z%qkY#Ux|5Tn!dS{Fw@p&LA=ytzU_H-ILm&YfN>9c!al`Wd;yYB$|%={u8gH(=Pjoz
z>{?`#i>(G<3mF$D;FtXFcn|7&zo$gY;5M|f3ZbH@Vzssc_pm0vF`;6LWiCHr$V_fY
zK6MscSG7IwD5lvm{g>-E#Hl|N>0Ch;R;qY&LV~pfaJUMbmN}##N+P07^mhLuag%X(
zM8&w>*%z3`dZz@thW2lwjncdjrIq{L?CT6JYA=dWJxQ*C(chrX6n{_;Cm7eLhLYKB
zmYRvC0Sy`X=?Bj<H<J@tKqcSi?}`?hY<9(~R9sy`_ZS}d#$k>X(d+sl*8d8mLmw;m
z<T-@JD%0ad6%eZmDK=2Z=M=3#Fnc6HJS5Ki?VV55<`qt^V5r9Quc2@9X#M*ibX@eM
z&g{#u6jT!O;Wf>1MsC#}k_<U`Wl1rpV_%<bnRT1V&kGh!2XeU6AjkSCj8;fSQMz48
zo=Cmmf1*o^7aK4@b;QSTYqJnPMH2ZKNT}=cb=-R@b<*u=4w;UXp8@ZSwUR<4(}-em
zn}D+vLDH)vs?i&{X_=a!ZU+;c<M>MdD+2DaS(^~X`Uo?{j?N<L=cF=wuz}JQ!4;ZW
z>ghAU`AislUO^6d*TEWpyh}#T3d=r7O^S%-6CJzZpr!j@hQagh&Q}W>4%eT$Paxlf
zX6xqV($F1y@afMEJlvGI)?}wvl=VE~_@Rz+LSr;!pw7HeAiStRdwjSoI|u>i+}bY5
z<H$Qnev{S&%&aP_rXG8VAS9zgEihyxy%F;Z!AC$SW&vLQ1Wzw?Uqa9T<idob1LY_q
z!HWF6qw8Zm*SoQDNYIsMcs+_8Hh`bVOC~lwCKwMwxC#r4DH?Nd<ki2R^HqldZ2L&j
z)?cn|=W_?0fng<iAN01+l$PCw=4Kd;`<XeF_8?mwA=p#~+^DYVX%Qr;0ldUn&)Sq^
zc4aQe9@+O5te&vM&^Gpl$40+GQ5*@}V@@0s-Hr94+#yL7&Oznj{98?24JYuW-$j}~
zO>0sz075mkc81)bx(wG1sUE5C58m-gvjJTqg({91dsCo)uxnY}uP=`jaafFZ2k!G8
z$ifr4ZU&MEEe~6xa(3LAkYGgJ@ijf`B6X~aVbx?P5-F_V;xrRl%kl#jF;kqMSY6u{
zxfvLY<AW6dsZ?$(&-^SS!IzrXZI%-t9f-y@1JsW|k0TuvIoABZ&S~tXhvUkO=z%?j
z?E!~cVwP-$aHVONM9r%dM_oADAkB?6al}~iRJ5-}OufqmR^zXS)oiaWn?$O1O!76q
zm2amSmT1VzN;Bw$^qsPwBKkHVE>Led`M%x1*Oz!ENp!71$Ok%vt4GvehVvzMn=mrV
z#bIwYmMQQ9Avdgip9E3t9*MrEB=bw$x$t|J>af6|V(-iQI4u1y>+fUjr*&wz1~!BA
z#>oA{kzoXp%HG70mi4J6XhBmFCM?4*QtK&zqH_HG=WNv3>a_`UfooEY%9DaIcl?}O
zkZt?-={Nkqp2e6A?yxB=M~<M|*w<!ay=UpKA#lK@IjNts%T|f9KmkkYelGb=aw~HK
z8YI`2b`Vr@e2=fCPaw_6wg*+-s{{7>{=Txi5NAG-zu-$SK5ze5N$CfXEj4mb&mA2s
zX(|=aEW-HN4ntuMwYXBQ9MsFog4(=m>_ffn`vK5eonAjsUdP(X8Kb=vvjQqd4!(#g
zL)}*nO#iycVHdzstgDqChAFKq@)*Lz6<gdat1kpM^Jo?iDn!Q<)2`qJ<`_tI*%b_H
z7_2WeTDzPM@BwaMn6@?%jkzkLne_DlF6l*AixiphF=}vu+Pn2yDMDI<TjyTtcZ+X6
z!?XhkzMwQBl|4F@1i?7^bpPot+0R|(;f4p&p+!qATLdd$?AQ&2O8>Bau0${Nsph1;
z0r(r0CsQH^B^JO0UiO>GwKnet{JsU}D<r^T=Xm102<?1+{~R<KD<vb|=fH!<G_g<6
z$V@TMT2<|zDyr@|RnE)8dhVbgYXRH~XDC^}+`WTjL5i=3$l;RXs=vI@0aP$Wz17Uf
zvVc(vZ{*yk-V_(e!n(&8ltZl|h}g1RDvrp~WFKQfl2eW(e*%Jx&vbmGIdp0#F-tRH
zHA5ev`>#K=xd5H|sy=V&mohQe`-Bzbne{iI+Vl>=cEoc~QZlqVH?}Nj{NWKA7E-Jq
z#pQRr9hX_{4%rtsb7Anj?x{D*L1~nCdYA><=@wepE;hubV(u|vqc;xDf^Z5EmgCj0
zKTTDJu)hweV*@HmvW`w&DK}wBLQN3VbK_l^Np;78ze-P`#q>zE$*QacIpdA-^FCv~
zWY=LsiHDUk?1FP|+cz5kw%s22&onn<+nT2;ceuK)DVa*n1zy8r%rTzwT}4E4olQ2-
zO){z(63QNa^EdEU6wT6{JhN2e9VZ7^qW@3|^6O8RVdeB4ym(o7x5-dBUcu*LaN{K1
zE^5a9#oK2Z+GnsCg0nhzFY<1sw~@#%Z+~mR?J8S%&bNWVwu`}T#;dT(V2dxAf%nSp
z4QYfBLc;>^C&7N5x`$q8)mZ+U#vQgtLpSlaRhk~2Qw(Y4Eetky)H8timsts%`axSa
zQeNH!cq`+X^6YZ$-bNqr0l??wRY@LB80r$x4Q+?<-(j!Rd7e=BT|t_>FC0cn0C`AE
zSRC4R8HU>}B^lJpWs{X6R^#QcmV9ad4Y3hJN3nP9*Jp_i#adw0olP!fDBhh?IZcyb
zjR}Ti4|-IoFo-i$KUoPJXNXVw^YDJ$^>_zPQ@2c`qvEf-i%2`jX8wIh>ANV2ZBk62
z0D0B8u#-#fG}&DW<Uz0%)XO)R%9l2Qzz!?m%MnGM3V!mJ4a+})huH+KqISH~zQZT=
zKVWk|l82edx?WU@=IoMa$Ld<$zKjhF<^c4lIjAiz@AFcdD$ix--bwuz<@1XBFELmW
zLG36uVL2n&L1wKA!?<i-42n-LCs3)gWVdN9NXcnRGGH9vC~mr19Q83IN1<!?aJrEK
zMj#8D1q@`%B^jT+V_(wk(vA|NMba=kKY78Ibf?<pp1Nm`Y}*`VqQ=GNC^{AD>{gD`
zw{`C_Q^#)X;j2uoy>-i573Ozf1qK(l0b=ENPc<9`qC{1earb<s*m@$Ryr$yfxRqSn
zd<_HEs7YZyf4}}!udb8AwJVhUmx>j10F0fK98NPXQ$iL!5&Dc!(-5qwE<5r$D>nqp
z5XXQd>uQ&}{qDbgMDpP<ENhA?u-}~+ROK835oeTNaYhHS(wy-J8?&RWm!a|J+@9++
zdm4rU#sH?@hrOfyo-<#hvO&xWa&=Mv$?>)l{WrKOg<?0&wMr0of?1wX$^$*nwHGl_
zZfZSdh`MnB^-#bXgY(y5s^N4fZym`(8xuL<Lo`0`tVX9u!JM-)*h5VnReyg^z$$4G
z4_P(Xb1|;;micCVu2bgXI|q?dUN^E+cC2O$;qbB@PW;xpSJnPVblSK*S2HPdU}vT2
z?fzn5xO7_cN@x7+Q7LAfaq1_PlD`Go9cWt4jadQO{rb-3*1#PsxFX_)N?$;W@IM56
zZpD))*rZgyYH4XyNZcSKDhE-=SQbIkylt1c2olDIp8sjFOF%w6_attHGPhKhjK`-5
z^UEoa!U}}h^Zq-5D`X=xTj>C&gEm)zaN4W?Z>r&`7v=Z=H{s{$#Dh#&8ygDe*AI9w
zYo?zELBE5agvdDzlNSHT5lknfC6>B(kG`PpziGb+5Wg(NA|&z7vu6E`$*i8X{6nB>
z7(FP!)y0-NvBb6=JIG)fm9wv>8f&CO+{QLWFh1#Lz>X700&9W|ZyX;!;JC)Rm%9Tw
zguVWUE=fSmgcR<R<iLa~O#M0y^Y->f&#c$rkk)vUF~o563<+h+d=UDtUtjL#WKh^1
z1_eD<PTQf`LO=96?y!o9T}bCx6Qv?~1Ik~jbJx3h2R>sIza0Knpdd4JEX1wjqzq2}
zLoFde_yPgH3oAwLEi>vNF1G@rW{>s3h2Y?|>R^-}9b`}v$gU}Z4Fb9Cyp4mQ1uj_G
zrKLd!rRs!FEWv@C2z@#jU%}0!1;eqrGo(Ut&1>i2U-YPF$r8xThvqX{S+Z?p!)w>q
z&px{GhRz9$zCW$qSbrhJGw?jyF|ORwW}r@y2p*|L=Oje>39m=@1p!p)@qRSa0_dyb
z4)0y$h;CXDp+F@9KK-RF6936Dt0)8FW+qX@nDFe*Va~vcixwT@naoE@)ZU1PQcL8Z
z6@sH(Iik3W_l(x>%|eyFu(x3{=;i^5#S*ryw-)xIa%%VG_uXF91+i$jc>a{lKKJlX
z3Hey6p`cPKb%Z_eB|7B$qps`g#A-P3i<F!Zn;z-!>{O|B=o2xcv2Bekc(;rIQ8hP_
zuB$!`1HVf?R!Y|CPA!&WFt`5BDlPsY_j4oNztMaGW_=f(6@`p3xdxy>{ChhYSKeMO
z1fCfjNnhFU6mbeRVR|F;!j_aztR!W1VFa<L4z~f4oW*;Et;X$fFRXH~FDJahJw0U2
zo(v%6pO2n&NTid58r!5~R>JTQywB`<h$FKdW?i2Bl&x1S->}o}j?8j(j(r~AvBSkR
zBTt=@^8}>hR8%bnw*IXAa7Q^}j}kG6`SG(WoLb^>h=G9~JQhXmy))^LZ4Ig4P!0i#
z*Twz0>|6(KjDbIL`x%nsif_TzWxRsX<HOrd3RNIFSxE)VIKS;R8PwAB_5h~)%LB2&
z+S?j4%W;+Mi=>L`4dfD588%pqQOOrwK}y|P(~L;{7X#h;<Kvi{#YlX4Eow<xr^Qo(
zEKRwg**qPWjK<FvBE)1xp<+B|gVj-s7I(l4b}Ye=o5?C8mQr0fp4<vsW(-J&N0?({
z*<v<{GUe?en6HlLwWmj|mZp{ecRM1iRAp>|N0LHtNEtA2oB^>-KS+uYHw-cNlBFV0
zS8NPPqdbN@*3LhzXk+j6)Df)C=+ZF}Vt-f<l~_HbY)2fd!XGTy>^(3C2*d3cl>Y<z
zf%6rVm21|S<iGEB{*IKP4Cqsr_pLdZ79>cCT*&oL(}ZLood2<=jlr^*SA~6M;t-bL
z1L)em7r)8NQCWWg0N#zYQed-(D4TJN0+1gj-O3HiOc$4$Fr3gA)%Be!@?-%k--<Z$
zcaZAFi%~0TY)cI^dP{$(JaHCsC<w0VBC}gj@04SB!gC!^tX<8iO)hR3|BSanpW_|>
zQ}43MHNJLd+%-l$`L~8Pvk&&Hh_>+veFjSsbLNYs$(pIseml=q6g;20N?bMh_N`W<
z#Hyx%4uXohL8i%?i%YiTHw=KJ(yxvJ56c0oXTrYlU792vj|z7m@A%g%e`kGyJ^j#Q
zYtp)^-k$L+-pS{?9o^VAcZ7KYkBw};&2O#>^7+>R1Av?74(la%nXp7`6{y-{U)a1L
zO}Sf|2;SnS;B%gS)s37Z_<)STeZ)McX+oRPwFc`F&H2$MCsI@pAmZqPyR=Zy8g!zJ
zHjVr>M=Yt@`wcsO5i9v@V<_ko^f$u%#%onwZw2ZpQ(5ZQUhHvmtqfW5>sxOAVR48M
z?O5oUtCrA_FR<<$a!8$)D@g780jY8bP-S6+OK(N)97UV#b`E((MxJ`u-TXHIi>~LL
z+&4mq%`K>`t&SlR(G$G$+Cz@z@C{xK0U1W#@o31&*Cx?TK#!vh2q}O70Bo3i>Z0?~
zJ?@XB5wVwJ4TjTQw@W2x`_<7-9V|SE=&8d1>6IugdzvckXdjDwnj&smNQVDP7YFr(
zJRC%v*yvm_I?vlONW>%utdgC9W=thL!;rJ_HqH}L<pgSM-Zti{LcX`{yrymUSc^`+
z0b7U1S!V^#ke*E~CLNO5fo(Y)S{5)nygCj*0xori%9^^%(kFb$0tLuf%%R+b72p(b
zL;Jfq9c?lDusdmo4qE3WTNLJ3L#Pa4i&r%CW6x@W%z<K$2ai<ktM$7v-K=$o9W#iC
z468kt$+p3oH|m^9hVUk)cx{M6eRR35get<2U)l(RaIO84T4e>xT}S?j!imA=nUowy
z^MJU=aM@yY<SNu=`&q5L<HETx$y}frvxqt%b}U9G4Ux^rkBRS?Via8fqTBON0*JPC
z{VxBsg|OYYcF%3*8T(vNxl&n2C1R=|e^}Its0&-4)&4f#6T8pl!<$Is3##WnH=+2*
z_mjWK79C%iv_$ckJ#AEEv`g`+O+DDjY#zquKD$|d9`;GbS;NtqpAt0zBIVJc!Ui_m
z9nuB%t!|2%w8pHTTr;$SAyqp<AZ=N)3D>v_5D_?7^L#uVlTl}#Xjq{oA*Kmm6;jt)
z$5LAl=^r}>DzLRhiU{3$dl<q=dI^q7Y4v=@XgoMW4%q@~^xAbUL4JN-BSx~jYIN|<
z93)2Sa>gVBRjAApJwMdJ4f9Puxx&<`yIfTFM#KlECu;h)x%U}mvZz@ZxnLiM`0*?8
zgDkUJ>gJKKiOD3PXT7`syXEvsGkk9IFs0!eaas{NUR+$FQl=#{@*Vlg&gkwFOvvUH
zY53~j6rabU^RMR*5h3Z3O@RZo|5N$C2x2kASc0fwQ^KR4$C(mNRxRaAW=^AEM5V##
zvA=%^E?2@1;>hm4xadnaP}Jgs2Lh}ZXg&Opjmie-(H~oW8cwORdG5kUot1<_q0gHi
z2e#m+kuEUe3}m}QcVdVs0CcSh|F?6c10#~?{6slc=14DW=Ux(WsOaF)jwK`kg%plb
z^@YKhbrQ-Z3&HU*vPB7mDC+#o@R_5wz8XhVpG_Zp93y)fqqAeK((?0?6_@-(JKhy~
z3_~=LpI>IiH4kV(-MR)4Mmp&xmo}8bk^Bivj5Ji=A){pJs0`hmM=cbBnG}R}OzJ;K
z1FH#|qv`kO;z|{9vqlBlGaff=h+1kq`4=4<e-t}Xs?W~)L(s1ys6-=alk`_{6#p0L
zWlMa~wKC&+!OS_X_G9#y>nkMBj=~Nto{l+DdQh4na>~JgIS)nrm#{Vp_U8Y$B(sZ>
zx|XDcUIilF9}a)#i6YrLXLcLoeqQ35Ng+!!x^)BzbeuMCV7wqxiUrh@!lP?=WKWM(
z5O;ARKL^(y+WfhT*|5{c^oOI(0LB)ijO;=;CIO9x%GPdZv8o?e=gPJL{pIaa#I`8y
zDhJ~yUc(+@4iJAnB%rT6<Wt6ihWaBv_lNbS)i)2~F3nLfR5QP-#EGo+r2Vk=V;e}Q
zL5R}{3R9>O<&%==wW$Yt2Enl4TNiJK%j1tIdy>m%?#)A`Xx6jvh$!SYm4a}CDaJ5a
zow-tFS9Y=Ly*!fqPs$W+tXxaTGcyL#Ngbh>PHA>l6!u@LCKqtvE5E=$&;hDk#lu!5
z5TGYBqbHQG_}6p{+m9~y?ilclLV!xQ4ixL8wKmNc<C%g*u+(|L7G%$ra^D!;6jP1b
z5o*_x+i~>v{7u2)nN{H)?Sx3lFS8(scI$_VJWtOCfxE1q3r->>z93AzRI6*pT%xN%
zq6|AxvomX9GFNU#9ZiFRg~0=tCP2-_yfL5EOv_LZQe8l&>(%#ABY#gRnZaypX$b)P
z2!`FHBnZ9Nag+q;%__raWxlzG+AU;<LjFw%{c=EFm}A<R=UfDj;F@F3LHQTj>1Dcq
zfvU!=^o5e~ma-Nv1=Ynw<!?88d=(=8CkNGDwu5Gm0uG$9O8Z7+h)tt5@Alm*?t@H;
z*^p@xo>WK)bgPdfBf}JJa)B-K=F-b0dF<<98*8$?FkjvNM10q5X^WTuI(MigdK6Cv
zD(8mj`o}Hf9=m*(;(dh4CZN_YA^1Q8GOP~?&ox!EoXo?C$sOSguH)gewf4*#!hSHo
zwx|L6^>Q8+nK9;mn}2QA`&#(TNV+zYar{%SMh0s(0Ra^du2Khdm{sYI9jLqUm;z;)
z)}_R(*q;h)&bBQq^R)QaFZ7L()G=zSZf?#ExlKkZ=y${imsqDqP3QO*pt3Ic=p@nY
zq6cCb?9x4)JQlB{TvwOB5`AhZv=+*&uGbBH5`QRhjEnnCHw&c<DB5%c7?_|keiRP3
zy9>n!Uhum2iZRQ+H(U6r(zYQKcZbqYjy?_5s^GtbSp!R_=7}3DOn`Ts9Bg%=S2_Mz
z5Mc--sP}}W`v+eDD#l9q$^MH{nGh_)3X=9$45U8<&*+Ip^b(yf<~pN_$Rjwh*LE}Q
zLe?wVJ!{al=Z`bJ`gpb^a$B?<U@eNgSI>974ap)1K(P9LL$O@T8KNMPHG0BEcN#hI
zZmtYW#?+@*wA5auxpyOn38BwOV7DPud&g=yFkyW$>{-bam`CLE)B0DpWRo^jgz->o
zKI1$RNii{_tvbQ`nOj+-c5Us+$*<wkrq{n%|5`L9f5_0|vQ&LdsZ><Ozcf<}J*5u6
zDj}VOP%{tpRRA$S&cE4rNvyxz6SloY3!5ZxwNq9#{M3)MJPxZ@sx6w0DNdzFL6}!A
zq7{pI)59(4To*?^7AslVc@9LB)p6XAyXabobCj9M50O-xBZ**|-{$q{e?ic|oe3~q
z_T)mouhN>>J0O;gBM+&O$6B94ZwcZn)?fi^m8DaFZ=dw)?nuV6u`TXq3J_Y7z{vm9
zS*mB(z2m{2;xoQ7`t2{;^IXE7Za2^UB(s_lfMmT~Z|vCBwOVywf?Ah9<d!Cu7exWn
z^_|oKC6&>8PHFnTnjKswF``mj^Z+Lt9|>qtgwHt1ldb1Ib#Q-MxqJN@Y_y(sH5;mt
z;@K{XO54S@%sQk-a1OwC!_u)7DMHSp)Zwh~zf;R|+{miP_Pd4Fl?KNXLEYi{p}xve
zBG(x1e#)@dq-nH+9Q3&2qY)cOTKWc*|13)27a9#(LG<+|d4b=E!E=XF!U*|_3)aZS
zQ^BJ)y7QdJ8{UIkaxUK%)ApQ``#k7bg|Um_wQMZ^ia&@!n8XzXHV)yn&1c4dXag3E
zFGEATbBByzvJxm%wTxg5fyp-64J~7heE{NY#@Er88ND^(m%&MTsCZiM1a)cq)cM^#
z4yOiy;4FD2^LgnS#f}K@JM+^6r8@mi*!+=OUb?6DGg<k<M(|}NU<sr9jWhGFLz_Tc
ze>snr^?1|VbJ6NZTs^_lw6IC#N+_5DIl;pvU|`T#@w>=Vw<H3va!=c-xcBQ9Sl9(s
zjifcapv}o8a>u<vjD><{X#s~ButC<e&L?IZ9Tl~hd^>TBmBb?$v6G_dB1Ng{BnkbS
zm*9xOS$lcN%e2Q==w&VXBPw2;fK$5=c_KkV4OvqX3x%?xo<}!-MXFce<K%jmp~7wu
zanbScmagfTQ@}nSa1wOVb{D6U39%(AL(I!)+Y^nM7`cwvGeD<X#<@g^x>2gnAl$4u
zfQ|uj-`XlNX1Clc6qk*xgF67bunPlIwH+>1eJug4Gm8PT<Kxu-;nAU+V+Ez(Gc)My
zZwXcm_Cw-lKf02rJPBbSV|r%*1yb&nH30@19R-Y)7pS78#<(#&kPrdDR=fu-=fPyE
z2QPmrvwmzoFR!uIz^>_eeW{ruoB^YY(A1OKg$v^m8a{&gZ-{D?ECtFBe?S}|2Ska_
zL7C$XtVa*iS<0Ztfm0`eZ@w4tCJnWjETZH#g%)Go!|6n<0IZCo2#3_}>_MtGkZ3)Z
zoy-Iu%4L)tz#X&Gr00ZkK7x;S<Ufw%XTysl4p9JsBj>V%pD^s~)n49p#+cGBUC%R)
zCRy<c(4Qp`x0+QMxJQpn1EYD|)`FJg^hRbybwo)>jfd9D-X0fAfaW!uU);glC;`N^
z&;_r)d*0}sVULMU8C4|D2SgYe&p0NF9}}-g7JyjvezM&aY3TuvSkw-`MhrcV+NV{)
zUUbF#*{5cBb>;Y%v0_5nvORivExtM4#az--#9R9CbHe)1UG9ci?K|X!8V)~4AU*)B
z2%pI7rsHP8f;O(OuBA$2i@sV*7jg*+I$_<zf$Ip)RuDG@dwV!3Ay+cOO?@1Ovbzad
z`2`)(qHnP$_KhgnAb~9Tg*V-p4PK7Rdwj}cRLXeJq_dT{VMHA2i}Bsze9u`7RbDt`
zq0oJ|*`26!*<(Z6gUg#tU#6sbg^!c|jhtNsiQvuw!7l(dt!-2rz;v?ODmM89kr~C>
z)n7x|W+|0x^$A%@<-pSk4~a%-mTTO7krh)*#`9mba1;{_52nn>$T=5fs+}j#xYVzs
zYptTa4OTD5ZH&k_tfeSqq_FZh4G*qUszX{Dr0vNrin)|VtZx?@#1`UPup#?LQjP^B
zT>R-~GIp$$PgCgF*Rd*S1=S5h^L2QXD&8ve`o&#0cl|(e17*^Cb$wm&QGkK!rfGw?
zou#1A@%Cs(Ihwqrv6DzP6{;+S^9_df93|<{PhyB>y!^#s`(QLopK=_XUL4~qkSwus
z&YJ#M4x0(C+B^h3{kD1Ro<;32-gR_Lhs%G?Gep<8ZCuEiS4F^8&6ZXsUu5-n>NVos
zH;TsK6K^R1bh*_To2R3zJW{Yi&2LG_R$q18Wtsl!ZFj_Vg1dwKpD>k)Q0mJj&$vaU
zRV~BL(=u`BJdKlk?cx+Z2~yxwqb}gRp_bj$oebdq5q)TZn|Upkzy|AwaY7IwIw=pA
zV_;Xy9qNUf31q=jX;v-^7ddXYw5P{&&!NsJjWJD+8{8!9IXU4eP^70LwpUEyXw|CV
z<MGH&PBw`bH^~?3b#8~<Dp;l(H%)PXgLwfbT5L5sPYYc&jpk8W0DCMCf`$IMg;Qwn
z(|4YFD#Li>Daqy62w2#0qkTsjQOX!&Hb}!N#y@6G#y#091tNLS9MbgtExQ8v!LSFr
z(wd;&ddI_=<Gw$TXh%0rdVUTSLHWz7Npo`}G&+Ra3H+FfGb-E~$qdX>J(AFM4Y_MC
z!!hL{L$g{Q4I}S2DJh<-<&i|~y#PY)1#rk}lv@i$_?41_nGM$&AJNi90q|x1zolQV
zN)-pPNS0RibX~^pXk;$gsw%~)WSJgGwESedo-0h)^>4=zi$T33Ros`2i-&L4#<-t%
zj|;3Q&m_z)RBHUE)R2Hysyg8?pRd-$!@&8CqKm!W9her`B-{tw#6w{jMt6Rcgaj%n
zm+71SZv#1j+~sNrK9%gi_ravxDp44e_C4<MCv&3pFqUbe2ruc-Qx)e>h-m@p#+-5f
zOW=-2RA0KlFEHzj-xZ28qsTHz`2d_j>b^%v<hw`mkx*K54R7RSIkh7qku;d>5Gg==
zP~WM2oH@8bs<S){q4*FGL;7(Dgs~+K?bc7YbIj-<AN^wS*5zRt*nLNfsw-6He??>)
ztD(K-<PQqQg_@BxbJS?E+dRyg?+h(TK?w03yik?%_Tp!G4JAHJito?(;5Zf+K6_`m
z^CPYuT~8of!P)L0`%3Lde*HxATyM>W4B%>e=!~@a=m8F380vSd7=2WNeUBfGdtr~W
z8&keA?~Q^zjU%AAy{V0`<kPqI@nJ)-W;n~X(Rm@Fb22W=jgOJqc~TjIC@EnyB&d*P
zDW$AM(J&hGPEwV)bLWTN2{333D=lgI%GiT@l?i0a!?<Z_N$QBtZzr^&C%+PAFdGC4
zDVD1S9WmNqgOc_kST5=nrNI?Sb<4ir%rq6^$luL&qd|v723sA0LTE|i$+snf7YPLM
z4KZJ8><4d>tJZlknX-qi%9|(Y<~kMOBS0vE>&G)VQCqF6Dtl>ny&kH~Yb|<>p1Z?~
z-RSm0XlecFL+_%9mmFVw8I?}R|Cq=ctJ|4Y-*TdGHUA#F!A?=X75dbx0Um8TyADt<
z3iNWL5-k!Df<>_K5EKaD`%oEtUE_?*c1baZ)k0bp)I_uPXPK$=2pnAqx^LVFk~#|p
z0{{7^9d#A_?CkumQ`P>^-*tn>e>~ERUXePf3@!iw$C&><n!+GIi@BWykd1NF<?a!U
z@=)IY@n6hp%@C}(OT_zA5ufi0aw(~F-IHY}-H7Bg#B3CTsV;wr=23FzLvbLWv<oxJ
zC08TU-4i^X<}m$M4<pI1(z)37vkI>GN1}Y}iVezDhgM9~G&{^|Z$kkZ^r3BK{w49s
zqM7$u$1`35iEOXgBcTE9O=*DA2c~s;Y|KGJkJdo>RkN5{ez&2s3Q+ScxE`zSc8s7U
zL-69d#jAv3x+t^mnxgH>x2#R}req*}!8_YR$tP`*Pe|3%|9?K(+#kK<n3fog8sK-g
z8gsh+EDYJzxvTV*wPX=<!E*d)ga-!My&-D2_$QGrd+u^{I#TF;hxPtk$|rUBkU~li
zf?1}hYfY+n*Cuy}kE@GuMJCbUr?HzP=_cJmJ=Tq&n0HW2LKmIVD4QZLMby;6JO5x)
zS~cA_XKGf#^1><CJ?2gL+&TBfmhD>3yqVjOQImRCbqK&cSI-h0*nf2qi!0Z9#l8Bw
zp;@GFN~#%H@h1%Sh8=rULEsllf0LRh6y5IajO0UxMsJJK<}@-m<unSmF=C+@+cgh@
zZ;ksCNRP0#Qv<gNCtwU3a~h#7RQp6e0R7PM#ESes`kRDC3bUyV59nK|2vVn~`Q!Xl
zE(5uLzB0G<nMM}5k7!d*ze`u++u+Osm?{EdY^3dT1@Fz#*8%`5t#)4l3n;i@u%iA9
z6#?U#zkhQRFZMT$7ApNT|9@Hg*)7=Xn*~*c3<xyZgNC{gSfA124QU6ZKR)=<q=tGR
zBS-b?&ZrC1ji#bYkbrW<m3B(Kx;7@t`A|78)SWcMik6LPPOFDv^4Pb|icyC`WBVOX
z!yjMDKv>w6M)wlr%no{~8xsthQIIH^6k<uW`GNMla6n7&+eBJ0<wKTWaEU>=N+61+
zw93VvQ9YGAFq;N>d8$jXWQG3~-Fb48i9Ql&g}dWm_hi)9<~rnQJ}=K2^d<J}G)Atg
zU?}y|Fh82b@>XM!Pz1iY-+&h}srhz<tfV#KG%!P2&9O`-;)VH$?CT|(beCFgRj+L;
z^=|@<6yN7Ib@oC&j4{>7r3%4oJ1AU~b&@pml&|2gk!29WmyweA4$Iw`CRdNQ&y@fd
zz*?nzpip2%!9D=nZa2YCvF<8Mwr-jScfxQuDsfUi$ZmJ)3$tC;42GE;K(y)JX`ACe
zaERb*(S37UvM#BfLN~4v3Gd-%pS(Zmh4dsh@+Sf_Mm-iiDoyMuRKlZTU;>)2EgBKW
zl`PTpc&SmUZUQO^o^U;Ag%4`8aq)DPPnO~5O1CKCW9gm9hh?S8p4<J0ZtMi_sDePd
z;5MHX1ZewpV73wJloA*tLp|-`_I~Yq`_$XF@as9?sO@w?(yyy1<q6GEwc@O&jOl#G
zpefjC)A@T^y~YiWRv4E^9L`awrAHlY#~eGaSp=(xwNYQy7qOe2f}@;{IlbGW1L@qi
zOTw;DxMw?$Fg-Y&-bAlv84z&a+{^6gN=98QLXH_H*_E>qfzovF{@4)loj2<#uC)y}
zkIUO*X-R01Gsz;?;HV@(-REDhS4<%GY3Vw~qn#OxP7SaQ5Zw!^8Od2lni;huzrV@W
zfwloz_r`T2x~pQgdtKxvSdodB!D3+t-(RezCZW{q7%AX}m7Z><@9X;hrng5d+Zi86
z4NGXnS@k{r3aJ*`U*_Cp!=Kt86b``wQWZiuIn?%kE%~6;UTr^!C*cOwI%s4_?D+e#
zu3A53bY4kxhDp!t3%t?4v-ei}F^aerwHE_p`$uHH^%P&&oGfxG|02k?VLizbIkk9M
zZhH={fVpR^+c+`16zf<}y2f_a)<ZrY(M#&xH#TmqcrUL4SmNF5BDU(oM41KxTLV5+
z)FENKZkY}5!nHi4o#f=;M604_N=k;FO8A5*H!(FCJQO7NL&%i5;Tux&mKf4XDH%%f
z+?rgswxZfDp$FV8cuzra8?aP}k%!H34cXsc9kYIzQex6gB{?swI2BKjdTxT|pRZ&+
zaEE>#Ayx$j3s8S1-R%K0ss2Z2`|FI1)T2SH0{CmT;8ONr!6Rh*T+Q~f0k<^GAN`6v
zr*|lUcTnJZM)Zunk|^csu&2Ri{a3;}QzYAK)%LrXx@n?MTn(aWJKMitlW?nP$&N&?
z2gL@R4sUrSxx7Uj|54&*QyTY~hBLozB-~(j`udETWO(*Fd(4TCY)@}U!SYfcu=<~p
zc9V(R@5}l!VMyMAo_75(RyLPB81YF1FJL55T2qs+gq0q!Ji45IE+lxGpxN}bTvs#P
zzq`CgZ|4Z}U*ASVN4^*k<z)0X8Zxw{K{(j+9Yg1=v=^GYG2%uu1<xp~&Z_H;o`*<i
zmyUlLv^yB7vqzj#C4^d7k18q%_J*J+(70T7QO-(OI2Uw*p98m|igEs7Lh}R41E{h!
zAL&3dxQ6l#se8gbo)FCH>F*w<{4{!_TRHGFG_5aAkC`UV%sCUy)?TioMq(mpuo59y
zjvXKn1ky4HKc9#G-HmhDm0ex2+CP-QFdS=D%$0)1|DUEj*mp~);;zEW3M+AvcSdf(
zV|b+h;D9-Dg39NkS$EPS>oFfQ<(H|Z&~)!^`jGQoDl`!(_$188t{9Y}?`r1}Y@-9S
zv$}y<>;KUf^NURWLNpP8Z6h7*w<9zkYr|Q*fDeYeZs8g}`r2J)iucx)qtbi_#kWAJ
zUuBYXKc^_2hU!CNF}mg*^NgPiDtwc^`il8uBjfLfF?ni)Di+YVgJ)lwJ0WWOW<Cf;
z>qXQWRg|wd4EinyIT6GyW#lAg8ARpZO@+Difrbcn!`pP|%Zz>Y={LtP{?=mARDbyt
zqEYGuCP#?vne2R=jK2g+rk?K66w$WthM1pVZ@`}jINXv*mag5}BCockFY<wlq4QYZ
zQ=yb$N6a~uX|O{w0%HUdv4NE~`<a_3UX#rS@)4WQ=*4W#fjN6Ruo`y<If&ST!MMG`
z|7n;2=z;p1Gn501K5ZtY85G;+!iL4K<^KG|?>yv_ndc=jL4Cs4s9&~(R$}wn%49z&
zVU32NQum6CvZ(GSq;R>l8M<SCqV-P-^RxW_3qX!HnwO<SW$!;2nl>k2OiJ{u{XBFv
z3X!@fXQbCd>L&2=<x2`0p<{MT`*<}bHlw-#Dx$Al6-h}%w&D>P6e+ck?h$w%7A9oN
zbVOa~`x5$7yA&5EMCoRjipK*1QYXakfz5d7%49_e5$0J|>U=3d1Q4a$|FdJj11+d1
zHsov-WHwt-XQm`SzJn&++^pMH{sV-=1W|_pmx9->Jl#2L!Lpd+v%I#w+QHy3&UA?`
z!>>4$2?2dn0doJsmmd)U-kwl+BLddppZ(?~alY`C{5ZrwJ{NB@!P@d_PA$)7!`m;8
ziL2#1Ucef5WEa$!1oZ>8u2puVKvg7<&Fj17A099OiUhE}JjZkK?c&9k8T;R-|M(aG
zz|2RJe|XE~s}}us&`VQ==c&K?sPT{rsYILbX*e4!@j%Qu#KkT3<G2V_^Lrw9IA0<e
zxnnmB#VL|?knzam6^3hfAxU?%TLgN259+{lh$rOj^N;nM*X55f)r>|p)HojR$|}M(
zwA~wSsdMEl`e!A({8!coV*kq_+V#bCQn2e8EJ9Er1yMnjF&5K@%8ta&OyUqDasd*$
z_zbPOI%(fn#~6fJ<76iJ?sXomMpR5qGL9TEGK)cyFSde^-a<wJ^neqfj5?7HMNxav
z(HUf0uE;ecIcjwG9PhG2y`*W(SE5FUQtH{Nv3m8%W$_jX#4r~|BHUe^tHhs@)9BXA
zHn|$NkOY@4P|K%+Y<t@_G|6nYgFjO0w}O$7wn63HnpSVHjzRs?+>XA&7gw-N=Q;$k
za!iZ?S^?F?TTI6WAwNqS=}&F7%)*nX6<&>=9ib<zegUrHrI)2wFn`_DxY*3VN8hkO
zPMg0?#EGIy+<I0WF$oHuh9(J2zPA^%)j!U2U8rgWX!>PqSTKqp!y?Spzw%-`(c*)s
z0}I<R@u!ZG+tvk>A_)L7Yl_A^D)VWgce8^o+q%gtf65&+Po#J(0=<Y6KC<t)%_Uk8
z0%4cF)ol{+S14->^pa5jsOrvax=HBaNXPBYY8j7KzbO-`Y=qKLu!Tn$xf#CEc{+QY
zlIC(FrmoRwgdUIA&3AIcUJ@3;*819NNUlunZxpgBIBq7Gd$5cW8S4fwr}qDwOY|-W
zOg}z~zgD8C2D27EOD83z<MjP!P`_axT6j7=OW^z6+a?4_Ey{BFYahZe)vC5;t>ggk
zR;H#(;#Lwx!-Gt=QbWxRQq=<63njOeUU6#qV5+BN@NtI=p)>A8!XcyQPCp^2)0i$%
znAQ%}!_w(wHMAE?zYQmmntyG#5@Mx{>FiWk?ku<iG?QB4`$x*H_3j2oFUK}G|5>Yh
zyrrf4d8-gSmy4ROO)m$eP(dXOhK*dtNVTTd;aA1yZ<sJAhAa;LJp7MAaq!@LOWcDX
zY1Lj72|z$2l_U{C#QP!$NsD87R~Q8BEZ8N>nGcDw1#{yRiplH?R7Uc*M|m1$)1K`|
zl8VI(jyaLWuJ{w(m#WDhN27v^-R;{rvOVhg$=Is6s_;(qWPZKqnJMyU#eXf=jz2z;
zGd{#<7=Z#VjH*qEsPjp&QEF|9F%lwk$LszvV4Ub)h>46Q<N1^dvT#Lsy>AVk))~+T
zG;N}Y%UVI0=_;Yv3adWumpFq6sg?#I(r#(hX+I9uSL2h%n@aR=&r;cgDt>R~=s_9O
zTLsE}8za0o-Jv}JXr??`B@l1eYV?<Yw8$*JMY+0MVf*GBV37Zmyh3(%j5PkhG{aEw
z$EoIp0t|&<D}CVc<p0Ux@H3b#l(L-@sD1K1jerO=og}X?<Q?J|ItCY8>N%T_<P-va
zt@dc&Jm{jnM0WBBQ__7*``}1$s}ESn%ya+4hr>M~9TVLOc&+tMCed{f;PT#zg=U|Z
ztI%tu{5%F94PdFXUEikm`PFJ)ri~ae3a}))ov%pdk*1+WKSP(p4OeO~sl9!bjiSe_
zB6huE1!C~DiCmP%+UIQk141O{fLGcKG`Hy-CTx1e_$CVMDElzgKH26qsA87gK-ft@
z)2;HGtD<8=VGJBB@TzCMyCm7%yXy-gi<-^Gu&XuxUzG8#+xPR5+jVzO%KLr_d!Gd6
z(ct`9GB&>unIc<b>9Hgs!dQE=fxiVT6HNdxov;r?1L5`~?m{7*r;Jpt{*Qy6_30=R
z&H)TvJxtGM1&a3J8~nvhQ4QMafURgXnT)qLquJ?b%tFH%38#X@S?PFtntSzeTHUgv
z2YxQ4fg%+2hlE~hPCWZgHFk)-bnC2zzm-6ja^KuW9V~myq5FK=p8s}+#x#;id1By*
z`M^@tfis%${_rQLGDpohGLi8iL0)zKeMu6XHl7Z-!Jj-O%$&Q2vWL~gVb8B~&u<b3
zq4$~L3-iplS4V3XOE{F@8BvvAN!RiMK^}(iQT0nBzBM2aLzIX}Uao%$snb1jjfbH4
z>fCe7b-$v9>7!qv#Xy6I!Z1{#=O?#^g*q)fuh>10TJKQa9<i<ZPykOSn=}Ac9SI1Y
zCIu50CL=wi3)luL)Y{TK!=&sk7uB|j2eGS3ztLpt<K-aBi5NE!w7*8+=%;#39u4F^
z_s%(cD4VSm(F-M1OT0_h#6U*ZW$%Ob_gL2w!>%FE^<M?XZe=*VAjl2!2(M7RF=2v>
zsnr_Rwu#ycD4G;*fu`SOl|(C3{S7Y<cR}Q>bi~AYn9wu{=c-$<7tRO6nOs>Jj6WGp
zVVMI|+waLA;M-{lw=ECB5-VaCE*|)5WlX?B?he2bvXCCqYo4uLn%@=^L*<+pT^=%$
zx&B9?a;@Hbc|q!c4KUS$r#C9|I7ELGbQ#Zo8assAzy;tVbtDPE_|zjyOCR_1_Q_7e
z*Vw}x2UCAegQHt|_lW>%jLlP<xJ}Le*G5kOe*gZVi#Y#J-KyBJsWYT)WR^%nC{}9$
z#nY_Jw<acTU_*Gua@dQNac0<?{4P!a=YE_ayYn5&Iolg3Sejv*@<r*+WBES>$Bc1X
zWj1@{N(~jr)8GqysoA`BE7UwdGy<Si(*2+e#;P}sXwt!aFHHxhXzxt{3PcpY=|AmV
z<NhPXHsPV50efLG^^#LOeMp4`2#0C-aX#Me39}&Q%XB#6?uZPvGBUnC!>KQM2gmCP
zE;7ml0O!);+?x<I-|PanzvW0(s(}IltJfZJHgsQCYl>w0;S^|{3vt`Imd>m@(1j|c
zD3&cqr8K46!<w@QjIG4Kwg|L?lVZ#H@3$nKHY7W1%Ihw^ynq7fgUJN3eM<Vh6Al)p
zxRbn>$m$8F&0wz5@br16rNDXV#f5bZT5Mp=|IE>m6f8y#u|w;SB&#KDY`FKa#>XYb
zanq(o7?$bDF76{ZGZ#x0UAZfGuIZRYlGJX0h1VyD8_`X%qRSVC-tTc-W>|A(izcl*
zd)rKG@gJ!l14=PN0g)38PDx_Ky##%JHT)FNyQ@0^2S#l5{xG`3cNqQ=Qnb;Vk?G<;
zyVp=pzg*~#B_NQTL72Dn%y>7j*p(a%T>-W@D^g)l_12lh(&-hqD<*HcWvv{?L?3jA
zcS$zE6`73-Cd}?rem_{4%F_kzV!m0f?DyGo^_8BVw|ihV+)F3LCR6p8g;YY?DgQtF
z6Oy>eafWxUUc{Jj`&ev9N)(0G*Dc8q>ln5g*}DZi*lSh2i$P&=SAM*-veuJbe|>ig
zgV6w3`?V#^9tBCszr9jB!_IRmcA900`XP!l=P~kYbziACo$lV%vzI9Dw^R>7v#tsC
zH5Aqz>cM#sigkDPS32l9&N#{LyDi{+#ZE%hgjd48!1L%vMtUjXrm(CSJ6(Zyx0eRJ
zwGQ0G<{cJJv@;}#D`{#r&FMhmua~1U!)oxH8Q~Op*E~@ilbP5URXZ!H-iXBYl*>f?
z_`1TKo#(xFg4qF$!==>{r$NEcSj}*kP%Nk23}^%#|Gf$b_FyVmh^11r`ZySzW<{F}
z34;=i)hI$E;YfKnXwPa?NiVxiUpUzY%Q1v9=;iW(RzD<d%n5eK`3PlaT=8i4Y!(7C
z5Azl(sq~{gs0~Xf4Z^#4^CJ_unV^_&x1?qD#u~#W@^RDf=~Pi|y44y@Cn(RTFcbQP
z+P$&6ZT3_e2`(u<<-;-`>$+sXW&Ai3%B6?lTCDx_FAq+hf5cVnv<f;re9gNI8x=If
zi%3JQI9Lup`5vec$If}ju1`dWKE2Ts8wYiCBU@`bLKUObgMM&FUp$kUBSo(I27I5m
zinSK#w?dFr?38{aS^-rbc1K)NM`;*oS(FpPdu0V{2oy^2ou~!9GUkV>&2qm^JkjjT
z^Wd^5j)kPxf8>|P`+}PhLWqVxPrevTSmc!M@51qw27}-|855;{Xn%|zlZNGAW2C#+
zI(y+V;LgqbNl|Sspa5e};TB*amgn~ki8+%`_%20ON7!+%La#EbR1zvz6{?i^CG{5h
z+6M?cW7{9HHS-!i)I5r6kWo7mbM^}KlQN4|bIu0lzQ7YmxSDR24ns;45ibnb+4I{|
zASLm&wtxci(b!qGC-6s+7c>FdACX>UTx*XMqu>Pi@ij=Cy^JD@QL6S5)JmDs+S#6<
zV=$<}O@%U{6@LT@zUHyr+hv3;^EpS(1;VhEf%5AmJMcHq#~kcANHMC~L=l;gd-Rq!
zRy;09Viiwonao%4k}y0wJ~lHYiNG)ZWhUS6ncj|1<!DhK@ng8UaRypf*}drYg)Rs6
znlWggq*N|7e{JHxu{d5uK1PV3MRK{d_|tW6vuWt!UtU!8sj`MPs=T*YyoHJSx_bBJ
zNX0;1oKo7d-GkK20WrZDzGKoI>Swx`bWhEbooi=h)3n6EU>Hw?29sZLCjPDVc4)S<
zGNKuspqhk0W!xrs`MZ~E6DQB425TtLtDy`SPyLRsR+J>%l30&ZYLllT2cq92);NoZ
z<C1l4w5^7siqK*eEx7$8Z3?_b8=vmH9G)nbUGi?t(VK_b|7UxytO;vIBzM#pn4l|q
zlE#5`L{mQ6jRNQ(>13qJ?P@2-Ezh*efD<5`cOR<i<_$=^EK5MXFVzJ@17XTNCkqaJ
zM2&0Yu`95mSW2~(GA|RXgzV>1P^9U(2u_{&@VO#TTudzAaK%)32x1}g5M_i6{(_}6
zQ#rfN<nL>NOX`v_84n^x=x6P_lbd;;zn3Sgk#gHY>`e3N?@vo1Ft=igB~0wFg20)e
z-<k}LVZD>X_=Cvscz2vSg8R^p!qZl%d0NiG8y*Bh37rS))6vO}hOMZshgYnyC~2os
z!0O5|Mey~+UGd2Mo16L;?NNQ(PoSEgt}^vm-}QMq^^xw!4>#Ls0OXzNBt87XkU%-4
z4Q*CEG5Ug3R|jOb_w+t8gdCh#CYsw8tk<;7i<nMq={&I}5h2lGFg!2uNk)Anv5Yj=
zx&$xG-1zs#Xkab}zd^oGmoj*>Nr4s!aHX@L;Q6IO4S=T3bz?S)y}HqX%|0FyTmGj<
z=)^z~Af1iGInKCB=$|MlgzL3=@R$=gcG1iG$ie_zK-i%>c7$2uBE<VAJ-2Z>7NJ|Y
zV?F6hlqkwV#keMbED`H!NypnTx7-4Tu6=TDeEu-}{tip!E@{l@fR#VhgPd47^<&5+
zsjb+%^k8u|hu^Lkd+}#;X-Hc0;_&n(s%_VBH&Zj`LAUTWD0G!j`-;YVi9$~C7n);7
z_GF@q1$9CjWAd33G76Zv2fGT0=rV?wDJU!Mk~jOTr#q&Fe9~%@z19OFX)L)#wDi=Q
zc&k7n-T6b!(!E{?pUlyJF-9Y5s?K__NyPKa;o5;GkeJ$+xYB(nr!S?V?%cBkzF!?i
zjUQlSb?CYs4kH%8$09(h`8=p>r1l8rKtP<Xra7)TG{Z<=vVh`W22lzyj%H3Zrick(
zz|bdPzZ-OA{5xn62inaWHK#dLcYV?e)M@>IvR+&AMn4j4gYAn^Hm@*TpZRN%TPtLs
zx>aCw+-bT|mYtnFHobk8N)I^|Bq(%z_jv>KPG#l&(qI;oqgZ(@OF|*?5Ns5jdVMdk
zNPbxVEQWb}d@L}e0H@@hzKaJMP$#N}e5G6+7`866vRvS-Y%_LH4J5gmwD}-1W}JD`
zcz$D}nuzdJJb?m8wm(EgP|cHX#~XkX9$F3X&swCr6o+)FYn-P$qMNU272$#1+|cLo
z;m{#Cgk6zK`TX2|&IHeEPC(cc;Zf3X6O;!FQyy|?pgi77*BtdjjOrZzi@bchKt1-c
zEDv}O(ps!Ax*6HueB+08CV1j}`Lp*H{oCz{Os<k2#j#U`C&z(#SGo13s0Z{IWWjq=
zgZKbo80^Iumu@_PW|!qna*7zo#GUNJ`RxIaoNHZLYg+O0OfwBO`R*Ui-9K@KwxSgy
zcUeGMia6<a4IU44Um{HclKG9ekp_1zbE5#l^g7ZH_3|*$SVKiqInAcwk5l27V<tlI
zIKFi>IeY+!jmGLyo9d(_VFLWq)3;JjqPWTb-;wLatfiz^oLnn2_M$lElmwQj3(`+s
zQ>}OBOA7Q_a-YMsD<6;HT91O6mU?6!dZDi$vG(iIv>;9@O!VoQFxpBYUAJnwSDR%|
zsOxf!D8C{4XL+Zf!jT)QVG__AIQM2ECOU_}0a(nm3=m;rygqTVC6nc>y|mkI=uiJO
z9JOuE9LFhYONvtpOZ}o7YQi}LYrN#zrRe}G1YPnC^Bl6}UOR5ku<(euHcTzGd|SS9
zwz%PsTv?O@P+4IkVkQwDmDz_cSr^FO9pAHZI|JlCeFQ>*qH-(h;0*QCvVFat@Lcgz
z>6SxuX6ALgWN$g&IOnRn>V?`qfUB8N7{VSj;BDO9JGxt|F;C_~&?>Aq4(oJb+BzXv
z{GS1)u{;AlT&39*n^+Kk?QpDVh8DHt$Huf3Di_bLZ;hyvpi&Vdb}NsyCw*QW-VG7T
z;m{~?{U=grk`l$T<)jVzL7`$)GDQ6``XzKmMkPQ8a)~d4cTbS}IWulWxyxF!7+F(*
zBBqLx;NZH*(YO3*k^c>3!d(F7FcM=^rMrJRw$St=1~}@?ihp~)d0%x9a~4F21JQtE
z<7C?aG=uE1bmqcOacF1Y_2~VMmQe>H@pKkyQLBI>_>#qpWMo>`c8Quj1436;-B$oA
zP$83L^rUyRgw7`nMFkD7T$-JXM0Ow}z1_;b^sMoR&|s;f<Uml*Q3j3ZWu=eDJ_Em=
z$P|)~$8zyIeMXOAFnH1p0b@u`(+Ii40YQNJJt~U{o9QOmpa!&<uDn@2IfV`yJ{$YU
zwh?h`3P!mdF=^tmtmL<*6e@3Nmc%d(_jbe5({Zyta^z_rrfjGRRd#k}=)j8V-I1T)
z)-#rXIa8EN*bYwfT6%p?yJ4d*UQvu6OPCdRHM5=`2G!6Rp>{H%*S-fmU~}L8kg_dQ
zfyB|S&lMaK_i*kMcO)U=iw-=6KYj43WB5+xD$~y2OQd1hPA=CA%WTGI7uRNrdBBTr
zS`eDIz%Qryx2H^-Hao~Fe-dtH_6|3B@e4Ye)uBWkaWPQzSCQ@jzw@E)vgmGZM|ZF3
zi?w5$M@HkCQiJaob&TKtnXp>;%wLvItJo=^r;;5i<vbFkuM1C~3^&h}`t8%gOG5DM
zMT;FLG?-EmZ5Q06sIW~U)-E*+AIiUG^z&H-o$kGWJLlQ(lVvRSieHcau%3@QjxTSs
z$6byx`}G5ql6i)s0%3QVik8!vSEq3+cHx^z9P~96eQ5j?ig_N&)ZcB6Px3vPuTy^|
zY8vPuwW4zq64ZyIYT9=~(62Z#XS)6l-+rWpJ(IhmXZ<(zDUW%%mbtd|YQBe98uMUj
zm*};Kfs}j%%<c%3=a`Sm^k=?hJwL9EtWg;aC`_wxZG?WqxZ0uRd~?GwF{S1ws+!Y?
zL7%pgdNr7)EMWB?oGv%7b35Z`T6R2%+|C95{YKsb=ZW$e^<zE)0~*KS$6M#yWxm@&
z|8Lh*$&1IUZpqP>V%|d9(XyCqa*X0`2bvqWS$QyM;sDrVA5^(c=_pZxG*^JTVuCtg
z$Uo}H0O}n`IW0HcR9h3;yB}VRu17F%H9JIyV_t{ygGqB~iMye6g)iylp4k-cmS@_Z
zl<I4H`BjkgB^)Fdyckw=3TDvL>g}$wczVepWLM_&O?GE3eB?3Pxsp@?khF_o#(ik+
zX4sb?h(vGP8qGn-aRjNzMnXwT9oL-=++5&v>K3X(mQ2}5mhp9cVU{DrTXWG>J%yp!
zmJ_$)emNZd+F?xYNeE=Qi?T^jB<9>8Fb{`8bRD>_LzdsoWk`N?KaV!cZbx?N>d2PI
zVstXmf_5Q07o$jfrdj?p-!{D&yeNT&O|hrs*0z|CF|LNsGgUDGAjUrOrt**O<jUop
ztUQah2z+k;4dF+#+?UMCxxwd3B1Kvz^%yro9&)~8&#^so3ll_q-ZfTC;f?WOUOCVa
zr$&=xfSYbL$0;fmkkR4RN0|#c)dzq$2KF3ELP!jt&$<5y<e{b-yE~ICUtz?zPmO&3
z!A-X<Hz{?$ob4o|e&31>>V>bR*&9<>nGmNzVxh=&Sz6>Huz_nd*TiAAhL}gsmmBrD
z3jFr*qC3F7*rNWtxqD?24+sN%K`g&~Jg{jl_|ag6fI0tfW~D(0x-qq$@Z-cTQf{_J
z?9b$<@ib6_!;4g$`+RUY{Rn}+_6vdt$BO>5N=X}Bi5A!H5Or$)@<#``NM2yNCDaYl
z7pKqR!JpsItH7OXE(o0)^bF#k822cA48-Y0MgN_C=ZHS<!Feln>;1Je@b;S+17{8N
zfOIxi7G`Y~uWQ+i`H4jkb&OfodBCt3Wy)$B3M>&j<LTlWkD7#_Od#Opa#SH|V(3|t
zTy`ZvImX=7dmYj6ZkuENZKle~CY)5%CT;A-@tOPnW|(CTG;Q|bn>!t0-Zf_$(g+%h
zHXc?)oscikF>30cKRI*~_z&(Ms&{2hEcVp2d_!#@BMmasuS<IcWJe`HErax@DEb_I
zA~I80zVGto_C`&Tmf1bn{x++I6w|lAL^+OH1V?~C+$hd1b7hRMVmiYedQBE%k!$3P
z<<dxN@!G)}Pt3Y)DBIEZo+NK{7%Q965)Br@NW)8+?45z90wEKKu(xUks66@kn}U-F
z)8<DY4tCsGlXQErhTXxX*f-g!zoC#0G-$~~7pXkXU@aLk@DB0PqR^q>w;JO^<me~X
z9kgoE|B7yh=lJEdkV4BkZj$tto|FktT{eoeK`c~@<FF)l^gtU^!t%jOi(fbm>(>o2
zxK?L((Lp$GT0dWmBnGeHRaFGPNn3!9$dSGe&hx}XFL8yBiBrKPAMvAv?}F9k^r+sk
zTqG(0?N)+5w;XBNW=ZsqO;0yCu7YS$k9tvXCS@*9=LrdYOLw)OilB1@Xz!^(mn%H`
z;8(LcV_LCkT>S{C^~bf;8?}Yws0)xzTVFJ}K|_|HY=~hNk=1KLZY6&}yc)}xIYiAU
zuA7b6je-0-6{w^6idwzKpmcKLN*|cEr*CiuPAr5L0UQw8rh*yP1->4#dBNo@^YF%Q
zzIN4z%V{={Wu+zY6Q<Tuv1v^y|MG2I93y0|OLzd2r;YK)PIEpvsbHqKi_4(&h8l9I
zk$a0ZIoz1g{C|~~iV1I;L-?J1V6|3m=R(#@63Zrrl$%N+ORwMOWpeq*V=x(zpuGT^
zd|6kX4CH{Ka6=tAG+H)$D!n8mlEUL3sCHnhyY&&6y|v}O*=gY35PQ_ZKUTw;a*H*3
zpxeYL0i1M~?JX@ff9=QmGDe7~vXdtz3`!_7sNOHr9YT{R7pR&I-`f03m{&f~U<C~t
zgYq>A;AJ<F0J2P@4=<9b52PD;x?_(+jHqLaDq#GPCX<a;ar#aw(YN&n+p^J@%uTXd
zP6E7^HH?XM9S&Uk$&&1{l9{2Ip#;TSy2*o5rR0uh;xC=L#|TxOEdCk5#2+nn4kQ9i
zdopSPS^x*qakP$A3ceA`=_MBu`So=gB;;GasOAj#&28r-MBta>;%oq1%wM0>=T~D@
z6Rd{dG!5<2iib`Y$beSGo;|bW*A*iu@e6XuyvJBlTJ~E3V<jdifoZZVxX;;$u*3|!
z7CZq_dNa4vMe=*sUcU8Kh_HHcvSKkxBmN61g*$j{6Egm;Q_!-Hz1dvLSePuboadv|
z>>NfWh>+8x^oQMj=-h&tJc+shHec@xRn1A$0cC1pDZc~5PzDjH79ZY)X4!R45w=)X
ztECGCX5Hvj5H+y|In0S3gy74dNYMW=AlTr*mrqCdz2W}XIxD&ko03(>p`Mj<(VWx2
zeOr`g8>-c4tAn(<ycu;Z8M87@>1`+Hk1*tY*3;Msn`?Jo4aFqzS=lnbScL%{H#E6G
zi%#$jqzX_N)mBniR&QnCaDRZ{Qx&1Rc^DX>6-IMZ^9h*PZWx9Mi8N`&RzZd`WjoR*
z_h09LCaz>7yQJjIak8EF!Gf!W8)$dA8VL^E$FTZy4!`r^4vx0o+@AyIPz32GkRO&W
zfRH*-7rBoV&9=Otp<VyU4!Wz$U6|`%lePDllH)x`Uj~$flDq^qy)=`i^!oZl|C`v_
z%p*fc4PjPrkN5>zNz~CmeVQqeXEJ!I@{jhH)=LB`7Z&K7>c^oT>h|`+HlT`VYm~Hs
zdajD;7%OR^esp_QsTb*!lay#*x}fpNqghXkV3mYE7*0j!v)0j5jz%mNT(o{y*IkLp
zKT7chXlz$EwOqPwBh_=V48xwMavicL7Hz_YT9R9}k$(Anm|GA;{C$eEF-6fiH+fF?
zT3=q<_a`<^$$!@2{kaOujsDmNg46>1<52+nInps^!kI<~p=)oC@|FO30lZ2p`~~@y
zvGJaHC8P2MX<vl{+^UYz^dXHD2O<gCmZA?VFsnEY&IXuMV+bEUBBt-3wBO5B9bcY~
zXqwu_?dY+Cfe;BH@li$Ti0qhz{ya4EI7qBiq6o|nc^jnueli!C=lEKUk>`E!+))$9
zQ)my>PkcGMcdP(gLLUY+vCSh%U%ZHST7pe~GyfVe`Y!%-y2Q+6Ff#X(KxKhVN~ezJ
zb~Cr`z-7U~%L?orcSUEmJK7LEcvC5r(&S#_LFO#JmTIcl?H3g)mF4I{N~h`IGo%YG
zSpZ{QA~#u<wTkD5@WQ||>Q#&(^ds(Q#v{!UP}?Q4RW$gK4Zox=8@xh0f&qUbNOOon
z3$&)<Ev)dM53w7emW=`P8XfbKvSj{2qMY6im_K!*C-P|yA~wDV!h3D&Df}OlESVh2
zB%n`yH_y_c6~SY|RfkxGq~g}K8e#EWW_ke7TDQcW8As=y$_kBQk0o2H2B24(=F4Hi
z(eAR(D_rQM`S?G7XeUErDYs@s+^m!xDL+@z>C*K4Z7r^v-fxajM}_(rytpG=PE*M4
zC6;lv#rx<I9-@G7xP>_I^X};LmR?7y&Dw|E=sxebJ)^F%;pC6C8}8gVO6U>wk4mYT
z?n-+0ZWt=WiX;C#VMSa=#ef7`M?zuh6;?F_dVUI$eVNs(^p)iH`2JBz?*=yAUwm@;
z?8x!EIlzlSXD07AJV)zLyGGZ{d4wV{BeAOpY+c1n-ZN!W{xC%&8B{OdsHE^j(-Wyl
zw>-SHq6X)Ur=u~saD5{`s*79E&oyU!#vxBBR}^)xXbb~skOCe}qwD~NA^g^iji!-{
z-f>*bi%MUArrl}FP?5O)^5X0$gp<BD95xg<@rkERDRZ@+e)Xd`uh$y#9v$Yr*C!8M
zb$?FDGWYDZSGJp3RGjO9#`>x%!2h|r+{7nYWB>DHt$CU0!1ecM7QX%(Ju!Y>tJYYR
zybJ~JId4lY3XClbxmB)jy42NHwnEXCb_&<Qcr4`kwWp1xpLI@b58gZ}fK4d23pN~@
zbaQaoW|6Pn8LMWn&cY4fD_d{CGj5bgpwEN`)LcB@JMYwK@u;snppIH?6twwuA-3}*
zP_{BB2)XNW5I1gQhrq}A*-XXuWnI{h;pn+=3)Y@RC?5Zb-jr7XYd~LZVkXVis3-rM
z;7i1ELjBw!HEc$~`wcFCD3E5KWb#;^BO)dSq6z2<M9%~&6D_5L^S-slVmfj$TqLp)
z?e5Ha{f>?#d+xRq+7g4$z5lBh8i{b#`J~(Pu^Dc&)nK;k<H(Onn$&H>?BR|!$}YX!
z8{Ew!-+^*CS$c{38b0Pws9JO`Jl-aCZhCtHMv@BF!t>WTFZ6k}1-Q}ODQmU#$ASS?
z7q-0}lECT<AoE-bnZHh*L@G0<WF9q~VLZ4uk|@SJ73!2NQF_#?bhknr3FH-Idvvj_
zc=o;+7MB}6B5^vN2EYV2ynZYY$3N7FJ+sG!`}x&@$s=<AG~e9)xW?LQsrbzkT;h7*
zrMcQC5VS!|piSpmUtO_&jeqJ5SvQj>Z^m7gD%3RAm^(Mn1@MzV2Ao~Bg*MLm2`qYC
zQA4YnYehM1>;8YTgBP2^g(i2<q4!kpL#mtDXyS9CX`UvW96TKdStxS+^z{>M&;efr
zVV|E-d)(+KQo5C!!TW=-y#~@Eqg2PVEL_jLxT%uo)#dD(ogmRCF?0ykH&-CqaXRyV
z)}(cPkcBeZ^uP01C_9n<HAWNNK!v-KgG)4E_cRjiiTlthpIBB2E+8N0ug?$B-}OVe
z3DiE`aQNR(&3lnNRDhSHnmLDe{Gc{G&VguzB}|98b-4vpkkosU8;TJ=aP+dU+bMeW
zy)zT`*4;iZIxncP_)`0GBH3|ngfGN+&(q`9%SSOE&4WV-fEy7CN2wHL@$^Tb9mkyM
zK00$0{4Se})ola-T@Xv&*d5y88Cq`Ef~*<gfO6g?dUO;vm|%zwmjd$oZMg8>Uq#GE
z53Qxn%m;_P$fgd|F3SsRQ5B^CwzHr6Q7j26o?BKU*+f=NR>82Cu;{d6UZ)aSQ#;;y
zs;uzgeH<BWt@q1Mpw#fVBGx|@4JL-@sy}k^wult+Mmm<{mhf^;WqRaTqMlsEF!ikx
zA(bod53*&p&woEW<gC8!r9A3<XThBMRxn{&vF!{E++b;gJ4^_!wYjYSWAzaiwzMQB
zb~NIQC464BRKq6EA${RNb;GPwD<wYQJxq0saGYKEWWk9dC0B_q<KjMFgu%~rMP(jt
zdt!_a7BB{gH%%{WRl+vdN8|(Uc^`69+r7wzw23$AvZoO6NC+ELvwgfs4^p>mEazvV
zPg}Q-OfhVs=p<AU$M3s}x_nnPY<u&o^+KqO4io(d+2l~R!(7*W_p7~;c?#<N#K|H&
z7RAM6v(4M0Z<NfW;n1cNO!vY;j6c}|`2VB&MFS5}{Edf{h;K68&qDA_qO@v!HfSr)
zGfqLu3dx<gN%8N+>z~Xt^IKh&b}NpVUTPBn1Doo9oaL`18OgWr5@f2&A8-Scpb79|
z?d-!!d6%RtOZ*Xad;2Y>_cXAuyqUlg!GF1}2qC|uGD|`y@u7vtB25^3Z~;IGi?cQr
z&P^~^x^3VohCfAQWTp4*W!f&8v8(6pQ&(<{G%^K<t1~-I2{5;2@K1w5$d1*KeMRj>
z`dq+>)98_p&gAC!4{e()nkNI`UlHBZXX@5lxDl$Vzy`()J2_eyU=j0g`Tp>XS*8K0
zu|x+=%Z+*k16Hp|XfABP-4B$5Ejt;J%&MA}kGjo8A!8F~b+foxC)eJgvWla)Dy#yW
z%JJAKo`TGudfQe>$-fK8>4NOElMqI?wA_`Y$bu}^{Z4y2LvByCU+Tz#;rX~|nhw$3
zmRiL`hU)Yd%s6#7vJN<~D`2_v3X9NXK01e|JUH3Lk_m=QY)6@@u(^XNQ8ETAeq@N0
zepLpG!4NzqeVE5D&<E+54WLws8o`Nu%|WYyzGW6X36w!ox7*y=MEH;&`KEI8D|`)(
ztt)iSm+;53d_mBg!i)EG%rU6xS-FBzc*GC&kfYg5jBXeWA32_|Tg$c{g2v!2Ps(Qv
zK}hK4Ej>t-sbjU8f1|j#8+?EQ5&WZY7H877P})gP841I}JLnx+d+zxjMOFhrWyAmg
z08X2=V59YN(j_auHpv4O>%2ynKFMB)Ifo>uw3uW){0w(Unm`HpLooeD1Zxd>4o~}I
zvZ`9`%RaZiCCAtxr>V8meOCLa8dOm$xiCknDog7;l$&<3Wb51#CCEIqIwenn^P)-?
zJxzX|cuRP~kbN~eDO1O=Fa7SK$NrEqQNShty8hL@sf^+HAaf4#NAVdmu}7Z3m-OH(
z7Rb%K2_4Wp!kYI<&{X8&t#yy9i84A*=9`{c+lay$S$7&3-PT;kUIQg+X{u7=7@#v_
zGHyZ{LrgDpb&26a9Ivgd3YQR?K3;yG_SR|+Ayr!kWuXGt28utlAZl>}kWARF{=SqE
zMJWf7tcHP8EGy{9m1#wkSR-*z*0C?ek|PYii3G0gtvUJe^}GgizQ^_Pvbn&Hm?n|@
zM`WAfvnXB~6ScxXIPA(yb!=iRs_H=*Fb9acwd#Lwb)#IYE?Px$X9!FP!z|EdQqi(R
zqw`c@*VgKtJ5h@&C;ZB<bpRt~@5ONWMTNnEWK``5!or|^sK6b2EccC=A#5Q#e-|84
z+W69Rc){%eW7YzgO$jDnZa#RUFlzdvpJ8NzNK;1p7xU(KrWX*8_VDWB<u_>|XswlI
z3Y1#0V6?Wvy(FxBBab^Ur&8)8tbI1)+O-h|N@2FKO^yW)3Un_%{iX<Q1qc>ryfyX8
zPSxx&k`DuNk;x9&^lq!=`sEn$B%SJKBohIrUd7Jw-LbDb7*LU%DqMrGW3pEllR!G7
ztQ80Y0maD|p@1}o=@?c~a^{TK|G1Fmv{_dy74t;ZYX*9&AK3BZXY1#nBT4Y<c0aFe
zE>F6aW-3`=fCsG38y{@gV)g(bo!@!6n!7HTM`VapVF=}S_ZdJFCD<6uE`sXesVd2X
zyi&xxpK|fmh?=2KJ?H{7?A*!eo1=Y0UUQ;7vFpTDI!7HW;_FMY=j|2jQJ$l9RLVoG
z`mXh(V4-t#7sTC(`-u1LF7a3W=(+g{DO>4BcWj*uzjkYj5ct2rRA^v+Y~$chw)^B`
z+;*NR<2&ei9g@93vm&#Jwz0cL-H8)TfFp*mCnVZY5n8q*(fRO0{DtV4VOBA9RV}9H
z4U9@d?OG=W{j1C>1BcsfP*&{he+Sduv69WTs77;Kdl~_Pc;OJEq#N}#>VjqeErAr@
zJpWs9o7hqJK$4(8)AVluIY7q0kugJ(wRAj!r0b4w(2D__2E&fg9ec(o0SQ{ciPVMH
ziZvafw24Uh^={zb$;88*{ZPsSzgGSfxiNbGbak-kI&a@!K95v=@(w${6Y=<k=gwea
z#>ckDrZWs&++sHFBXFn+2VIFPmOM88A~sx$V}-#$h+a5kN=B~+UyVdWbd%)sz^nOD
zjZqD@M0fSLLJk(@l6E{)f8=fzeu2{!_}*FV1ip<4$+8i|y~Z|B05Nrl&O@qz65|Nb
zN<X(1-3!k_Tuo{Timc}$o|oq9r?k|m$*c4Cnjor~UgCm-cOqH)VafEPG~4eX#x`g@
zne6-o6Zjo?mK3Iow^x9v;~wMCU1hbp?r2ce{g^gct?`Ja8<i_eyzq?qV5E)#LgS(;
zgqqDZ9*i#i*Jggc&EFSV0d?H?m}9@kAC|y^X6Lh5=awvm<l!+qK3J?!$K_)1-I3~i
zoV4~ia7AxF^FgRGT3JUjOw1llF>l3Mm}#p}s%OJ=unh`}WuZWr=R2(HT`(A=P{WK`
zSd~Ej5fF?n8GjBhFYReSiqs=}jK6Q+Q!pG$U~U-p*_hCb3(L!I5HuI?34xj3WW<2_
zdOBaGG@O+?JXVMz-hOl8>;{G;0-5Q9BN$Xm7EgAW;JBX83Mh@qa?okE&aPK;Kv#0;
z!iY(FRFOUwBjN4{o#;9<Hv71Nb)q37(3)f93=)R^!*GbhpYT9sHm6et{Pk%B8vk-z
zBzlyxpZ>>&Z}}~^x}K|;#D*IJMd7TFvpE7*RY0ueaXT2E)GFVp=+uhe>#n=f!XCi0
zMoc~oTp$p2!i3$aVN&$a%Fjbgooa_vEDHI{2h#0#k?F2Vnp{?RR@F*?n3dJ%Z@y6D
zoE2M%>B(=WMYY9G)O(P_C^zY6)l?4Dc=NG*n&AZENIIGQjP!nnw7(}OjNnPSvg^h@
zBJpr0zexAtxRa@yt#o1iCW!ZY=Ul<ux^#ikH5y@MmP5#R)Cv<uon3lG8f%$#=Mdqv
zE9krLKmE@Fg(xv=cQkJcggc_hr!i|tM%zfs0D$2;t*E8s&T8@iE1{z`9OABdoV!jG
ztswMD0=O)x_W%K8Gcb}=zGWoLbgi7RpV`$lu*HL*t#d;=KB{NCd~1b>c4?${@JT}+
zBE~tLz09acWLdiRYVbWh(U-G?D7iAyk3k<tdxK^+6w3rHhRDyW@u&%G--QvYbpzia
zs`<~a*)Abl*zw8bI}B^k#ybQf=tElfnev#Y9#$eRYmV${8@*R9;Qn8O2eTgIRmBJW
z#_e+WbkQanfKpi>SRET9y?9b}naSbz8;AF2XK3X`snND@43>wgY~d`Dlze!m$4;hh
zE{%pMbdQpYd=in5J5>L0Z_99Nh!KMixI9f|)3VGx0t7Nj>()Zg-HW%(dei5%iSnlr
zOyOexG>Tq;uw$Cft}Q1vmSHlfw7GZUlUH=qa5Y&p>1W`_eYXT)ZYB^HXIF&`5NFF9
z8M`JM*Q}Q4zaf_+K=!4^7^sv&cj#BDOY|1EPCAVGgje!f()70jAfiAgac)`6cfz_&
zEXBN#0tt~Eu=2?8pC|g-B;VOMn0}DGHn%8M37*~UW-GPOlCL*d^E4*N5fg~Z@(x@%
z(nu`g1NPkOb0P9Uv5sL<bg+COAvpFmE(B2FE~i&qmYOJnDQT?b5zhp*sZ6tex2#?}
zaH)|AlZ{_~2PQ&09>vFi)rVp}t-@Vrjs+(#0pFZg{(3_;Z{cW5G$B1bwrP_w)i14u
zh1zcK0<>sLdKzidew$`;>9BFSm8o#p@@nHBeDjFh84l9X071`dG#}nF30{mVwY6l7
zV-S-oNSM5d;bl>d66nwWX(`RV?d9G)pk2!~i$rM3xo~Qi4n*CM&3aJP37}nwoDacc
zPyu+AMf4t*!I&<*Loy}ekjaztkKY4a8aNX<=nU)tYTt#Z>*0gu(R*4Bz0(fN)w45j
znr!$7yY4knSLK4I(vNo}H&GuPy(<yG?jeL|7KBU#$Z3(0$34)SeSfPE!~O2;d0B&8
zHg<#oL{5aZ0j73jr}w7I@WRA*<nIY}I1S^}z`aKzQxW1h%u)t@(hsR9;zr9KxkYl)
z{ykb+-DDWvCK$XNn`LO<)L8kZ!%YWEUb0TgyX;;))DjZb?ukLHpiyLun`&wf5#KUa
ztkhAC9D%kYcw@P^n|Bo4B(sz5KNU=Pi!oqIZd6g9Z$)AhO2VPE>M(5Jte9d}X1sJg
zD!vl7ndFv$y}{<_E7E()@wOX1m2m7cR0iZL5Yk2~i<^HhJ99f#QJe;3>Cs4#f6y>c
zC}nJ#^xs}Q(9xNMiB!Ye`~-cJ!PtpsQfbUoi?Ri9$f2O=^=$ifLH2w__*GV!I+hCH
zLc!-6VLeBSuOD^8_(VOhUa{V5ZX%`jl)PO%eId#qOlM$9^$$Wj-^^fUtFyla-*z4D
zf2euZH7x)kqh4^4&aiy+sg+xEj~c_KwT~cgSAO|Df>em#NHo|Qja<m?8i*3vvq8T0
za4;A!$jCgP@$?Knb3G_({e~x{g#o*0Qrf3ZjhGvrvztk`0VZXO0h9P))PR%T*l0@P
zKna{U=X4)H%`}nn-U9uxbHlMdMoD6`RXrZ!7vrLj5rfLFrmi_>M!-mvX+Z7~f4$d8
z2@zppF)lQMrZz!uEf2=iP!Jo=fC`Y#Kv1YV#8iMriA?7z{V*}$-vCvTX_7h5zP65E
zO>4jqsJeNsSo3Jt;@?qJ@0CRLV{N5;E9A$>)o)_i@f($hh=;RXI6oF63qR22TpM+L
z^tnu2xNP>4DVC?+0-i4=?0co1BKHBG>POvqEPSlY?F9F}HlafS5T6mj>HKa>f{cR1
z0Xb0yAjO-@2sAj5rZ~tKEu@r70R4AgkXH-*$9*Au$PoAB;>7pv#u1}Lo-!^f2(V)H
zQLtUX-n`aE+}iG<<zbv?A~~s9-~=+rpG!e)bzc84O;AGUe5JVPt#{I+i>*H>igZib
z@1&~FA8x)z^VR&`*vUi4D8@k<=Unuo;++(l_(pR-+ffX?J{(QU1MpVUyIv>PlSla7
zvj5VbsUJIoJ7T^0Gyt;?_|uq@SB`Dm>i#}5Li0ZckMil7BrtZ>5ce$({r1p=Ikg=*
z9J7^9SIcDvapn+cmMLHM3(r6(w>Kw+Xk_%zy(4ePj+eZeR_>#5Lw9)uT|^CPuZcc6
zqNE589YXmcGuJ%a0QZTBRE6b`aVP)boGw*L;RcPxpavUik(^a-UsO-L-ff#I<i1(m
zZr40UA3e_m9!r@Ny?x>MyjDFW%6EAJSxcY$&j54u`;3ej%}k7*k@Pqd2+{7HI|~R_
zD$|U6{%zhgY@qAhjvtK5U*WgC|2ReDiI!V+GPk0`y8MMPYIBukw24u_IO{jm{}Vwm
z2h@z2=s`vSY*Qsy3A*UP|Jh<s+-<SBaEz6J^TI-NCdhm#u)xaDd$qN)PWy>~pK1@$
zFjVNDktUR$&YHejX#3T9@2t0ZgFsPT!Gh`it<zM6cbd^dAbOi_dyVNHE|nD4HYPwJ
zk8fDrNHRz;+JQQq3u^f}iz5|VgbK$EoFc=x6iQy!`Sg|}<C5snmVD5-!ee;2fHV>d
zwRk*;;sSq_%ANk#w;vC0Jwd38iJ;eBq5aoH{%X8e@Qv^-TOc73@^)RLl4E9GLPX{P
z;IjJ*C-&_ch1QAGb|VyMU#Rtfe<H1;RI(g6h%#9llr$#{!1XJ1WjBXoRMYV@UT0lA
z=s8)tAdo@{BuOqGk@|VZ`8a=i$2=9)A2GL5MtLQjT}?W7fxZ>A{p%!=-ughJ&lx)U
zopI8{PEUFSeX<B$6QRviHzRf^|K>4<n6r;5i>6|*t@>(a0>!6Gy^h%ti_U-Gx5jn^
z8WTNiE}f<o>PqWB3A2_IG>|Hwcg9c(g|k+1QVTax(KbOS^v_O>>5h&22s5oIrjF36
z2uVLaaJw<7jT2_3n1#V<W-&oV#w?8&>7(s38v|hpx!+I8{u>)c{Cp9NHnYKu4>ZiM
zU}y9NK-L(vG~a)Ik7XYv8PQ#7$R4Mn+@12nLN)>v);&Aor`%bvZ@0$Jh&!W+DLact
z(YjZXY{*hE)E_lKZQSMxRr4T=8kzgo1zLGlUdKB*?iRL1clbQ*_mO4-#kEIk9vU)w
z4&zSnBh>${)U(4y+_C={e=yaW^^mkE66!KJYN+F9pRnj6(VHnaZ-^+lc42T_SyU-5
z*a9unPCTj^;BZxXzF(=|T0I4W-avdWiBdx3?VE(kYZ8>aTK#lbxN)WBK^>b6gs?4#
zgfo?a>jHRF-o`0kf;5JWLKM;KItS$+SAPvo$FS4YjH3v~6TNIPC@&<256&=Ovy>tP
zPdo=8hXT6k`Ey3@;TP#p;!<v#a<{O^OiaU8#^2$|=a{Zz+$Hs{c)e@>|GU3+T?^}2
zJ#^ZyQmngofO7x^SJVZTz5tm10hFY3;G%sHBHfn0-lIFh`gH@b6h^PUktvkS<#lA4
z{&s?ClTn3+OzU}jJ>9EaivxJobY_<lH$6sU<Iq!;Q@&la2!FqWzOa5I*P(1^mKN3+
z^i$23(A9OVhT6|GhQE?L#CNz{gXFcsz5A+hf?Yw6O5!37baIe6kj_UV3X;OwW!142
zR)0VGOd%IbUdT!&8pgbGx9#I2zTq+gH`$o-^?g<lsp*i~fKx&s?5o6VSD2GG=|#fX
zR2rlVJxYQnyuS_$SA4P(ug>wp+bb-q3SJkZz?~wZdTHN_fyZF1R+5lhKA-yx(>qEx
zHVcpqSUvX6B4eb$2b_QW#p_;@Dd@%2<^MeW%BZXe3+UYw4_wI<9V890#Doeco-oFM
z$e&jkpi#vE{Q3`dLb)#~I^4c<e(^EcH;ilNqU;99^<lC#T=ILx%`!p{!Fm}h1<a~)
zvV-+>fO4=V6~W`^1$vups$G<AUgi?W`0$8HvkntC0JTgoH^}UWDsdaSYq``Du(kAA
zRlLd~<!dDFoh6l#B4&PYTPNhnZam&*C6Ks_#$=Q_Tu~Dro~ThGF-snW)5<NROLPy5
zOLFC#ZtiUCW}WB*$K&`++K1*IxudT2q7zZ4zMb0*DXlizj&~YA??Mq@hUt|MqNO<o
zyXOTLOG;oCA5w;tF77Tp_@&CvLD#oe#7IFWKiuQ}vh5=8QRvv94s?vwrM0x))AeoO
z?8#u9L@rX@Q34G-!6=b{1>@RI|46Ud_qcidun<fB4}jj|ayHQr(Ufr*vMnkK6jod1
zgHrFDmQWlizYu98&DLU2#2aUpFzbAO)6c{_OT7>K;21ATb1&TI;T5|r10^7C(9dYd
zvIzWxakF*dE-V%GQ%m(UrDw9qn##O6LWfsPS7tzs%@t(l?Q>0|E3)~Y$F%)|9LZBr
z;_fNulo-KhHFDs<GN{N0V>C&3lbp_@=e5PBtMw%FT;tv>n)Pm3@o=RjQ?~YEADlw(
z6WPz#>}RNcs`<Q{@H&)l*em&YFQO14an7!pRPiK{BG&UN$c%3x1T68X{*sdj<{KCo
zru8Mo8*l9h>n{4=ayVl%x5Nx5vr)pFK5U*EF<vk_-_oXUkjnxX0e0D5;{Htu?KdMb
zLr?T!owIwRPb%Fh$3l<!7HjmQzR2ta_nLmGzT?egn8tAc@Dinwq>G2rD;61zNlc^7
zko#QJ0~gXbOf00~d!peKc{$$&t8l^(b1%sROCYI@x}ZT=#?U_r52Lmm5S%B`W$}Xn
z(uwA4u`}b~?EAt#VR#i+m9W(|L2Ew+(c5fXrb+t<hGE-4VL`>H{m-WRfIcO0nVqg)
zW20FR3IEZAT=6|N#Lq;ZGgmW6(1s$GT}e>J4IK;#y*Lv7O-?)xxt!RV?<2jX-yzSJ
zfRY$|F=i2~jwO^<!1=1I3?-=1m9PZ}rI-QMKOiW-Uc)Bch#m75$kI=mx$xuH;1O2m
z216;S2#YkZ1}r=mv;b%pf(T&}L@O??*3lC=#wyz&Ar1n9p0$%J@U(o;c*2Zu4>*Px
zf&)JXTS4~$-Jx7I6RHB*1vsWxdf6vdczZ2tgbIh?KGNEsBz~dGH(D`6XG+}Qiu|b2
zDOV`urz(Mrcgec}L9Q=KZ(#>XL-j~Gy5^GRyhyP0Acb{=5y;x(x6r?@RLAtZL~^Hu
zu;-RsV8P7GZjp|I=1TH$RMuH%kkw@89uLH7-J9HvTSD{i6S3rLNuh*WH5yh*7B7K1
zmS-8Ay6il^0WBA7pfEAVGl&F>-OVfj7`5m|@&50Q*r{z$ewLEK`bS_{iFBCujPKM)
zH!pJa=iVP(2qHNcEt|E-GgIe5C=B+k$d08lc`PTmRKTy&k>2Rk1e6puE1_DO&kWQ8
zJpXd86W6lrSC<?ECPN-K_Ke`f&!$VLosm26$^VcMxkYBnB%LEF#JAroJU?LNlbl#H
zZ6Q^e&VsL;8ok+Xn~C|rBwW}~Ck8~SQ<ug;A<0V_Os56vW{DIu@raB&biCvIHu1`d
z3*<Ubpf4utmj>0$TE?$?btKC0f_7XE)6Y>_DVS+cb0dh~V-Yew6z5Oq0Ad!VDwEc!
z?1HiKK9TxI2%@a-*>@rOyay$mTfUd}OOOuRnVoY>-e4D+M#LLyJ+8F0Pg27!h$uh~
z@~}u(%E!+pI2UEXG{shsTaTn@72t6~uNKj`%FkFhlJsd>y~1XM_*#Cw*zzpOUZ*9=
zsvZh4k+4oIc*Q4x2KPu0WFbZwh3^W+A?!26F}FA}``M2j&O6#QfymdC*%xajXppv*
zQdwX@xt+oTM$AfZNNvZX=AHreoUf=|N<limpvj9gbWY#Bl51!CS5<0bGFjxbyV4da
zm8zNbuadbk{RK{kz9pEcBk-x1UcbyTEo6SANBo>5;kp7BGQr%OejE@C@Z6YEqR2Qh
zO$PpJWWn>(Kl2u7>ulm4CJ<Jop+5G2tO9!JFcG&J^!MYl^#WWa@S*iweD?cCkPOn1
z`nKi~`|>;f|HR%!oc8j8gHt<ef|^;(Q@k3}#TM;>q~(*5=ylL#sG{o+CWd5EYMa4a
z(4T5Z3I3IjwT}JZvOWz(*#M`%n}DOFVddDep&?s2yex>IxjatjoUFYCsGC`=pTk=O
z+b)l?$#m>@oV!|SZ>ByBD5zF;BO`;{wu380>uC1k^0QfcVhJpb$50AiJ=nSKU9xG2
zM|+Bj%Ks5Eua?cCtdGxjF^0uk#fbUhrmUcLj{-#rE}aC^Te$zGzbL;Tn8~H9kG{9~
z&$Zj@s5@LYnOCoCdiU<Ime8mK5_`roM<qi+{4gW=8vwp7aGO}dF)wM!)O)cvB0y@d
zHJ4MVU2>1(G%$$)b*z~M6Yoi8^Yzvz`7?&)aYF!qw*$;k<Q+s>x7j>}Z5nMp=!~t<
zLBHIyJtTY2W=kEPQ+gvGS?p~-zqv75R_w8!4)Ec?lk7|ZLdJs<q)H-@#@dBq-9*0W
z)j*xVaWa@@(A-1<jRhq+WQcBfh5L7}{7)9^9g}WmR3liK*3xKcn`{DLz~_tG-oq-)
zb2a<XbHyvQd(0FrS}uuir+kwZWO0y3v{jYHm6Uj5?%ESIQtkriQyK+pu)@Fu4YS6D
z1W>a$y|DABAzaqVEOEf;Uakm3I3a*`z>i1Z{#B*RT0El67|q}^X2EM7*(qYiO`d~d
za!!(4ytJ(hVeF{k<qzGe-F=D1C>2K^t!ON+xEC{P#Gev>Ff0zWb=B`g@Xge2%)JR6
zoE}7MGI>$0XDHEjG$we?NG#+lne+Vn)FSqES9P~aEH=?4H`D1tD93H4>bPci5*w(O
zPL01K-C?brr`<%LA4zvPG9}MCqK=35N)-=6b0~YA4Bxxeu6DaFUhCw>1#O&_2w2<@
z)`8?ColZ3tS>#`)DI%_l?2<;F0(4G4;LdYm*|xA`ap;KvVh7OCf~sPiKFI+~Opw6B
z9_C`{(KDx5PU9m>_4{*vO?Y$At)SQ&D*%4D>>h*SVACWrPtjEvh2kdXtQA`!AUZeK
zIN-|#w-2#0ldx*v8fR{;sO`l^nTn@-%T44`Cif<;rP?^Xs&^;yh!9076#p!cc8HoZ
zc@|{1dRT<aZorhGY8fWT<}q1=o**Yh7Rz@1guw@eD7Y5dbc3}@S4oP-lWX%K>`j!9
z%gmEpK%|b*&!D~)X@tO01I~r{yFVh}vA=N&6;)Kz^l^gZ13?1DeN<dTZi0u%PK##1
z2x5nIoOg8v|6!;Ix?!Zgcac*2szFBH|H3GF!qy@@*eOYX{YNMxsM@sz;2<tev+7DP
zmGDa^z^%-F#iYh1mkETww1?Jv=rnxRZ^y{0Rgvk8=kf&^)^AVEar~=pK(PifuC8*@
zg&Zc7qQsizZtst`#4$D_>c#gBE#<wAw(d8yw%CGyA)Se^d+}2;Oe<kR0~2@t^~M1z
z^zOEuB$##NstG=OxD#6$v698mTsU_FsRvdYtEU`NUZn(`SlPmiO2*IWb*4h8EfI)%
zHYG!i9=(l0hNZ)O$npCdx@^~j!TM^?@)0?xY{c3q>VY<b&4Z@(l|*Uw#BM0E5k`gq
zlz*h@Bgdj`y{D7*-0vd@5SV^m{X2k_d`UsV$^}!n5voA}{C#LTA41iqp-5><3AaUY
z7@VrsfVum=B^dIrcbZgS1wvIGSw`aWy#O!6i8_H!3WknLtUiY!mx=qv3J<_zdOl1m
z?G6sDz+DyrD64cYaB-sNutH20wz=@sVK!+DXD^sjYWT`j`sHsk+MV$yCw~H^tLFsK
zQ#6A;@{SP&5$F+1_R(jDA>xqz2~s8dh9*#ReodC-12g;a4JkBJMa^2VhyI=!a4a#g
zW>wFy;g*IT-10%SMq~3OLcEt<s>Z{I%Ed=v+Jd@{p21Kxi%hkRT2;!S{u%V>=1d&~
z#cKuRYMvEfIaakED^+mtWEGmxDMh*fW<D@u_MS2+q@Ken?KI6-tw^n@8iQ&x-vB~X
z--3h6+EdMnvRu(`R|=Rf+K~G|VeI3&gMmC8M1!i_%GJ<6Ry@;=DLK`1Nx@ZaZe&c#
z&qX&#v>4*~J=E7B!LLfDU*|`%er=<!`U%i)ErpMGC$-(b#YF_I9qxn7Z*3qp5~iub
zzta!1`%vHB9a6}KdS-y(cA)&H#h(lYPJY%OdmG;z)Ku?rOT~)U85F((Xpxzm-A1Vy
zt1O9iYvY+(;=>rN)!;*x0eyi#G`+PJy1xQwwS4I5Kuj$;H^H2sbQ4VFD3z2c{N-jF
zfefMEGc!J0%E^Jz67ETyi45qBB-`ukSo{3$rp15m#H`K79x}5Wp32eMhoZ{p(>Tyf
zpq<6u6kdp>{D<(I^)zk83eic&zh!{Dsk_gohz(v%I5g(P^>;MEQUXR^DQm17^o{~c
z@R$?SzqA<)^ZowB*b4D@+gN8<eWpHq{9}FA^L78oiTkRqZ=<aRYooF`3l&dexv<j>
z8|^)85@CWMAUf5y$N*R{$MoP`kieQ&-`QNPmsWFV^_hL*G+@NwuLLL*kZ3c`+!g^b
zz5V%yXLGqL8*OBNx%#)O!ik@{C}06|hsA<b<5jgI!<b!cW1?|gkwkj~`AtS2I)Q4M
zNHtf-(Ozc7K7wQ?Igv%$w#T1o_C&vcy}PT7OE%K^#2V3~mY5(P0BqtYB>xNauk_jx
zr-hDzi`}6)n{MG0d-1*>B~5D&{sPfIq{y#pPZeUpb~nQqq%vl9?2b5k%_nxeg;n^u
z`>PD65M1MDcc5K2g(Sd8D@f+xyuwqKrLZfzrR>T|0feSjh2*e{Qgz?p6i~nUdyg&3
z!$Yh2ehPu9&UpP9*h0r?wUD*s-(4RxG-B35limE@NCUbmw^-T_vtRmiL(1U<ZSWcZ
zUFdfmI-k&LG9HxVGj_iAD6qGnZEltWtmpU0SGTa|Jt1`$PL3{E93dvFnAaTf&Tq47
zt|{1{so5|@XuBMUs0|ed(~!)X;n3rjK=W&M1{g8(e~L5<&j8@%I1Lnw;PHiT(2J1o
zWCwcT#o3~aGlk#Flfkv#;|AnZ*15$?Kw+E12%*)l6=XJ{BJFv%s;M?fS0oJV!1peF
z%?DZjp@eprQ-JqS`X5TDXjAj~Zi2JZ_R9cRgs0k(bZw%oVFmVpa7mrfo79=huGsHz
z5O&nko}zCtx^yX&RlIg5yugWLQbbhj80>Zlykcc2GFD?so~goh$yq~Z+|Z_&84$_7
zA{@0&d3m_`C3;#JO}pBm6((Xt6A&Vr?ZaK}sEJ4w;-M7(NC4U1F14hs57k?lA$V&a
za<n;S`CdP`DAY~bJBOc*J`tNNW~8#H-{^Hbn}>bC*%*U=3cO+BO&>nIC{|}(Lsy)D
zr%VUFbR8q^wj@8vsY8F|nUAjtTEYW?vj<hyeaEdAZge|!Hwgn8!PsiWEQEu!gZ>Jb
za2wbaivXh#=lU2GWlYWm<bKRD1Hkk;q6g`Ga)G;{b~4?JQLBw+P3mPZ)Z71&7*_6(
z<c8vsUeIzhG`!)sPkU~fK?xp7zP0Y@+d}(|Kva95i0bm51mS2YMtD_64+BQ5GzTS^
z4>!{p#$o_Bn(+a0P8|F6plBCar}LxKjA=VtN1aJG?g{S2$t4-Bk`5IxO}Nk?N~1v9
zk2K2@@n=5YA6|D9OP;E;%j(}u^Hlk-zYi7K9qaqTgyQ7&#0ll-idkb0wKL?)2n?W(
zz1^7TDzl&*qJTF$!X3oiMuTK^7B%f&GBYzhWEqsgV*N1*n6&&M&dXiBNYGcR7`#rb
zW?*Li+--3)ktPkFc)ZLcwK3sF+n?Sz$@Xmax@Ec-1l}4^%a?T$SFh{B+^de7l8^|t
zZB*Z^*t>|N)$MUIVV?2$A!9i~?vvNQYrU#K^Ok-I9h!93P&>{iJTZT{Ak<*?QS08o
z{z2?F3m_RS<v%)=$!zTE65kFgh$n63>KHQKgqsDe{!DAX{K(oY#m3!QTL%ikJ^GDK
ziHOd&8Px9u1=Y#e6KPBVJhGpZ%H{em{%tMH-`Th`MxT|!)sgA9dS)2=?%{&=GFD$x
zHgce}5yVCC7j(05YiQ%+{2>7NZ{KGApqiY7y#LstlSfbHygrEFokfX>w!TqK+*^}q
zQ*k0xFVny+oK%!YnD$?c7jL6E%Ita$W>_N6FwqI1d}P!Z_(7lY5_RmAKedwZMNlOK
z8DZwPJ5T^Mz<EO__8YY^*g0Kzh9h=N1$_6PIvJTYZcsF_0W!c8I!_N(U%r-8-1C;N
zyqK27Bn2x<g30T71GJq6;<4!I4yDi|t+GT;p;s~W&MYAcbXp>Eu=pmwW*Wa<n*2IS
zz+l`w!(%C05<=smCOoW2U2mR!trlsfY0Mh9lW|nZ8&IRF5A}Pm$7gSas|lkCb@Ev+
zL2o02#4GJFe1a6={{NxKSMZ2&)^f|VX`1MYYcvn8y}F@u!IzZQ!Vi1$A0J2TFqnJN
zjqc#>=)M~IIMCA=HSg4*)OX3vMp0+vH%83;a%F>G%T3_$0+(3H;k*9!fWHi8;D$ZT
zE5B<2flbC4&Xh%IP;{P`#~;zKxxb+!MIfq%=j!;~DhzI(-#q!w;zl41qxhs_9sTTD
zFFJN<mb@;TY^TEH(GP|il#=oT7WRpxBG#ZvH2kuyztI~`{`{qfvg5vK!7G`5*8i)X
zdbe5@-^Ic!J?>H<N?<EDK%1%cKLC{2$g`Je|FZQSckO`=Yo3`feD?FKUZ+Q|j2#=y
z{GKzX_{>{BH~XNz_+PAyvn;+~($Bd+3VD%H`b+tAFXZY;+5WibyHxzQr(epHgElKI
zu*P&RO9Q0ZhUU-lS=0{l&5GQ-9*AVxi}ID!mYaZ0?0RvIXv}frEkBl|7md=Aw61d|
z+r12F%EKtDfZ`!NL1%v{<c0==qNsCQWss{1hu$C-mBKDVa2~+eO9|rT>pG8`eK@^x
z!0y)*obn7Vxk>cu<(0LcUU6fJ_t>(01c%v;{_s*96byjaWHHRrR{yg?=Zq$vN~~A^
ztjof~dykpU+{UC9@?}J^fZNDdvf+lsVk(NU$;`jc2}9KGfY~)Lr^CH*f)0sOR9tyd
zPi9V443xc}wmOr9h<T-x-%P8|Zm#1(?v0_5^<4%$J&G43HBI<0=eO@#D5xs_puZZ5
zE>b1IfWcqeC!J6FS5s=eqv9}X>QrJ<;R?~Kta%DKYt$FfQAO5i7R<Ugam1HO8T)9Z
zF698Gyhf)b;{Z!ai?EkAh*z8YrY-bh3|cf!ch{~P5l61AP>R7=j1<OdO_B<c+hD?y
zb_OJ-b!%v(8K%>188b`Y$ByIQ_!(vc1o6ITOm@<O5BRspNV}>16sok$u#CuzPq^dO
zeiF(KX9Q;9XgK1cO+Pz;-#0S{%O8{q{{_uEY?UyE^o>_c!oN60&z(<+E{+(1k3HD-
z^CXEv?UQ5>m41Pm;#>L|ZZ8(uteczXhH<lK_|hi)m0FPA=Xz7A?!84UA@H2R{6V_t
zhI$7&#^O9ix-39$YA*2wzlFjinI<>g+y6=a()z<=p|<CY6QSC&$sUS@wXAmWjqg;z
zcL7deDrAE;Mb7XCdlkx4))JFG8x-8^)rwIY;?%YLk6asWO+n8~yf76`A5y)fa-=8q
z4IUFp0vSt*!UjDYJz8z6vhn_R(bgYTlBqfQo4$}GnqV|<k&+5bitU+YGIURw&Boac
zz`GAZDt<zB;@j2Tn06Rx`P<*p3#@E_Z#J(&XaS@{9l4uqNlX_iXS9c<hTcvSK=TjB
z1w1Hh%IKJ);vEG0)OH0+NpfXeB{{OU2@9zlELVuexq%ETnpPWT6?bLc0Z1-5W%tIZ
zTe^D~2_o;qO<EV1qD+LgV;Vhal>U2%3xTS@dubnx>49;_m5@Y5DPaPhm(l+j<*v3k
zR&Ek=Oy`4|>7858RqhURTN)XCgw1|j55oZntqPDxQ-IT<I2{C9umMp?Cl^g-Eu2L-
zs9oYfWfA$JrcfD7-R{m>tLDUUbC%>fMZ*%w0W}YtH_zxE^OVBXvwR3cRJwfhLs-N<
zD6i6c9)~Mq?hl#Y^lWlhtDM<PzF+nvd{mzzP?3;oxRDJ@8sj`<u{wC{rb>w_DSbQT
zEgb>JRW7l0Q~bx~Zr8BTFp{z!#Bf)_9T2jhwGgCL89V`tMc$nF=ZFK{!Tzo$Kmw5n
z4+eHdxVB7&X(?++fb$>un!YaXuMn;BF(c-~u79peWXXAp$SG#yNVH)6&MHl@SpZMv
z!O^5m0mQ>6*F*xQFP#>DJyzQ@Ai8RK(;SE{4>jEwU&*UjsCpG^cUCJd{OGc>1bTjC
zzI@7r#5{rs`QS~>5evA1%wAe3z>xx<t)h64GjAOCLlef!<!P_sy~$2|H^z(L@Gdl5
zHP(`4ahG`_#q%6eCM}UE5IAvUSFCpr1J~xR|C*(H5+UFb72|#}rE(Sggu1RY`vQDH
zsdXUtJDc*rm3ub}e+dx1Fpg@mIxGAgK3^g{rf^Q*Hj;=V;m*XV`+%tdGAzDl;^Y)$
z{ap+<JtHl~sj9!;*=kN(bQ6|~msKVzK|gi>+Ci<aOC_li!Pt4&K8oT4zz;>Icp_=!
zchm$5BYnPplaZqnus`u^!nS(C+S;WDizow|QDXX(%pNgbR42^e1`g6EGGP6&7crRo
z>tMTphrH2DchhVNZh!bUW7@uQ>fz<%QYlMUK&<S!C$ks{UVj@Ch&A%&?4cVA4xPuM
z|7P=6Bjlm1Sk$TYY^{okL0h!43uW{KCTCc}6qh&w!`e65-xMcQH%_6OfGmf-#U!;J
zFbY<eT_PMcX;M6qf!>rrHE%uLQ{GRby()G^_}DrACJJ5M8gyJai%U3_Hb30>P1bYa
z<;0#2Y_sHke)|e@>DdRe6}g|Y^U?>nNbk70Z9k7|OwGr%1=4t#c+aQD9VD$^ZO70V
z(*yWQOo=t-9vi#DZd~^1{?)EoulX0=bGJt!*py3AH2Q0G5RX*CX$E^Ht!#^!U<qT@
z;&6EkINA&xX4Wfb(U219a=4`z7h(jr1BBi2tP{IBN*GUf@+MZVx815C@af%4^K_Qx
zK!O{CN#mRZaV%CqZKn;%M#BYz4exk}Nh0K1l1d2bscRTwP?_7A(Wj#F`N33GOO%Du
zW&=apciC!FPvaqQRS*3Dex_`gL?>l9D|Q_<jfH;lGW0oEs%I%l^s~onP?cS?n<<b1
zrV|Ol#s;#dSl#g`ai&pg-@TZ0gb+ccPpuM=&~>PkT+1HJj{3tO+RlDmX3j|d&I2sf
z2R2Bh!Cg~w18NEjv$n^;k?HEt-aK$(v$>m%+VpF@8vP`E(<8I{=f}GJa%>jP_roZ-
z-h>cXv>%y&p1RaLGq^MFjq8VUDJ*Bzm2Ht-!^O4qpnxbWnqTcKPWiY|xHovSg61F_
zN=eZdL_UGtRMNz~<v^xctVL<Qv{m4}ip1x*29w@g?ffZ9*~-6;&uruE^C6=ZKecgj
z3pdU8Y_#7N<TiEL3}rVaGG=sMv|d%DwM8NAg6z%+(Ag=hg{<@$-pMb~u_vjFHGjTA
z57xohZCjlVI~~3@47=>(x1=vB<f-G-UsFpsRpFhSY3)i*@Gbt}|H1jgTh-ZmW{_2U
zM07Av)!<XD4-ai#gx*ww*v#n{>R0&B(RzhbxGU0{N;KZw%v9O&#)b^-wx$}9)<a{a
z6n^AdJ;#8s?E1g0CvfR8(g2rgxA=*;N8Qmhy^352AJzQ#A8!~j9`2LhMR+rhQ}8%@
zA?fkY+(8fe7KNo5@2!A%&OQXjDcr>=dA$dLL5lV3w}W3X3;>2>aa^r5$u;^nd0FV_
zn&E}K!QPDkr$Wy<@C$dRD&n9mS~tn)q6dTMqVG&XbRFkmHNC7E;dm!K5Y>iNq2EFa
z@=bT%F?X)p>wA0wkdlOt)-sbOJWbnlh}lDb3jbH_V~$<jX#eA7RWjtl!dWFzeTZOV
zk`;?gBn^nhKj>nuAV=}D$;HHsQz&Ym$2dU$7=5>(hTy6ksf2upH1=PJ9?{;QysCMr
zW*&dUNi1hr|GKT&=E16qQD2^xvsCXX%Wgh*q&C_O0}2CEcD{?eRpQzoPH(#Ltyw)`
z=cZGK&9q{^dm9Mnbr*`X2g>)iz;(u^3h0)3>)-&WoF-zS!;CwoQ<jpK$W;E}7W>>F
zT_)(8Ae6r-sB$e}W>O?P>k@5XN`h_PLlH{CZ42VEK8;Q;V%nWUI@*1m>c=tl->1rZ
zob!E}kE}6JrskT^OvkL<q0rhV-OzwzwgF_4q;rtpi7%>>UN!$JpzULj*&s9w7s07=
zYB>hp)JfzPssJgH1w*zNA-A)ni~}KN(-3Vn218>qt>I4)wZb+cR*1H4cPZ}$GMoU(
zdn%;BmSW<9bP_Zol@Yy{oQEW#sDcs3;3&6M{fqCHT+%fDA$RHV(*IaTmqq#Qp9+e$
zei9c?bURF*{962Jrt(1;V6RCn`1Zo(f|EH;WvauA4*wQi-(0*3#r(?(uVLP(*DOXf
zBMlAM17#oYL@s4e<|Z9)8YZo6@pd@WW)p>M?yM0(s7HF~l(2Bo?wJS}0=(cXaLDHx
z5C#=DHC6V_Yds#a%yQo$FLxVVqpD{86Z<3!x;UBpfWoz}+PVsJM(9o9(T0N-Ie&3c
zs!%^33gGDm?aZ1MMQjbbkwO*r8xyd_zO_Qs=^CI@e?R(7z=Ah*ll5Z>RpMZOjHrNp
z514MRMf(cu#p)rDZ=PNit$zFSqO$(LfF;sas`BL34V=8fP<y^9qoyWWZ4nL*=!qwE
zn{s7m4*CY-g`ZKx0lat5^5R1vo|c}ud06@icuanq$JnDxx!|hOXY5TSZV88cD-rh8
z^7f-#0--e)X{?@%Ir3IDHw{%q2v&kD-(gckqLBTLcWVmP?KVnyBh2;WcnN{+69MlM
zi`?`ZVl!ue--c#as7AGo^1YTzUkZm=pKs@}mP^oB+;r(@yv$`KWS<OPE7P|$<rUMs
zbdYVzTYvc#HdCSJ5<3h~$ypgw8c)4TR}RrT(Hn9lFi_Un&wA5V0xm=-#!w$Y|0dF!
znPJy_cVuX85x3~lWh?&<%LV`zl<E_uX|6{}p!P>G^al{3S6uss|B3oUV1)1EW=&0>
zslm+ZsJZ*t0B|AtG)a57ISJme{5+lguh?Be`jyohz}hrhf3F}$vzAvd;kAO)?j=d(
z90p>wrx(3nk*7m#9|lvJ0pwdIQc>-2Win1k_5lTj*4GYTZN%I`$Y$Jb>&E}|bOTrT
z0bOqz<p|Bp0t4a1d-XYcmiSoyrbvavZpLL0!D;_Wd&{~A)U@+@L<TYH9EZ{(p0`X*
zGMv0Ma<ijxUIPTmk>Wi-$WxrEEm34%GM0YqMF#~6g71Zab7`IBc#s{osDf&YT~2n~
zNHBrjo61*$jIQXKKqeHoZSa7#VK733ZYqKmfA62QdN>oIBI!`BxbccSFS%iZ--@CZ
zZF=#Wj$rll|4>7DCC42!gUrE!&;Xorx+LX$1#A;C$#w0!llWqt6XV)j?#=kGAssry
z%{BfeE*_E3<g@ug)qsJyFTt$(2X>v14%M?RHEP@5ayrIk^Iy=ka2^AXibJ{}`=PX-
z)Ek{I*LYD_w@^JePe+pS*U7m4$2Sb2dH08h$cfgQd;G|@JE=Ki=SDs>*lWA0#cxlz
z*ea=zeQ*dj7-Fl`yc%x@ZMsc4w@oAM-QhlLge$sJ_B1z9)jjSpVnk+G^T3`tCG`Il
zD|@CFBqKMT>V2QkbnBUo_JFx^;^MK``5VP@>1GX;%+DniHG34J0%mg}a+0N)*lkUJ
znOakaHT!Dnyd3)xu%j(o!qDi2+yq<V(%ybO6@9lBM^t}zbyjtXSURv(^}@i`)g{Xj
zKvHg6$_3c-=l-50bKoip-?P|<N3A`>IwHhn;STGx&O59vU*yqgTgnsg>R$yuyLZB-
zwNY9;cz7bFriVbF`TeR!4sf3(1XHRnW4fWNRAzWHbJ)y@3q~b(>1y6D<R#qI6o34I
zIEHsQhT75$iK!VRUP8dy{~a3u_A>j=aSICbTR(WoB^mtTa*&w)NVSmrTk6OMDNbL;
zJJwQd8V_@~E{giAq6F4PC?%lTR=D9JLoMHPB~uqWrZlfNU=@Xop^D3vk>T+1R(+bj
z0?KSm$tkz8sE(<5KCZhO92%H}%}!8=jiqEkX(69=>RB?YDI?Rh(Sc_{$UqKa^5zc3
zE>dc3Y0NqS4hf(<a+EWbNXcBTaddP}*P&Abdb_MRp*1M=fEqsHC6BEBr}do_ybyC9
z=F=;QJ?KYig58v})Oy}@W|C=->T`pKr`TV0L|{_N7yU*Qwn*3KrqJx}9=R7(hA)2%
z7M*YEH`rhw#I;{^;kV!JdElet7FVJ4uXu=pJ;iMoRn3B6%f=O4Ef;@rX%jP?oqqdr
zLenl(29Bnuyd0$Kvy&X1*}*I}5d0mlC$Gk428OGdyt-#)t1}b?)Uvdv#qBvlYd<$3
zW~|-I$qq^4=IFWQ)!eNS^sy)1m9@KalAEhYDrZq^rVg5U+Eup>6?F=R3p6~Cosqgx
z&KZkb3nJjf7c5m6W9!)OZmW1Kwk6+L!nFgTen8KSHlL8NgBRr8^Go5nD+3APEKW8X
z^>a7l?<LMqFkq^%3orbgp-AY^q{9Zo731^b8)6GkaJN_1Q_J*${B3_y#@?&ukeslp
zySFh!(t?@#FSDpO3ORulZBOC(i_Q~6L^E<azRK6vP&to)M<~oJ)4mwmgT@+rTXK2!
z_}!-cC>LLL?SmUH3ze)f!aQ`7uqC={fS3NdB9&h`DjIMlcBo0->sP)A(lduUG0<$I
zV7z?K?&bLZd=@9R`MgeCwgRe1C5X&;@it~yu-SqJ&_{m6^bI%}8=eR}kfBi|{J5t{
zg<151@z&=hMNUjZKcK0p(A#y}n#hCO6GV7rjmPHUHS;yV-)_8Vcgd>yjl9#WxLEC$
zsqK8zguMI4pswXwy~StHvf8zcYrRyGNVOjwKrag|0$M98R*hWRL{%n+g6m+^y1S7a
zW7|AG+~1(2{|G3_=Gk}(+IfH^3VR~s$$fM2jLPb#M(?yb$d)oc1~)nTbhS_*`rHHD
zHp;OuX*a0~;8(ou*?5Gv1Xk6sp;g*%J<XsceuSrR=y|70^cnvcv8l&AN~_N0m<O+$
zdnyf@T3Ts<IwkIcqxwooT;$qoLt~CEZyqd*f#w{}rk>o!KM-2k19AZ|#*{Y->2jTH
z^tT6Uy$d`pG(IwImo>!I6MyGm;a(FgM8|}>6+9~hA@Jl(b~28uZ@I><|7@33^M+rc
zvZ?aI{s1|dgP{*7nUc)v&dk`m<*6&OvOG@nr0Pzd(*qv!Sk92Y0c@1J{R2SCalT#*
zh-Q(*M8u3ReO?d86sL(YOSsR2Svmx5FU1p8Px9?R=UK|wf1SpaJ-%vZ*9jZHLnYRg
zPW#LrM8>=#ooG=NdxU=MB$9(8PFShnr5C-?-=u3ZY7^DQZZuw3Rd;ucQcGC14r68H
z1?Gvn?j>UCa+?>X6j;)~8)c<wJSzfI1|#X4xdk)SM};`k3R*|uI}HO*!yp$TML*y2
zgc9St6w92p`oT{w0_Ug|#3l!w&1ZvnF>X`IUvZc5Gj2p3)so}hZ2^(GsTlh4oe6RB
zaZ_rL^yJ`62yEz56_JYqVbx#&<J0GR4K6m8WrlE0|MTt&Dc8Qr@xxpxFJyF{Iz!;=
z1Q?vE-dEwSWum0OTmLV1Ex7rLiX#D$jMgNF7ypp07JKJ+y~_ZgX16WC<A=j}O|$W1
zbE62Q4}*lzX1pkZku=f48Riw<;#+JgIt;+$VR3I3tNdQNQC(4se?I~mjy;OHVX9a*
zEc&ypmkAq6sUs(%_5Q6di}Sl?5239$pKBhVmYpzP5?;b!Sd-`b<kA_>+FvP`e*EsD
z*Q(J?=b#hZinpsDR+>vqj2#4D3$slH+g|8a8KhFls*Z%h*1SiUM#J{)J<^%8lx_H_
z+*V*$sRJk;WNq^B=N6V9OVnkiC;z_qm;VD=JP)pn64;8UmgqIxk9o-F!>Y6?GB_fr
zDC9;WwZJUHMiJ>ZM~N0CwlL*erx#WP_;;G=+|z>6Z6_TT0m<R$iSuW}>Rvi3<*wA0
z>u76!T9$VG46F5xVhkb(Ahg&NIzXx%wyL|lHGV34D889>wJici*V7u*0t=Q|<YL#B
ztz5P>e{e3`O^2B^NmA{aF3nTtOv)5=#D`(*RrgD?X)B5)Zt^+syP?T{n@rzFUz=n5
zN74PWiXNwo4<EzUACSvP5xHZ?hXh5Hz&BZ5yuDPAfCCn!`#bY}wTZZ%$DjOCz;b@E
zeI#+ZNUHSRU&C18PdK%Dh1{2R0b@goM8d9BU9=~<8wYex{7<{{U}b+f%!|DTl2iC9
z?EN{`*EtPj3c4WX@Mk&B{tK9_gx4#MwNJHBOi91pWnr@b4S2%~|7<4tj$`z{C;i5C
zHNk|R1LpJ0ZO-6o#xh?pJRkRpe@*!G%L74@Kr`Tf#ZjWZiO&)RGub#Tk20iNMt7s@
zgDbXao%{fF+^xr@MMDfbrUYAl)pi%S^#d7p*v39<OShs<y%O=oKoKbE!$M)L<dsPc
zFuoj!{546pPar<re8F=eoOmkyDzg3Rwv_34-0KXv9EB`y6uDh&s2YaOfw6L{Cbfs&
zWJG%fk;cNo^duln{?u1kFE$OCJy;!ho!xp_7uZ+<To6%v2aRO>UbK{LVQy^b1)kH$
zKPl94>5$0~yXJd}SLkzAREXa633MQ4!vhBx=>AGXK<bHXlWLcOn|lMrfbBCrAQYF`
zdk~jo-5iIv{Z<F^c$s@(Gyj+_E42#O!wxnOD#QHi44_=*0pOcA9efqn(S{sL!#pHo
z48N$2Em_Ma;5UZ2cs^_(3k7I2-U~qTv?Xq$2j)AtlIKi^ilE+et>IlklD?y1gb6<g
zYzOXF2MoxpuyYUKMLDP@KJZ4|x~~5<Yu?cD2*XH(s>!gQRmY9}2}%wdD|^aofvG7Z
z$}JPDIK(SaVxW^A{Acpkym-I1Fpfzs8X``5T(#Fs?s%icD{=-ZKq@ASfR4Uoi=fHe
zBWPFmgmEgs6i&YdY`npkuJ=Bcn`1L1%uelF&ENt{kg=UL@7SH{jqU<tXkAD_zN?Rp
zfBTTP(&#gCoc+UDDqL%OL%k)W+WQ!sq6^ET%q-wd>+h+9CzOeaT$}1)*sR#pEyGoo
z%!@C>vbCS+__ka9@1gGo{`l6LF(&sk3sJKnjXY^=qK&`kAfjf$au9SBSTDlC&}Q{t
z!Q7HS3b}z<$HG04aJd`K%Kgn6vbUnd?09U&wCO3gA;0fL1~3EtG6_v0+2^|(EM$PB
z!e4DF@gC~#-(!-&)p1>VN<Q%$o9q6*Yc+VCceZOZg#Q_~x?kK^nu8XC%a@OHcuB{f
zDc*EyOx@yuGYsyW^c1(fWSyaWX|stRimdL05E#}D{jw}^Em~2?3q-HyMWa2>Ol)zu
z^BZX3Xo+Pt!v(R5I7O_^F6vXT-dMlxe_Y<#J4NGY&>P9vEt$O5OMeGWi)Sf}V$b4T
z6?k`NL=6151+m)trXi7jGm86``+5uyeKXK^61o*+I<unE$MkLE5WD2@6_fsMJx^(>
zHwxLP2x`EUydZmrnDSx<W32~Zs2*qdITH*wOi*-@Dzgj>ZH)0xblHmK!bP%N)(;hM
zzZ8{a2W1W8<ocTnFo4{q9<oJ*o>KbY2ab5A$Z!~b61B1U<M9{X!(uY*V#)p~k6s$;
zVo5*XfB`es8#RucEZKw{R>~<ANyaT1t?EW*`IrpMK^O4@Hl`BA2<w=J0ygE+$pGcq
z|C^h)@>}`ry<&X68*ST*N1kQdVJh%5gY>>et}ap`t4Co)@c3bo%@TOBl~q`KqBSD+
zLA~l!yw@g{=rQch&^M;_kZEJGyb(FZfkv#4G^pG6ccF-~&#td=f&g8`6N*YDhH3s<
zYKmd;j|2y#n?@~+is_cpcN_2Hzi@#05K1958%BqZ3r<I;80$7DY8xxtAx%WW|GBWm
zSq@&q*J9RIHv)hc0L+XX>BeB5hjHX11j;fCpAMG8J}tIW^;_3dt1Zn5H)Vz0rjRc&
zUqlJ`e{Kz9Q&xkVvg9#2E2j)?@Mm@*mW(TY#(z+-4{(Sc0Lyw1>9?fS5KeCGmi2i%
z)(w#0N1yfJHx=jiL@MHK+LHPd`Dj=yr>X@RLd=G?a$)awHU$!(2Un|M7MClb4EXt6
zB+(M-dnkUKSZR5^b3HCgy1Mc~e@xyn8hgxS19Qdx+bL#cDZ(_VB|d$T*jv>B#TCca
zdxKr&e8o4%6XuY*5+?#8@PTJz$eUu%+^Fd8UM7{aY~{LU^Wxa1HAY>92a4ymBe27}
z2J97{1gn2&i?*s))zVYbjBVvC2{=NK3$yk$P{xD{iZ!AkVOe=}Nt7sf-b3794<j{I
zWEcjf6L%f~{*LifnpiL>X5cVO{$NG3dx1tb7BI90F*{^8!B9e8%MOb&_MJiB3C#*|
zS$S*1R#l-J?i@_1k^e7o_d}qE?y))7uo~5^hgJe3M_f5gE=N&!(drgJ`XpytA}zj}
zCwxH64PpRLF>kGKWNw#f9MJ^9<}dlX_50T((_jD=K~0W2544BcObt_y0ekyLUpU7J
zo>Tg6<Z0Wn(twKl?#NI*1ogfX$2|;g9;?T#+yFyByua(swhlt$>XokvEkCBPV4}R{
zA8znf`5(g>$Lql)ZJ9rPp!J86-<mU^jshv^DC=;Gm!4lv{;XJ)g$x>{ffXZ|5mF?j
z#>%P~vN%MU(X^X%_e3pV7pP9A{}dd6X4-q1#gugcaGvfEfOmr0pn~(>_D=gOVhX32
zLW=T{jfvbn?zI$9cET0E!Nk-$e9?yQYSS&e5qP(ojocz99U15ZHh(qH>vx7Nt8ibS
zW>acE7W{73LnJ5BqE5zjpAxPHOS33-n;1cLu=-zoSBH5}lpEdoziN^9#rmeQsb1Yr
zUxZ}*rL03es9Q=)wK}N$Wc;{^zPl!1@A|`xSzW$C#Hc476YgN;ns#N!2p=*C<QXA0
zj;aIoslb?d+hI#x;n6E%(T8oOZmig-@ILWT%)POb3Js{sJalen+UkeF_-BZPEx<$5
zriP)9<TnC@2_j0jmVc8HOhwL=nU(Z~yx)a{ri!dQ<t+^u#PdXzkjZO43<{I$t{|ib
z_@MLuiIF(MzF}o+jY0Ju7eJOyWraf}v_sk;C2GQdza#UKF!S9x)f{r##kxIWh$1EU
zD;Wkq1qeVii(8qUhSE)MS1K0cFc47$O!xC3HGl4VqSk<1Bjc-Rq}tu$BG+C(akw@!
zLeHDvg%Vu0(r!nbwY7d;h<D2PZ=|W&5QkU50EQiefhVoRIAk_;;RNRk1e|$t(hxwl
zFFg9r{qCm-1qY9QPKn0{wABCkplqM~raYXV6W8kX(qhh>Oy8D_tM?rYK~<yUx|$oj
zMF4yjlG}$%X;rZF5c2be_VQIl#G6{j<BWXNb1OWtX2zB#GD!t3`l0phPY3z~ycc$7
z^wO4T@NlZ7Rkw5&xc8WJ#;giq<F$~Fp`?v8FgV}7QKQq@V4;MGAFAFpvU^G$ek0Y-
zHjOuVT|H*Tmk;@TSs$!uQ%I-_{rV`HW9%*lJ}w15;W+90b^Tu;cwYRyFhfj9vNiyb
zA($);Jh3pl%Vr8FzoqP-Bbx==Ix}c5Hx0a$RPy8KmjU5S{fV)cDPg(s+>>I^l*s(|
zNL=@L#@QT_lYv<UAfS48Z6$LLFNg1ASp-2w$yV&9l3i-J;V{oAh=?RCFbULGwQ_+s
z)Nh8<T0O<KTtXvAjCoX4722I51@h*?X%d3J617uDC;Xa~rYq%v$-kC9$@Hx?9IVg4
zvoYUU)ztV8e=ufAMK(kJ|Dorre@~R0=ZddL@Q85{F0T)^HDPJCAwSjLMD5z`B*<wH
zM^3!RJ)~vj-Vn%gS?LJrrlaPAJr|adsxvHFwy`3&A9d9&LlokQCU_6(DqS&pvCz5I
ze%?H6A1XFEGcV{@_GfZ~6O&W!`CkKwkH4a*Drczc0DsAoK=txy(C6@Yc{zk>V#F$L
zyvLMb2eZr;^fC`$4wE8px%41dX7~&}g})Cq3rn>v^^Ho83n*<ht=uR(ANO>G-_iO7
z$zOxXN*bNwjR0yy4|Fr!;KRxl4oiBd{+1b9t5-guE_dPaesY#q2!s)=AP@?abE#h;
zxew~xUsQo`tmkU|S;o<a-KQJ))O35*=PYv2W_Fth_oaYm#a(`HaZ-fbhs&O~**+^1
ziW{O4%#ZM<SZ3z9Ti2mbr(>&w=uBU_=@t`9&8JLA6Nra*txGkH8Tdjc5lC|x(Wx_-
zLMQi(SJ6Y9!<A&PHd8IHlLXX$!@Us=C@Wz=+j&Fa*oJN2F7Jq8<ZfmAcqEu`ec!#l
z6<|1KmQ<c49%z^T$2SBcVAl*3AKdm|@cEv|U>Bngd6KA%BtnX}){vHa6eu%;mb&0z
z=Z=SDlKs~<N84d}UB4cu`({u12F~{XX&@N0phmXAe>mt(^h#lot_asOquif&C6B>|
zb9u}Vn24v=WqV=V?C;`BEaFUl-`|R6Tf_e9Z94OQM7abrbJ>R<{r-M^QNc&(>CtD+
z7EZaIbt<m!9eL+DNYO<5)L^W5)HX<%<Y*{ocNDTCHBz>{pX-0~M594KRhQqI7^!W^
zaY3=di(#ylqe>U~KN|cy7K$K6%)Hn8Xa=nKT_xDAiZoGe{juTes~QTrY9&Y?>N4V@
zGbX~o4s3=3i<gF{;KM=L{9<iAl7l*6SVa~wB4B#Sl~;K+P!gLhq~so)yy^E2s>pDH
z<R{cg93d5?GCqj{kl%A2-4g)~+G9A8@hXMaeb%a?rI}zRBnn}FG=LER#T)jDCe`p7
z3Op}we|9tMne&`3)h8U*=)El?IA{FtXhTeOpc3o9`+Wscio|SkBk03_QI3h;JLD{d
zGe&tMV@Qi+d&n~Wc&REE%z10MYmQ-4f+tWR%JRw#Qx~^rQM_)Uvc<p7z4+&GlC^xT
zq(IqIxmmW#KXy(FH9&#8)U^-#j;wZw?q-TXY__7>0U*QYGvh|!>}6KTy(?Xn%lyGT
z8^Y)6uTV?us7;fOHoLPU8(ksJ-D7ow$bqG$>Rz%X(X|}=rS&VFaUey>>M`Ofe5qJ(
zg6gX<{RP!{iN}3+KUwHS71XQ=`!#D8rK~}~v7`uS7%uJn8wBsA*IhyYTzRf)Lcafw
zN{aC4(w~V%S3!%Lk531ME#-!yc^yzvMTM86R*>ib^W%&(tbsc2Y6t##X#|kfD451J
z$e|L@vd8;J(R2+QZ`yMKJwZ*Z;`uvLI$|T*$%MBKw(ol4GCn9j5Xo-^_Ng@O8jek3
z0*#kpE<MDkgXQob$J@<HzR9K9CD@aeJ<4{a_K)47{l+w1r)FLX*X?{`;_buoxo(Y}
zu>g*bpa|Ep*6QD8b~l_-ZoW!j@;q1$27d$RQp=K+9o07x){8gB&V|sa5%l%9jNV_6
za#-Z)=-3>T&BvT^Q_(s%3}%x~hS7YP@bPd+tQ4Ru$q0}mh1QV539Aj{H6eJyzA#n+
zvE%H*N@M$gs>5`fN-MrnZ&&sP1I19?RH+{Py)_)Um1x9CY;nBNUgr87%J6*JM!+!!
zU`H+*)Z9e2><ffK$>KVW&g;V$wP}T6?2A-5rQT~Y5ab4IWxf?1wZOu@H4#HyTee><
zb_E~&S0KNgH^YjyTQWv-zf5S}z5@99Dm`Ll(H+?gV}`M|_$w6MjNO#)Drs-2*~xJ(
zE2KDW18?;8G`nt0a8fIB)v4SQKj;Dgo~e^en%Dr0pls9HTo_8tz0GwQd{YC%RJrL8
zs*;)-VYKZod=Og3%9U*2*8o+ZQp6x#R+bQ*QKOUs(d%SA4=UP-=`GZa_#Y4uIl&*}
zD72XMR34Usvhs|P6e9%e)umcrhx1?S@4VEPNlcN_qh+o)E7u{|5-5w`_q;r~J09;z
z_N!hB=f`hGdrQf-=aB9dy>zi`8gHP>NKpE>xCXsG4lEEvB*!U$ajodk2Ru$&2hdZx
zih^;g(FZc+UB9{2FXvCGIXXN`OqP<fn}_la>-_j^+|<Be)hmq@nDQMu`5_n{F@>o|
zTp02IA?HR%V|H)60&w6D)xzzUF+Y2VOn^Hz1tV(!oo-tFDsU@k;zffdN>~nIUR)fd
zg%!L@9)>=7<O%bjP&O4Vp0~3dBR~H2Y>{<qf$~7TkXqr%&iGK}G>OI0PbQ9w_)h;T
zh8Na45}$}9e}+H-MI0}BEOnO42|`LNlx%9lQX<slZLDw-L>|LQYat?qmCjBd<v2Sf
zeVfeB%>C982)*t+INZ9FaGxZu#MOm`{%WT%H_=M=i&)h>zW?f6WB&2ahY#p50>eYB
zCFNq4g@*ZAcl-Q!izgDnu^@T(Y3JK=H(aU`yf5yFhsP9G_r;62>)j9~*l~<RXB&=?
z0Jv-*Wp9uF%FXVfsPGO<JVvmbxoX{K=3?Qo-ToE<h0Wx;X?vUAD#`h^Aw-5mjc9*t
ze|j#E9}LRtrUW1>{c$_u$Wfo5DaP7RqFSk9$qtS$6+C~Y--M#94`UrYWkyMEx1Ztq
z(mq~NyZsoQDT7n6(LGG7V0@6c83~PmKbm2g`t8H=0uXU+lUYqApI=bizmlIyeagzC
zRN@C$EF@w~|7}dFQMQ$pbg5!iIBCWnk4Cc;Sd`S(ufh_zRhPOvgjQehM)$%q+k>@o
zBK1mbCU&0XQ8i9@VOV&w>yRV*p;gdBF90=sJ~JF-ey9xGGdZa%CbY%auT;nI1xEgH
z*&SeoN<yp8FcV?vsx}1H`A>`n0m}N?%w3ts)A^9cMT4k-%KE!<ozlDPOjg&uIgnyI
zZX8Y%FjaLE-Kwl{P1--+G4Ep;o_T~~f3*Hg#GdN^hOt(>pLAj)(7zw*6)?fnNNR%X
z5MI|-W80Z?u)I?K#u;QtDrPeDhNLIsw^cqdi-3n%PD4y5l&|zY#OfBO-#ail-iaUn
z_jru=%VBQ`L<5mvu`&T(KVYahUi<FWh{n%K<H;3gdmUKZByvu=NN;x{4IR5S5^$#s
ziFa40(6X~!W%}g0#Iwlaa+1G4WoU2AHPD$IZAWddZ5p)xV+qlNiLE#6PrW5=UXQHG
z8PzTrv6-2OPz^6z-tDO6mhG_<pzA~zjoA6x8+^0(lwf9h&JfY&-AXx%`^)wN{SwLQ
zFZlo;(WOerq#KZ96kc3e03x8V_PyXRO&dC{ku+*x0ijW{;Xr-E(h&BqtA437<DV*e
zVuGs#{5PerYhqB0T~^0-1@cLSIosZ|;Iu@Imt)0@_vM|8MovW;vwx;2poUs{4~^6A
z#yF3eq~cZ4uuJsQSi6Uxt;xHdZ?LE{b?z<nzyDfXPq8|A#2c>rx43ERLoUnM{6`o3
z{W>oPg7r;FjW>Tz>;G2?eO!J7iU8^n6y?nef%KH5rs-aYa%dBlIwvr)TX!tF{y<K?
zIxOre7)owTPj$Abx5()yHuZEPPSha{tj<tx9<J^pfy+5l3AER;Z+Qx6Ok&FHxY7VT
zR~y>zqd-=!COERCh5{t66wT?T9ap06A4}bGIP|5pzbNm<*g(w_w)i)Xi`=6%jc$i^
zAY9%DII=a656C>2Y`{PMaIDOoT{hfx3DNlTEYZmg9S_>@ZG)>q7T{165yzZnu+r2%
zjrW2<m2E=XT2fdLB0~=+tr+d<ri<_whv=G8LTL&qAz4EmQV&Q~DSWYAvSL{3_J}ML
zL)?tnGY2tK#3b#vTz4*2K;$i!3hPT0V7VU8W3d0&VW#!7t7KTR-1Fcd;j-!uV)4yk
zfdBvlsgDays~89k_$ldiAiQ9ZVpPxqFuZTcr8bXe?LaJpxEJEsZ^Fq*S=9}<ctE2q
zct1FNu!wy1)f4x1=2%GIM$_SV(vY|K%jbYl%hzJWdJ+0fBr4CWcP=vV)Fd!<WTMw)
z^(CNlu#-`0M`~!JtHdHf_0Q>yNsEM#dMVC9z;wtK*-!_#unQ+)H@Ml%yP(rL!RqU)
z1^eWt|JSl-6@!actR3{4RPCsNy=5u+LC}zz+NNkq9?>Vwkv-s624!J(p|H-XI2w=@
zRd+1x3S5m8vZtTZ#71j)Mv67NQ0tDaY5(i>xh_yB9klh4zw31kz*xxXql|?Lr=WOh
zrLH5d#;Zfb+>!PB4syHf{51J3>IW#OA+%tSR)q>GNF)=BTy22oiC<0xefRA$KV_Qv
z4N?Qj#F7U1_;iMB5}+aZb-yi8l$KjS$}|n$`H@N=+%HQUhpA-(gJmyvHq&!gO)Y;9
z4`_T)6f>_*!gyCbco=-*A#oSVe|)Z%nax&8+qt*I|A0UHPk$S%+2rRC1@|oVdkA$5
z0sT!3$V<gPtBk0>=|>7?>C=A(Nx_Y=ESvW5=L9xsvGqCx4U>5p26xQRZlFU##!TlJ
z*>bc?MElfD;uF=QrvbY@2FvgY917ck#(>847Sw7j0RO?{Qubv=Q!bHgXv1oVC=kM{
zvLUc80Suaxa^~!ZHu@s%sB+h;cpqZpj{@|qRF1RYW$BHx=F=0of(hB1BUQyaxho(5
z{>9sx?r*XLXj&QA$35L$qg&I)cKa4FQsorZE6C`OW|@>Hia_SRF+KNK1PdgtG-3_q
zY?~`gjbK(a`Po3qv1;9<I#>ptS*ycp=E;2KS!N)kk5B&93E>~bJ9K^bBa9}X{f|;!
zzZUiUmCi%flM*}!spD?6zMt~+>)dBv?hO(ppe^LV6iZHQg&zR${AoDL=zCQV(Q$C=
zLm5t98Zt`*^6a_L+nN4GR3}iYvKj9vbu$doWYHfxPRISyH>8DRlz&ve*`JF=p8`3B
z#FJVU;sfx}<J3OsVo|QKax3|vpJSD~jt7_iUbP$t)#*<$*HIBgHnWY0MJgHi&0|x(
zG%EJ~;v7U^JsGH}?~)R1a}^T!G5^t+@ClH^Vhpe7!j*DXL0hOqVol8soSDfTp;(kW
zo6P^`YUTI7(1VzEEJ$Hn3h*0<$&kgX$7P#Aw`CR^*Dp{!5Naw;p+ETrF6@C=p{IJ*
znC$o~O%;qf`{Ewk-CyxAAtL_<%Q}*qXuGFkh^MZGqtz^(e>BMSctprmS8AV4-+KuI
zOplF5T`;CrA&jZ{*;L{h!G7ZADT^4;)lW<ZkC8g^7g2xIFyXCcG}_(&5Hsw;-NRz}
z)Vw9j{9DYDOlRGt)4?~8#LbdANEP-{kvC|$CFy{Azf{ZENhrvu?LRWA4){b*XrPU3
zh@xcBOP42@HSb-|>XO5a_;_~3`Ns^cHW$vJ2ZC-#?*E=Oq>yQ_EO=M&Yi)Ys+2d39
zOs>L@!pPDORYy2bs?)f@OepsfNp5LwtYV=gcSlq>ZLaMGSNyZ;PWSfwZCNCC)5lFR
zu)aU-)-k5l1oEVrxbhC#@jjHFZE?_##vwfab7+lDnmV&fA<f&jmDTo`gL1VY7LI(B
zWOk}iXyEkw=)20cUzL@TtB%NZu*1q;69l}seJ<V*vhv|YGR1{zgRvt!SCKFhm)yPw
z5_!8SGjJ_$1M1!>7h;@pO1S*sbv+Bd7qL8f60`~48AAJ~NF`UwNtef;i63;0a8v*a
zTgAh=GTu<eNpNWWL9dmghZRvo5QR)0D~k(*;1{Wt+cVN?F7VTE*{`U$C|fhb&%&=H
zUb%g~US=-}4IGR0znW2P7c>>|emcr=l1j<%!08#7)mml!7c?lIju_Eveje`8u9#Pn
z@W1Xo*do(qj3hH3tPFr}-$5nigsJ@T6At)Ctc^uP*9Dp2C1Vb}ZUIU%fAe%ki*R2Y
z%Y)k!nqmE2R?b7@r>FXVkF{x1B3W@>xoa-zPBa6a7Zc2XZn6-|gb(aBEt1%AV#11I
zF;Mc|U+0SQ5e`WcYm;#qIG7oUr#D4Pt~37>?!_zQT;Y;I`y;XL+hmV!k4bSN`B-RG
zF$o+*p5ckz*D~IFSU3<zA8|VesPC1}HcgdzEy(pCALS3-Q9T&cN>@jil~YkS6Wwm^
znrg6+RHC@9l4WxTYcshMN^QhuC`68S1!hMw3RnW&L-RNm%^*u6Nc`x`Os1huBh-B5
z-vU|Mb6iNdy|jE+@)=hSXJ<HA=~j@E-G+I&ug{wc#a#J3RYZu2nbu~jECal{g0gnQ
zUlBL9wVy$8x-R;&I&!@<^16aQULElqmTH4oI*~P*WG<Nv>K;4k#qef`YA6@XR;@}d
zO=*$H46}Qr`t59<+UumWZ~y4uELk{EXe#WraO&uc(w5AH=0XXJbll@~7P5AXZPrLE
z*t#_4o3^%0diWi)?Qg=$_gop>i;Ey2qFIGs>3(y~Ai5CBEcCe}*O^J4iTueWX96Q<
zOELq!K2M^vqpS5D?NI$5diM_me;m$%(Ir(q#YWiYQKiZClbp9EPj`{if`KN|)#FfL
z*~-L>I`dYN*MfHVC#_c#yMIyIhQUj}YGF<g?dWl9bl!a!7&Pxe>HP{Zh6JawZum>$
zQJR!f=N*{aQ5tuM+sEcHKgi?)^_7Glw?e^@hjNh_M<ty{P*T9hrHLmR7Fo|xouoH%
zw65g%wfW>VPUkoT`o<NX(%!6bkpDR@r3yx0;<~JZX+>2QN}@F#bSse1=m*iwqClHj
zrQ+{)`5lPu(2%k1Ugr5OrgV$i9L$@2C7fKg6AE9Qro`01ye}~*0EahG@Q>8xmiUM=
zTb<dRXN~C>hQ8gZB@NpGuY-6oMFy74V7DnQWG9t6?L}b1iBXE1OH?pV(#u{1^AsXS
z;8JLT5aQiyW1ujR+Ue`E2<%U3Zdpg5ydUOI)5Q{!Pal^a_0Ye<FjY-vJq&bQ5Tg9|
z`DwYKkWmKg*D2fk4p(13%vf~eIEu&UYJ2sln2P&3Hyfe2Z$^B~JZ|3qg~#<nY0IjL
zQ&JnDYR?Ti5@gPTa|Tc~Bp@0I7(N*JzH?+=kk~opEw2A*c2ipJ@qy*%BRe)qD}!!F
zeaxd^Tok%OvmAzG%_peZ?lj(Ich$uAQp8LEx3@E9p)(QvAFG~j`_9*Fw9lj*Jx#1m
z?ALkBG?z4jOch3e#6+|7605pfI&D>{(n&_;2pD+Gc7!vj!cV2z9I0S^hcTIFnHI5y
z<j--rs#`NyDVXQy7un5j!G_;AMqq(U2oW<~C9P)B`raUK8vu1z<yZ@fv7N$JQ7iej
zP+QpDDCsC0b-$9bj^mAB*=OZ%Fhn~lP*k|F2Ely88(*|lzG>>Bw$OSzHFNrqZHWxw
zL^k5xO75N>C*NH{n#WqDhx)PxiQxDWE6gXv2+>RD-yAmwz&JsD$oa)kIqSv`r0H~`
zR`SzyVY8Bzo7bW4>kBlwWLffeY+5}GM^BUMmF&I#(XIWlZ3J$3TJL(kZnWF?IH6D{
z&JMJMYe={{($j9&*ie3!w<GEGW<x|5W3khXMjwcF>*Faad~x|9>M10YEHVd&@5x5H
zYuh*dhXBVvZgk&{sOc-ZXbljO8M4%SjZA3luD(mW^^iLhL4RuZnz4&*5Ws{`<Lo0v
zcKp*0MAc2d=ug6c5bynlJUX77AP@g_98a0+I5-0RtnL{TWpm*w*F>$o2Q2*MSF&$@
ziPYi|3r_EkX7e1mT6g|7tM5daOl(;K=Jq|p?|*vlo=mT^meLZ@iCxb8KUsjV?UpOG
zA4Buv0CIMus7j)#Qkvd_#XHY;Ab}NB5(76%(s=fH_fTDCX=gr@=ieL|2N7d6!V{<k
zAFA@luO14_*zD;4z3QX!eu(-dVN>?Qu$<E^F`@QgM37yr-s(&dD6t`Nmvw3OlYCdu
z^?6$9M-KwZzO$9+{ya{d9k%y2`ulv9`PERRbqIwjilcx;Z7h}kD}{`V7@3PW2<){i
zvcfHAmz8C$1>7z_Iv|Rdr12hkZBy-$0xFjG?2xt}Jt=AA_Zchi0Rtw2Hv+w=3e*(1
z>yd02G!#LSYVAu7>u<zh1Lh?Th_jrelBQ`q3?1s9;T>H=v%dm@6?tU43KcHv?yzk`
zUTa|CqH}5SC!W@@mS!xH{x;jFFHq;{TIF3BsbArfplI2|&P$<nGIrgji#gchY(Kw2
z)q!Nkk3e%fg87P;haJk!POcIRkvCTKzqAZ>sXdx$5BJzCq2<V<3z}oeDAu?0rbS|Y
z$e-{XE(O>blA0VGJP}}67k}Sx*lSgWLg*H>YPO$2?2RbwYHLt~IlQ4tp|f~E&VWO5
zlk~x%$&cslI~o;CxD#1VTHm7`4IO>3Y8)6g?Kyp+VA=Fn3in;CerJ1N3LFMT;JOAh
zM~F~fyOiP+oj-Z;AYLG%Rp^n!phoqkQa03d3wi=TZ3%g#wjo(JYH_=Ap@*(o8HyF-
zu0UuFbV6KMV^@1!)06hH^c2J6*~j_pGcNPA>8)$4<si&boZb7!->n1;0R#Ok@J%Ib
zn0zN!%(h~f+GqDpwTTJP@c>#NB-Ml)#aW|;ynA>my8TocbC_`bdURJ`OT^5&0g<)o
zDx&2u!i5mHl7J&p3^!|rgRGa0oskTQR`1ND9%}~V=yx}23`|fQS+7p2#JM79pdbKi
zd8v3N@2-ruhFu5wHDp861AP5kMl$hI9sIsi!;VCAUqeSF0h&pAHL{chEVobinVa#y
zH-s11=*1ResZ;YU+<d5lY7XaB>%Ct3&q8kiVrH4LQMI<8j5u3{GqU7Sw&@G;+<13`
zL|G{;Y;NDB(LqhRWt#1?L^tek$9pWCZ_IUuW0fJqyOt}iJLXj}cUYvItCeFcq0Mfn
zqenNLB&w4g{}<Jy{+sO;8a2$zyK^Ihrn?k$I6NPnh7GU|B*N;t%m~QW_1QLTI~{rw
zIZ6X^RftH%uhn8ik0{M1RbE_dZ?6?QLd_`waux|*xF~*(IeQaa=$LNBQEtNio|E>7
zCC~?JM}#i30QQ-35GZe_1+t;=?O#E{6Mar1suHmiJZds29O^X%DZJQ`IH9(BV(&yC
zEkg^|ZhJdqWEr0#TezuE<RH3egzmTROSzr!#x8AR_!wG3KtQ>OA%3y5+u1GG*M{tg
z3NdYE$bpHx_i=NGN<8OG_FT*(EbNnmVFdELJotb)C*az=RZ{t%(-+D4d5e&SGa{m%
zs+#!fU;@TdknS{zL#<6w0x3|KY<vM+rWW&ZHC<q0Sp5GE65BgiGK6Jz_)jXP_z|9P
z&Jgg`E4H%qrSHZDw1jX}R6?X55=_-J;Ef8JQ``9Wb<_JeST;N&VWA~P0;S`Z1ky&s
z%DuDL^{_I1f%zs0b`Nxi@j$*yeNS`hN>*0?)_dFQjLIT*Gwy`X;6eV&tk%ChO_96R
zv&yRDH<lYq>wn$yV^Y5s^aomem6ivJBX5xsF_kb>G?G^tL%VC|W^SjF>7K9Y=<+x^
zhbAe4=%K#wYw><|?w@xyZ3Fof+%y=19!m&Qoc%90CiaDgsPF=4GDu2IY{;l~-P?Ng
zEk$B{X2kQgVd3R~+Nv6MAgglDBx3#TjTDU2*wdq$230Hq&OE3{B;@^;xhWbaJcl!i
zWV2HI;Rd`;h5}ut0n@}(z`#kX<X<ujpTmA(VnpO7`>s|O3BU?0G=c7LcL}z_zW1vh
zZLd(aaw4ei3^UiJdv?9Y0XS;;-_om?#ShLEfjv4;B*g)<E<jt%6tlR*t%$7c=pY|H
zQF&V7VLnYbINBc3q|cP#&#=SKqh<2u&xiY>W)<!2f0E5DR%-<$LdTB6h;JwUy?A*g
zJ2e^g9yhlpIOoh1%4Koz69<jz3-c3$j<M8<28IIaho02hFP0iz9G?v$G0aJ<7mFFf
zw`c2yUMdN7!m4`_g~~_8Q{lgMM-4+gXYre@^q{<SBP$y&eBf14A>uC_cy_m!Ugucn
zI2?aO?7*mFRASZoj>nnP0+_jt!IKFwlOjHOw3o(?=OYRFxPQndRj^U%UVFT7tREsE
zYpW|0p+JGPvEH>vp>UM;5?Q!(oaNq`rrI>SX_j!$>&DYrZVvZ86sSXDx6~RUrHy|u
zaW`m2otSteMCek~zNa?fMm3HmxCGAZ1!f?s8!3S`N@)IY)0p88jZ}2#h}u~|Kini$
zdx)N7t0GpXD%PQ@(^P#FK6)#>7rb+74KG9$Q_F{<gCuP$m@LeeN6bj8eUeOI+^vV@
zH0ql)N6sGz3hm#M+LMZQex#L_1P_HE*VUA!yaqcy8(7pzM6l_E#Z#I;xrf~x_CE^Y
znT9Wmv1xD>y`dd-Q&0F9Wz}W2BUoi8vL6-Z{9Iud3T+~Cm4bl;zC<XhpSRo0?`sbv
zWG=fx_R+M%v<RzCK#~i$ahXlOeBV<4+8KC+>0W<E@wqewBk%s=g+w>Zbbg0)HhD<I
z?s&p0u&>+oyxEN+a~FPl-^Qg^&b8}Fi^6$J6nb6o)fM_tbp*P|9kLbFlBrHFuBVno
z<8knZC~}jyQ6|}AU<y8naZwmxgC$rGme9y*DLW!GXjvd2r=d`HBw8rtG%c>Gt07Hm
z>#xk713=o_sLR}mi;C?8sg*9u4vnQ7i?gn2z?a(@LND4XK4<4xbDB{2J*Z~X&G>`n
zQ_jKibMOBXEUu(wW_h5wx)D2KIe`>)#0%?>d5QC5V5*jaSksp|6n-2=YI&Vnt1<Q!
z#(fOj%{cz(a_Jv2*klX*4HIA#RD-B_azlU|!Y~^lJ}u6~<}@&lbuX;T=scZk>Pcm)
zWF_P)3leK+$CEv~kj<)GVHP`-i*daSYt+H?<{cIRlP#FJX=s}HAsfJTK{*A#^~wJr
z$Y1q~lUA<;&@O#+iw?v0I$jNdg^2r`Swz2zyRP;=@{T!x;-|UMY)Gk1-h&j)%C=}y
z+)a<fYj&O&%f??0L<n#NXR$Q(Cka-(rz?pwGPBpDNUn5-zv+XhF(HA+ipF`NvUKYa
z>l|Xu8}4CYBbhcX=0SYyPCp@wWePg0t(3AGW;S!=Zxhg5jL<csVvRGbR$qN#q7h&#
z2*3h$s>#yEc;uyVqCkra1Wi(g8IKK4xX|WSpzZW%+6QbP8<cF(o&vF<h(5NV-SJ8<
ze{{;lQ&tjD&1T!Z$^S)RyZBCfS$LohAd)~ACnn8GSlI277{iW$RuUVp5N-T?GvEz1
zdu}Wfh|j5y<+K|e_%c=zkAPdy>7H*NkgL%A)jTGd-eD25THP`IjFJP8GG%gF3S~Gw
znd+w+v{1HeFGTR7JR0uQBS&GTO{m7w?%+>&OpXVVhC4(T=!Wnj0bvSVWMX88IqPG=
zWWysgo`f@Z;}g~l6MPLi2T30k_aB-uSN=C#G<-LRuD=?q{tjnoBEveO;I_VFWL=rh
zE7~g!0Gi=*z}kDRp>G9+nYr#shWnlOO=FJ>H7g!JU_Bf?a|ZV}A}f?8IG?|-6=o)r
z+#r0%i_=-e6gQTuBz#ociRCE6Q{zdxJFv6@y=v*t)+x#abtsXjPf2r)nl%fl2Ud<i
z%TBBZ4e#xiflA-0{FOnI5+^BkA)&3ZW$J;N2Q%GcbSh>`$Tf^M$8V!x<yQ4QQ(6s1
z_NumcKW78RmkcTFt}xZRouy!3w-W`2yiN^AD-L7`?UHD>x*h>8o<`dFHOv}Qy3M;@
z3@bjA$0TYUsX~%O9>Eb5|EcHcwu1gKOHhtwA8y=a@vHCdP9D-XqvhyAenzFtPE8=J
zevdq&|7S)dn^_Qb>NVfd8!7I&mybqtX0B=v=)aU|L&DR8J>nn$LIWNa_?e-`zuirb
zviKq7<v7^MdL!V@1T?8{o*vK!3^<3+cqvli@<~THNXM=E8?9s>H~cm#e4pyk-wP`C
zV56j6oET+k<^(Po1(sCk{I7^b)jdV3mJBzf5b@;9zaO)EQwz}P{Fh8$3JbqPnS6={
z2*XXoU;wua_vt<(F~;x_{)TfW?z*kIQ$;X7w(#rPat7sjIB*E4U)8TyVt~~pvK}u%
zyBHGlA8V>Q!|d=^u~z;p(nqZF2f-c)si~pgK#8F&uIgqh%3G#@K*pT8^IE=G*9VcN
z&7pgq0Y^ylpI&W*^TG~S($X*O+@zTzQrGJ_2$sH!RYL_3(Kg4+E%*Nk?!-X;1xm4m
zQJ!cTw851Y6C~;;KLB1fpg;~WDnFy;r!FUcRYgoGqL&C-<ffrSL8c3F+3-Jp7^#>m
z?-A|iTMkVCMY_r1V0o>-FfmdzlWQ>POx*Xc?fYJA=fF6;2(nnndwJeQ;>gzGuy`u1
z=9M*QD;+hD6LZQg`h=Iu^_#sTjR*~(K=0zXNLC*$IG!&8+~LXf8MD}OP2L?t>_$<*
z=5t&4kGbY4@5$=2cMa-s>7w%R^wO|i1X4z&3dRbavGKJTCN9I4a0P>hI9=R6<RHV5
zwW?HbJsJ|0%q{Z5+F0riE_pDauGxQKofEg_JdHwGLAVhyY!QETLUCMh%q0pCE<7v#
zfO#&4RmTk4LD_zG$M1YN>5Dg;hjAJnin>Kb|8R{OA>(rA@J}2>{;bt@)RAV=6{6(#
z2w}a8Tr#}a4=EM9eS#6Whnn2M-kAEn)VSgbs4vZq)GUWEqMCUzVn+)&(B&f@G=4Y=
zxmo7PNtqY4>7C_E2+;c(fmv<W;7lo-uvEX~-hR6Ih4mM680!X2-udcb0vq@&-05W(
z=1({+%j;0_tSb-QZ7yx&OnI!{;j#SPGZmy9%Q#@>(GEM3bT;bDTtx)Jkac#G*Mp>t
z>oy!Ksde`PTcR;2yX@C!90gR;TzX<F8%=!+z+5mltkN~ipXJo^;yrA-SfOqXRUF{1
zadEe;1qU3c&~RTN`fz_o&#-UiLZ{`xU@BXq(K*@A=oPUMA6B;#vsVpQ?Jf-`3snBJ
z+umvp)aaOa&WczvazSQZms_y79Y<-VVt~|W3CTR&rxe#Ok8&38$HvjylT(o2XI2K@
z#P-tgk62eFnjg~HLAs3`D@g_UIBWeL_VBa0pIjFP(l!=LEbays_8RQJ3a~?1@0yg5
zKntM>ouDltg4D3H@$poh`WnGN@N!9yyIYlB&HlHbA5?ng6(9-SAZu9EVrT@>+2iVi
zEUef*Ukw*|dSLH7GX~AeS`%v_@-zln>yz~IvQBEAO+c%@Rz5WXxch%|Ga}yrX6F41
z_*w1U^N;xoPzMkO4W1y=g)w;^v&>~%=(UEC2)JmlSw3hE1wUbgc_Z|kU2NVbJj?i@
z=?nS|31w%O@@+m4{~JLh9-{A&f>=G4*5p<ypg2+x^jO9d^e1r@UO0{(0)QnkYQUB6
zPP~ca%Tn^6Ug%>k=kd}T3u#ixxCXMPzpVD2<AuTyO0$_#*=nIu4jg;WFvn89;OJwy
zqb^3iN86oaAHHBREvNK@QFnVB%A&vRfEOfoH;yi~$bI?TIEmIsVX+#fs%L-0?&P;^
zUbs$uJrnCvL&_1H2#vu1=LHX0H<*b9`^W2d#8AwMcgIk!xu~%|q$EOPLO73G&J`US
zhR7REj7CZ;am>*jS5HK(NiH#!!gq6aRDrXX;F7Z|+i&4~a{h)jn=~Rci)Pk=@z7SB
z)zszdUfk_wQjthi!;S}{1Y8x}pQSZZqq6&oVc@^^fa2=Isnx-J&ABa+A7U{mCR9J<
zV5|6HB6dpMIe&A;g8X(r>!sf=d39KdcVS#G@teyCBnl@(^{(DUHZ660!Y7WwJGDzW
zzs3vwr+yQhS^F4(xQI;<kIK9kY5UboW@Rh<JGyhxo;~4jjUN#hZIYs^ii;6VTuLth
zRfRD49V0%fCH>e$U2BBLYL+kW<xX9`KNm7C>I-4s{EI(i_7QZ``f*1}pN89SbLyQ~
z=#KQ!+9($)S3K{#=iB3Qk<WCozqng<?9}!{o{}nUgO{igYZk=cARUemsxyPTKlw}7
zMRzz?H6wtMWQMRhnfo4IgP^~Rq(eJT%K4pW_6OJsb*PC++1SLg0H(=zz;&byM%IV8
zQFV2*pvZFF@HHZ=D^KP;92oEBxJi*P3&J(J5<sFB^~0Fx5EO>+w!FRC0h&A#T!RfN
zzONMdqdE902BEZ_DP+x1E9jEz``xNOWT%%tRZ3~fU6hrW-aEj=tt`A`E!?aXIaik=
z4dEfh&0oQ%MJoP5M5K9a1LZWvW*W0OS0UI6H*pSm_l_i)Lj#p4hHP8v*2?dHm{+cK
z-ts_Rdo?+P=C!=Pvy8|}c%HSj5Of~RMNJPrNh?ujt>?ET4RY=2BN>S^CK@P6Nnh-?
z1>_2}$UqCPOPH&5`@#D?O(Kt@<>8r-8(=D4H_xydnh!mix=(oyIvppobKsxk$$6FD
zdYt)pubiL#U&0T7Xg9+?deDN4G~q#;Z}RhP`v>PGkOi1dn<-2d3V==VDj>*}`>ACS
z??@|d6lj{kIN}gHhwhN<pqql|m^%v>r>%>}H>3H&R>bc*F2-En$+u+?+`pPwlQTQr
zcUq571#km<@VwOoHZqd}kMv@RSAH`p)}WW+cdzz<@vt$_Na6onf=#u9I~X!?*ArQ@
zMC~7Ac_7o(_=%$%T7!z8YYv%KrZ@@ek;1a33cW$h>N$as^Zkf7%ajgdie2km^v9Ie
zFzZQEt~;ugoh_4bcOPaa9q{rjYcK)jNSJqb$2$4juE7b6JL^z)!?N7R1=9F-{izE=
z3=JTZfoWz-Sda6tg+nH~XPV8g6cc_jO(9$7R8Be|c#`-fjUfok$#>8se5D!2(3~^D
z<ujLpPYb7q#jA1Ev4M<ka#rfrK&X%w@&YENICXK_Da~b08qCosH+U4?h3-?le~_h7
zyTw}KSbZCSlihHk=E<pz<`^k}D^}=k2{(h9$My5@lcMcaqT;8*N{YRxzlP(gm+*Ug
zrx~*LG{Ra;hU5haycg>6b4efLz@>KA?|3^)v2_pPC>3EdXwKo`*WsHx;Tck5m1{%9
zDgJ`%UC`3OfC{hbDKGp1mBG(6ej4rAXa@<Fks6v&h0)UwjG}DWV~_qijz;ogwB#Xy
zxUZWZG){l1Pc(SBH{uz?mg)qsrS;K98y$rh@c<BL{gy6@`DHx;CGbiRI3KjMvGI0C
zLvL1JV!y|ax-+(=&)H|G8V8$G12&~Tg}%3@lZ47LeQzF+!9))=jgOo}*k6V4=_QP<
z59ox{UBg~n26NL<b-d|INKN#p70on;IpLEZl^ekRMv`YRQ^TEXfo3PXUphra#7z(c
zS!6dz6unNrbYuA=$X=*|mFxk`_}3Jd^}2=x{y-53lCM&({^5+<rp>v6nBW830D7tZ
z3tgqEMNTmR^eNKAA%&XfJ&@`IgN=t?`|jpF?^<j9G;GpQOa~BSh28aB0kn?-7n_zq
z=WLXgkzF~i=jiy=SVfg#o-<_wYW*J9U<{RIjjfigx=lQrJIch6(167B#ynOCA$X2-
z+~E8Pts(i_@HLm8S(N^D`t=7ZK!oATD5iOtbT+TA7@I~Zv8NW^c^a(Mn!9s!@%|N-
z4gMNU6r>!{@yC%oUNjv>N6}%QaA6FU@mVsIYNa^7x*2ZvAkM(448beXj5Cl4mt{;5
znPD6#ej9tE4UU||XEQdYqt)fna+ZHL2vOtnJ5`QsQUx{=d}{;*%`=Haq54G}*J}1p
z0#_e#=j{~MYEHiQ=|m5Tm54MRKaE)hJ?Pq&^g=`J_^NDjpJB*GbjW=yK8b~eqJ2i|
zlcXg!5jpIb>Bymd7zS7S8e#bEEE~=?u3(<^nl%jU599H%lR3x+C>0BDxub>O75dCg
z;vzrgW3KPnGCl)QqO+fbk=90V#UKKG;sb1MuCm0Onz*_5xPT!|$-SrRzZ09Efw2Y9
zgQP}L2u8R|9(9>YR<*XPUAOn>7!gegxPTo5_dninU)}X@*5T$(8vatZ$B)jtV+*z|
zxR2s*1lco$`Pw0Dr@UednXFZEdt@@Udd!T_vq&?9{07I%>;L1PSI44Q$N=db<WKxv
zv1gMy3HF$#4>G_I9H*#)z1k$cjGV<O0^6m>aomuwTz&|U(Om>EHa33FEU>esm;|%1
zLSd{SN)AMl?WJ#s|7%ROcr{b#-c*NgxT0U#(YNYQ%L~`xsi_L@tUSPzcW`=nA<$Nl
zh|HR1K;YF*#D-|1U@GtOKJ0BSo937h7{iX^3G8Ou7n)rsz@aSAY%o+(H-CYu9&ovx
zREd%awtUY@UYC(-*#wf6zZoFeDpOX=Ju=|sF_q%AI8%g<fOq5`^I^hjo&l)`7}_fk
zM2{i^ru*$N9-~fL7-QR~Iek|l?tFD(+_}5jk4<(gHn7OmMvkp*``N6s6d&NwYu51z
z<$vjQ;!yz-W5GwsP6NhChG6uxnePB`B4Qq%5q~^C(1BzMMjaw;Yg>l^=TA*isQZgn
zjGU2QJhlVQyCxT${#7dFwgFS|Mi?-5c<ZwYuq4OP3we`-!Xwa=x401T13MpaSY(H8
zz@iU8r!l@Ti=~Nw_!dZ7+X6B~rNnWNyOEra2uGwic@?y5ap!LZi&{aEKLns!^kE^;
z`aFH{-pZlnsE%hV<R(p3lr`2n<W=2RC6X#KIVzm7JyTY!*@+x$Q^5U^&sW@taQHC^
zb1mHDvlzSaBTn<#BkGDk&2TuFFAJo+1Ybel4dPiw9|%}5=ib(S=96MZ0@ZhpqHfKl
zq1Y|*qtx-^pPeNn+XfRwG2KIT*_p;jtYXV>011k<vR|+IRh*MvTqNxSAoja>>)w3}
zsjK>6m}L@^ou#)NWFeCQ?mv{y1QpfV)>j^?_%`JI6ksh@>rYn0IYk{~JrNkN1WVB5
z1@YZU3G~m&;m-c@X9Pl3KTB_i=3`zio6l$V!ZK0;HD?6z-!<(e-1O7b!ND4eW{P$j
zJ_y%TH*oc~+O{k|t*p<67;b3f#%m)8xC%f9So)IH9`MQd$eamE2tVf$be!)gzZd47
z&Epq8!0eq6mtCobOyER&tz$K3<w|$s1Qs^eP}7Zcb5OOnI<Hq_>`druzJ1$5*U=ih
zKY`)6<_dJj?+K+td^|PNbp;7t^eKDG>B1s1dJQKi4C6Ib23GSKX`!i@(nBe}(u!)o
zxrC5yajN30pY-?qWL5VQ6w<{Om5d`D1w-ETT6M)5+!LjsOaDPvwaCG)M)x?xXTv(I
zrHqDt{#$%>m+3<#XrzGq#)R{J3@bd+XByukro-kD5TYL>*`0+k@im+t$R)+-<U%Y@
zF^Tg^ngv$wy}FXKMU<TjCb)p7n+v@7j$;r8QpNx2<Rbr=Xtpo`i767nV*$R#mTrw|
z8@A^7R2GQqB{*nPQ`tA@YIOB)oOXB|%+ZT}YlwJX{n!}e9MZMP5$Rq-UWl>9IS)&5
z=(;x$UZjxN;m&VqONQduols%WcA{o+^F3v$i+A-ROsup#TN=4l{w(=6zA<q7urzna
zI?REoJ=u8)d1Zd3>VLW>Yj-S~4p(?8k)*pJS>YI0U`x+(_3iU{+)3cJ><2BAX2(~l
z#Y>>Za5(Y>E=K_ft?jF`rm)Y2wa<w_)WJLJ1mTXY0-0CoqNFr&{ndyRQ~gV`HUm@4
z-i-eHfyr#O2aeQ7dg`r*uy6dh!LJyS3O2hrsNel&hU$UPXdJQ6;?FV_P2dy;MSEFH
zKA{Mtt$p{Cgha9)xQ#23#(xE1ZE^G6-J2PbBUNDb*Hq@zm$nV2{(R1IJ7Wv1tSz-l
z)ERs>e>D{=m&tl&o?_s=-ORY1;WHx)Rn;)%)VmS1u<rp-I7K_bgI?UKHiBR*`<s}6
z+B7?#Gv_JkH(kp7Cn)f0k6sKNu=<_gq0lea{vN8n%~gx1?u`KU*{C+L;y-=K7J{jI
zq8YKygTO)CSIs~}8COW$1Npk8=#Ltep|8VJJ?Vi&O4nLTNu5-(Ac_!53h+jXlgOm2
zL~gv<S^1OHM6&sIZo|}8@I1)hsa_K5I=l%8kmQo-RF)x_Ui~t?hJ>4DFae~TN&!-p
z=;U=@*)p_|N;swV?w02CusHvyc2*3aCh$gFeurLr3B9z17s8N3L8rV^Sz6r*nLeR8
zljU1;7e9@ho~=b~XP-DM;3|ZZS21&<rg4rfq9<|acuHnB;A+W6W5f{fHXDSYd{#1a
zm0JhXy01ory*$k-XC+FMhpG>;Xz3M`XHxaGr1bbUVhTbUBy(Xu94gvhp4OXz&-al-
zDmWnDCTtkzJ-$F8gMAB@rZ&36saqMiVR4W3i)V$YeX86{8gaZ3)0Im5Y8N+%temR=
zbx)Nsk5IC?NRib;l3_=XF*XU##aGAC{{I*@@-vhV5JZi?;Xmbcy>K=z%>do3>Ob1%
z_eVYml?WhtzCVZ)I*5n}m2oI!ZF8Vgd<Wraj<ycflk9`Hb)@I&R_b8#D?r&W9P}|N
zWw-p!0EWw*bvO%PdIEF%81rgfSs`ulT4ChQWn2@dFnJWtrKbbyD|Pd)q>NsE6>JXt
z)6s)@JoojoIqR0cDjF!+4Ce@J1tzBPoCNQp(8PYf3)JS+3Aclf^~g5UQ%7#%xg<X^
zvs@eu(NO$yhl~db8-YdEkkD<23-|wCHai4datvtRnq*`!ohfvV>NpWsY(e_->XUCS
zy2Hq=yuPt*K(n)Fpg@z#cnsA+H}2J;$w@T-yL_8y3~5HJLinT!Xi7FSq|Wj!gI-EW
zQ_%O0>b=+5#d1jl-&;Psxo(6Oj3bytBfTfqg>iVYQ{OXt$_`NvL(*Q`NLqq6fNxet
zQ;|jdk2BLT1?6T3C{=HQ-hAm<eSN493WSmZI#S`PrN#h!E6N#_xbvLsB5ch0>cH;|
zL#q|S{vLx(V(}s3+vu^L2Pwz*(+Wdx;sRERA1h`lS}~Y8G=-pZLQPA4s>ZLEjBi|Q
zITZ%4Za-vS$Sr~2MM(ASe<DlAsL6O=+hK&YCQ%`hCzIa@y_b-EdF<u3u$yf=aDffY
z?Y=sJlIMuXGXg><TG-UEQ4grCa&zB>V9}TfUqM0T+sWkY__OZl?NjpJz(6PT^kU~F
zrRIBHftij6;MB~Y9x$LQnjc*dtU3sID-UP#iDgP*8Yf_yOL40%IkF7znM{fAX8Viz
zeYg3g`BKt{hD~oAziCQ1pJ6hhrNa*sCZ);tikU2FL_m0iElyKy#N8Cjeqpa3DXwZi
zLNq|YsjvW*Xo|%1X$O0=X2=eWx_g5yHK_gj-V{oob9v}{E7NV`%|$vw!DDqiwZD(B
zk7M~(3*oFl^h{}!NRQo4_L@Azr|u%fEtj@V&OO_Oa4g3rCw-rin2O94#}a1x3)YoM
zkj1C0Y^Y%R)nE9SVPV*AeBIODY?M25hp0ds#&1Il(B;jW(cRHace!KcX{Ft@7d$e$
z0L;@k>HN?|J<o>X$w@@L=1&z>XweNEvAxiRFwb!6g{sfnJLj<hod=4*ig{exX4y1v
z*TN9!RJuweep){xEOpv#hC+LzD|4wRSh6jIKRd%FexwMQWUf3KO!;r6*y;|Av#p=+
z^Up=vDNVnzPJ-UPvS~o3&;L(1XJE?Mo$xaFy{9h5c~%7uA;v6&b|gveP}%n-`3{Gn
zW@zZO#3>|M>8|1meuSaegnycr9IbaD?(Dlg;Vd2C=R*pFPNviHLfJVb&ds1n(8kwt
zO*=c_v?@N}JA3EGJ*Y?YsBT&RDeuQo?@6>FP|JT29iRZT2;~`=z?6L}U#I@@!XyZA
z1<vRa-U;|XdgK~TLUwLv#W?2c<fY#rdriLk!xTF#oiFwltv}WGespVFn2z$Q7lBZ@
z0lC3sybTtUCYfIPU;*K(Q5xr<3(zW(WDiFu%$z3VL)CbCcF0F)%>rk1ldmqG#me5H
ziijs>gKzl`LGx#|6eiH3^3RySw@;kD)>#A`d>$9Ed+MP3G92i_OUEA*5U>XMLfXcb
zVlwSxDT~<gH_!ONrPtd=%Q0foSLSjVvst0@H_FNDz1I#8jcAY}`JAHXh>CWwvTi%i
z`TT=XhD#s^PKjA156AUj!cOtcaAp4ruu6m^w)e$~<p))l4<Rni81ebjo}4;Un@juw
z!RfelLYi|W?gvIZDVJOe^h$AZX?&PVtJgsD(l}K`HklW4HNfoz<ZLzx(p%UZ9AEg5
zi))e?RRtpI7~<6U34hCIyp1#3Vo}|Ta@uG*Qtrn+Pz#^w5h6e>4<zBrn72C6vV_-#
zn1zs^uU!xr5Ec*cPzhUDkUQ|XlP@l|UNw}eCur~5lsB<T2C?6e{D+K&y;XTVYi&V(
zxEEz*sWhkZ_(m=ktX*zLx_)omv(|HdvnQsI<tvUHD~|gI3Mc2$H5O<Vt19Drr2$5(
zcK<zSM-PE&fAi3nK36MhVcp|3NrYsQlhv76tEF@*IX}1~k!K|MdU9vIicS{&h^EW9
z8B4@UdVCy{>F%neljxUf)F-TIHEIXHVL~_J1ch?n{&3|lIrcU1n(=z$uyaPzlVQ*@
z{s2KhzQ1U)mfC8yy6FU=?MgZy^h^ZZ@sSruChpi=4g%+Ts+9_&G+V<BwwY@R+{R^1
zgiY0ihE0MH0V<4qhffiR4H%ZiBNAy^fG4SsL68?Qx^u<4$~}La<BQS+=`{fe1)^d+
zfkS!Z(cPLhP`EH>B@I;x-PZNyh_V)_xBOLOtt6T)z50d<`qu{h6Zalnolf9h1}nk~
zY8%&SVHs_HR)&LGknKQ9&QpfGpt6PB@!Zf@jpzR?-Oc6vZct_La0hMrEt$p85as{&
zs`N-+R`Py62cb++D=(@w1{;Z^BFaz(|5QYJBbvRsro%7wS*PcC?5V&GNb`H>GCMo&
zL@4~!PO6+KHNPqeiIP=}WcR#w><OY2h*>_S3u+Ky8nyS9Z#hF;kIfj<mn`~!=kMt8
zdQLIKFW7RUvv^8l1bTD&rQRRRU<Gk7&~wLQvalQc{S_%P|I$lpURHEbxRD_H^t%N&
zRvHijtkrv4y3{JE%&&|&kCfk-(@JRiQXM)`_fT3<vXntcM7UX;uHk`n02I?oX`+B%
ziL<^>bCIP;BcN%z0p*9Y&D~h10vCiAV^Qp9(GC-+Oi^Gn(QL+tjY~|;BQ)5oIWqHH
zyZk-14TM)r0EnE1Mkwu?h*6A`b@@&=b%o3|Q8c-<GQA{v72Z-7J!^%gaLa5ZVI`dw
z#;2~wp8U{b@B7vKMyq|Ls`A3W;pCf)Z`Gvu52+&=S{EglvUiUdDC<QDO$=<5^?}PR
zEv7g6%;SL2pLB&g*<AmBGVLXI6CK>(KcWPj%o4#)gO95E2u}WVyrLZG{`IXgtuuem
z?yRPgBvaHzQ^&8{xnTF6KNk)rPt@D%ll%Z9D3tq@vbU#!Dl!HS^Yu(Juw(f(%#Q#P
z(4#ze?4NF=c;~Y4wapt|FC0vH`+sO7*T1!tBGane<vZh*V(s+qmV6d$)a23R(}IzH
z*cW2_>Lj`(@q``lyZyJ4oD5*Ql&3x}Z#QObh&Q6K2q@5zs@977Y2?WXBxHWH>qRC~
zO5QAiZx^DN5Pz6x*0toW#2tp^9oND<KGDwzZ|wn&0>=n9SV&h2+T7kzRRc@)@~_{T
zvt|u96iE7Qrb*@i5vB$m<CHUuL2gXQtmxm<B~yFRB4a_Z+q+uC4e|ZB8=4<jFYr1H
zYIwP-dlFLC<6e2YGo#P;gdHDH8M3zR<fpFG;N9@4XAp8AiIw=D$f{Cc4zh31;`zY{
zEDH1(n$-=6X9kRMkKH_46Hc_GQ1~5iy9+hLA24-9RyZfwe}YflhI%x}iy|_39~PQG
zF(vH*63)Fd4h8Do$)z*K`5K@>VBoT|q>#*FVb=;$+=oZv-kWw+HP}yYyVpJ-sb0P7
z=A0UB$3o}ak%TKS?VSH_W0+T-LMdiKp#hXn0DE2p?f=8nv?z7)lMGD|1@VA(3kt<{
zFUSkSE#wu^14r@J!eVZMjEO5r?jY~#QWU$2p~n5O-Tgpp<ZtNSk-I@}V)a>1E<^`d
zdph<lIzQ&tQ+XF{dBpWCrVp-LJ+V+e^+cFj)RK~635LtJ#$o6tQUWVo(A4+uH&St0
zpOqJ*z7@TbtSA&sGW2XpOJ@$G;<cYT9@JSN{$;_}POIwo6~%MXV&z;vBl4YNk(6DB
z#R2rl`eUFoeX|+&q2`dX<zl)VW{q&58Ykm6my{u9A=&y4*kh<|w!f`4W9)O|om}KZ
zp&ZQkClqzw`(T*;Hm_^d-I5<CU+Q6$0f#mid@e>I;!5q8Q+TYcoPD;*7ZYWtEO%-O
z-<PE^gueYjye%+So(gV9QdUcDC+klKFnCPI+yVo_6FH;eN%>`XT3_FxPF`oR2Uk#s
zU=AX~8a&5@$BzRo@{HR7pQE!OOtDtR2TC7dSDgolst)x@=)-A4TO(0x3_c{QO<|XD
zQ##%F$7@`*lc3eG={zzxJG#a@2g;@mH3q+b<Y;R`omw5-Y*hJJgSBzD3RUPQfNvI2
zHxjJ9NC2GwNu6svo@pFrHP_KI6p6`gy%PeM_w_+W(Srd4o*0^cTeC25D#2SFsG;U8
z^lMeXf-XM`?&TUr*C8u*kdNd576`~C{QX>O{gD6m)3@^qwi%a#FM~QNgV*0&D)2et
zg%NKP8RR91LL6{lG$(t&jzBc%Ri2#fQ;>q<pG=J3=e2qb$~cK4xygSlk3JfDd>Vkh
z0*W+{iv^~yl-{n)9Mf{V$1tQ|89^kdhVUt00D@8<kCi2F9;u9r`cC7czYH;U;^pOY
zD*x*$fh*Yk09nWej4Lk!cZ$=hjgHMlUb=ThM`#tUWFu$bTWmD=X3FAFE0?!lK9L{6
z#oz%9ZW_i1nsSrA;Nl2zWAD^<$&5YsaA)zwsx`B9=Tt2zX)y(2)SIUk($J|xJceax
zq+&n;D*m5gmc+1Gi$+6cS%%OG`VA&W3pf%dct>VtsuC+>Xb~mwN27Jzf5tLgjlhg&
zZn4$VzNR}YiEgAs*j%2an?MaVzgpVg_CtO_fhoJ`b+!W{-X(2k*u;186camNNedSd
zF%XG}W?HiYsvh4yJb?o@lYKcL<ylOSV2w+4iW^+76ylH*7`hJTrICcdex9Wif$HJe
zqRxLkA<*L8#R%s0A5Ies;Q^@r!^TY1)Qi%dEO>>NT??C~cvKc?RD%ZO?!>6cw*kgi
ztWh%Jd;iRY`%0RAUwk4bqPX#IPH_@M%E4o$YK<c?WgNAr?!{upa@f1jZT3Qf6in}c
zxH8L0mjK!VCC4ik$x<7=YH3MAk|D2bq<Pnz^;WEAUG_Q!A}-3<PoK`np)SR_?Eh!w
zK1rrl+397vI;>G-J@%b3RA6tZkf<HzN=UAWb<4OHRU|0L(3I{9uL|%d^c)**5qc*8
zr2Y}y(OhY01T84Xeu*>?;E<5`#}95d$jsYklbwWz%Ps3AaIH^KHojSo3-}*xY6XM6
z`_8MpM!e?MX4r}b0%i}llfr;yi^Kc1Wo`aeqGtfM<w$z35s+yG$QNqJa7-FqD}Zg5
zSnF2RT6Ff}rJuVKoFStiuGfvYrIf&PBQj1T3>-Dnw|<|jh8c?A!rJot-%hYPQTnFp
z=kcb&^cjeNc#l5kIf|#$IRVM%I{Vcy{0Ej(hg8Ab?>g{XX=lQPydh5Pxwa3~XU$yk
z)oY#i(QI>iDZeVJ54K^{n?8rqP<kAYf#yXe963uisryg_&>W}Rm6%bmB3p5EO#gnq
z2yh&sZDBCoAE}y+aTYirLpIt<OzvMx6^0l19xuT8k9A%A*Oo~!Pl<b}VS#Orw=;G>
zomp=OqI=&&9BJ2J(rc7bRS(-u&|~MkF1KeO`|2Q?(qZ&a<#_%uufL<l{Nxyvkvz!^
zlTKex?qYloA#E<_8d?boh|oC1rpaoRC<z}%v$5_+`0%42hcIsImTCB!ub7;3@zoLu
zjF0p)Ad2Ktw+`gx!h$=7ZfAxf?aQRtQ)vzRbhJ7O02~WZ<c-#dt%(d74oJn8Baz9Y
z0hHM9eJf$f^h+nJAG)gNHpu}%_Lbw}VfZqoMRDFP*{(8Wc6y}xHs|CqYsZ|#ZsBat
zkEX^d-z%gq3Xddsrv1LxAg>va@sVL9hie|SL+!o`Aygn?{=o7>4M|Yln>x=#bYC^!
z(*I%J60^pS6e{W>J`uC&cp|-&)V(_XR9a+7GuH6=3+J(wgqd%2@*u&Bqm+#2BrEPw
zRl-%4<(&orTor}GeFGK@$YLk*PonOF3XKWIHD`ME`MSAt1KIBOpAzqbAdF=PTaoX%
znt+Q4`5hjoPxnM#g9<>81pooDfnlAMUgJV5da=jSMWIWj2p~g=Z@wZYl%#dBS6G3?
zVQT9Ffp$NPh|n0JLaAl7roW$RqhM)-+dPw*9ni_dPqb^reo{wGm7%JcV(@8uL;^A4
zMd6Dro?Pv*S&{c#-2|#>5-SHaM>~#GaPv>n0NCI?QxK%y|6i#}VNf$G%O(Qvwd4VL
z^!7pV0~*y`DcUpxk@*@039P-H@JntGk;e5@L@iru)4Yy!wu#eiy|BKLiDkhznNDIr
z9FgwJ!QI7#Qk{PwA{68Bxq)+(WYd6f&rt_FF4w*ZK5)J0n?vg8HBNM>0-XuglK=0$
zUjtQ|8gF6bZ^oNc;7QkQ6x#S4DSHf=biS%<7CvZT`Ju6G{F2Qy^cGoXho<Syi4bq~
zqbL9Aos$}$C@^z0+2($ydqxYQvEiXkd(n=#{ipKQM~)7pZFOh@CFu2Xm)~%Tb*vfd
zcBR{G|61WZ*h3=&JyQ7><WEMOZsosKfjtKy1Zi81+p-|P@H=C3lN}--r(O7(xB`T0
zX};Gu&-Ja727U30E*@txNiXyaGFAf$C@Mji{na3CYu-XUZhXq`C`OnLtnTRfyKwP0
zWmNZR)SrKvCl6e*ki=zG0)!bJTagUdl?GM}3Te_wDXhP7hDncCv)HmVo-~jM<hxa)
zdo+(V*&Xf&o370eG~cdTl#=sMf;FtxTB&z-RBC%5+@U&_ce&El0;oD*`#hv&9HXX}
zI0{xHbPA2_UllijpJeVBO_~(&wK-Y+GXc5welU`@jZ`@gQNARbRM}<oR;a{p<w3VZ
zkz-~C)!V<XLmCXu7MwvyY;+=M?t)J>iQS2^%cKUe0^Ko}QYcagBlyEF@QCY*0FBLO
z8><GM(GZG{skhr-a<U|Hl8l%VYkYncz5!S;pOiFU@|zrV)%eEr3G0*>NB-##lKrJJ
zc0oyZz+zeTa5ClA;-7UhDsC<R?`zwEwUNUyNb0@DbhD-0?hMC!c_(BSJ$c0&KQIUY
zE@e_l+rteR1!&HNJ=L?W-iH3W?r9psCJ>R|IhfV$PA15t2#w~#9g+7uJJY#~bq=o;
z3*|r9GKHNR%R!_4>ci)v@Ph|_`mxNp@NZwqeiM4=Je{afzk3TT#+Kcp1~}Q<mc4q8
z63|&#y&0uB3j8U7wJWqopft4pre!~-@|1TC(7&z>PrEW>LN^f*FPh5A>X_uAh;BR!
zDJg<p!7X7eOS=&pxX88sDI!;5xfYXQUS*%o88!CemOZ)?<Sl^)<FHR=pqIS>v1^oN
zvXqdMh;Ky*@h(b}u89fLuNs18GV+|>XQ2aoXs_Y7NbbV?Ds!J(T4rWl7g2mi#N3I4
zpA5l(xy~6hMH+QJP`>-3x;|IpN*Piz!IObA=FnVQ$-*Us&&ZM;2th=fby~0bhm4_K
zYjwYmLx18{g)cIiP-h<X=2z`Pg4?Q$-7N_pdQ5i@#fQy)htl>tpRkQCb~-t$wfg#H
zkZ|rz5Q{7jm=&yvimLEu`b||%32d(|F5rLDChst-H&12n6VsShE-YD5U_tTq%XkDe
zzVQE{6CK6%t;Omwco-o=^&$D!U_E3P{u4LV@+R=};~YTb!7)l09S789%9O>sHt1UO
z7Tao+1gUb%y46rUCzTdx%+!z}LK`D6h<HfEt!7EJ@quN<{@h?#oTIP<HaB^3#?}CH
zn}@-41PrRvmq2q-&c?-LhnWG@{?YLWELqhmWe(IlU<{vtv(dYUSUNFRgh^C5`+Uk6
z!Vu&xt=fE8!F)D&RETI<fF*KwlbOe_tjeIx>WZ^{m53sa|8a7RBK=;#czBU9X*%TM
zEb}wpzv$Jpo-G2VoJ^PNY@=Amz^@zMVp83|5%ya#s#I1QOCvyfEwjr_6E%4#Yap^m
z##+sJOaq0OQXCdnl$<ZOwxhBuEUmyH{Tly~@ce&JxSFqC;ou6r!k_ErbAec;eiYZU
z4WiDgZ}2#j3h1~n6Y#}!xFLd1I-+;=;Ke&O+24dd;lMnl`?`(x!%lB=UWWNA;ZUz@
zSY0>1pXBr(DTpL48y-|~SQPJqN;yvUhlj%!G+c{=I4C&YeS2GQ9R1nUdB734<&jSy
z)iWR1oy1?rBn>>}bmH6sCW5<!ec!41O1c7uT`Pt-uLH0FApp1=I*`V}o4iyDeSa{y
z(EhL5e}N7|x(^{k;1TB5-6)d{n#N?{2gM{&(fVMNdrP5s<30)Nj=YdgcxVkd&fVos
zU+zfILcaf(*2;?jZ9Gfji>9lRKQM%{Lp7R*1r*0>htV^>ClD4>0D8Z1Li#HRa`Ao>
z3R%s};c~wM<4#;s^Cyc+BIfiif%A&ihwKIy<6e-KLtDy+%vRY`43EDa26<rd8t@MJ
z5;ML@_oiohky1b_)2AcMof)B1)e+2|i^ZRLr7hvW*XJ1prm01Ic2Y^p(6h4Ad8hq^
zEa1?at(dL!;V**Qx>Zr|jCzsq0<ifIJbcELXaROa%N0<&6OG++$n2|a&cnfbEseI`
zuL1uqIihdO*f4<a>(efb$>P^Ju1^5i#Ni$j?p-M~sA^082|5RlwX&1>{hPy=#}-t+
z-L`LQv%j^ZbsU&j_2uAzMv;n9upMd<FVn3Wd&x{xy?rZxqSe*z9M*0(0d)OfUyY{L
z0<a?FwAxM42^9S`|9q?Le;30$@8RQ4yE1lJaJ}k}*4bAIg|x~^o_e{K;k^OtPB_+r
z%b{csY@_d!uJx~c(YE8(r&taAi<XoNFQA0ua7(A22}ofWV>sKt@;X)#gbMC7_B!xX
zy5Ege)K0UcHC}mopJ`T>;W*a>NGVblJZseQI#y<~=bA*wlf+nIp}tJ5K9c~9JY}XI
zNLPL2jV-5?Wq>rXKoBw(H}rDtFxK$w7=9d-N_y9lxPMhV$tOG1zP>)j#P4xt(}4qE
z7UAd!ONEPj4PqRPIPZyby+FG63;HXeQ|{iEdX1`PY7hxZ#D7pQp$ATAY~mG_8SUyX
z{9%j;KnBcT&oBKtFVf_9v~AMHm}zPH=&69!vSM|zhLnF)g=g0)%nI8cG?YOw#AX?b
z6Bl_z%{vkC9&f)a3iVQopnrG?5e`h5nwl*lFyf39TK~da-h>`#_Oui%dHEb$gH-W@
z({JIWOQs7sk%RI&I|3RC{?DE%M)jI8ywHfy%2X7b{>z_zD|LR|&DA|G9J$YbX3)x2
z@qV8HAw^~@^q<PNb5ekG?g2mmGB?4io~!m`{uYZ_vQJPpv%{*j?yt9)M0}Ya?Pn&%
z1jZ=JqUa|)0`czDFOT{eX2U8Q>1y5wmK^vYu-jtmiN?R}xx+gPsoZZNJfUT%4~qWs
zuj|j4QiR{e($21Av6TXu|5&vIOK23(8h_(fSu8x)>|Yg<45iQ%K!&<}5F}O`>1!q0
zavVc+`4~eWs%45S&qv2yX9+u1YLb_pHv}7L@~{YLPM4e5A(q!2jwR%%gt)!J(3Ku#
zFDtlDOL{QD=2D;IBV1dM6I!`oy#blql5bNQ2#o7|j`kJ(I9e%ur3|r@PzCQK_(IKT
za1_@NU6;fizjv65EG#p14#`+9t&S<xUl#`hf(;t@J6LhUfQEnDf~rbTz^m#_8m}-I
zc1e1eqpMoY`1#M?2~76aqj(i+Vwn4u_D(PbOEq&Tj=IJ7B&cHW>-j?)<$A68?lF`v
zA%a@H88JW=Q`Q+PS)pTKvLLfuOM_qQZ_rh36J8~0#Ir3X+g_sEfi8khr#Kzy`8%uz
z&1o3a$I!jfdg@sV(5w>|>UdGcv#3k#^0CKA;&L8(OV(gKqh?@RsfvDa_Y0agMu&fp
zCOi1p_I=mwRX_F?uaR2%x}Nh+rr7PfQ~IT(o$93KS5g?eX|LF`8`qC>SEx#yq%(ZL
z<6$s33!+c@>8GC9fF}l5F#KfML9lQYuA#M{`SacwJHWL9EZl3RS(}DMlnCh43y9Oe
z^f7AP1i%OpkCq0AdrGrvmtrNSYtrn~;cn1yMID0#?u1BNKxq%0fO4`EQhGqPlRPV(
zB`v)-ZkR<35#?gaHmi2J7-5}PH!0E<*S6x2nbNDUMY`bUZWCA$wvE|?-a$Y#2>$XS
z`yW5yPhm|~f*dd5x=9hLP?#|RR#EWi@5<0lccC%>J?VD)7S$RQq_*YN`uf*QQX?NR
z>xe$~`->hAW4QwMV?zU$M|$CtD;!H#NwKj;_``5EV-BR@iWhI>r^SOL%V&l_>i-54
z^?}CGCw26P6qolfo5ulu`N{-ap-SfKKNv!9#mP?APXlZSTdbog*Sx(czn~8sy}$?}
zn-8+1OuQi7j@SS(XPp(hXLY$GRr}nsO=yKTKo>U4hkCk1`qsZ@z;5WWH5LtyKvPX%
z{NN6s8y}P|N|8olTGG=khj~iH?~M)k{AI?#f&epHkf$8u_zs^1IM4v(`5Uto<FEQ3
ziWeQp^y)Q7AlHwU@Wh*cZ}HwO)>GgJ{444ivF7}aM~+!a^KcGJK@dZX^izcUXb1%t
z4?xJe*!%sM@%i?!LPNproJaU?`0tGKrL!6W=>aQ10#vIguQqX@BqUVpIdg?A_yDPa
z<wuwfqwbK22Yo4Q2OzZ(4nyGfz(!NEpD(Pa2=ZKHZhn}CFe2{az&L8TK($*T<Kubr
z{9~P`ne1whBZggLc<R-V-m~sw1dqfGw^tXGWN#;R9V}Jg_)Owe^@;X+b!xYkVO+(u
zy_3pex>2j@o@vx``+Gv<{F*E!S#(P^R=sT~(dI50y4y+OC9i+hx-h50=#iU!5%kPw
zS<8icM2jQ(Qw8?%TgE&fJGW$e+*2y`NWmcpJ?mRFul93mG9+eP_#N&zbl$vhTKCpy
z^g1!*5@OF5o=YBCL%`ILG{l%vz=)}k*t}wADMCK)AiFDjJRmG#GUa&fEu+OU^|%z|
z`_W?jBk7eWK14&amJAZWZdFhaLJdiH3=gHnL2A!GQz=&HT}*}$xF4DLBl;sZZV4~+
zKULlJ%B@-^e<(1WFK3a2Bf$L=H}=bPnHpeQQF|y>Xw9rP6-b*j=N$^cu3Ky9PKn?+
zP1w-P_axm7LwiAfRlt5ghzQ(Hcs7XjF|wH-7f#Lxj{^$T^EiE*8<m`%^ugLo5HVVV
zyntuwmDcZ<-|m?VU;ErDXj;4dC-G9GKO1sD%~f&sB3V(^YPz;q;Z&0E#kW?YGd^P0
zf6daSR>#g{ZCTjLF5j_UlhpjJl!uZKb@dv<Pdq^{0+!fuc@yw9Yx4eqq{a06Cz2N3
zpYvrzfQr`t>$i-MGDRxZA$#>V(|2t3^Hy*~Ivrrmr)Od7CCL`*4WZ9tre>~xn)XLU
zl$5Cf7Bzyu=?rqPOQm)KU`jTYFGP@nl3^38U|=6=+x(X1_l_~rDjtT`N!sGoNkW=M
zZ-dz-Xw}bYe^1%bnhKam7=2=9axIi>R&C!_Ssd}^!Jh_z^~A*2d@hU_zWQ{Em^{&7
z;4nuthk*>q<MQwluP+jj0lW@hRt9Qg8gKtsCl9vAQiH#UBXUN^2@rxK%V5C`%fNWM
zXNHfUNeGzlbY|jopX%Eyz25)z5o5fRPdZ0j!IOp7g}mXLWNn;9D~rGsiKbx4PS)4M
zqdjP6ebXWNA9iSJ5sx4VGuo#&sNF|bOQ02z@QQxP(#k*%ZPIoEmdea7GD+lQv!JUR
z<;)TF&He=fQfWiJw#-my$rc&W5~J$8^AHtE77;PSp#uT2GFcx$+zN#@S|t%a{Q78%
z|9v%t-DnRIwgsecD-1T-R%LeWG7fnJG<XMloG)(U1Qj@wWn%rpD!j|-GYo%gtsDFf
z=5Mb7WUo_2!ob25VZm<B@sVaUO`zBxe(O?Yn+*@D>|JcKECi9~mxZxFb7q-VCeYm9
z)&FyFLcX~~YJX@a2rN^*N~Y*q9dBgo=@nX+6mkq1;yRQt8;x5WaXnSg$9^Ny5ZGys
z?@uG$XY!)sZJibhe#=12SzAiL0uz1-H(X+fKZ+Owp9h%q*Y~Z>W>;jD5nc`}+}+(u
zNj4iJyx@?N6QCP8ekE%=v5i}@ytmzPWLROG;LN<>kX<fCx3fQ%x#+%H3}xEjoJKNY
z@Uuo@LO(V@|B3>*@?uqL=kP{v7)CeS!)6dU(+XK+t;Vj1v|>z5{UN1*_!9iHPJqDy
zCJAEZ;7+*A*EF^hv`P!1p(7y{wHPt(`uQvwa&NMO99E}3xno1A;Q31^xfj2vb|e=1
zBfiV6)u7ch>i)LJQfpq{Z$a<m9Ndss@!uv{65Q>gFFe$@Hk~`if&TX@ud2JtZ*^Ky
zi!s;)R@Mr>c7@GDZZ|G%HDuKGYdtNpb4GB1jHaA={OzGYdpzJCbQOre`x!liq{1;u
zhx?~*vQ5ZBFohNh!*j2QUIStAC|507a_|1EHG~|x7K%2jl?G-AArWTK%1^wXrCBZ=
zf5RoLR7l?7H0y3ZQTM){_+15d3)AS~HCZy(%#M8VqVtCslU`T$1wEpl;tHwgqM5s{
zQh_y1H&ql{$$ps(56C5;_cB`QC=ZK`)Nm?fY0Wmm3SFSS^tKZkp^1y9a~Ch(3H@Gp
zb%DVzI;3jlUP7UCh=am9jyF0;YJwf>?^c@CZmaS#C|c_{v2J=~9#ir!l3(2?R!6TS
z=|PEd-zhB;NZ!1TuJSt5SjRFyex&@ep;YE+|IdpKljNUQ#py*`3dU~B!4sy8T@^sb
z=9Ufn^=VHrH@<G!3<;d*cSXbbr$Uj?JC#InhpM97)%%L`_z7PuJY|OLbo^y`5-aXH
zdtYUeBoTppP4aYgXXI_1LmoQICe<PQ8lS8}^a2OEcW1^nDEFn&`S#a-g;lfwPrp|)
zssPPDFoocG&mqi!15kiyJ?TwRLj;A~%(VmX1#9HneRGGZ@l!Fy8-&o87LsG7<ru==
z6*E_kAPN-2k_mVapM>~5uR_TKDsJ<yIUf1GLj|^ct`vnp$^bk;8+$T2^BQfnP(TN_
z@45{{SLEC*N~Ac~B4mFri?-w@vLgv}CfxHWb-QqNszAy&Jw^IwJ@|UWluI5!LB6^M
z6UUXq=9~tHj%jYPA%LbA`LyIbG>VyOg$>sAiZk^B)FxohZ^T%;M!!wNc2PK8CCp2c
zPOeV9N|{89k_r328+`$^*~ni|`nCt>Pwca;u-RG4>Iw!$6eEF=3??$-gR-HTlL2t3
z^BXnXsWDfhJu0QS(CQt-kzJ@BZKQY!Fnu>7b^;iVZh;_&Xky0}wu}`Eva`k*(d|YN
zB?!l&Dj97(oy5lc(wrwl2gH>j>ccbl=zP3p!pg<^olzO9N$so>8>>c!LWVpLIWTXW
zlc9pt^GG_yngRP7e0yYh&~9htqgjP~%fYDLi@cS1vxo&tbC5S0rz`1h8hBCfh{E^g
z<kbW%ee>8C{<fQCJ_ZFGng*Gz+6(oxP)0T0`vg9@_xnmpf@w&$a%862o|;mj-@2i!
zRsHCa1v2Bg>8k%Ut9Q_J$G%FORJC8q4cHECl_K`RnRE8irQl!aQ^<`G5-_EulAiN^
zAoD^Z<?EcZ-m%L^fDh+ii^gjl43<qxpV==SaDBOVYJb=;UQ9!@K?hN-?FRY$DtfHt
z*aDJQ-j8#wsW{~y`aDa9t_IS{O@@!WrEndg_WWNGFW+6x1d8g)Rz1M4J9Q=hco?SS
zUa0smzIEMmXY;Bm!ph(+yq={ZLQ*Y*n71e-#NjL_){|?+vxH^CCXJk{e%RNVfZDVU
z^4*@&AFLgK-a7CRW)<O@Hb>+gfU0B`GK0z8rDGMU1?*fUF^~}k;U8A0h$-lH3`Wsi
zI-G>_D8M<6=!<c5D=+<Ljg%bdbF6DWN`h?|bu6>5p5l}8H#9<hnc#_yc>gsS9wyB0
zTEur0vf^o`GDEy+l<$I#CZ*Gi$@5vCbS4j|RWu$n6HXyvW5Pg|90QZjUo-lHd|9w_
zYjO68o%)bFnwwN5cV9+_o5UP3w0RI)#z`;+3miMf0^-PgwA9o3=euWEkIoS+`iF!h
z9fZvI*Ozr-02c`ofXl$i(T$)cq<S!I8@s8FZR1wi89F{Tv@q;|lD@<d1J2NgH<Bf!
z>kJ~NzA|#E<o0T`-~-vS1T3%!{fO?<A!_%+(R;XiGPljdG~(=l_e-y08s{D4>hTsF
z4k#CXSRgj^wurrdwBDdm!1^lMbi*AQhuP^N7?=4nq`#p|<DkWbwK2>xAHEPSUF^2y
z*MTvgzgyG+22ev5exP&mN%$XKr}+BbdwDd5=M<+7LAPhXbR?*PJVrNF<xa5k-Td+;
zqCskUB45&D_J_6#DkYB*Y<q7)%61~;m_QhqW0<~0$t4%K$;RKjDOBX_(Y?D0qgP&N
zb4!X6EN@b=6PVKRymk9K!WZH0L&|q98{18~>A-`ARUwB>0Wv9!gI<t;OA@xSc}%^u
zaNyVEL|P>rP@tr{uYSY5I{d<w7ueBf*((+V?6*CP{*b=VVE>5NO-Ob1SQlY#sg*rx
z%m4wd$5&(jKx^;hoNAq_*GLB3eP;v|UilygW5t0e-XBYr?{-0JK%3hEBpwGPallkg
zbMClTpA^BIx?U$^ELsUzf=tbH=7n0n{6?7>++QptCoEDg4T(&P7rX-IJS8bmu-9oF
zhhsmhKb46mqp>JPI4ug23B8G4OK=>P=|Cw|j|Csc?+99C+NUvN8nS}5qBz8Xo&O|w
z4|X`8`1J1gdxG;7M1LfA>`(838III)heygDUs|qflo{$eHb3AWlBQXjE2BED6}geL
zlg*VU=QlZpg6pgw)V;On1b)Wl-Q4#9xqlj2trWrc137KdIC&i;_slaU_8X?9@lH*+
zp>^jCSpKCk-BTn2(K}(6U`M%#+!+7FC)-K<$%oB0H}pJ_lStV%2I)S}R~b4K(&ecI
zVzF!9x3fG!YXhZ31*GD-hvuKeBK6+`*1)1{LS1lZMu^GwsIUOgz^J!rcNDTZ>8mwS
zNn00c+|807#@+h|(Pbh$3C#-2JP)(q77U}GVXnehsM)&awq8QcKUv;a%4m9cJP!*r
zUR!>-E+e3tszP90$|VxqB-i!`Ui;NdafCgsLao>NL2FxLp95_^1)bgc+6)otnYbW0
z+2qY-9ES)W9zM<ou7OI*^hzQ7Dn{7_8;KS@=zR5*hEC<a=3(p_rvwl))@l(Ek<leK
zl)F3~j$=>*<KCxSNba&Y`jo1XL6Wn4A5x2vm>LL1Ev(RbXJ4{DBEq6-$*;0@MK=Ue
zjxc(V3d{<mXCfC3%}b3i&ZaKk=8nm)p94_XV4p&~=YR&owWH-;pV4-b)3PRk6=#Ch
zU4WDW9PGs^F^Pn?*|QKo<@M{IHq}p|OSS%W58-ynqhvChyOYdyo~!ULpRcm0f2e#v
zd_8Wz#7mUA0D%AH&?w^VRD=%rweJ{$oY`!dKXIY5y^QEPO<rYaIzCW3c?py_?D*^V
z?EQ=q;(x%`{LUlILvi^RQC^xDTK>a(Nw5k)6lKx)HX2m&V|5*|QbeEP|DtzW-X}k|
z(lF(1EZAedUGEW+fl$cYC2xK1TmQG(S=Q>Kd?}HouVp`ZC}>?Kf8=OG5b)i{GI4x2
zO_;y}zh~xXAM!BX6}(-$D7&yC)XG?kPO<}VM4ZLvvD@C@JtZHK+Dm{#LVu7iIW6GZ
zfy`G+H^?0yB9xClnq819d(a@w!uO)p{F8%|G%;|v5S3XjN^H!I7yDs+t6)HcpD-mc
zf0W7d<#^s`z|&+>(s-4U_$M>*=*S?5xG3%cO){1K`owLLR#gr`k#w|{()|x`Ybuz<
zz>+$gUij4p$Pz`JA{sed=3W=Zi`Lr}(oACH`)&L%v49+%+OQL)4tD6N5|<v}FuVuN
zd+RZZ_Xh#gHG22+dLYI@q<D;A<AA?Sx&1laiqnG*Sp0I%q2~l7^nhgK(a+yfu3&Zt
z7(AkmiJR<eurq(`(hE>c>$xTW)UMLR`k$;p^bn3o;)BCyBfPHkCfAIab|;QMDLr)L
zwrm;b*@FD>)ZVMVPPUTR1_Tr2(e`o~4hPo$Yay4(gHMdU(<%p%3mU71)wNo>bR3Z@
z-g%EGZ<jXLd55&Xwq$r!Akf)Fb0wjR51Ychd5Kk3?gU(e`^{0)x2ZZ>@kj`ocZu%j
zYY)Ex=_1#wthr)O;gX@)RPzf|z2`9bb)3lt>Ym-ot;rpIt^Vb<H0ARHNW^C90hVCW
ziakNJh^f+uRy?KfbRD4i75Toj?=?kJhHNe{D|dI|yfIYzf(d=}J}%+g>xtcVVq^4h
z+-ly8)utsWqZl;?5Letc<YbhySE3!+j55jB90k?RZe$yTee!ln;PF=C<te!NBH4b`
zy~(3t*DXw@U=+qnOPDKV0USc9jeoBE8TW0<apVB!Ul$BTro~P`2^6^tJP~+O^yUGv
z^b3Zc{6QAsBlq&0oP)6t#vTWWrcl2qQsNwLz6rY2LmO10YkT@Z&YI`*uln7JXO8_T
zWsuFgHBIi#-VZBkK@GW8g1l-#=FoWJR+hNcOwG)Sh4<vo0DmYiv=qsBuhaJ)1kz$|
z&DycMRbsEKxcpmhLQen05TFNLH6-wtX8P$>bA<Yg28lmeM6o|nfY9-TsqJ54TS?hG
zrd9f~btA@605#&EGppt9L{lUzRII01N#=A|+6%)Ato(ed&kV~A$uC57D!G*oe2AW4
zCtc#`<~QL#a9No0A@^?1@{Hhz^Z9Q{Ti?glO0;rsA-g)1wERVmdFMu=85XkH?N$YZ
zdaI?AbSv$jLNIUX-SosisrR|OeDkKst1mnNce*~d=pkCtSzW+0)6pPDZy{{GFY%>y
zKEv6ETczZr5-qm|acthYBFEtpY$`8-A^FUtYgfz#+c>$#OsyhmDp*xetNo_(NawjZ
zB!*{1J_h<AN^|K+f&Z208MaOm1rCGVT*CSRClUN0cL2x;u8%s#cN?23`~(Y}dx>RH
z=zkYlI_`_8!P{wov`?f3t^#{Ai)G!NhT_!;!JGH`DHkT)yHHP<1&HZMYcsVdHPSFH
z7$;sp%*(-c3am~ea=$Y#X!C?|^0W<$B^<Rgx-eH`tZckBy)?vbwFiUn5R8Z4#PIW+
z--S$y2lP>F6(ZK)!wh#2_1!h7$q4}I<%x3rgmD95)oE4I3x0J(Ht(4*JkyWaM!Wkc
zp*D!Ot8O*B!zWyKb9}^1G{gf_(@s~&IITZ{o%LCrkpC(P*SdheIB3OZl}4@mi6uf+
z4}m~?Q7@nY+RI?;ELi~}W{Zu}35E;kcX?a@hARpvEVNP<uA%SFR3>I0Zpwsd(vpRu
zpM1#PMj0EoACD_^`els+h46X|l1PTHvff~vvq{<od1zXmx%1-Ec9bCxbYngqFcE$C
zCsFW>E~vbzxe3%Y`+7LJIXQm-xWkbJx);SgT+t8Y+{+YUs4HI*h6|jqvn*S1^@vN1
z=0pK;ulDEgfH(5#*_))K)17Ywr9<kC>X{56{{v2LVD$0%cIsQqxB~r)WDZ*0;!)@x
z`aMaBK!otn5t4z=^iC^ep9XfFK}>uR9ym}2c_Zhux^X(~H==~Sn6y8a&j|kY0#rP+
z^6lGI{feEcn=yb$17fGn!pwl!#R2484tj6EgT~=tczT!>rE~tMSm*2(2cyU~N@HEy
z7H)!$7utmzyXvxtEI2ezcWiclI`-sx>5G!Ur81%9S0dLdw(Ej6tw=>|Q1e9BZLWG7
z1>cYBS#RVb-YVDw^)$5Wr_XN>ByHcT%o)5!%3Ce&9i&G_Hpo}+Lhc9+o6sM_x71R8
zZlEOS7Gh?X5%ckZ7;0BUP7eb%^u3H@etK+r0^znN)PfReU@D0xV&}1g>Le)Vl!-N&
zcg?&zWlv)T%NJ>05ydPf&1A5Ax=&;E4x%t<%sx_Yfeoi*DuC8@qc(;^k!q`hCn&gJ
z$KRjqi91!8%KThD1qiqz6Yzc%_~<|RC1p>ib?v5khGz_Nv>KEfPb070c(op6-{z0L
zb76&rq?;m5gbny@@=tw>WKj?>t}0&gXN2Ub^<-nKs+X56oHBx3anvT1%GfIc$x}|*
z-m)%!nppKS`69H&FD{Md)}K~6K4k@M>qd<BJU2o%Yb5(UJ|Q77qO;e2)>>%M0{M&C
zLKxb;vj3N_!1rGwhu2s|9#9@w5z{POMGsji?Hn^kDvx`zZhPMWWisdmSs_x&Lj1W$
zFabx2>~Z}N_bGt(#WY^95Ph$bgv?`aSW8Qr;VkRnmPj=JL5>vrxa;{!HZj{B@0!Kp
zdBD*L`Yf0id`Z*@H%tuu1Dw9X`$jd$qcglZcH5<)IL12PPRF`QJ0LPgaBs;G&qCol
zmZ#+x5aX>LI;3t_3k3Qt$V6M_Nxk}Q$oiYJZRSH+yt@6yFyJMrlNr7FXuB$Yw+h5X
z`?QRjlJLshH{i-9g!OGilFz0?jp1wq#;FlHe6~x_O>GhEDR_~1LO$@%b$>!bI%%Mh
zty5;yYl+(5=euPlKc@!xs$Fxo{q#W<-<N$a?n|K?EB%lpm6xs)sN9Z;r=h(m&4$R`
zcImf`%gOn%P1$0GwuekI?$WyVol`Ir5y!iC*K*GyXdb?WCvSSQw|Zv)^h{a0AJ5hS
zEMH5BpXxawbT#5qj)Vj9k9dfK+BO^B`-omknX|hx8HW=`iX%|GaDpnL2KQO})f(BX
zZF4GEDV_sKVWY_y`9<;?=umj&86@BjqFMnD68$U<7JjCjqd8>vaJV}?{e6&G?37XD
z&dDB7tS#mYmNmsx*ZW7v@hqxDZ2jA!eYMhfud=!o!;c9T(2^Op_}7g%^8%;uhm+%d
z5RtR@s#ND?EFd7O@?&P?pLy%Ibmp{oXfRX?e6WEx^QgiTJ1Vf1$I-K~JNyPendlH8
zziWx(qAJP#BBb|4P8+MQtjikY!yrHQOfze?i3Z-}RgE8OmBxMgi#Ncm99AfrJ?2pu
zu^Cz+3*KU^(P;A#Pw|1l7Q20{N2?ueT{F?qgMjJ?Y;*IEZisbT+d$m#l-M-6uDxW4
zO+Wj%*(d}S<Z-_#>tXV2fnB6zvw-_Z_a0T~%xM&u=Zei30gLd5{AJSnvpV@;TLzSQ
zzbNOu&Lo0=7sY$l$weAhg#qR%8HxbrU8Ws{ud0spAVHLnu!V3YwYQb|o>YS135j;b
z${12$+eF?PZ+%9SDD|`(mV#FT0<fD=7@SwVfVXzv9V7b4`qMw*pTrIpvOXWrapHl2
z*rhqWd8tv?8|@89qz{#^XuHmaQGy?#hqvvwD6UJym2*)}ryrQhASZ`bZ3Ro=4yPX~
z4NX7O$UF&gi5I{Nsz$3eaWB#3Wnvi1knc5==V7)T|LblRa{`9EUY_{2e(<G5GFmpm
z3d)>ph$vWE5>p0Jn&#89yYS43@$g)xF@hC99CpD+@qR78kB5&V8}UqB)M$To{EQ6e
zYQCv3V=%gr%%<p_WJu}i8c&d@_qAFAA7$8teHd&MS!|Scy`D>DIZ;+H%s%F8jmxVD
zDbBg!yevT(SU54afy>HB(~upsaqbb!oA`iBXA_6KE?c8`M~d%dEm5D1dEz{V(Rye?
zNforp6h5xdKSAVFx}GzLV(AzB0G=7k3Z1kPm&u5NH%U%V#w7!~o&&$_rjU}?DKBJ<
z%U^G`o+846M~bFp+|<5$x^g_#wsB4)GX%wraFL}_&4Qm8&HpDj`y~n$4U_O2)_o1W
z&7Yw+ipAF}^HjjNzgw1t&G|K6SX*%g>J<qnCSt!8SfdVwGTpw07n$n_di;z!(3wTx
z=Kh-C+kj9a8`PiHjG1hsj#5ub?BpgOWV7F0mVC+1y}m;Eg7*@E&K8;ak(?O$pQT89
zr09Nll7Q6J=CdgW*E?F#*5UpCt(*p6kF%Ej><lKx-~@i|iTG2R=7NZa)1F(npLjOz
z#1J+$;XF_5qX{9Uh^_nq0so*}ZXBQCGqs;q#EQLpHu1KBQ7Q{+QYon5*vXE;Qhbap
ziEQ|L@}kqVobGKUfkOfRF(KT}lY{4m1LPxb#?zO}Q7T(<f@yO*r=_8?c%sTg62y9O
znrAPRqJ`4eU@2mPkIIW#>n|KgAmZEo`V(IT*%gv7h4^p-=y&NA)fKQFqXw)-o@+?{
zjLTbmIC=plMAXw;j}rc{m;1=L=<$`H;oECUjEzsVL}&#T7a+^dd_VSHmvu&GPp%X)
zDDF09n-CiufL%kT2=Y;S5Z-(3dqCjYHd-1ByjZT3l9q<*1D+%UjJt-Gucp-<V`$<A
zRw)#cCKL95uM}2kpdFWXixF;Pr+*K-cFm&bi?3enbeFRS_j~Iq<5<$PVcbtt($*cc
zLqdu6(q86sy`}+Cy=U&MJo>XIu~eKS?I3V{vS+Il16{n`FjdX9E+L>l^LD6Kz29aH
zhyd9}RIddl8gNE28dc3p+GFu|8?Z2b=t=EX_ldxTNok%>(C11f2~l#0>~Fu|rsG;r
z&4fEYZgE(0*IWjK?_KW@$XA~m^l{DvwRUzRSsMLJ7^LxIHp~k`wgQ=OwXF|A1^Wq6
z5|6CNtYm^f>sJ9qcq@*7-LGXaWcO#TgIag&XfMG1YYEJ$(d4n?cGyg*V{l-+@tOhi
zCQ((1DdEwQN~=uWwr!tKiD%Cm(EV0fo?&e4KwWbegn3KxV%+XrPC1Hy;h1JXxc#2_
zY~Z)7F^`neEr7v5<EEdS=}=M=cbCEum|HsX=d1A-6juAhc@XJ{d~lbo{D?1BO<UAQ
zPk@-dJ@zj_Z<+k579MyjucTn4;=9+VC|5<m%N|C8=jgHy6xKqgC46=IPa~(gw}V9!
zZP@J?Q#4KwP4Mvn0h{R*C<0fkLJvPbxy8aog#8b?EP%(!UaESC-w8D{aJ=-144BIR
ztq+cCQ5+zNHSfeQ6;3!|+LjqXbB*0jhH-NyaScLyTHMlf<KjW^610$m3+kvqVL*{s
zM0b1Bm_Q*ykJ~#NCl2+ua)LhJcao1^>94)Z!2RJ&p#0p*6zTz*%#52ffpc8eAQ(`@
z$jgqMJ8n4Cx*12<JV7JLvWWJFW*ksWj}B>_Pv*&$taNJFIO#}~_5jthHr4)orW9?M
zUn@y;_TC@&<+vhftaqK0U%g${a`0C_d!5EM%T@SfX$c?MA$E}OUIIX*!C;8F!+23y
zys71QoYJBJMQ_es&YQZ`DG;M%V-4^X47t8Z6%j7Y;}#G8AQWF-l`E6GAewbNIk7!^
zf)g^`Y0){6`A^Xff@%Gyf^gZFKs5|n{A&^A+lgtZOC><X++)cjN-9Owx?#*86@zE~
zFg%Cg2@q<R3S%GCnH={KIpGs+enZ2^4`njexGa$5G1PB{eKj~W0VRxOJeI=J?15wz
z5uAK%^sek<w*;EEuhXmc;L{vqS}5vF^dd)~(~|86HCJm<E(0z?pFHNTwz}<a-B32(
zgjAbv7z;9;4|!wa7%%vG)seqK|3tOZ!HJ2LHg|t7hyE2*W%&PRqtM1P1#E<1{8jB3
zpklr`IHn8^LtXGoNun-OdPndh=Ly+<?AM6q55Pk&5vm<QGoW4&Iy9xjx1haj*ucrm
zDi6`|;TOVxhLPb;zk`dI4O$PS1jBNXG+QYX;cyS?RcyWba1{y$jyK#_5jBnn092U>
zlWXSo+MJma{l^zB#EJ*dk*oqH>47F)!mbUqV08k%thaAUvj?3E86Uvx*CQe?h2t?_
zAuE(_Riifr3|CM=9Fbx}=f}oPxUVB;1IF+uu7(1>?u7J(?T;lRJbq&_UN#&kU<~Fo
z3rv})>y^waXxPeaO3*w$OV3^>VJ`x-uA{3?BIF5Q4F>rHaX<h<x?J`00F#B@C7I|@
zTG^ItH`TVf%lB)Up##g5fE6sZ=ob$ygb|45dctH8So@^`XD;}3=<+urgQtUJlm}>v
z+Zm!@ltuZ#YwTE9Yv&L=GKDYz9!*%&=E<srU(H#{em4}KVy$!#LHVpYM___1>0oA7
zPc)Tfk!k6*@`t!WPpd^^&usKBADRGv5GrAea>^;tj#;!VJgWivVeP{dz8R2YJpKrJ
zT>?+ag1@`iUK}iz;|K2SeOLTtM5|9z!}L_W|LgNIIE>Q3`~avyn|TV}TAVZJ541gy
zlyYwNf=H>hm3~POR8)o|Ebw3$0_eQvA`q?FZKN2mfZ7LUFsAY7*Tf5S!!gleQs-XI
z(Zc_&#In4aj-a%XnqtMYSUQRbA%?51@^8-#MU>2@!4<_liwhjKd&Qfu<?&f6$sRE(
z5f!}gp=OME<%28=StfOHRdev$q(llLFkKbJPauwY{N<f2fAV~xS?_1Ky?mv2P?Oz@
zXP+#0i-d~VFi2gs?X7M_e2_2HJSlcSe~5kvFX3JTPLBu?o73GvtEs%2T{5sekN0oI
zynEO@OJrzS#2Wh0Z}1b~or|XIiaitnyC+}~z!PX$x1oF<FpHo(@{cRCvQJ|RXamGT
ziY0wG<WsO_CMN!*^M6L83}<#zRjueN!rn(`7!F|Na*Bj0BIcM+s6T_BZbiugtGyh%
z@CeIrwh;6_j!<kW6dpq7r~a;q9wbowG}<cVN4BDn0j7cx1ni&Lo-1r5kaewpj!LA`
zu=K%#aS&9aUH)lUHV-B(rYt@jv}4MM*2#`1JWl#I1=S^MP~6c+mDSrU>E4L*pc2%+
zK*9`{lk^Nv7x)5EPpg6YK2)N&1%fz%yk9|xqA0fl(AZlCy<ZJ9vI&=&yazrCZbZzO
zYN-Lj!b|1`<IM-XUm;!P4JQXCZfuK|)4P8OUk1KLTiZjE#b5(Md;-$NhpKnxgB3Ty
z>a~<S^7sPaNI7l^1P^WSf6!z*r=P?t?~8>M000NJCe>L0sGb3ag#wWQ-o*GOwYQ5u
zt#7*}QTyw4SuiIR$0uY~srQk647Jj)=<~0us*(^mSuM!_h?-62r5+KFJ_`3PRs+x{
zzkrdANYmZaPuMaSmCC$&Q1y8C5)q7OdIIypi)n2Le;Q}Q!Cei_)4MDzUj+%kYmx=_
zPW<zUT}4PhzfjQl>MP+hprW;9E+>kN=af4iTMwi~=rBCOw3ZgYl~=v2QzHUY+&*!S
z+{{jwU0;x>0UbM`!MUmWY*;Hoqx%b{Q*7&^eg!j?Hs}lytir81rAqqpFSkP?u9kvA
zVY0Ahu2HScRbXPubv{-&jcLtX(GQ>SY^?S4Lk#;}iFRgd$zw1BbY~pr<#ZHFN{&Gc
zDwug-=aW5|SMU=>uP3<Q{#15_8YNEw8c>{}H6oNlb@#sU(Q8JLapoeaQJQKg2fm~%
z2f!o9(D-$wii*yjp``s_%l#^Nev-IH^?LG?0Xp7ti*!C8C<veI^3T=9u%hnBz+W5*
zIiAUvfh$n*WUPkc_*G0gtdqWlyPW<rtEl=orV7F=*I7ptpCAw57NQW1cW<lBH=3f-
z#zCp$0#mty3moWT2j4S*Y;}AEpwkI*;lA;|#rEso3%zXD1OKn~azP^*cZ?ViUb8cM
zH%SOq;*M<brEaRH1Y=ak)Wv7HK-Ev^I_8O_PlOB<#A>iRdt51pxS4oW7*y_V9Ymuk
z2o4=l(a=`;UPQJ-(c0XYGx$gYcvMLZ`P8~C1#tCy6A?_ChNCJ=E~F_MX+<udK_n!`
zFkk1MIrMt%;!TWY_O&cT4;mIF7Q?9zy~SgwgKeS>vO#4LF6WwrxXJ{=2Y6Klr-4*{
z))j>C0ZzjG5o?_z7LuzQ%h$~>%Y6R}tloH(l8gQ5$-w6puTyG7BpzD}u+SQ)UXeJX
zcc^n4SoTH^i1eYW=@sg<sGD+SBF#wKe_;Ls17?;dSi7+e(m5rIW*St7bS^5%kMDbD
z`)N@!$x0FD{we*Y6D#0jsBau>=*G`|GA9T5kN;uEjYF+2R<PnRXRg<8F@umcf>dZ6
z64LKl7q(}sX2<Vz%r+N@Br4JeyqG8eJwU?0YiVpL=4{e(5@xemO6SgszuqXDJr;X#
zF-&?RllDXCC<%>t;<aSH!quDa?0gl~9`FCW&oMOLOW-&Fw(|Myjo9PC=Ly56NkeAl
z@js<W`ihcIvA7!$<<5&U6LJBeRo0vb8&!zRkq|y>y|W!=9#2`ep2{ts$l$23P^$<=
z;4kBxZ_Fk19oOX9a<@mDEz2Rs>kUYVEm3*k37o~?K6OK%^gRjrwz|^%d?al+<<&3@
z3HS!neS6*fku3hGkTi+H08#rVWoHP(C?ry0TU;_XKt9lnjRJSr;wVGA<VO1i?u>DT
zXaR9BvG{MULF6cEfAxxOq~i76y(xp%oEmNq4YM|KZlE<|eMpU(NMpkis7xzIe+<2h
z!AOdU*GAdkDHjooU-7J6!K@A5c_`N};}VY5tIVuW78kMe*A<Y=7qGju>M7&)G|>(L
z!o!$+uAC8~HQ$ZeRCG_zEm$dP55ZvrIBWE*a^EJ4j@DNn`Zl}a69KOn^l?wrnHj%c
zNLTAy8)?ZRvE6cBq>FH0KQB%9lt+wVIdwtN(*u0AtW5^@0na&O{{f?pfEPznnV<GV
zfh3L>{;+3>g!naLhgS8#VwTrH!`MJGL%$u=ZUneV%M@+84qwdPQAZ_-8Hb7nBv$6)
zo^{khugR~7*WI0r1#(fZw@6R-yWQE!e^LoLwNcM(d<*)-H;h+!4Z!UHN}{2y&!U1O
zjs`^s!DVU>XEOy{!DcUEy-neeeR#ASoNVgOkeQt^ej<nZITgbxQfdqq%l{QAS9W?&
zT?}AuPtX|+Rm~h`0B5W9T-F<VnSv?<P(D{5J6d5aU0%e9q=LlSe^RlT!(XXd<+RbR
z3S7i0fNS>MY-^C<i}n=E!%M>s=rr$aZ~-X&BUn3Jb5zv!l>}a^^X}OReN?_<RAI)`
zey-}9YZ2v#+sw-9HIgEgkR+$pw^XU8911`>O$QyT=;RdKscR}CZ!Z7qxaP`fmhXNs
z>{sj48Q7kOuN&ToUG5JWt*k$_9MIap(5<?&3o!)Ggk4f_^&rPryLT5HcqKGpV9N!8
ziQBI;N{-TwKuK0G_V4HZZ}rAaMa7D73lb%DcTgRzl`f;;!4>`%K=fAiM>eYCDIpOw
z_TE*+8-2CYM!EA#f&`j(G*k4$AT58fi`XleU;{oZVOE{6N-W+w7}kMYu0CywC=?PN
zT_lS=h5nSEg?T!`=bO)}@oaf8eDzv76Q%*;E^Tl#1mX1ovjmcQG$?!W-gJ{coNsB)
z;6WGa&cs|K5Vu!6bU$KKB(HkKUgBJl;N&ue8*Sm6&)Oce$Z0G6V4H^3zZ{%izFUUX
zk5*1C^7?j-WDOybL$gBDU)A}IQHDDha<<>+R74r%E%{|ln>|0(H-;Xb!#yx^TaQJo
ze8UzT_JQG2(W|*QWuBq-l5IRG`GqwWl8s>k+LMJtqrBep?oc&x5vW;e<5aa%`2}6?
z&T0#|kdXGKfas2K*75Z~YB4Q)L=dSvd2Pi+D0Y0Kp3+N#RIx-IcK3@_P~g5B59k~I
zW{{5On>N3S@r}-D))+S->fGc+Qu4A@KXIAJU^#k&!kJKEbdK)`Y>JdjxvKdy<J$0T
zc7W*DuVnUR#UJ|4wi446603|BkNjOt`{h{G)X7X0XBYH{!$Ry5xo-do3O)?P(HmQ3
zu*|4ua3|nze59zz=v)H1aOGBzcDCXIZC3}46=l$x#<Kb{Ngsh0s?!)?!1f(`t^UrG
zwO~lCOyQ{nd|T@h3^F274h6a-AA10^2pEKnARh~N{{~vEn(o2_(m2v>lrB#ud2T)%
z#B;iutcIhiOh5)93jnG(pZ4;O%a2qK_P`Q|*1M(?oFEjL@dXhw)&w1VnY*<!^|(HA
zI%)V#_YwzsAs*tvdw@iOZR+iO<=Hfh8x1m9-Cf>!W=6GRl5t~=&m4NMea<083yua-
z1Y6224rkuVe%ir*e2%3}hc;ZgO;L5zXEy)fS{O6v@&v8Da+0m+4}G*tW@@P@jC0>J
z{Sk+TfbH_1Eu#T3&4Gop!x33P#v+1ev_0~-*G=wn-1T$DmL*x=+ph-_`VpORn0^DK
z%lF3aPmv4v0S0c=yo4Vz3sc?Q!*m=4Ihq+xO>ZPJ%V`{MYc~Kbq+hAoo%YtncdJXR
zgw#gNzrB?%!7-`=Bl(4FUi;EgK;b|Z;{{Arx@4!-_42xc9MPx5rk}ozVJfMpZJcDb
z#s0Q~YgIkqM`|S$dzF==VNGcPf=9z6pLib2ybdFCUq61W&j=668pQH}5m)z$<aQD(
zNMW#i6Ms5Fz6)O0^f5AjzW{MFx}Z}@tb(_skw`_<Uv(t}O1{K!)&Kr@ld_2F=^>$7
zOS{DsM~Y$#OrQV&00L0<sUua10}F6fh|V~!XU^(50XY>X+&q%Sviz1Gz%($U6<i%g
zfT1NFavlUq2nQIZ_qXMW0exPdiyU1)%6ia*qek5*Y)u#KkPddfBEW`3BWZ3(u0dv=
z`C>!>?1jfM9<D3CTUTwvS_^d4Ant@90cQdzPYh7AKu1W;>7R%$iJoTO_qO|WD+0HI
z#_(xgz<zOtjK2gTKRFYR;#iE8qaJ&@(7`poiJldPVZ56>X&pdfdiq2AwZpz{U(Y@4
zB8Qo9@-RFtd>+}S9!fvXcg9e%iVg~ewV??JM>xgzugPJG_FHTMSe4(rXP&kIrK<`T
zqi=#IK|JJ3Zu9%n?$7zauq@V3JVc9u<_Oyq!}d4E^27D38KW$OpV7u|oVpIHb#~DM
zInx&TY>9*l+pMFAtW3)Pw8&~oUU!#7^po`ok2dK9$0DQDO^t@rWNOAiP})AhwhCd>
z*id$r{H|K;s9QT5DF(s1?=cnAN!#c^Q3Q^c=JszX3#h@VdrZ;69LW&)53AB@MtNO;
zG-{~_p&yKY0%38ZxmpNgTiYK_@J=rxB{3pdrg>=U6o5Kf8%D+d)(n4Gqj^>jMR{MI
zQ_HELV8?}Uh+U(Z=-dGH^L?X^;y2!!U<Z=yf#&iQL!Ha9Ih#l(5YSN#8s~e+F-E!O
zWwQCWQIuw|(@+&%m!zH;QM6orh|Ok=mLRtdgPVi&8XZ+ypE!H=DOSbNOj1|fMh=F3
z<A(9VMln|v-t&T4w!s&<;}_b4VNZE+a}{zQtg54C>PW4!+^-~86Twi748dl9c06j0
zPN!aC8y+hG-{x)Y4mDkQz->mgDHRP77ib98=p^n`n8y?Ti?Ms+rKbaEbnzOKc*gsL
zdd3-#%gpVy9-BSCr>JwHrAHiHa!#RGcAJYnx3di0gtAW(es7%$Ay{$-({?+gL(18?
zBkS`N1hkF)&&mpcmsYD+NbZ@K3be-@L>(S<AP)DGiVb0LVgw!mC^3}yR=A6%n<Pb6
zIS+d9VRT3Wo9Q;t*=O&0<=~tGena$XuyshQ%ur&P{s0N%fz4JgG@dxDtRr0s(cE{A
zmnABle_AN~qY+>he0Xm*3c2MeI7_{M%8e=s#6q*^Ye~VT#R3?RB07iwl)bc8hu9ET
ze~{P3+Dg-pRNy}Ns2LqwJ-izRQxkOYt0>w-JuS?`J!Q$<3gP0$+~uB#{8Twl2C4n9
z4<2#?umV6-eQ*_Nz=zWpgwGA{79jEJ(4^<6kI236^^Tgp1N{?`(qA#>xSol4AQKk+
z=9gv5hJdGW>iIAod*=TXX*{2B%`6~#a;m>HNPs!7<1F=uUn+40=S`oxsnDW>tsD-q
zjb^Iy?`KiwZqymo(EmtkC@(7L>2f%XvS6K{;K(<+@996CcFzZI2BuO*48deFb@~Mv
z9uA|B8CAV*;yNXv@Zj3E*9pj5YG7=}(t==U%0h45c5F4M#%4Mdfn&0oo!1OMXNo4a
z>+VQu7%ebXBb3_kuayI&Fbglos00TNgGxb#bX|pLst*okekSS2ymV}8pIHK3hcY?_
zHk)InbXG|Pa2hj9+k}}hV~X(_xOXtthBza-`0Hn+{(|9@TTLuGwS(ugg14JNSeD!7
z5BSr9<asbelULUKn#y6bRn|SvrbeNz|AlQ?*HHntv-`hqwbPm$tT4&O>1@dQjDkz5
z-XOjnJ&HgALade^u=zocMr9MFEkxCGIi8YTN*yJJQbgsPd_1PsqHqF<v(K)r1;i-I
z?L)8M<HGTf@`M2kq@(t-Dgc!|5`xM(+&0v%uVwOquAT(&+Y7+gsnZMJV4S#Xi{XJ~
z3+kw0zo10jxIY%0pZ=}gHzX1HZI|>br7pZ15Ao;e)t9r3;TjzdzRG@V1-Y{7hj#op
z7&968bzD@==EJ9&C`>x7%2LDc#hx{^1{f+^ou0=0tB?ntE*@N5Ax_|_>iWQC;vJNd
ztXq)#lJ+~d0##y8v+=crmlnw~xo&?7()`aDOo{_@65z;O5V%A~=iiYf1r{B`mt_g(
z$UxQ-zVt{%BDlDuDCqeE`FbSbYa1E^bUD+X<9aK*_wZ#-o$IAxQg3XbSy4x@XePUU
zi9~Smxoj>W6IyJ#_%`{+;pR>6KNY1+&4N_gzsY@;ybd<Xl(wpw9JnSjLh2g6k2Hsz
zty8nRZmZ|=n4otSQw8{JhWh~eiJhF-2=dA_eV<s6I8Ct|UrnYcTq!7qBYo9xQ45rO
z{FJmw>(X-{C~w=NLwjx@?Fe<r^E<6o*`Fjt<-ajl8;Jgy-_v*M`NthmbHp^{Y7W|{
z(8!D92|C@)b)ufv)?f`_s~cL*mza2#p@@&}{`lCehVi@3WPzMnt+dz*1>Uf8F}2H(
zom}Cp{yQhDu)PVfK0OO$<k)Y-=CGGVOHfHK##a#5xepeE8hVNw@L)Mkr0m=zy}n$Q
z_ZSK($CWg;qpfiE<qC{46&crlotJ=0PmuFECaxOR$kPr6YptC;fbBele)5~oiFA{$
z=9!B&l8dBMMR`AQxp#F;u|Zm~k4+Lw;gCgD3JZ@t>P_fgo<IewDG}y^;_Cx!)*_UX
zwvK}Z_$~PZyw~a_i0kygp>#_0xUshMyz#5jBYJ+&PLXdmKyV`;??UcqylPsUC6dlp
zdhb6a%7>Xpex&bAorgaeBAUWQR74I`a7Q9I>Zm>wyyI!B7QtzHd~713!XqzD7dYL=
zWt{<s3p8*4!WAZ$kfFqHeig3>N57~&caWml{LruY-8^78QtPWX2E2?3_qNV2e0L=N
zGyA}bFf`-5swh-zpD`Fvy11$xdSa2;?2Ypr=temFi7sdrewsisL{@T2_mz1GPCRU{
z$)uxjt&rryQeWMwyX=xGb0>5cy8R;9_BpwJ4Ln6jbs=G@=1&aiwmK+yc&+lmqzBT=
z8x@5fV;Q7KOx_9sB<>oBpmg;~dr#Wm`=y=W4W<ssE<;!>T|dui?47=cnwW=isk~mm
z<^BXd{q;d%E?YzJ@fXE_c$7sG-5*!9Ccj*oUzf@X=yKWwC17{)45<&Rxx1@|v@@2N
z<~Ds`ty9VFWjInJU0J$mNIXCurWY$cbaWU(@8F`?`aD_J+k0N4X!+ng(xq=47i<;`
zBtf0YR6m%-QC~9GYhmE@cPt649gxA~C&tB3(&kkwn}#6B9EXwBZT^>S<RQ9T5tO;*
zY&l|GW-|%(9hA0#0zj>ECC{NS(&axSoc;i5GaEp>vr*zQ8|kMn-CP!8UyF+XUn`lB
z`AM0;>M(FtAeoHzUc^AU+Rt-#pOlYWmX%fT%W-xu2?~p8oDwnGZ%m!{1@IY0>uxt2
zXsiO1i**~xqUk3X#9SU^RyFEu@1Yv7qKXd7n26QQpx<T&p}Sb-Plq(#;g^qopPKk{
z=*Y1W3;2<MMKu#CO^ZM*8$i4jzR42H--B>%I{}3U&|<TgF=@Jk!xIDNQa|6s)6<|?
zAI2gFY|3#Nu06XL<jm;2gg8B9{IR<uZxku^c2>a~9MQzxtqx~%K*5*$fTV=vv$>^1
zX4$?$M})|*qIai<MGs$M<di6fPKMe*=Tb~Qbs(c0L&|9lB+Mg4NF52uj0T35rLV?S
zGTB<kiNC3m<}!Lj(WZ+O5&-7*R`!^#RKJu_>}`$cgr8M5;sw;`Tl^^WQ3Du3u^bex
z;NbJOKOkB-YTF3x<yXHB0Ll+DfgF5QzeJeCR3n;AfhhWY0025}Gdc~H^c^KMRI$#1
z*(iu4zGRVw+ELIXLCKYT9@y$-RWMABqBy(*c2T%d<?tfmH*O!JI7PH5RK#Qhsa=N6
z2?xoCJ}Oavel5dP>QVJH9~t*!9g!!)51csc)Oi*h+I|3pgN*({di+nsG0q1(#_(v2
z(HG^YkEHj%zc?#z)@~pFKJErK!u@~|vHj7l+jmg1n)iy$CIiga2f0?Gpg^fBAAhMX
z{QypFzqM89Sy5&e3<s0-Tk4{at8EXk0-cs)Hewm>k~z;L|07FUylti#9{Tt9#9JLc
zeI+&w)8(N69#VCA{gs7Ff~{_5XgY{7m+z7m>Nlzig~x^DLa%Nu1K{uk-s*Tlg^x#Z
zRpRt>wk0kTg?{lsWzo28&O{>n5)mn1GB?Xv;pb?=w|b`yB6;j~oUJe{U!S1-E=BJl
zbpv!)G@~atG=y=KZ-W*3ZCgd58CQ+lMtC`nJT2$Cj6OP};1tpo3NWTGR8R|+-|8Gn
zXcI_>ZV(fHFHFMLf^)1&jE`=j7cM-({-}3O5vW~cDHo69?7IjkG?MXgF_gSB4ldlm
zt$;7L<>f3(p}83$ZGrKe;+<8CP@m+HgR)QWAP3={?CDMkP~N(Z2+#m%z%!aky#hYL
zxP#8>Ex2`u?Q4FclTiB@nn`VxHP%tyP)P!rd){pmtN)3}e@j*ne}-*0fMaxYJS)Oz
z-r&dU!T!P`v9sqW`0;n>-Sk9e<i4(jjf!3j6Dm;V!Z<usH7}z~S2e_<T{$Z$01uEP
zE~E$csbBbgo^Oe8!JBY21qdb3gFQW8N&a%pDN)|gM@J=3nLdy1;m3aDSvPVCa0}xj
z;uQ=KCS<L`(QVda;t~Go6Vjb!6B3$R0xsdWq=(A`?Ceal^chQ&YjT_EM*0PCJ~*j4
zu$NW?rKxmEZ}bfyB<;@GmY((zvwHRUKdB505+c~7_&@Dp){7##*$;iyfx^bt*PGJc
z2I4~+tm9~k-+oewq-spDQPmrtuuKFR^9;pMGh{#N=c2wFeb?bD6TEj|rk6j`dVW(3
z6XrT&2fSYD{GB2@qQx)6WcCXJf>1!5n3PeJ-1XSlU3+}FMCn#Y56W@c6}`_AyuLA%
zPA+nQQZ}Qp5+rb`419E&H{VcItUq5KaUFTEn2KwDfd6s>;OiGEnH~26;A(E{-zh<@
z@6;Uv)rCstpVPyIIstqd8I|CcfBo6Q@78CuXLi)7e)lJO!_G{NVl4-&w=L6!3>3DR
zz2$>=3=V#G_<si~AQ(yAnfs1^%JUGV_r7cMJVkJ~TrmhVvD?T-W}C*K$a=HvK1`Fo
zqC+t|Q(Ozqc47B&iSK1TT|#)oeR0PQW^zf5c&N*H-M`*n|Ib&vzD%2ZGqa8;qyp~U
zC~0dD8wx(&c=V2R?3eTuAgSvMLEXKuAo{^aoCH(UHO9Fmbb5S5f!H4w1U|&dDDY-5
z2xkM~pc5h^RKGU)^Xo<ZAJ>au!Ccu=7=iF#I{B6vpLg`lJ&gM>`0>wD|Hdm`sAv?5
zS=(N7N2+<f#0kS|jn=vNHTJ_ki;$)?J$lh`_EYty%vZ|v?6P(Y>-r;|AeSWnXAOh)
zToh$+kobs!%_E(GovF2*B-5e)asIF|bJKhMIq=~KG%HXaROb*M<OfNh(ceKYxIPdl
z+}K_;ibVoh<)pU7kylS9#0a)`GI2@6bC7Nl!Pp&&Y>LF3dvD6gnqQO;H<oGG(%%Rz
z+tqS~>Zz_5A{tj0b|xwtTOC<t@>#Os?w@CtZ-~Zw8%vjt@r~@_{rJbhXL=m&|ALdH
z(sP3}Nl{V^VoUs>18e<wqvnQi6Bk)qAxNV;e@R5-ZGxA373h4Pne*xE1|CJ)CQMJS
zusU+;)s|=%@vx34uN($nAFGcVaj(NKz{G>IcAm7pitPjjrR{|XDRl%PcYAKhVAL4R
zs05z&Lcy0>jg@I;-Ua-^PLc&S+8N^xFkU)*f*tE`?#YrlHVfpob4nX5_F33ih4X7B
z>^)DW)LYI>1d}8j^Xdjjx2R2Og^YG&{QVx`2Aqbnn*rgkg{<gI!+Xo9E@tq+!A6`J
zm9LgA_A&o9-mTF%)<&sXAUzIUNb%@|&E7GnS9mOJo9M?a1d|*k7>mvbRq(mvaUr0+
zqKrd}!}w*XNG^hhD0$5gzhQ_EdxZi$Bx=a1&ad9RJex|kg(sCtU5MBkn-o4$_#cy<
z>=+6G^gUQnyLiMEkfv49cTq<c6eo%(9@P;_uG!gy>Bk{A2)g}Yiw%52+aQV4{J5(s
zbFf*-)7_#n^!E_W=tZ=LvUB@R<JyrjF4R8W2HdE_9#H{c#C{l*e4u`&;K4P<ux?F|
zC5Bte%y)R?p)R4U$(~fa(Qr15w|h9+^p|g8hVYP9xEW!ilDn(?(%Z)LVk+iCtjTRm
zSQ3ry(PHou%8#z2J?IkLyno6|BYTIf4s;2xhX7q&_Su%U_t`ScFD+9N$KF9?sV(s3
zLL;)=V&u<TA`7lUA1pmi#-s;HPM=gVy+=NBNHi_Vr+_c>J%6Xi;B(my#hcvK2aWjA
zG@vh>Q5@$uNiBY;d(Na_v7vp-g)x_eiH_kh(XWN<Yw7%6=h=k|b*_85%SlOP0MZxk
z+{>&$u0hqqgq&ZUf_I}bnrd};8?>`ef#aQlfkU7a3lyf{PUX8o0oaVWR159^QBgRy
znGPO2tiJw@X%Pd0PQ{>Vpl9lT2<z`q6T8vH)8|`_>bGC@mtRR5cf*b>kw_|gwcxdJ
z!9QhJb8ZceI>4Utv%Wx6<wsj`25l>eKmw#uc-Q_ja6vRaaoZbSI;YiWtIuX5e69y<
zsu7}<EZI#|oK_aUie5b!kbBjkFTJWwuWIfoZZ6Cmt+`(F-&=iZmRpP9xRI4_U*WRz
zpsE8GSc4OYO-WpaLEe+zICUM4I4!)`K%T_<JWVXNxjFaNm{-GBQjT_m-ATnk;1)b&
zjuvWGU-_j}8ukVTOyNVGlLw_J^M?lbBpO2k(OV>P-dhcuKvAaUQOOsAVP`z%Z5<P|
z$k(oNjnFSE2vnx_!DA=7rO@s|slgO`_o-<LmoinNG_p!Vxzp~hsq3N^VuMt(qF=9R
zl6AER;1pgp`%HHrX(&$;r@VYNE};uL)+3?MP?3IeDtDHNM`o+T4fq<HLYT=jrXI}4
zNOj`j;052m#Wi4|LA+u=*!8IxVWRIF96$i<T%%%2(V-1>NjqB79p}svP*<c{Xnk58
z%fxqHlwg1Z61j1;qzKy(A#ekOxk0p?Zt-km0Z)O6dnd`6r<1)F3{=RGm0$v4VO`^R
zIG%GAs(z}(xZ*RkHpR|$F8zQA=se9b1-sK<JnMVB^I$ds-g&QfE!(%7{^-w%8iBZf
z!xT?ejF5i<9zP+i-#q9?VHmj0u@dB{I!I@;>xg=cmD`N9`BCpMEzvIPRmsZb><$E8
zfod~AS1iA6uEexv7<Vcjv(x*#;&YP0lnA7!%snM3M)hUfeq51$OjW$wUewd99AZTY
zsZ}K^T9&lUi5gem^r}fN*t1hOP-cll(3ED`FKYc|BV<!k<tE*o@0TiZ-9pgRb^iCK
zZw!NCt8!v|zyjn_+TLccp|I=dgi*@O&^4R)EZx{K8v*x%Qw3<pd!0!5@fKq3mKNF8
znG|7)PnkUWgY14#KA}%*LEIYBx@?+|-4O)4b?}CJYj^klu^<~Xz&L-Xd;;V|sX729
ztFv%%+64tfZT7L76x_~OLiN!Ynh_<lFS!;#QylaeD=oRgw=9D`vmb$}d*w+by6=Ah
z?%Z9``N2(!AXy<NfU#`k2>oA|>m1Z9<C-2COWD_2Y00WS=fC%WTFmryweVT&S3n>3
zD_T~H0<{qZ|AniobW(7Alf9}2xC_oc!<Kn0dn)dZBAq?acmu>s!KhFpPO?E=jd69E
zg>%<=sWc!2v!{ofOy0`lTF6r|^jl_yhMqr$$htpeh**TGrGjm)n|%xsYhXd=+-DMC
zRr@8L%WA_aPx#8vE#s^UUoZGZ2;v*=k%^x?arCmp7kl#2NVwx3+CSAQq+RT}obBK+
z4u#&j7o~#uGk#!~V%KBVK`!iFK^wOb4eI3`D?tPyzunMOkJNeL4?S|^P-trS+ggy9
z)b6NgBnC(M^ANPyu4-{@P1hFqGXj57AzZ1wqs{04?It}gxz|b^aoraeyl@D9QH~E~
zk508@ZTgmm>l4Q+l31FyLuk$QChQg|b6@`MwnNHeyw#EW7RP2?YY!WIzsieCU`@;U
z*0cm@?H&YrKKVx8rneQ;RGoE#5q-w=C`xfyBgMAlt*9g2H5cd4w}Z60P$=53&lQ9U
zO*;sI7N9Lrk!}u*rjzf_*rl^Z!y#2#{PLVqHp1Wt{6XMZV;`HQ!G>SF@2YpJL0VJ=
zDNJ@%#~Rd9dN_yO6!7&<`pXtE{Vuu&9d7<*$so)XFTAHU94Uui`)b#;nruCw8(`bk
zp{KYtXafukn}Ua~l5rPvWX#QN>iw79SdEZKv7eZxr=|jzVf>e%)p8;lXSdH52x2!&
z&_k=5kTIO5(E&cFMUH-ri_bbvbRjI4Z7-Gp!w^`Ii9HJ-#16=BqOllPeJxGjXi-{4
z!OQBWI6WC8;`Yrlsr+G9l2$~&{eKx83D>=XfFvsy7(~H8qt)J7Gf2CQ2_T8IR`XIr
z34wnpVJBz=7$Dw?Q>*wOYKR1x0JPi=j|rUsKUVn(BfO(_vM4-_?a0pvVEB*D5xmM3
zA!2`#?PIpF75NGG+I1TV_y<bw2;sKD>4U5gVr1Jcj@d1G&72b&9-5}DpHJCKd`JV3
z)KEg^{4r;@X00B#cK+=>=RX7?X5y)M)3fyd&1VJ$IyI~qxIWB#Axyr<wECi{bMAa9
zKJ==pi6nv9L|=1M5by!IT3&T6+u@4NVzPO=a>MZ8`gQ<FyAirzLdy5e_a#DXW}s<|
z=}E&+)`+2qJ~g+fa(%u50>+yFm(xEN-fez@#HQ&^um?^kH>h3#51U`pL5)EkrF{>s
zMvK3MM5GnERuq(n_Nlt@lXRibl6$it76i;Lnz*fFXCspC6SFqXF36t7R3|a;Of9L=
z;C9o-tEXXaQMfephHZF52ObT*)=lKb@I!#wyBqBVQERr=h|=&=*mwGmPC`@s=r@ft
z$$q!byH!Ktl8H+qKKB^Y=}1wPLB|?dfz;%}my5R*>!2w)ApnK!6y=MqPh=(0*{g;o
zf;?TjP%or&#|!U&1Tm;*dXZVDti^x3O|Y=PsUM{kRt=VY8bfM&?)X`?ZaBT3_8=$3
z;-?iVv#UiQ!<$7wr3bf`0$=>PPew}|j#z$$YK06ID_*QdF$&)b8@k&c_CHBq^RB1E
zGsM-O?SunbvF~oMdP+`jU^(=jAQRztgU)4HGtbGM4l^wq*8>}Jx%W*&wR`>UYy{r{
zK*g*Z^Sw~`9+KE*;em5xsft|n8ClPIyjO9GSRI+p&vuC%9O%GB3$pwvkE$*@t;>5<
zi?D$QY!xk=(q#r~Or(1Q?I#XULS-wwCdZk!Tp$_<Bx4BqX_|h4c71VT>DOh-3eRR?
zXqR=^CQF29Cv{OnwsZ_x$gId!1U~#6+nfuIBLy&Eq!}}t+4|A|D3AUVVLtXUzgoj>
zEr;A;>Pa<LXU{e=Bhm?36oi`;su>A1qpGQoTYV9?B)#u~fUwImO++B^{GiF8A28>*
z6q%V3U>TsW&>q)8tf_WRowy~l%3M>ruF`glS%h`2n%cB58$`>&Mi2lvEFXHfA^<uH
zyd}Gg`NvyFF4(?GyN@2+bH$lLOM}m`T>-^&_#U<THiwaGeA~wOUkgHalNQ02ZpM#s
zRp9;+Y1ZQA8A)wnbd{K0rtGgF44Z^YIrk>4!k#HII4cgP3(Ighe*^OQiWJE*RQ=^V
z0}TAS2K}i7u3AdMc2e39D1pEfK7gm=HminyTTA6Pt4VKUa<O(iKI90)vOMFi2QXaF
zowOPC`m-ae$2!%#S6UY-oxPOH-V#q6wT`HL|5>tAEnsGqug?T6>C+7s-WU~wkon}`
z_|#nBmj>NHrrqvXeVj#$lj>cFv02QUs>Y^LG>W$sJqki%z8IBEl6fsgKF2Ky)<A<r
zv6uyMzysfbK1qsl02>oT*1=C5v~qo$f+7mbXOjxcrTSad3s^e_k_PK9taK`)Vj9*B
z`v~H>6;hBR2B=!bnQ~-V{Lv{mborRJzO!{)$VEH?gi8fehrXHN1~+t9TFc!bd8})?
z1W>7k?%lb#Io{tf5AnF~{5Dwr-kh{<>%sbQSAJwdSgSJc_UV8e&fc}FMT(OdcIzvP
zi#7P7FffN{K|$Wb-)eg^Xic4NoUpd>EyQU%T8jwa#lDDmA<<6V%w4MsY^6GGRrm}J
zNVE+iEKz=Gr;BqBzpa5~^Xs2am^AToKgPv;A$4ChhnBEE5wdF-3CBuNRScT(8_UwO
zBFqC`T@m(#za%>SUJT<YN&o3?wDGAIXA?t?Q4X;dy+ogct9^qu^fRQaR?k`O`m5!S
zRq1UuY1ZU#nS;FwX+ik<76g2Z@Zl^vXxDS-$%m43Urb5{)L8@**-I`JBXjWSI-3Br
zXb37uTcysHE@Di0+L1AT?n<e>s!gjgPWBY&_&7f0ncLJ=-e!{@rAoG<a&^CT4LS&g
zH;BCycm9A!I}$FUcaWfp0v+%wf&b6(5&4xpTmy8KbT6TOtn-lPyrWTBor40nA~q9n
z@J@pydbGw6Q7d`sTS=X*?EsN-Uoks`>T|EsKh<>WzIA%C+x}V4C<T$5%)qhV+#Q^@
z%1Dhjk%d`IInIj7Mb78%X4k)21ezLy!Wws%*cPU$-`c*qaTCRfS6N)APe_A?@dP;2
z9cSugC*#1r_84!Frk;;GhpN{h@6c#+YCK*JIYaUvD90*Pz{yWT2zr@%%xf&6kUK96
zl46+&E||<OIul%=&r;Y&kRFA7pwmB+zh~?;;dvpVh}t;*um>md$(ccto{qkx)($m;
zErV87i<MWlGQp(uw)t0cSwq;z<jfdQ-6<Q4z!hcnE39IA*slj`j(do@AfG$D>!uzP
zaqa*iUo#;b1$#6QrDS{hgDau3AC0<>^0QYK>C%_b#Z&%erTL#>_~~oX;*R~colEU>
zZwb9tLg!W3AJ4=(m3=k^hLEkJ?vAF5xsZ$+LGhi??Oe)ptl@#Po?4a5*t(o6O9NNo
z^V9Fwc?+m&;nuK{?eJ<p!L)p7vF{ugoxk@l{4Jqb??N_yQdn-dlC`aQ<|}KctOcSZ
zPj63t1R3S@4Viu_q5o@M7Q`1aE}xp64<VuIs8J$4%JEK_i||S8=M@vu!KyfXwSu38
zS8ZwkZ$D;8vqP&~<#IAflm2$ZO3sce;gFnCb#_#I0P|$c-o?tC#`{Ftk;3K5<*sEN
z!~}0ngeUFe!46E&CqnF(qaO3a$8%wT03mg$2U61!sf1lKX_@s8k<{mEssr|~XZoUx
z(P;A(hq=bkcvtS7>gB)ZoGRdFuVXcYP_Ws1m8H=mXHbIdL<kq^CRF^Ufg>-I_!0X-
z?89xXDEgtHZn!>S<v{;{0|qhpCIFH0J%#wEb>sb+iQ9xsIzP|O@(Mik&zC?{@+vo?
z;j6N^`wYL4v$CQI?$`Q8pi#RQ=$QE>F*v0ZbNIz8MxmCfNGC302;h{l?&3A3dfr|O
z8&~K3Y-xmE!(*U7H<8JEDVV2hTzoR=qKKQaTaFE#z}OZ~kY#~(1XumbCKC8ZH-yR%
z+ClJhcyW?#V(@&tHm~-;dFM=T@hIr%%*4;)@M^q!I-B@U_WFw=-HwrNjSRTe_bMLc
z_Q>xB)<_nNt{mm!^7Q{W9|;RZoWq>|Fh{2C<D4Te3Vmy4xlzyevK#j&$u|7gE+(lH
zh{wi_t`iT&7_5hyOQ{m&iRvT(?z&kcKGl@cyF%LYtH!9Da}M_0?mw9X1)*0`IJy$z
zYliwu5u(bQHJF2udMkYZ_zkg1qjpGAda*6SsI*_*P^Z0AL|ZqPVbP)$n^un|LGhvM
z4<6+JC^<bLh)^%Ko%AGs!2?o-(&J}9=5pTnAG+B<$-OwC);TA^PM9zaK3|i}CTGVn
z@5xDNn~TrH%L}pb3^V1W2hV}NhI*T&Buj`jPl%%PCPM@`#CIo^$f0e5&Jnju!#pk}
znV-@waWn3;zlow-ba!4Gd;wycUEeY)1UqzJeNd9>M5x5K(f=Lst@+gn^<l&z$Lj(q
z+(XT9?jQ%GIk7;7LIBHg<p$f`xP?1i@$wo?jb|Y;$svk6)XVQ3m_$8OV%^(|Lq1kb
zG>^Ks&zE>;92o=_hw*4~_&q?@29%AaK<qV6o+o}7wl+Xx$%}9t5RReH+R{25P1(P(
z6ED_Off5F3ojeVBG3i_<kyFBKj%jild3#56>3c<9=I*qvN+XvNu`}Z!s7U5H@RJ|W
zi-7mGQcs(@un7eG{}zddm&;7iV_HC*^aPseR5X|JOSy!>E$g+?o>2KpCve6@OwkN<
z2Zf=%%e%m2CF)+{Rb})adRe*+3aBL}`1(NoZaNy>W0dmzl@;KY?VyVt3Ju;t=@&+x
zY2HH4e`YFTIB%K?vPU!>?hFPE@^(VE3)DBd)+j;S{f!g7Y{zQjt^X{S19>l)eqU?@
zs)FLd!<0IJ&N-7{#5I;IjCy#=Q8!a|X!h4Obpgu75Z22;%QTi;4ASvLOa6{jF8|QJ
z96Wi6+&&64oB$(@Sdkx4?APpu>JEi*1H=uQHm<Pc$3uj7K{w(P5$ctm>U+;-ar#en
zpsN!3Cb$;d)d9@I|7`LC`jPK`!MrR|p3`X7fh2VQ3TZR{+DP^s5Fg^M17kA#Unzu*
z5GI}iY2~Z>zF5hiRQeiNMTGPAZ~<}aP5>^2pckkp5*`Lm{g*r-S)$m81`#;R`j3(a
zW_vwN#+|})R;h*bxp#wXTiqng@pu;RVeVL)GnCF8n=&0EmM!n70JfCMMMHxrdTSvQ
zqnFKi*_1jpFi^_$#FTfs*(_;49kju4j;=W=8jt(v8EOMTkWwX<q4QFD`b+aHmPE`I
z^i;=zK04M@<uYfOk#W*DWX2+M#y@;GJnKEI2#mR_VfjZv7ju`9`ufPV>(jPh_t3bI
z-KAzUA1DNI)mHxR4bbPETRet-<U+L_6N4proNv>Yb!$SkYY?_Tdh8g6X&zKE7~`nl
zaZLCNyBnwvQ5i7=0{{YFF}?EnnU7n}h*@NSMLhFNM<}g?+gyStjx#fqi88rkNLrFy
z3@@KPyOJq1RXYRxHq7I7k1s6UFI(~Hs;jKSJCx9WiM#ebtjX%a2o`>yETqWH#L==f
z9+lFV%?D5%%W#oev*_cMxj;j-9fZ;kv5pr-HLVA2K^*<Nv56Nz^rMu;#vP2*dYu)J
z$<2d^5fF$-4Eiy2U@m>Mqe%s=&fr8$lq`B~{Hm(qaxmY!C(#ex=^C8wZJa>L;B<f%
z*c{x|@-w>CI)7wRftI~FBo81%p&h6^uE7CU1O3T?*)Mk==QHg#_k<S8VKR<20F3cU
z!|fR*KF`yFHWAuA*S|wBMZ|SG(yFUX=N7Dxs@B%9dK~^82K?L<vc~v}s;21+5jDy*
zi&a+E#gMIS$P3v>N`YKk_Z6w@8o2yAO%>zEg2I*mvf<tN=mCZMu@Cfb#?`vETtx8H
z1n|96xU%&oN?kWWKf!6(r39k(vGgjj;H`#UgCwuYr@@#Q{M|RPzmDq`r7Gq<V=a-W
zX=UU|dS3+B4(|p4iX*4Yc^PG6@U!tFG$GxLrg+T<I;(ZT3+%g`!fiS#l5!BOLA<i@
z&5l%ko{!NS@+iF_)RL(D<rtS1&lht>ygrN2w}4NOkS~Ji6<qWc&ysB5QZfFXbblst
zX49z4vS0P@(hQ9@XMf>{-IlL^too<#S-7v#n_?<&$=g{++ZCC{G@3L8_$UutZkf(f
zV@O$xZ`1EO1;UT7cil~R_yJ26-;R2_1`&U@hA-F3r7BtSg5TjR6gK=28ur^*+>lp<
ztdrjVh6vpe2U>ye+~=Vm+$M*3Lk{iApAF~7{GHW}AVSCg>lC4u&9R>_D#t+ltq%2Z
zF8KHeejmzG{3sij;wbRkJdf2Ytfdb4FCVYkZ)Z+43b@@l{J0xAfz>WKLA`BH!ZQO~
z9{LYlRE}h8kBrxNkb}}XF2<mHeD6$r^%u>B(Z8vtUK<<Q_vN{85#-aVo3_*3kZ!40
z5T|Wt21^#*i>Og536Af=H+K6@P}1z9*N)7G=eo4Ho3}x7Yu#`*-M7KuJ8NYe%6aws
z-Fg05(c+DPHGA~m*YbxmAB9?}mJ=!M=i{--QdG8iv3|>s+m7ygaINugml*a^NhPI<
z+F!TIVop8Xm@YVF)}~TX8Pp{rytHl0f4Z3%l-?u0dsC=r$4x%ZfLoQ}gj|HPY3q>b
z{<2RB{?#0WwlOf+rhI;;qIAyIfYc*T-}}I+z|iB3Zw7^Y{3&dO^vKvxjN1hB%xy~|
zry=J)Z;#lWLSQ<M%WXvge4irxq^Lhba2oI3i-}0FRICdQ;x+L-81HH<-W-kXxzQ^!
z7zDaJkCS{h+72C?M2`OIY8BXV>nxju^FbD04{Nt_21^g#LZNJKyL$9F@4XZ{<VfcY
zHf)fCmM8oYTiPN%Ap9*74}y|Fg(x>bDt?tBWSJu?^x(het|;lu?UcO9;Nshi@Y8=#
zF203j$65kk1}^aTue=4Qi&m{O3;56g5NdKz#k8EH6g%TmhKceBW@jL26@A1|G$=LH
z7zDtMRG?(PKgNyLJ9HqG7I#uidi@PA*meRp=w8s{orLsZISO;P+i1zTfr1f+U<d0j
zhVb<n(EeGyLo_Ab`3(OiK9Z?fC*xk>?dJo}rW43Xpoqv?oNI^wY83b6A#u3l2a2$W
z`~+FzH$Nfct360?hum@K+^ahlbLQ8$+m1iYw_HrD&N3aK=}=xW#Q{8Bs4p%L45*9i
zWANA}QDmTHH*D4(7z>BJIacUgx*!AXE|NfV+ioa_+pxfY@j-gK5jluYQwK(2ATdQH
zqm+9WeWK5tuRZ!UK<Y|a#S_|I9p8dAc*KVlsVVd8B!rc1chBWs|5m0!jnKo@$3(OB
zh*0ZEF%9ZG>_6>8&c|#zN*8oYTiMbexZiO6?*t{{y0?+k?zIfdXq}n^Us_ft&a3XU
ztH;yLsa6{|>tdz1Iq;)eArc)^oJ{Abcg$i9;*%D9J8WYC*b2XPeuMjRN@4?fPMo_S
zhMWb9T^0{^gA3p77=_SJW7VW^AT)RsQCq<KN<Q?z@=P;uK9_d1R-A8EgH~~JCOzLB
z1=@bTAYI^&PtEO2it70O`!aVWv}!B(2Nj(h8DwulAQAksbUeNAbFEDe3<34?jk?uL
zcN;GsmQZ^&4O~(pSPrtCHjed}y7PGMYR7jl#%~3>6pu30pbC}YZ=_;DBHN_Qpt&`Y
z(%n>^D`l}$4m*vyd=7s1!G4$qxOC((Btk2)en<iXi*B((513f%T~ZQi3Y9UyzSKsf
zW*x2eh-9BIH)LK6s{)1E@w2aIml(Xp-QH>&e6W$neq4#(p7z`<pYLh7wN=4`{uVR;
zV<cO;jBlz<#upw?>i`!NVDVo%lenqIqFT=OV9Vm!qBz=;r4kwGC^(G>Lgee9C4ql8
zYA*vfB)4ApqiM4hHmC#sW}bUJ1PKNs@kKOY8y7Xn^(mACiJ_Rw?FTHu?~s^SQb?M}
z%muhd$tPu`t!B(~VFx47rh96kaYuUQZtj*A)Gg&Zi&S%W(kb-WC%|9lm~?-3doEf9
z(~dp9UA*fx9@tuztJQWVRCu?b8<)GZku+2erM{b||MTq>1+Fq##OJobYW>^v)|&Cj
z+r6s%te47WD74q<Ny|v%IsF-<7>Ur_w1CgS!vtn)0=_I9i>D}DA}d9*J64<r3Uf1J
zX~pA8e=&OEvpsDgQYbw+eogK5rVykM^)8kxyUG#JamK|8-?GEUK8^)s)-0*B!H?2L
zqY|ICR|`vB36hz?pqB8ljfR!0P$O(y@9X0;wgi;!@rCwZS8_)5Bo4h5s^~!s90NF@
zrKUZhEVDTM?|MEB%ORc|4^<b72mLNJM3nuL#6dw!WHYcc&j7q7tN-YWyVg{S4f5=o
zJiN!&d3hCjjj9GgzE+k&$cbuJNDduCr5JA&hSV1U(<b2XATK0*<A6wM+RUp42y;q>
zLrZ<~SZh;4iGc5PhZ}RXR{Q%G+U@!J?vq=II34M&iY{bDbYn-x^_;*qF<z{%D-W{b
zRNFhg&;J)^fSOcCYy{X_c|+=K=fhCNzYJxxb~1_4hXaPOGgSCpJ*H=z@i_$5Ooi7k
z@S7ks00<>2<g?sXCDJp}`cy!t45AFX-H7D$cKa{5?0cDTTmwA#e@Zx_uTbDdZ1n-#
zzcmg9)T0J2m-tIiRAk+il7&qEFc&C~V5A+j%7D{Qn}XFq<vQ<~j)4_>H_>Z*sf$OU
z6$s))LXC4#_RX@Gf8Aq{(q4z*R;s-hlluAP=N=KF8W3pXM{B-|<^^FtJi&k`|3UI=
z;y4zoCtb`iQ6FYyP+*ss(M_rarflvBI+)*UxH+d7*FvdL^c|k~a2Wvd=|W=vATdOM
zU{rCc%s{5^0O}Fuco6K>Q=pcE`RLG_?jp`0<6tT0Vy%_$qEy#~DW2}NXLpD3H`Age
zVt)<-Zb#Kw8@$_*4n~7i-lOJ!oQ*;WW|Vo+V~aW$xRaWNNR6JzF+WvE!N=1y0fr7`
z83}gM)G&rj2{gQTkk%YEyObJ-4{*Ug=5E?dDS1&gqNydquA-&hmM@l9k3z(%yMb+1
zDH!UW2%FCHt2J!XW<9oa4uqCY2XIzG8NJvBDKlW}bAw0PQL$!{^-ETwj{*^+VM-kz
zKYiDS_vrK7F9eKpYZ~9^ZlX*6*F!(QUgE-J$V~K-`xyMCD~;sAH5_Bw+%t%iXNg_p
z_{<>2#GY0M9DTn-cA7B2AW}Q4LDrXq2v+W1t7je~&teab-yhjz!`E#eZ=x0?@aFJX
zl-jI^?v#fNSsPV7>+Iwbnj_}ZjM7Yxx6FNJ#C(6bL7fo^M56aSlr>3E|Dhf=$-uCm
ze7I-8ef%=DR;gAS9(9v>PNdM;=jJtjN^E3Urd;86;!9wGU`LQ^G724U?Dl7Rz4q>-
zUQ=>%F;PoMwptiC2Kz|uO2Is~;6mH-hyB>VrdqiqKVoOuZ9I6S!f5+*AxSV6cbEF|
zwiIE5dT$74zc!2YB{FAh04OC4+;(&kJ^TY4Ky$tCJ^skGKJz2*xIBlI_9e-gshj<|
zcrWUWy*sjxnt}b)j(8ypbfB?vc&Z&3PZ)$wFNgVfj^Cg`e76*a5Cmf!Ebub*NFow&
zdyv$cKY_29(!7v$?;}@=o@?*ZNKfRiUlo<oYPD5in#J}FQy{&g<tx?_Gls633W4Kh
zTa#s$42{)(4K&Yw*JZdw6-|-+Y+C=_7^r)F{j#!Pj>Qo}clvJ_JBV|pY`XLt9A1!e
zpJ?sZ1X<9xowp~~tmN6-Jv?S<H`EQ3WXY-$r^93EVpfX8Lsz`u3PkI2-kC-Xof#$0
zPz{cQ5AA)|7jgo~EHAWKU=ZRaK=whFR+%EJ@nNC6%fr$m6))b(GLYO4{Oy5k%nn4v
zWLL-7A!Q1ZC=YW(ls$|%>k2t?ncsVxS5|Wy&hf$0?pBEMvZ0QwL-LM)a9)Cr265P;
zr&5BEkw*1IDBl4PRYuB)t!z^fJJE00Bh2o;=~s)2<`-nMdaR#<Uxle{6^?L~9trNp
zC?OYo&W-~rf5B7Gn$C#EZCI69iFEj^GUr7BsfVO?+D@5I+urSe4-%&LayaB(numCl
zvHa?mAQ<qd9EOp+)<5{A=vfjX39$Kz_fLq~-#@SEfkUsQgT!$S64??EZiNPZR6ER4
zU%{FUq09>rHZm}B#0OD5q6o{TqRF#o^E^MwU7?TtPX)4zOH?bnu{9UpQdC>dvIa4<
z^ks7zPrFUvsa@6^PGklOZ`QH!Ma7HgAU-!VkZz;;-#;AU-LhMEFh=oQIZbu~U$QY)
zyXVv177o%e9&X{6vedRPo1J3`GF7Cjxp$X&Nb!$Xr$SVO0x5F$1#A&0j$8BFsar^l
z)9_{!NAu;GmmKncil=xXn`Aioh+PkWU9y=t<^}4v<k9O<;(G2BJ}y>&lBI=iRw?*1
zf)kt$v4P_W`e>|aUa7FV7v^BY&P?Ax`{7H0=OleszgAzDp{XO)0dp9za#>84!;1L!
zm~?$f$d*dA{dvIa0hK!R&)Yv<js+7jS1rR_^MzYogebU|p3N!N!lZsR-J3SRa>Bi`
z$}|rmC2)uM!_qf5DS+E_SVox%zimDH0=5`MiFWOSc4cQLUdrBqd#Th~4<3J(j1&7V
z7hIiGnn(SR)&E6$Km}-^t35(ZH<~sHeXmqml`!A7{}bMXx^Dq@Y1sf_tRM>9iSCK!
z4df8=`E;<sps4ixsy}P=VwA^tQ#Uutc@;G+DL0Z#C2esJOnCy}A9d4<yR`7&F_n$7
zbsn2lx+o8u>;2Mo4xdzuOzUdlehO6o4!al7aa?z2PuNH@Xs#u``?HbX_4E=Yq52Ud
z+Ju>XCJggGfd%(~O^KGGW>~TSgEv5A>~Z*rs03m;=oL+v#fa>oW3HJ#5v2R0D(p9G
zX1_FdM?p8~L`r8bt-JscS=HT^)^QyW0vjG}>kGFAk$t&XgBxuZ>wGQK`E?&k#B3)M
zsyh917_RN&q#3+acbDd%$Maol>Qtod95}I2v=v*wyDSn`qV?-Or;tDDJt<$yaRT(o
zcJ{lC5>YARB<H!b@5UG4<ReBj%W*nv`C#2yI)kv^;UD9g#Oitd@9*C=BE3*B(dvNe
z?vByPx(R1pd|Je)%~|-Pg2%~fI8PDQJAvYg?!P>Hfh>P&&T;R!=y6=iV$iT2?|)CF
zv7z*8+1pgN>HCjZ^4-k4?MdgY*_6~mB36+HlLs*Ea3v7wXyIN%>eEckLz!G3ZuN$u
zt~)1+e&km2mse2r;2X4orfID5?&p@7D<tc(tsr^%Bme-H4R%9+4LCO&#yE0O%*GK?
zfa*rvIijip`;q<bZ9|0KU$4Bq$%-7G5NmsMi_4MG1Lx!Yo}fhPbi;_YVK#T9#HfUI
zbe9V&*O5-eNA7~S1*+bYLxOaph6h4}(>MI`M#bTwO?aAF4;hx8+dMMLfnh~Inw)_N
z^U~0D`OXw`s8?>N<QcS?GL&k~+v^5+Z;zPWJA<fH)gIqGxYjedfF2JIw@}{*$~}xG
z)<3H<ady_U69;a!&U_WA5rcJ*$FnDev7){CQ$2HLyj~SmuMAn*ryb2txvo=)reSZ1
zDlltQN$n9mV*lyaW!NCjP=CbC#WTbZFQ!hz1&q2}b?t1V#-6`10bTsf2#tEJ^;@WY
z+86FH@ukhpua>hmr=5s6+Z<pkI$(QY`}OEdR0!>hqZCtDuWVBPKKV5)P}|5uPk<<O
z&qF7BkF5rrtR~gD$^c?M000j*00J-s946aNVa5h<tRpMzpyAQv<N!=Sv%f-`6-K4$
z)`tWX4oheUYX8kg&Y70@=-_4us!GCqYhc=$P=RlwAErBu*q9&!c|?7oI2XC^Kz20T
zt@K84Lqi*O(Y?JdIU&x8%keVDiSAJ%iqDJtH4@l}3}z+@_YSBMY}DJI&=pQN-OPqa
z_S+uyqVKp$Mn>8<+#5U<K9o+{yLuX^KOX-<SoBvlLd{JIG`QhVIW>(@P%;hMVf7hr
zT#`URsevh|h_BnCTG=(-E12FZ<4@@6^o|{<4v4O{F5pQ7DD0i8{plGz8@clO;Pe|U
z^%7s_T=^KNXhz#v2`79g;&am+h6sRh+bdq>CeDG&owOJF;WY6q-wnCzj+P@Ie9iqf
z<N#8x>f%w-fGWu$@@sEVYE3lNsH8G+nu>e-HJX&^pfFezA!(om+16gPtK!A+4cMD)
zd>P%O!x*{HPzv-NFoXYv_+3USQX=K542mv(=N|I{ZS0olP35FHWL^z{E1rn|3}9~2
zS4L8t#+n3IRqCux{(MBPkEqCoP}*Qu*{R3e{Qs2V1Gx<Jqowwy>U^YUr$4V$(>Q1u
zyZb@aOCxp%g#ye~*}+NT8xtQzagUSIF|bG#sW9jp3d!+DKTd?o_jQKE^##akMn)VZ
z18b7%1vm?#5_3$lQ7c_l(O|iq0jy)qtMGx&F_VSYhDta7@n#x0FQZT&gVS?)CCDfa
zWu)$0wD;rmOWMf-yd9z^4d}Jm7cj>lmdF}XLZ&4~-1xJh(QpcoWNg63o&DS&0mfuS
zsioODfI(t_wzW<8j@(}FB{Fr26wz0dobi|^&#{ofIvr1Jg_#1BPI2w<Q>K@JHShuQ
zWI-rkGey;Ua;OsAe&eF7AN`@ZBZXaFw9<yAjbyAlqo{<&K_K3It$uEgD-2{mahF=M
zF!Jg=X9Dn=BKNcJGu;$HKT!-KwvtO6eo|b%y5%p=)!3qzgYxk$+Ep0eZX9qs&?VfQ
zZ9*}rYI!(hJGw)B9z2YB?1|{Xncu;6Kc|O06%!ZO1*-9w+V8Qqn-feswLM<_%0rjK
zo$_kg+hw^jvT3$Bf@|~r-NzBYwoH!wY_kg`J4lE2w#|F421A2pdtIOaFkV@w|KIj$
zBX@b7dN&l@n>e+K*whj)gJ@mkEcV6H6}07Eaw{XzxN+7A(P>XY`p<xJvFng_U2;;8
zwc+TH#G^&ZNQBl@elZL4RN9T88=^20l0^qkES^Fmj4!Q)#d>Qo>Hgh&TTlK#3<+pE
z2C0w^FwYAFMXIrplsb?Z&57_6R2v~FWBtWeXne|0s<?xu_baE_6x&=-jxQncWPF?k
zh`2?jF&`9M(c_HoHQDEnxwgLz2&!-RcabkpYh8ll2_$PG7kPEL;t=Sns)E>kYRFC~
zkM{zFZ61U?rC@eL{Q<+&e#cx*J+OdEx(EaNB?-J+5MH_x0v+4O2Gm(coswq9+2Aw>
z(D|IAV+l75JJ2SoUsG1k^*OeffpNQy4oo}Ek0r$kgBiZK&?S2s*d;4=DL{E3G2o2e
z&rJiTC||TsHJAp+zH!;$v6Z{*A~h`6qWEQ2$lt{WKfS}q=tXpzm<re$rEvlsFo&AC
z57t836$8BiW9`AdA6bT4E7PYNwv;s8M;n|_O<lJo<Iy&g(|hX6^7v6L0h&@f<Vgg!
zbC_bs>bbDv<@6*b4iRAdePhEc;gVOQbW4IOB85N~xZ!rvWDyB1E`HRcNVq(*Y#pVp
zf`Qr1kYXa$9#&g2``c!}@j|AG$a=~Gf7MA~iHc?|^>X4itO;4k4Ou@IZrhXnnbB_X
znOqsnk8Y)!Kd8_f+X{FCLRA5cufEY%SoDV!sXjE|dYi~tPR)y(fO~%D)K=M5^Lliv
z3TVzom#$G>ezmtkxx_*!T6Oo2B*nDBU;1Y(@9<{cFcH4X1+;f!X)qM2Xw0pnxD5nl
zvxQ8vp->HU+eiAbgq1auG}leu-f?9jf*>I-wNF+wPeY#pcDbszES$)aaL`qSgIj7P
z59%K7*`c|e`39DgH-YZ+Sl=(5IU2QGOiSdKIBG6CnUr2UGg5_O<bhN%$Bb4FP+s4g
z$T1<MM7A0}5M3%K+_aa6d$QGhv}qXh%@(n`({C4LE9OTFoQo#X?=WGQQURZeya8QL
ztuB3Pa#&_0OCR%BxQieNE+LV2tCG0?S$pv@GoG>&<AeHy@!#-WOfS_nVYZ>32ee8z
zd&yz|ZI|&c5zNAjKE8pLsfw?aGkHg<nIyI~ZVf5zcp92w74UO+V35~q)>BO!TwZXg
z_(al$b}kYB_ic|K=LwKk&d3mJ*L9=M6I)uTa}bcn88D8hiZ6!ecC`8D3ya!dZSOxH
z{kKR3e4h-|{t=b_&|T-4<>rBIKk-Whr6M{RI1!Pd<FPU!Wp8mq!W9pOX$@sRv3Nfq
z0e0PRLve@jv(0TTEQF(4^;&k_wPDk4PYdf33^$L)lOny`w#4DrF9oaX2!Dw0G#*nI
zHNO36@LcqoWz}+jAJ#tpx|&R?6XsB<&^EhnYdBWz{wt4zdTp}p)kMI5{92weFxc-m
zsQ60bSO_+0ku|wt;}3Yq*x&YGhD$<*lY1;am%iBOTLFt2s$Ed)DG9~D1Z&cvW&H?^
z$6?UW#PK|U<6{Hl!;TEc!khux$2ICHl}hu0AC;(HD@VTwHd9DChFFL>((A^k=!O^)
z74>h&upEIFr_KTYtauDwunbYi7RE}REA14_sFRhj<~Tq{RZ>shlPdrkD`-jRs3@sg
z#yrt$4V5nc36P77XsNnaK~G2-1`1}(y=2=#t2Mq4u9L!dGz*rYRTy1cIDG=LMq+#V
zYAjZ_&5Vgnfuli2xQMJh{7Hr_Gir;{7<0>-Pa?uslh<-q$UXS!8sOTo9$at$2smr6
z8+SrX;aeq*heQ?cdjqb~8AU{A01sh2^yj2<y`(i$G4-J9`QFIr$eTO(Se+wOxLWZc
z-#5(yg*$Xv9aps}+@{$H+r##37}1ie_1ByH2`m6zN>`-Yu*Q|9B*h`0o{L2J;l2pG
z<k9S(GCu+#`?U!O$_Xal-_jEe^g=>o9*3fsKNdP{5qa=MO{DWqW~v2GJ$~+QfUrA7
z<=o_zDezlZC(oHJh@qPH25HkZ<XzVz!4(G&bR7fQ?+yg~KFPRrvNMr!NG+xPSA2eu
zS0>&oJw!WtZmj6r)u1y|(FH_r^Gf(RqU;lBJC1ff>Rm(mo#sWKzS5Fv(YDg-EXNwQ
zf*(|mk#5`RR!pV~+w5MGWG2w~Hh(v1Ts93J<S~`Q6PnKHQ!_N&NW?59>CA1XYAh0i
z^5b=wtqX!|+I}vsX-9@<?eG-Hs915A78Ug<{RdqojXBdYj6b3+na-*)it((}iBzTH
zyjWT?V`38q3x$owl2ZeM{y|BMmHOOo*8)ipwFtFvEQ#eD2?bn(NIZcivekWT`OAZg
z7k@n|M@>4&-9eQJ%NN2`xoK$|2lTu5hHT%TafZKGr%<2|J}vY1Fz>*bTPeu5KH!Ic
z_prWLjRolZq^!r9u&<e_aglGi4;k8njRh=$QZ}_hQ1ppcGJBssd2-W87}!5Q+OR(b
zH>Q5_S(<(d(kR*#wXhl82JMM{)0R(w$pCi(dL;znNW;Y2+X5i)MT%YxOW@z^P8Ti<
zt?unuCxMHXGX9`VFjVlPfm2Fd=6g9pf4h%<O^j27)mvEWL^<9-4lz-7aMzHbh?YJ3
zTjpaA&%(V+4cgs{mRstBS@mEM1#e99?a(GZd+eR|fUjFt4MiInJ$3Fq{kdY)yr6JE
zV^*2LD}ps=6>8YSxe}Rn44WX6IIHmqsbEh6R4>=M5${MVuGui&pKfCh`Wtv)@z{E!
zX~hE^4iI{BfN&DPUU=r`^+LC@W{Uc?=>ADS)+rM$(>ebW;20J$1M5G>zu%+^y6tJg
zN8EV1Tj^OjzChOYjN5{d3p%`yxbc4V?#tAcy*?iwPzcJsEk5f;2GE>|FAQLOwH;7c
zY*E-!w&2kiqh>S7ZQm9-_Q5F!sxcWV5M0&x=E#m({7NW-BEuM2`l+A+-=ds*3-|lQ
z&(w<pw`C!b(3v%kX+NoDsvWv?3Q`|Nys-Br6fgj19{nFaf{`1{(Q_Z7;WqSJv_@~W
zBHkYDH~(h^vwzgQBUSZoZ3UVYRI&Jz9_>~syz`PB&T=_OV90T%<|=zVWbBoiR|34S
zkXg=aD*Z-osd#u`Y|1eDtd4<uS6B`h3L^QC-VSH4<iNI4P%n5p?JB3=()|4ZS$1*%
z_Ozc+UPGOLUe>SaGJgqUWcBK9E(mxK5cZX+sveTRt?np3pCDgtqz7IVF2Sqnk(=}V
zOXnug@M)S|*=TJ$uXRWUW5_&f5^ZcB`7KQ`r0<!&!!I)Tv`pjxy|@|{4$P8N!BS<}
zypw|}m0HC)0G>s8RnZf*`Dq3hO7F&TJA}-Uj<l((-n#h)xd%Sipc4^!b&;2$0DWfz
zr*2QxJ)r}3<;sepoe<R3FT<ZPUuVQ0EQH1xHN96{H7MT>LBJ3a<K$pW8BD+gMr*Dy
z1iH=l%X8n++&^7_`-y;7^>m*3wbZh6<fjZvAJEY1-%>DG=&7o$fkNp|KkV2kqUJ>o
zAr>_J%jHrtd;J@&;ZG+Ya7-1znfRD}y6jO@CKrr6VKGwnDs8g#{8?NOoc{U3+hKCf
zX`&=A4c|l?yYG#IfuP}_B=o2WCWx4ZE;yt!IXBY!*Ru|CgsB}nQ6z3RxE`+2s&&^?
zz>7@p-DUw5fEQ7b*Y$=ED`bgYSU;<cNiN7vf9H^V$0|*KsD*mXq5WL_Mi2B61nGa9
z&(-g0n@k38cT5?`5Q67mC*gmjTQ_6#;%p6;f_n4%Lz6x!j%~xA+%Rf-#Qip*+N$5N
zd#J7lD=ek`a{CY6ySgdGZ%^2@{5h1h`2nZ38?+aRXjT+y2sFZ*yGtPw)MtC1kjDl=
z5T$MQbhk63@#HQ-tQwS35x{d0hJZ0H7xV6k(GM~0KJEeD4}w8TUXi5HTvF1O_C5PH
z#pz<=)?7Z|t_$3W$aW4=)mqZqDzOf$m*+q-EGBVqsHY~l#quagHstlac6rh{qsXd8
ztqN=iQ$AM??0}ibF$$Ah2$;~^Fg=EVq&|h`tF&9n%k288Psvhv@rhJ>X0x8vV_Mdq
zjr#BRm4LZS)KQ*g*w6Q6k;cW~zihZgnx`d<SrOYxWWY1d+t!@IxCQ|B)+3W_j<Kqu
zWH|L&UCSb5s-XB*rRD|&A>rGq0N~$H@yDdP5r_YiBW*Jnm@}p$#Nw?C-HbCscR|dY
zvQw!N)fwJ6avqI|GTBVX7qE=6dOvsmPq)?lsJ}Apa+f4oMK0BqI-5zN#r5GWnc(2*
z>PfM_(9Ym2-%s@ly~Hf8jd0G!`3UTn%+C3D0C=h9FYao8Y^$G*mE;pOcQabb7LO$y
zp(v!?x7-csgdn(T2DSeoGaRBpgd0<3ha_q?&5IYhEIquZhK(r3xHnx$Eg&YR7$T5F
zh9N{yKl}{1D8?3OU}cK5w;@tBm$|JT6wdL&$<P&B{_eo$fy;S~TsyEpyDYyW+q<`-
zWnQe8|3l;0<*qz@6EyT$&TzN_wd{G(7zjP<h2t{Neh-12!<R~An|u*mr0(HHc)Bh%
zt~#5PVMEWDQPNrWSZMdn>Eolk!t6dwla|bR845@HbKwm!;9&BeAfFhBv!Y_E)gdBl
zAPdF&SoQgeDPtns4YagS)D{_zVqk#C)JXt*L2s3FnQO_ml-eyqTzgd(j6n|aV~QB!
z1Y5+kpL`cBhP0pCKtUT?<0$US%qew>>9cXXpJOK=^GTc?mO?vGd;2H=ORNz5Hx`8s
zNxj3fQZXH26Fl+?G6#c4_s9q;7E=u{qgc{dUrJfPG1i2%ba^Cx4(4tB5`%OuE4N#|
z@$Tl{aU&S2fQA9ove7PFe9K@4p~@Sbq6IV=TT;nlUR0U^V>F&%P>UGsHjSpdyBx+C
zfKGzP%G7)vo{5Aq#1nv5sN4N-4UIv-yz~6c*4u^zl}#nnCm>HH6@?2Cx|Tj&1+a~)
zuElu7?4uezIfI?HK=$>}(qVskYZCPxslmBbF-}6@gA6Wby>efOg5ny^$e4O8Yh|o_
z@(g}g6=Lc9Fv*EgPzqr)y`EX#C>cu^_=o033Tkh&uT5^j7<~>iEOrGM_pFTYy?-mK
zJlWfvyV5@OeNU)0#5o^CIJFSeI4fS|bDHXV5G`>-@u6#<$7$~2e-23)&G;IXhXhW+
zFw@aN<0<UE&ae#0^w6{RGXcI}i4d}#{Y|4vuS91w$Da;24+oBzvA-#DDsM$9K4i{T
zRmsE0pcaW;XB<qikT~($$`&p1xtgz8Aks~G{6;T*_^^KzUyWT}X*|wPbVho*Zg0pV
zAaI$r5Ry{BE%D_zSq3?!`&CDX>Y%l#^M-mRAPd%Mn#(3aD`P{^oY(HYAHKMLyu^w4
z=(rNvQ-r;?yr%Baq8PW5SyYJhEyHfQS%4N&)aeE6@%Vb$sc>9|G~zbePsm`3e5lU(
z-0WzEFzv6<XqbG$$kvT+r2N;0r+wsom>@A`UU%VliW-6Xltj@%UY#)iY?QwV4kGGn
z4oIlcYwcYE2O}X$<kg`c03WXfY{U_DpP)5dk-Vr>J{;5zKkwJ-i>c&mPJ|gva<q<i
zDcZAASW`qlhC1#O-zRUkqZpb&_qvUO2V1=J*(NMivD>G|D`fmN*-`e9`F5(YkzdR`
zzyev4pLAFJu<+HSagT@YEyvg$=;|{8F9DW$nbu{EtjI6OT&DJ-x{e}Mt7O80Q`Szq
zeVfZGE@NOZ69OS?p|1v1WUhl1eU+J#m26(m>G!@Ae?nwn#F-K5$^H*5iwMr+H@y(a
zGB)mBQdX{=2-dv26>*9xLb|T$L@M6V9-A!)U8#JG|GXDAhNT4@;h}u^dk(b(6`c^!
z66z$SdAHQzN6+XR7Y#N-Cs0UJHO4Wd!+_cr!RM3G!QDNpjl|zSzyF6#GnN(M1X4Ah
z&@sGBJhiyQ1P>rq4XotM7NBw_(vGx8d)F>QBQy@1FAk8j4*>bgF0fxQCRMDhr&ymL
zZ<cA^_ct^dxc-614xI~3HX&Tk8(vaPfJK1CIS!~5B`SQAeEkB&**HD%z=Hs`lf9Yb
z7)>ON<$+2+=6=3C#2JL99BevTjvUA-M7x?i#?#Tglr({TIj!73vpqu6i@4}{nNMH)
z2ehuwZ=wj!8;^5DcaReU_Q=}X{Fck4KQ<b`co+!uNWGUk$B%Bv=g@}zp;(V3_=Xrl
zCV~)N6+alcc<mGdvkd<Y!MX202;S8*j+Tqg>$L2=^+|v<_UAV4aRbUq(T=deF;FZ<
zrbEb64;ZNHlbn`~uRB$NWCn3qF=z|a_0&8RzqFTXJiRjO+gG5D9p<)~^x#pk5%KmH
z$10b|MJNN4e}v^95Qp}vqo||z!>eH(qJy`Ajuk<6KTD`{scTKWm;h)`A*$CY)FT*H
zz(uhsSY(!2v8wynIL}=GPF(gruH}9o@*=TYGn#e$+l7;RoUJPrZAN;`O&yHOmRSqA
zA+Pg#5OBsesu2Mj-oCW>w2i7M=+^o+blzTCXY7fBrAyNG1b;6>X12;pDEioYzUs~>
zegwUxJX(xxG}iv|QDKoT56iIW+x<!^8*0YYIpWG}3z3<rdSigHv_2a&lDVZ{Qo2=|
zq3r9pu?4FC=oatgP*wJ6K=`97B^29tznoIw7I>%o)sUymPC;Ntof!}k?LxN(;|L$K
zjOgEee&qIg{M&8;bAWBc$(8IlF5zpwah|*uf09Nq1n&1Vjz;Fay%@GYq8n0>F*vc!
z0JVyxw;(acQ)eVttpJ3<t?N)=@!aWFxpMB{Xg;V3z9*wd4xU{-V!Wk6#ex&d<4`r}
z##l7J2gXZ|AOn8cf=5=*VWh4j6F~ejFMgwmO7*Hi5$T>CK|3GG@td$c+Nej@es#|)
zV}+F%;)6TfTv5evz-+o^plmnj=c-~PwvQ|3VUg`YWq@tkGlOB}K~{Z*Gs}Lc|MDOD
ziv#yX7;1fWGQ&4zkuU2&BeYn;4OKwhf|Ic6H|HCfLK+%jEnpQ{X~3!%Q-ecDOSey^
z$(i8krVglWd$<c;*im)cuCzyr$1QC`YUGGdYQap^$`6IumqJyM%BUivxdl>WhKa0j
zB;k;q6Az>ij+?k8z@P~Zpu<0Lc>PiM<3HBqK+WLIS>2pr?UFnl$Zkvoz{>|>x#t%W
zSd>R_oQ)gzo^Z3#Sv5MF49`q_P>_N=FO-$8V|v-ZhlDS29p|&rJosbFh|f|+#+wB2
zQRoWh${u)T%UoH@7INO&J|PzOnWyx_ep6xJhjSfwrZP8mysFav)-w@%G7@<-CRS>3
zw-dDfv|8ydOgTaDH36G4!bKy_lvUX-Pi^w2=^E^nrmMc}{c<7b*E$BxA?YnqErGKf
z3rD#ujHqcD<lOI_{xrX8ITKyyaRi}?4e5D^#{ih&L%|yBLyOKN^f@01O0_NA2fgWe
z@HIwz=baT~P!A&hhVj~dI`aUKH{kK3vqaJ2eeIDiF)GUy?=akTcQRj%iya5}vCYgj
zfjqL<gYSfuZHw#i${X)ZOuxQec<#2^i18u<0<g@*o=Hy0OY@rc$kIp^k0h+*h9jaD
z{`*B*l2eU5E9Y)Bud`Ns#X`b&%d6=-x)5#leBYc)fEOZ46_27TfB!t!0RXCi*(zrt
zISwdJFZ+6>YnQUCd{8ZoRrJV}HqnuL^XuosN12eAHy$D!hIc^7bhhcg?0xpMw|Hb5
z$@|6_j<8(jJ(_1vy7~(`{Bl|v0iS%PN=;DTKw~`bF4%eGUdZ^r7=0_a<~_qA%Ko23
ztLR{HcG$IMHGpXuIU4-Q;;49zS~vGXz}CT>#nV8p{4VKk<oQ%{U}d?(FuLRpq!t{J
z8+Z)mGQ<040L>a1P61^(SGLMSv?fa#4VZFnATmF=rhHAhSFPA2VA4Tb<rtcuD$ieW
zgaFHsXi!b}bN%W?@m4<c&sgU`H5#3c&O_z9eZ2SiS@Cs7m=A{g@hjA{iTIMU5rh`p
zT$W@aTv+GH$B>2x?w1opX-_n)hD?ynkYQMSdD&tfx5d;|Zsx-jIkWu*U-k^fp`X!b
zpibL8!N^`~f@0RN{Er&s(JnOV2SxL}ixobrv*;~b>X!K!rb7`-DVjDbDF$DNMCC0>
z_Uy@1riuU9LKI<Lh|ykjS*H+0g$bqGCGL_bTe~R+=QDZc{@_0f&$;X0JqJ0R(;8E2
ze8&nd8bgEtJrMP+i`sB4r-|Ph^alta;JsPoiXm@o@T`P@4$5~jZdUNt|HM$IYOYGn
zD;3`7uxrkv1FB!_olscicAAc#XN*=0e*$0oBWDBi#fZMP0(sJ(APXugCA#eByO}(R
zo2y#(u!4ByAnOr-TATmVsxNuHi^(B+iMOGj<n1>`BcPs6A}1vIt@8IKS%3H@qy<-B
zLC`#iK#c<D4LpMdgFd#0j=w`E5l1VOvpZ<DVFyImX=8`wN=q(Wik+5h9BI(A@}i=R
z)2LvOePfi&1{Tfz5BIw0JRwK<k83a1F1c{uXzjK0e1(UmWE=598lnfTWB_1+07>AQ
z`-LuS*`Y1xaaOJcjG1yKr#$-F378;Z9zt-k!(wh3<6GWcQlqk(HA~RP(9j>D7qQ(3
zSMhpE{;;61(}6Ve;YbLog_I^;8x|NoW7pVH*3Q$Y6f^M5XCB^w*~;&Lz^OFBctsEy
z6wqcAp8odl$ga7VC^3I}tr=PU_G>*nsQm{56()@kp*;T2X0d1bnc2E0+C;M|r+BJi
zpSwE{qHTflcKfFIdx@D@#IAWmy1W<rr5Ntc-By-n$WLIZHps=Y<t*RRon4$raP96t
zwpsV`oZ4K<eF<JqIOke%8>O$6lrJjCq5X(sQi{zB=y!UDQ)vHtwzE(aEu@IkwgflK
ziTEE=S`S2GISIn`6aSyc+gUNoxQ4dcPg^!wyAHkZw&;72yodCoiEUAIynka_m#n6z
z^$V)vS>O&Ivo!laNZ*VB15{c+xgSYw5Th9(^B+`Nmy^3SYEBi7KlS;$$`f5DjF(Re
z7Scy(_P-Bgof*tCbx!KY*Ab(UJZG_wL*S>`@bx~Wl7%xNVT~zy-5du6MCx<ZkI6$I
z6n!J%zOyIz$%{47)9@ME@)TnorXbc8w0<pXcF(Evkwj13|NkhIDn0~Ut-g^gJ$n9r
z@z4A*<07X$6Wpp%>D5p^h_^ge53dz6XM7T3qukU#9O3ZxE&~0VSmif@o9jagvv=l;
zI1`9}=*^Nt0d<<I7nRkDv)i3|%mtR%+{z`-0rY(f9S;m=w*KTm5y6HteAj68;T07u
zZ8hHmSsI9%x<ROjLQ$#PDyyAzpykm{m^0)tIsxrW`9wELg5alYAfkYlSwGUqJU?ki
z(~$_Vh|{~S=5?%_q~4aj&8_OrIIb=0Hmhqt0QNj^cfZG~nir)=cQ&eB4pRR}xI=^%
z%0yC!3Q@LlZDS37te=paS*@>@0ZcyyeP&Oq?Zg*k@l}m%hYA>{JkYwwsHr$SJyieF
zU@|vThQxv%HSF(37M<+O_<-0e{FL)(Er-DuZc$W2#VdJ9G+wcIw%i;gq*IKl9@Q@=
zHAPRN<kdLNC@aX)ywM;kDOxAt%j>k)8K%}3P^?OVPGGh?T6P6iGxj*BuX#6>p^r0N
zddS8EVTyT*%gopwyiG7pODA2jXmI)MEe7sD_thGk)<PF2ln2kucZIR%0#JqyvEZ7n
z0FRieLTT?<jq0+emYgnq+vCEMmjnK!SxS7?Q-J}w#g|bF2M>wU5H6^T75OnPwsXsA
z>d)(n>#*Z6-D<j79jww=QnkU`G`Au19^0`eL$~^oFYN(6mM2@BPh0WJcuzBxEHX7r
z5HtV@5Q5UfdMeUKB)~J=-!HW@iGXy>0DUm{ezgzbi0P1yJ>Gxh-YHddfN32*|LTCd
z6R$~w*;0#VP5JI%S#}7b{bp}?w4M^HKpafQw2uT&W11f1Dr>WxXlR=Y(~A)_@L27S
z2rBzGhqwrj9uqX$OyxmWDACxCpX#H8x3Xl;0st%f)#Xgs;yTaw0yPE4C|mbQe42#d
zkLFlsel2@0Qx0N<6TC5JE&2H|O)j<q<HFuOcIxh`PLQ-0U7kFwHi?qlR`djWYsm;!
z5jRm#Gg$kSBg;2H$fsG1%L13`fahaQZSXotmIA={-VlHN`M^%?408$8-g1K|9rmC}
z!~VF;I~4G~M=rU&HiI1S^7${_s$T@hu#A9g)qQ6+=To|OkEWkEGZ<~XSCF1W?+o2;
zC{9jR9>^J)>9pYcT;C#;BZq$FBry<}=y@7spyWP+4*1KE?jB^#R5u7R>_h^}_L)kM
zUHt<yXosRGES{B_x65qtK}k!SCf_j|2)-TZrS+$qfW9Qdrmp=SqHkMqZH(B7@Q?+h
zYRSADN>zMsJAQvQOsZfiDk3yqu}0|WYmWTqXK43u;v<&LQQn}%60ooTM>MGsnx@)l
zuK1`A6@bon<Q^$-wbjugKmh!qi<MDMb2LDPjDx7!<pVxN!to=@h$G<hGRSzX=a)F3
zQll?w29}7qU`DIWEIg^tz`4c2ejrGfx9#;yW+F_P_biEc@*8GL$k~v~51XyM00}2N
zWT`O?v|Cp+?&vQbR^Q-F^Ni5ETEir-^~)iliy5YH40FXL0tw_rem3nu)T*TI=0Ym5
zb4B#Tvt#_Q{E6W&HM`*;N$_D%?pdMHU~L73hz4uDrWj0Wc7DoIlrhY0%s7Q8)U&dJ
zY#HMX6qBBJKbk40KKx(x>1U@)-(3UOzs3XQ5|!U%9c}1z)R8u~WoVT3#O4d++lF(d
za`@gaIvE79a?>}u<WrxeOC~U2C5t}8mUM@)SdarhS%(?-e{(Ve8gPow1T7wy!UNpk
zIh>Y2!$}A2t_nS)jQ6Uqowhqs)I8kk9*OXgPv-#Tv9<F@2LpD1$Fq0E`=E((F!Ssw
z)LomCMCq6>CB*Ynr|L!`j^LAvNSbx27doPF5RgD}>d~W#s|FE(NhRNK1#UwP^`{(_
z!e$>NLDt}g-hbvklq<)5t>B$RQ?}#?#C7e-`Ev=Q3bTv@KbiuKS#DA>^Ie}C8$QI-
z9~>o0vXy->3?8)#^&kg4@PE^6$pMyw>T6JVMQTwZ-;cvS3u~^2|I=TJmxScgs+DtQ
zJ-fe}QJ`?ffCy>~Zme@mBjoO3g}^T>a1GZkTYgOw>LonCv0o6|z<<y7oK-LL^zi!=
zrGxbMmtCQvf!ituhqai2=B~%S3cObFJ87{5B3FP<H}!4FidqrRr8v6)LIsdzQWHJn
z2l9c;Cb(@BNb?WlidW}jyiN+N`RjoV{V*`9EuO9x1cDpIi&Etz*!6cf$Z4F?;HNw7
z{cBQq$v|)Q{9gd-a6im*_Ztd*!tdG3<sx)_p{k(^De!|vXs}_T$ptNZTKrB>2=zIE
zOe>vD`=DZN_T1qi*D4JJ^`a<)56>k+6o<csqhX#5kgj7TNAub0_9<&#haZrM^Nd42
zQd|SN)1~4BfX-wo7xgLSV05^wy~JEsVSd?8*yh~9;U_HVeLGH|-V7;EX^;iXNTkdU
zra7VrG8jv2c>$iD4x1(avJzOaTtpzo;k6ycFcRozlXi-q#(tG+-vSV!LZS|}a=#eB
z9=<JWjS{zVx#^Jh2NnA<dy^U{tO}tbutmW1Wi_<H_>zjN7snrI_i{7TYVv+}NdN89
zPl(HJKP82uZj;tBGHeK{RKpyhCiicj<^M&bd?Je$MfizWla)t2w3YqV;+rS@Gr&Nc
z1f;Lc9I?eVZkSB^?74Nsh(4A$_z>%j$)`UxC3~WOAy56`KX|=(WR4X0PstR$b~}|Q
zgn;LBit3EXO%YuB+DQc4=o64=HifcTT<^gMdympdKe>_oUen$Gx)~XQV9K~pXSUv~
z;uiKpyJnz6@6AIWk~AOiy8x>%_MW`Cny|xd216$j<B-HABgRKEz-cCA+pkXaTgW9a
z)4-Bi>-?l|ele9<BcOREN~EXvRKZCw3wpSvsWJLCWIG4TG_Z#r*hnXv_lJQ7|F^dl
zvoJ_@zdeF(8Fh}@dallAEzI3ZahLdbn)_ZrmJyijJ5mASqBzvF2<8b=S^6EOefd00
zNBRxGS1d)DF&FvHh%x#I3wf*n1Y%ITyvV}ns=x0VQJ~>0<7c`Z?{VK1v?XHY4#95F
z)XG5EkNh2yE_w=Ge{CmKkBj~U&?PT4kBzAvN(LxF>g0ie^jJobhgrw)bE5-`;uLZ0
z9S1Pem1K#!ZQelhpr)@Wlbg9Mn#vOwcxYep;Ye^}>!CJ?KhBzv<lmag-OjBkU@u|w
zqrS4fdP)z^W9JXXP6qbvXAX;pLa^p72@R<|8Xy)R2sR04z{Zwc|D8^HW%=nXA$Sqe
zk>pyPc_u(hGqQ_5Nr$v``+0Oh^AgKD&PyBPZhpM=Cw{!3s(|GUBu~^Ab$HaoxhuZ+
zsD334a_c<?Dc7(OK+Z^lI-T*5{`VXnzCQg?n7iwo%>qNI3@ozZcN1;Q1OE_|<!~$!
zz}*IqbOFc>&e0f?9Zmgojpi!?s^#XSuL}YI|BX<V#AcEHaP&!up{bC)m+j#Eclng8
z=AvF#Hc5L$r2(MXUj2BsUkOqG1`Wj(kctecO{89Cvd{cklc-h?-Ptm75%@q*2IEpR
zw0mpB-xH+hQFZa(6c(by%@_K0V!Xrgs$K-1jx0$$PVIbg<%soDAF7MDfrDjvr2W&)
z``qg{m9<pf#yz19eze+7weD^iN=o)y93luWbnM>XfKwp-Dggh0=zVy~!vz4)2^?<e
z^TcQhLuql=T*RlunoufvrH$PdrBi6^5_c*;<<WTW#m3XY{a!9k#5}!#dDE+?Rt#R9
zV$r(YN*4N)eXvSz-QE?gppNgkrYZ(9P8$aeYu^HUo$9OKo)&LIB;8U2>n?U~yIf-8
zY^sMHX_x~ZVB*yThh7|!xI;l-J^A|<9lErsFMJp1tPkhzL#na4{sBaT!cl(tb`ti%
zybhM`nEVQvVSquAm4a?}_ixMU{ixA=7lC>cYjyT^fQeeA1W&9Y-F3mQ;k3B4!w^YS
zXaaj~+fc+UkVm-6hK*00PLviFqMDTyhRW?6Lw~nXL@@bW*#+t1jYN02@eFdqRN?dl
z>l~Mtjl2~2)a+7_Gx(W*-4J7QIQ(OYf9c9Phl3Y}&4k!OE2AUIUl#*cjM=?ey#Eex
zE)o0nVAUW9@8PG)nYT9TU`nEFBEHO-kYx?WeizcnPO{$$qM%1fr^$&uWOszpoV!IN
zRJ%0te_;MJ)0sVeB5tS`5La6Uc41rfptawH4^@SVnr3B%E3|%_W`+!R4|@^1QSO)h
z0A`4j5W_pID9k3Z*=J6>nH;|Z|F}dSNl8BlX;z<0&4jzuh9|d~b7VNMwOm?~&Wi*v
zNyQkA2CAf<RL77d6L6bc-4}D995zfRu3M<%z47ZU#REoXo$;hz%X{(zzsp%e1$71~
z@HHJn#STb}Yd;rwiZovi#bIS>tTL7D>SPn02ItD{eUPh{^l-r|+ZCtl7f-PfRXh>u
z{?dGq(Ed`L)g;^kqPya6wsS?B<Rh_3gPPhL1D+BI%mByJ98`411_)naq(x}tz8>(H
zEp2;S1R+LuUJUPB)CJ=8Y@P2=%$KA197Q+ZF~zd4So#sDi^_BM=`gj8K!>CvpGnz_
zlIxS*UoeL7n}f;=dhTpU1w$$eh?TDFDo$Htkvo11g*8;KiJ6j#dQ#q^5^IU>II&m$
z9Q)uQu<6vU^#Wsc%mw|9EsXl#>)~-8+ArzzR{WBG2<3X|QL(}cm~0zS6DYrD6EfE+
z0BQT6U}o&Jh?o%|zD}^y2V{u66GH$HO7jhyf`EEqJ;wCmxoYc>1324_J-f^acfVB;
zS!Wst2}QeYk$!BESy?Gut~?!<?kpF#gNE!WF+YInN;ZCr?HV^C#qs6E7xlIWJ{Ap6
zM312<Vq`_a0B9XIa7)LdCRcz01wdSLG)d%2sj0&4gOZH{om+)>#P=l(wN)`Uy<!;6
z4k1E#^doxt5FJnVV*wh*K@z8F+w<CLH|37{G}w0Yj@|$IN};gU2TzNG-8P8y$n=r-
z#TBeeEZr##wHy7sdkGFOUqzDG>9pcC1+>d2J9{41OQB5Pxc#?CiGL?$fKI_$57pVl
zu+;B}y!2Eto-bcyiU#JAwI#*Tq$F+7k5jKAh^^OMmW08tIa&Sc$WQ)b>GsA()HDB<
zf53=(UF+N>SKJ0up&{ntGq|f$DE8D)VXi%JZS3P&v6^xmgmM<}DL|`X)^9BuBRF9^
z&)OPWF!u;o&vo0&H<GQ<amln+YW>m~H=!0_uE?OOk}D7<FAG5m-8Swd!Fgc>dvLne
z?`ItwBs|e)hTwWGu8&uI470=?2QBBt&O-+lf))ZU^X4Hv2!Fc;$R>6WM1o8c*)MKa
z0I)Sm+Wt|mLV(9&Q*iCh!I->iTSn<Yhgj9FH8n5Pg#1!dUJYHg2zTUB@_i^a8P)BB
zDT`P{DVP;L{Dxp|mD?PtgTa|W`a*IPJYpss)(RnzCRlJn+|B^SWK&C0SZ$6qXe`Hj
zBx@%QHGkcL_WOC1#0TYKwy-KZkfK%;!J^V7IN<u}W6VF|{1kRawGIDH8FMo$uKkQG
z<>^T%u9u}9<?V~PZc0T?dg|TK-f>PEvCcp{6;Y<#+T^@|HMJfqsD5c5HFkvg@a7We
ziCbz56K-wSZ)honCGOMoY^9(Aif*`nIxMoy^!$=|ARg+!7E2LUdDYWq{u~EqzDM=c
zSo3x4=_MwRdL_}xgZVUIZ^U5h1TTLy9v0BNbxG~@$A}m5p^53FFBV$^F!S$&Y@g8^
zB5SA+QVGu(tT>+0TGIEI2jgCnhJf@=7y{v=!aoe~C5K)4)v-6TCllC^7CVOA9u)?j
z!i=3H(`2zdOk*ASe;I@aHjr|E0D(d3ZDHLc3Y`<1DCTu9g7AH1gU6UWjpiVEYiGm5
z3r$3+ETA8JbuTrP#(KTmHs;EkyO9fD=Q3HY+k4ISrv51CDTgY|DFofaSQ2pV9p0Fm
zgO{d}=^<%M|6P-%#W`aD%G3Tzc+X;v4k@LYY&XI&Aoj6f6jetbGcXN!03*^_lQWS!
zkBH~3AFGQ<y=e9|rv2Se{4o)jfcaAm$GJsDHbLm-t!HEws!H!ru<_LclO5UvQs@6r
za2-+xAd3#dp?A+suSfkTKtc30jy7-rUGNExX;gz+DBeqc8BjA#X0jyUaBKleC?s#-
z7$!dfe-wWR^mU0qj{0A#C8UQI?hwb(M=RJ%P~az$GsietLh2EQNGuNUvydN0`pW3m
z8ls#u3E;Ll;afOny$e>5(ksdC(+e3>Gp%tWE6U3Q7MNtVyTw#r<4b#STn7~R{oG6D
zbk>q}NR!|S3rrG$@}3$yaXNNxBCMZ?lSTpymMb*`PXYN*$c+q;oq){_DG|I*mR1r<
zd8g+Mp-8Af!`oKO^C~=)YT3eQytXmZ3cjR@Ooz@mWyy`uFX7(^!}BJKhXe+s=@;OU
zfSt2dFV4v2hd3ZXXs(n^?TB0{!xgijN6`^YAbKUlL1Jz#MHF4F8jFS!RAO!<QHW<E
zr}6q!3+jbTFS75NOIVo3!^`~ql8BFJ7xIeu9=iBkf}d+-^Kcp@r`ycM0LlJ`4(-j;
zhO4jod?epOj^m820Msj<j$sPcEHSnf{642=%?MM(bTV`oh%Uh)%0zz)FoVSPt01G{
zySI#-)+m3?y<W)!E#YIrYcC4`zoh_Io&szrv@umUbLfpqMm7IPZ-jF2+02*<o}sS=
z0hU77thr@*p@e~H8ukpg3?8%84}~7b`6V@a+t)QT{tS&$Kbw%k$>zKix^JSh76z6h
zX_*cZ5I?0`Y7sEVj$Qhrl?eWz!ghM;w*+EmOwJ(|vZ}<DH0_<_2U7f2<gqs9Uo3{T
zs0s$JA&qRo@>_<&Y#n1eeO>kKgC>H}5KFS7ml8mu2+96tYmaA7l9i#5J)@~Icm?Wz
zyYoF|w9e#N?PenJTZ5=R2#Bc${vpIS(Qhnt$g{luZTa{m3qvX39Ft7q;Eh@{cAgMv
zf7ePN2yg*;EsSr*vWS5O-xP#sqJ&Z+Jpb>tfMC74lwuzP#R!tg5XYNI{ZdD#85-;o
zIv+nKT)r*bpAB#3$v~be=o4}jaBP&tvEnTPG?WezicECjv-o}K)2?b(_<IAi%NUs?
zS$pp|u>E)m)M!_KTcjP##^x@KijmzfVhzkG=U8_3V&rUnZ#V1c764PY??j1IJJJ41
z1&@e%+I-WNd+ZnS8<SVYMKfN*n&}Xv$_8K|691e(pJMv5E?^d&q;ryXku<r7HV}&)
ziqKgrY_Sdb5$Be<r|enX;BCoL5WYpL>t{uf8$Lttu0ef3E8-C<WLn;O>vd=pom1%f
z7DYynvKB{2%stdAUi}C<cvpO9*=hJ|dA!Vwj{dKzs?^rV3tQz-SOPYhsV*f8OKq;U
z{hK<!9t#ryeO9-fo^)-*D&wT!q?^>LtG`xzOnrl2_28KV_-a~+7}17Ai#d**sCXUd
z<rGY3J3~xfo!23=Hd28oDw_)z#WXqd9;3A4R$1hGKs92`|E#dN$o?aBlTbIU|Kf6r
zyRXEwzL^`^+RF$Zh4*bsVH`cfX>tF)N3AF5&bY|~7o87}ptY$dE-~FH`xL!|J^Y>?
z4{|iS{@kp2au5Vub=1PMmkzYvqS^v24KaeIOzFmKLD;83sp2U{4%lpK07}xcfNl_p
zC8vge!O90@V<I3qjT8iNn>2caC4uoRGwzmdHj!g4m>5&&KD&>sF2ppo<_)p^QkV-8
zdIGWs96!haU8Sa43W}Nll4@FQ&eaVQMlqtmWU7rj<kwBj^nZ(>Xmg!|tUkyXY9-z%
zA#o<FcSOM6>Luy1)0m&0NPT33tUq?!j}=Iq6Jdjg{{IM2)>mw|2&2fx7`0IY^1!Pg
zqXl5;8_uh#-VuFOK%Y`%g5~B~ne3<g)RNO#D)2zljFG$j^Eh%%p1Z;4cQarYG_?>1
zhR<);t%5IH$a%vJuIvQJkO@48&W=P90IWw1P*A6@9^Q}1Kid3G0djUgZeo)ad}#sN
zW;7HULUCbIg9z-Us|p#1sFPHshE!95l&F=2k-Mk1r(KCYTM|HhiFkU@)Y@k(qft3{
zUT1d*8^*#}%9x-`xMcNE8qC*<%>_}*)pZ>iDqLe8HJuKrI7}-Pgpv-?qv?ZXs@H?6
z%3oFcubJ;Q)D~M!ZrjK#&I)Xh#5B;{I?-o;5%8wq(uO5N2f?hw>G2+IgEJZbQ(Spb
zCi6IUUfuEWmN4or9=E*XDFL2LL6I*M&eVWtQoqEy+~wv_Kpa#5@I3KOAo_|tE7+}=
zH`&+q2C{9&vDNm<4JB~VBiee9R!xvUUXWQMk2Xp9<vw&Oxp`vF`K-F108yfBy}IBC
z5$4M;C%}9iYYk2W=lqkTGF`8nnBH>r-8*!xH~<`#YjA73|1@)Auc7HG41~N3Aq}^a
zx-j&8*&5b#1-()4%VM#pZQSkq$ph_3U8y#!a<FR(JZw#5M#x<vdFB-q3gw~W4!?Bp
zYfKJR?lLYTSxfWiqp_5>Ux#hX{1mD0LNWogtg{T9tt#}WGm3Z}k3b_+zK#SYl%dMW
zfe>7WzI_sX%^3fp-g$3|vYB>4^;mPJYo*pYO8A@rbY6tER<K8n#_-OA5EG#j`7DuO
zx)1tJ7-G0!R*Q(&BgydM;$MiMfDy<OLm&j?P!9p8--}!Nqo?@v#rAjMz~q<kpE(L*
zGFSb)<J@X7Ce~!O*&!Fd2B~%ZuWYleQiolp70%Y%6V4~ic$25Y`rP1P>}t<>G$QYJ
zqq<C_Weno;<Y?K04Y_*ky9{&yp6(KdzTFHpQ7_>@#&PW{i)_I^Glk)PE%}b*4=req
zkVJqd!c6)pSVo{VLL>FS9RBGe-&_qfktiHmUsA;OY)vd_X^K!%jF1tol*`AReJ4us
z%K?9*p7Mr;+u-wcXxFs6JukID3!>cydBSRVft2p<54dwM#%0Wj$7(E%J6G$<N3#%l
zuw_iVkq8Z8`k`E9-JD>uQ$%^X)MX&xG6?xGT*>theUA7W%ZU!CN1DFKgrHU;(z1`K
z-8H@j&(EGp3363>Px8DaX!D00GAAqt0z9g#aUWij2sOd~Q%4d2E?-n?0Qz3@3267>
zFJw3etD~bBx{+OGk7_JW<bbgu5>km&n{nBtz(tdsrreIw&9jjAI^vt6daR{{xR@G2
zcQbB%CI=*TSYS_*$F4~-TZ+3<eotE2#f;W33Q=|O24EB*IuyD2;&|F!8T~u?M_lBp
zTKr>B<0m%AJpH;r=@sQjW&WC6jaH$f$HwO43^z%{8JIIy=OV!56NL(Y^~MEob+F?H
zmD*!{pCFr^uwDfFIZrICF-+yZCJS*2b%lq=5NWko^d=l`x|lH?c(vjuIT0=I#r6xX
zUUISf0-Pv;7_e{eJCy;(g_ajeWkTK#Ok;Uhw3&N1@QGm3{#5H_Z^M4KiPyQktiHL5
zl2&}=F9-kMp1>JV$qoh8fXqIKVA-??<hnSFw&U=QU0*<fU4>KXcH_WI`t67chQGdh
zz?~0%nvf_Vh1wDvx;H=R&ko_(Ets(=#gF-ImnTQmp7C3PmdDQbIwVr=H3JR{@o{3D
zbzXc}#FN;^y9}sLEGzp_c-nv|D`dPX`^8ulZGxrp6**S`31*6i=+curZ%Gkv`%BDv
zFTYw~q)`4%8<%w|`~x0IHH)}-(|@@{r?GyT^*$TtAZ+Q0izY%j5>XYY-V$&{`A{_3
z>F27)VXeW(0Th6Zx{H+2Z<L5>r??ICECH<5@UoZn8i3y|+=YcEQ(3HsNVsJ@&e*bK
z{0D3aSR9?^!cekA`7`mSm|v#b^+k{3F63Q3w*UM*t)G>d1oaveQ5J``j#h35eyEE6
zncH`?{_VNN13F9>yIu3LL3VP}7k156oRJK*&oR0Ix~8;6pqf&H{t|z2a`Z@wCa1L6
z5E%HB=mOURA=W2sdMUfWr8sV@1z7=>C6r^Y4zSXzu_Wsdk0tSY8B^uGYMgRb=`;_U
zfJMm{;v;&cb3C<orYg(3OIks?u}8>f#ZN!Ns7RXVonLc3moeheSU%nHccvLDhix58
za~Uka?9TY$4xng;&UB^1-9~>FTASD1b{A_3-kDH!otDWzuZ_gETk8lp*52GWju_`)
zxQG)gBx>VgxD7sa$_s~V7exgN+-lp(b*&p_#J}OhrlqlyLt`V=TW%jqLyLYg?AUDW
zhBWSun4-OOx3?gY%cj$*M<+d;--Wdu_0BEVJ9viuiu>`;rAXh*4mBCqjYpCJAtni2
z(TD(*<17g7w657L(nMtF1PpF(d7FFw<o)++oIFtxu<TyaMLyFtfnUTb6au)W{h)z3
z4!mda2cXo{IJ}oL0POc(M;+xk9rEJ%rG)X|BfFaZfe4n829sz^1VPSNioiJ$^n}sU
z#-F##&Bpdfd^^<maf9=F!c2fwC%YoF?EhH7N@5HjUXo9YIjgY?Fi;0m!)6*$Gg(v+
z?#7X|a60w|lEF<}Iup&pLl4>zG`QgXBw1>ffgklp)|*yA{?zX0c%%TbV2m8uss`Zb
zF!Q%UKn4bu5BEKMtwdHW3H7>?&ojS@$~>0-I-Ne2qUP>d-Ck9oZ)joCFA20dt4(UX
zT@+iRO99cu6(Y8+eox+y@5t}pCU_C`yu(oK-sv?dZ5ecAse$0C<11f1=^kmWu!=|r
zm98N3PD=r_^q+hrxWyI5Nr#5kNJL@etxMUf1}o%=P2m}OmGE}OY<{LyXS;SzA3=GJ
z0mKYsu!ONTA#J3>P3eC1P5kqtI0#)jnoheGumi+Nc_}5yXCa=Javl&y#8#;vD%RZ9
zrQt{RAtTr|R#YL>x<|3cC?6QfkSVkef8v$F?B~Eaz#oa)>V>vwwB@amPL=MQBp>Sr
z#TrsO)&+7i;8WS!t*66f+c&WEOymK~Y6F0>K4gfJp))-8l}U+laWr+6qp@7gfaQx@
za$t`LCfNj&XprWwmAj33dw=dIE(A4aB}?Nc>Ya2KbkVtqoIdSDp|B0gV*q}{;)?MC
z1I7iR#`ZUDhW4_I;L*;|CD1Zpd~dVBFEioxZeUh4Gq^$pPSGg$m$}Ql9Xik`I#C72
zvWf9H44~nC3e)ir@Pk=YG&XRoVd)!i0#J`bT>=B{*YXM$Qrs}n-v4K1=XYc-nCP&`
zG!gF{;RV;;Ppm%Z;Fja6Cf0vh2~sV*GYb2!S_2Xxg~=to19L1MkeenF-H`LkVjKV^
zsRSlPiYjl|umpWQz;oF^21#N~Dt)bmPv}A5tfe6!EpXF_31ySk^`uB{&jyp)hB5k&
zMpZz>VNIU~#V$GOof+)}tIJ*md3DE3%N`f5iMBnwIf?>i!FTM&Q^=(?h-CFz7jvE2
z@<P#4T;Agq2n4FI#;3SQ45bl4(cvCf9?>bqU><FEJ!1v9D>OLjPYAJ3sFYIu59#Lx
zMlREGkjTqdvI7MEF-2+>2~993Zp3QAGZKkQxe&xMN!4Kl-{mA~Wu$oM$-{OvY26F`
z8R~)V1u7%{a`U=Bx0fwtndckkCnEqeK+M1HHLAq;lW8kAhGnRP4zFbzjgdMt;$~Mn
z_Ks+l?hfzS%ZA4O2=*4hr@e@oROuN9=9n|e;y9SAi4wyH!LbBYsRQvTMI30Oy089r
zp~+wNSR}p>UfJ6dYc$R($~x6%!0bxbDIcz2ZwSd&<=6j(1jYDcnCZCrDcks@Y3gDC
zWK0T3z3x>2-tFPxq>~3<qQxR#25BxMwwv-dW{o{k_VmxMNi-s-F@ctA`$N*##9u22
z-0O?yQ{~L|fqCd(VVIDq<-$+!EYqIFRdheGrH)S`T*^|=mfZ+WweHWA?n_oX8$jjz
z)pW=(4s~ZRQN_FO82Doc14Ly!zWOlSP7KSp+%%d#aK>Vkg=3iYm=AfPMY|k&Q%6)V
zsqWyoyq;(Q^g?c&!+omB##7q&$-=mX;7m&c(ZF&@k_?v0E)8}}kITSJUxpJpnz;SN
zNvW!wO;$?g$e#rTfkIPx*0AFsw)X`~a!B3UZhqq?@ghdmD5@H2!HNGB`eS>>Pf|-n
zSp_-V<4C&P5gW{vIa?5=j^4OdjHn=f%_b0^t3>eomt;9X>1U#aYoXfp8u#=vV3*t|
z<_aivfjmgoA+f2RT)#fKE!7hFFXqc08psit<@yoTafw=i)q|f`ayDT9W=&j8Sk|Qu
z9Z};^Sam8VhMd&})~3EvK~*oLl9AXIDh#0V*>;eeN#C+R`9ATGq*`<X$~5X#jD7ht
zzpVYN(4Uo{VFh*5W);Z2&J5LA&q|9}cq5`+r2#dSiNRO=i^;Fcu~AQ4&}J_NlFh6G
zug|%+OWIw2TCPk+=`B5X>@8y}2Z3|CS#vefbj<zZHa}gj93iTev(~>CVi}Yh8!kD&
z;)Q30+nFgU#-(>1xJX7w5PQGfvFvt2GehHmJAAN)b9Aqe1N?YF1w3Ngt|djGkn}KK
zXWZgGx<yIbBtr;cp1qITV<V_fnF`U8^QlE!;ObVfpH_dA4Ee~@{7qmNi9v`&3T5#-
zdm-#?n4&7Z8Ujm72#?chSrY+Idseba?!)*(_4V5P>|5+zD`5zd`qZo(KT%4@B__uQ
zBh%LC>T;+`a@0^XiSGu9=^ONwiF;jqE|jNF`g}GD>-~(>0Hy|Yu56;NZ-U(}4TB-v
zsuMGSqG<oUW{2uwmrh$OIrmFKoPD&>AT)5BZh*^{Ui87BKDTB=okX4Bf6{595(uhq
ziuP1w)UlA83K4#&OfVRPL3VY32U?}NII5=w;WLD6F6?OyafkHU=$a9%8$r?FQ<1F0
zaDXyXbNF}QB~~%;u`5&>qzM`r$GydvkXCIC3WY0Il3}U3i2m##JJA@!e*8Ml?YZ1i
z$86krpaLy*%B;)?hLeynm5PE_byR^iZQRD}3@fF}R8c-5a0*SF>(|)$v=S5ssDBRX
zXF`CbP;YUZ_z=5;PGn4w5@f;NVOa)&F1C`_+(@jH0@+sI_Yu)6>kYHL7ckgWN`!99
ze8L$)3;V=))rHFNGyTKIB~||f%O`?UBnWf;YX!UO&K)Yb2D!9}!-;ukO&)a*J`&xA
zvtAOd0TJhNIWLhIleYat*l8;F2p{jDtMgRB5CEvbOf3VcukKYS)7WCCSqodqrCp=W
zt?s3#+Uss|UMd}<od?7~lS$-;Mgk++0reg)@W|We{<~#5QUJ!Y695dMFbIugj2pVC
z{I*l*dcxRL1YE;EJhKo)awXNKT4rp8mnHRl%eA(T*prYP$1~k|Y#b$$(6CN)^OW4M
z<bBgYj{2aMoS8SV{X)l)5}2vzA}BY+;8}zz=Lu4Kx|%Z4W2$f?nV6;J)@iBUI9HA<
z+@T${#k+6t>h4~{VdLWur$AI)<7C=)6}gQ2&r{j1AVp*Ch6fbH-&tvrU=t<<B9q6W
zyIrnEC|IDrC-U-2;uF*8<qQ88JtztVJZ3fMNe{Y(CY3`PO<<q+kCwiWA8`|)5;qUR
z`pdpYEbXQqNLpX!`+b!htikCerJ#Q#Wv#XsRo{#*wk7)<Uon|05O<8Gg&q+8Jm=an
z;7Cx<E$<MZ*-6$fQ7A_3`!eQ~Y=FtLGh)`=9mhrHikIXrHi@-8j?e-qHBINKZ3<aI
zCj`UVO~}|}9lw%BC?)P0^O8ypkb+bF0A9@ueLQ-gH@kAMDDX$*XBn8&#n>pxEMxx}
zlfhKNd|dQ-%rSk6F^!6F9AD}xT)(43n|Kqo_NrmQ*hw^LrS37$>Ri+xI(hQ{mf+Hu
zjH=8*g=uSXP@g=#ML^1%HwoC*FzQ4`vfbgM^E}kn#9$3>4-H&LndY6JBlUfd-!n{R
z8EzBw{wsJrvc69asZ=i@LU=N70?BP+_S5CI8dn*7_Nh&O6$);1m!A<H@!F`r!1v2*
z<HQy?D=#;U)sUai4x+M!K)-hT$~-;_nJM{x_xozW97>+Dw!rONJMRaeWfHW9o1l-*
zgvKq6h(m44UGDKK!<0s1EGe~O){5zRZQd)cXs0ouSw+*J4wNSAChmmK$y^rwQOZ0R
z2I57p1CoWKKDvymQ6BtCV<{FO1}MXCTYBo%DszXX@0DLJASn5YCNi}pdk)9L=t<Jr
zK@(yritB*H93);NZfzOtctObFZaD?NQt`eX294cp<e4t#Z9QW3jZ!4>?q=zzYLPxa
zD#+Cx0Gj?eC|wUnB(&}zzo7dvKm^;9dvT_o3JLJrHAy^B+AnXK8cQFc33M1CNn>V&
zoqO;1n;ais%XXIVOVOLQFma5Uk0yy^R73ETf&pO=(<o+<x)@<a;*KF2ECINuHX(dx
zpQh(l9+mEkl>sERm+L$w7&sX6EM=ZLlC4q?TIl1VCUn*nPjxpufPS}6vD?~%u^_Kx
z#yyaexg|^Lp(K^#|439BM#Qa^)Idm!5fnLoo6MYDZUy_AUXnii)8EniOuW+=4>T}d
zWR+ssFI>eTM(y~rNlQvyr4K=5=|n%7Mnr7hYXz$~)Ut1=fAT)hoHgv=&do-Nv+P1<
zBa&n;bPEn$dHd1z<y0)O0qbvN<v_NFcCY!D_KXD&ZSpcqo*ID!_#BwT(Tp%Q5Q@PR
zaf}j-$x6k-m=~lpCKujB37X*)i>kDm#QJwkU3}TcSwlGtrOMGWq~Es=Gm9%nQnrwp
zn`R{xKqXvI4iGTVDv8<`!?pS5q+XFk5e`VE#;9T-3wh79Dvn{vk=Y#UkqSR?6d!Ov
zVHmB@%nc+B(BvoIp(TSde$6meT46>k^{t-@Fd0AycTun?Jbr2!54;1TA@CKuX2uva
zpSp4z9K+2+yO>#(_^-0=;-?n9WEZ%|t?$-82ckXA;V$win;@HjqE9L^j#2YYOsI5q
zPM|GCI;A`?U95B|2P4@vx1aU?`#cOIn!K0Q<ggo-prIPi%Tbno!Z}%pDCW$=*1eO2
zIHUv3#MXo8<!(q6-^Jk;>^b`98NA*pyRV&G2($it|AZ2pS`)D23z=F=r?7>1l`2UH
z)^trU+6<foL4*BfoR)JxdiqI*r_UAXW_IurAz|pv@!o(7#>#$rWxWtsG3`)k)H;+9
zQ<alzh%0s+TRjdHE5DK#qbcA3oi6F0w+CFa-3%blW?;4H*r#+bc;RjxyD~oJNPia1
zE>e6f8_$2Nievg93lZ=#Vrjs}-5BqIbw$3kE2+hngz2yVR||GgXOd9EF2<BYciW8E
zdgxKvPYWqo`o(f;G~Wg18$;#ku;gBEwvB`ykYK&4V9hC-1$VP{EB~kGa??iuV~TtT
zk%IuFj|1)98QhG3#idPHM{LA#(%xyU;R_esBp;EH7$}hyee^rc`<A6?x?~kyNs;VO
zdl;743|lvN+#qikfiD>M5aH0uV~QCpoKcZB3>@&e!}8{6KM95UK5Fn~kT?0wL*b&6
zBz)HcRiLqwMGe@!L^ZoR`m#1faJQ}f!mw`1M)g3Tab-oydVGUyAhRm@Qa4PHLh@EP
zNDrQn@Smt>^7?oZ@;+aR&*P<d1riBv81tIhV}jP247IdSlpbdcP8l$Nca%DdG5?c`
zjL@4ux?3Yb1BHD40R`VKcCRgPqsW(WGa2ayeiUTwW{l^J6>6#YS+CS$IMkRJsY1-b
z0=+GC)GYOg0>DP0S`Ps~5k5H@eRS|dgLvSo&nEdOrFey=AOT^BP6~sb^b^8k?-tTS
zU&7G>+i+C8*CsO+m`&pF;%uy5y6L;MTP=Mm<r|Wx#HIaE%}>MGT2;bP>_ScW2xBYr
z1KW_$N9}#Jdpv(RN=VdjKG{?yad<d3J97{FdI|x~neuAK&U$+~lL6}*Db-7+j2|nU
zHJ4`i<oLryRA_YR0MUkYHXhFXuC>n=g$+q$c@}*jopgMG8A2~O4_K`fJmAtvRC__2
zG`iF3+3Onz=~b*F2bF10rm$M(5)F(iSX14(M(W%T@vMK>${I@|#tyxa&85bp8v5kO
zA}QUx<4801&Y*h6E@IL}8T?ntN8}8+wKZ4)eoIfQLziDo(5-ll83$OScK_0j-;`~7
zY?DgjCj^*Fvsd3c9hR8BA<PBtgh10Q@fWxFlomPdvQ&9v-8_CQ=?WSFJ#GDqf@k64
zebjk+-S)wF$a|!^DB|pDdzy}ygA0l{fNAfjcdhPVNuoh=xlh|EcYM+$Tzlo~GB$1q
z0Nl~5M+%xwwcHp#!^;?pX5BLyY$ax2mW{7C+j!=PS~qJ*z`|8G;7WtA=IF@5`a|x9
z=FB$(Mv1ARWlX{T;e{e`1a}*N_k$<y&Y!JtzXhHH`BWJHM?c`jz2RUiGb`YK=`Z<e
ztJ3;dwMS6UPrZ@lN$zHUq^|!gn;MS~s3uHp12r#H{2eB&ci{u0WXj0wK;aoOF9VO?
z1lwV(is1rirekL{oYksjbRIt;w#da$jp(k3bu7DE^k9&}MOjx)d^28w>W9KFsDjpA
zCafd%t|yk2Yqg4Et90Fow9V@Xi#_QIQ-dOg^Xi9PxLng%ti(%I-iR6OWl;~s$m?sh
z*d<cs4OwvXxz|Sm6#L2`CyH(pHbexdqKP}Yn6ed>^B|s@l&~k>W*5Ks4I-8id_+=Y
z8Y<_tLrU??krqXDU^IvbNG0JX2KI>e<l%c)U;4NoY^#Br;`u7mCt8D??u#fEd+LU-
z1k|ocF<@zB+E`!JOTb<r->4!IXM#T=N?A*FjRGN3E^Jw1-jvDR%6zxBz{+$2Yr;M=
zg4Pho^_*?lp-HOqF4+>#{*22AFXD)+*V>VBn1vYP41G3NixHFL{tAd6G6w$<M=$b)
zAQq60b(#!Y=G|ySItC~8?B;{2q>&vVG;QV&fD8dz#)St0a0H#I?4FO`mdua<+l0E~
zjX8UNxuJ&YizEUvi0*zo6pJv*gguN+ZvYSpnG80+;4)|QcUr<nDS7Fk5)Nj2bz@*Y
z%ao+?3cS;nb1<Bc)QL_mLP|3^xlT?Y^UgRJ8p2|N02)hPKKjVl;;Lt>^SyYQcUVLT
zHxT9cAVpq!X>n`-2eA%j&;Ls5c#<qX+N}y0{B>F-jz<D%I3I**#X@}V{9xPa0YM9h
z_JPJGi+Ra}H!wo*H*PHnec;Pt(Y8|jISDg2I@Qlw?-dEVl0yI0wkpeiN^*W!-KFJv
zDlt$6nJI#&=GK$2ej=IYhp7dcR?ssB73UZ=>}p-YC~d!(AUwlnXYf_7zls#)?E;y;
zVwfux^Po|Wvu=|taaP-apvyo2EIj7PL{GeU+iU`=_G@$%OE00ut^GvEjSe^f2!l20
z{u)l-^JQ)BwA>LENWAUUiaN9a0`T}uipe8xK-%GDd4#`B#ctFY^Q&RqLe-ch%Dunz
zL2m8@0G1_8BE3Kg1PFE~dvrj!sLJ7>fKx^Jtx3_wgQ%+KStpOvC?6hEO<6#-$~NP@
zwz)Zo`sO?JYbSqsBr`Xm!W5FCVCGPHh}lBW=mSqEv5z6EG(-C*RY$FVZnmY%n>U|W
zwH$;4sA@h-XB(oi*FT53n$d!5w(i$IKW6s9La_NMh6k?*D7eR$5K}ZVx0y3nH8?qx
zolm(ug*bsbTtwQ;R(N-muXYRXHNk8sR&Ez!#jUKNwH<EfsIT$d-vD{W6L#hbnL|Nc
z)9h^z5rSSFre2=k0UnSNbI39aDs3Vz(j7o#vXSIcWXI^e14D3~8MUb2hztWc6-O@O
z{b{fyvA&H$G)9ID`m<2oAY!N0`fO^&(})&^E3a)FeoMdFqz7UViUq^hMSQ*yoBg#$
zvXG;gWE3LkT-dHNWouI*b+k<LW9?**n$F-`b*HhkQq=3*W>7h?9eHP44^Cb~(Dd?w
z&+p$0R+7fK^c7K%wlLv^RBQ}R*$_TGMhdp|eEwlk(%Z{yMRb`GomBp$-(P7Rs9@8U
z+h9<ZqBjMGWa;-GyOZS=nsE1K+l#jWbStdO!C%%3RHxOSNcmcHCn3P|njhR2WyaBY
z=mU0-H+rkGcmRxuO#HH{AYa`Z#~7dME#o7T=UJ;Hr)?^|U17)sZ7YD?p2CX-9=}`a
z*z?V4J;(&3F8o98A?Wpix>I-An0~s}n~)agS6SBV!v8t`q;FJrFifg#BE#k(Q)$>(
zaAg}OTx)Kt7P!f0`?sDlc!2ZJpSN_B#`7%@3N130iXD>8yXYdSJJ_0Uc{gOz;1D8{
zzt<szFSGsj^u0%(^|ewSga&H5WJ4VMoc6=_6x`g5e`GmPIn{K_Zjoo45hpK9j(MJ-
z=Ty&IYiPIJR*n+2g_ixUjf023UJaTc^U;;l8D!L8e&oK@YtBLfe?~mC9`I_E#^^GL
zvdg>Dpf=w>YODcU4z)R(H@?WIs6YPe!ri;l{n@LfE`I(fg#&{sTBeaL-i1tmR{T86
z{a$zOiupL~((>T0o=ut^m1zi`E*7>x8>G11S15dwq)B3GpC<<3My#x+gfKP$=<SFQ
zdO%K*9=65X>)T9@&9k7#)P(3d>ysTu9XW!H22XpxShy#c%IgL;%}i)6GL%_w_WHqL
zJu22i#bt|UhIAq<ca}i)Ct(VFCt_nHhZ82iW0z93rABc)liZ5#qZuOUwE%4FVi!jB
zL1_GHNOBC(p6=OyQ*vZl;r*H74Lf3Czd@sR7y^by3HUR<)T!~*u*m(*HoMt&w1f=w
zuMaz+orN<{QdmgQ?(WIB;D(|Ec6YhKQ)OZ#GmQ1OK*||!g6m+hLbR=~eRMa^BZL5N
zPv$~NP`6gK77-}r!X=t(ajupV;|G%C4T|wGCW(>LBT+eIAx<U|#g%GXQ+Y+@ZqH-(
zoizT#g@IZeVi)QaL44!a>xoD-BOr{IM$CIv(4spYxni4OCZ%G}gNPCx%K?<t@haD-
z<jWE+wBVT+;>RRt8k$Tt+Go-0MZD#^#_3D7hLcDI_>rr565nERm&<7);S5~mn1LfH
z%ysdVaT)6io!YjNGOZ{%Ch4)&5yIz~vgExRNE61~dlE&vY8`q_K0HNm8q5vo$&$a{
zV;d5VL*`qM($w$WrA}KH@Pm!66#R<g?Is9xUCjD&Libm2(r~+d!4nP}LAB^RU+@va
zaal+}UV+gqjN^c{t_DlG@IzPb(e!S*G;QVw-f$L^<+Xp*QLT<LHycUuD3=ORlzq4Y
zcjV;5AYT}zdv>_5{dQXp3xnNtu9aZqiAQI5Nu+~3gI-!y&y-6X-W$E84^)0@vM2WG
zE+DlV#B`{ecG(GpXc`%p_f?#kO<{6b6J&A*B+ioKS~V@x1iNvPuewnbHWRw}H*o5+
zV-A?hj3!Nv2BZH}ahf9+vGxF@4PlmWYVM1K>=|?{T)aXnPM&(t_R%TOY#ZD?MI+(8
zcVcy6z-}n}*(U9$#7ZcjPz8rfE%&Q^3CT_`o~GRa$T7K-r*KND96cNb_wjCalgrLK
z+Hep!>51=hn)EB<=;l>qhQUpUlf`%XW%@GAulI~MOp>X7H}|fc04quJ%Yrx$ffd3w
zyU8{=(*)TR<{)tUt6hLLuKS<&y%nMZ(cP_>kH(ofuZwtg+<w>p);B4LJ*xpzT+N3t
z3Iu@dfS4-<Pxr6|r~#}kGJWt{Pk_Q~1shC`E`HrWE`V^xmWLyH{GMC(Y^LSz+!R1o
zK^ks<J?c%mg+$KPP17+3S|i;di@AM+E^fUu-)*JXcGLQlqyuBctH{{zt>6Y^1Gd|e
zN0Tv|eCj^QD))%N{dA4AI5jqsW2KmAW2fLNP{BgAHL$c_g*#nJy>1kOJm6!eC{!pH
zMk5R~`NB3=XEC?QtYL9ch9+{TDxjw)i+kov2>=;T`KaKmI!LnvE2V$%$U2NXL{<Qb
z!=C{pvCj`k2q5aYH$|YKCp|T;IfT_-{W%!-9Yleoq8t{b$BK{EItbj)7N;v_D($Ab
z8Kd$C*83DvW}~=1ecL)JeCkJ?Ae3gWU95!DuuWi$UW~DXasW2cl)8~JSBVcM37WlN
ziFGbFdN0|O=&}NrtH6gs^<i(d0h`)wF7Dh_tp*;umkPY5ZyaDkJ8|S?%5lO4Y=pzD
zLbNF~zYLCbMgJ9(^6J#PKf=+21p;k{qO{&dM1L#1u29TnO<V&m$+qjr8{%D@sYrrA
zoz8&HB3Y=;DL6MOLlveR0#Ege$bjfqbZW{31)vnWbF8la^=O6WRV02}A@0*>TOaA^
zQZ-A<OMm2%aOpD);I!s<wLzk!iZg~3rHuwkuR*nf*`d0S;2;UVU@iR{_wy3C2xrJR
zME$J$;OA?NCHnAahEZDQ1<gUC_kRtb;_D}@6d)PP)JNv8akh5H1j}4^b&>$O1g<on
z0dnL_CN}0*Es`bnwB3&6^b-_W>Z;5+tIF`WPk3gsRrw<=spJw=GVAHV!NngnZ=T!}
zLaGPr-Uk67J(Ho+Y>vQ%X^&$s)tbCkaBN4RLh#1cH{#BH@+L9ixAX1&RZt__)@Bxh
z(&LCD@nh<ECGS8EYFpONWaW|7&no?5vqZ?F{PnxX_fq{qbyFLgqqh+U;1Z64)R#Nq
zH-cCwcZ>B)aAn_I{sjyIc=}6H4GGzcHbD1&B8o_V+8d5oP*P7+RZk4;8Y!iTNw@c1
z?LP!uzzr`ePZ5=)g$i-^g*$4J`NAFxoc&0P<z2MHXd9vL&!R+k=khzf<AYec))ERA
z*yAY`k>}`z8|0sMm+X|&wfIji8g`lgTy6T~`XGKH@&B$Wts+R?4f{Hrefo)O31$aa
zXGW`xD%*-Va!2?UH;rh*^b+ZfUErvViqmj-qS#_)cWtMy#={WSitm0R6LXNR#OQ=S
zo5h#RiFWW!gJZB!s=4vWThh>2wvm}ns7B&Q2Z-<o)56-0vqHYvk3xnH0q&DnTt2`0
zTax<iz`m?>yRR|R6WOT0<y{s`1abG^b)#TVsf7+OrOY~EkP&29aWwXN0GBf(navMy
zGh-!t{y8lU?=6SF`P%&)BE?&*XbntxI(SX%P7kB09NJ1l%-Hn5mF%WRqm$zL>u3t`
z*$a)krhz3kCOh;ViNs$f@{C+1o)cQFZ)$;=b<DSM&E!FuRjXyF(f9AXnmPelp#`T6
zkY5FhYn`0X14*5KsA70(SQ<73gT=88BmK{aonlqxi3Hmsba~5}qX@W<iq-dWXGQbF
zs$7-r#9m#F5d~0y9(|1)Gmo>n&7>vfhz{g16-iwN2lwhB3ORe(b}&+4F&mXlz%|Ji
zJOu>ew1}8rZJk}#V?W5@ufuBduGLO36xt#e4P!dOgtVuEny2B+2-&%7!W7@f4&@qc
z?^EQ5`J=T{v<f5%WSL2~`3wuALF)MTl3p|V=!0|3oOJWVij(Nq#-<vEg=m7Iqtcr-
z?e<ROS;~7$RG5>3-`{&|+!K9#(a^w;Ot7QCmG}&~&MUrk<vmlc{1+Z=<zjk-ZUm|c
z#fUl~KLKh*^%rY995Vo=YIiAd757XgB&|g%<W<h67<MuWTLX0DVCH{s<eVO59Yf<0
z(9Ze!njOJ{p+#LlaC6mZ3qTZltSMuwmjZw$_P!O_R^=m&HZb#_c<hz|MZBS|+qe^7
zuuK^w>QvmL`MEANjVjX8{pLJeXZ=Sbt0fe|^*B4{8AuS*J6KAc-ndR(s_3ORM3tKm
zO;Yx2Y8`5V*TvckF8sEf2dQuYJEI})qoHZ1Wo|wnq;>_0MyL^4x1K+zCfAhzRomA`
zz+=Nw5*mfkhI$~RrPo52GL?HI6jLtNQ>HP<-r&WP^+^;pQ(2EVSp|^hl{3-(ckm+z
zEN7iYpS&)&;peuWdZ_&yT{ritfDb?FK#<TyV`8;1$}6awbnteayX-BV4h`&-u%rRu
z)KG6H#B+EOu|rTvf-u9};}g@>JU(Qi+-m*5+vfqSP|Lm4$@$06hSg^Y&vj}!V0rD9
zJTRs*4dX#4ECc|EWy1{bNelxjxDxTE|Hg!_6-3y%<JKqvhp^6GRrBGSXzF&7pKsP#
zw(mn>h$YH?QHq%v@u_E9p8cI#qJWP3wR^45&H{hf@g|B!y2`j?CU0NHsW49xecf9r
zmVJ|H<bJ8j0d_0Bkze{WfUdzX1%Yn{p)k(4Q52Hik>9`xDqa1Tau)n1UC-d?Jn1c7
zVxS9!-Kuj{;M?36J}r+fPVa{RwER8}DTL|e_rS)4#7xuFSD=WlG$f`!09@Z1q)O6f
zjEVS1`Byt6{S<3=KfqWYP2hp*p3M)H(%5+nRM{V(TBrDL#71@09rS`9=+{VSOGU9R
z6oK;~%7p;dc7(vEgXmuBE1^BQPaNt50My3lxT}dSHhQrjaLU1JZjI>KFeUI0r&nHl
z;$8(VJyB(QlR9OBv+p8)p2ja_!)2gue)A5#v!JP0DY1wa$zzSzUPm~T`Y6QFe9*Zp
zb~J&_1Dym&P9OUbmV=z&w}OU>tV1YF?l(NFba;z8VVoe5$-FD7L4-zjLLssneGjL^
zq7tdr->tY=QESXM_XkO6Wx@vrBJ)Ao-9{hO=B!|m>PQX9Ls@B&Op{ggw^bSmtgIj-
zUBk{Pnn-_!i`Wld4po&g7Qfi=$3QEnqm0}5i-D)bB1x~qgQUO;1^AiL9upwErGeh)
z0xt^Nu)(<LBBaJVj2!qTsTZ+U_R|Y)VzqzhwIP&;YfzF%T=Y$f8H2ZO4ifmE<-<9w
z!h?7Z!2uJzCe}-2@P2}H%H#FR$0ItqTbj8_7iM5kV!@`+={3OV80#3PclNwVI+5w!
z6O;3fwkSPd0=J)2j^&`dv*F3gzXv}s@9KE^erj~~c--pCr1&GfEjNt9s^Nv^4*+z_
zT$`CX=I;V+o83UZ-(cp&pR+|44rr7^Cg%dn<<I{!7%z~c>3MM*=gopFN6(=uT}aje
z`+P?AFPY_?v=<2UIau>7fj|2(lw;67)B=2UuRF$ODwvBk<KP4j>k@{z%+0zKR$Mz3
z1<uClrYX*<@2C~uBoft3ZZ#KHO<yRx^NsC8sATLfMRKMc$Mh*Y>VQAyE5IcTJl=L9
zc0gfUw)}G%wLGWZTV%CylzttvV`h1d4<Zhr2HM-<F@dz0(0jeM1`%7N=5ZD$^1ml<
z>_6ts$}>PFOYRVV@hnR*(1L%}Aeu#p5!vv)bBrqmo-tALG0Zr6m&5?mCZ%4=1|Cqj
zr>C-32+>P6>g|1^@U<RqLhpcMr~=64rH7OXAg}-&3vg7`5TSKm3G$RzU@dXJ$~$C_
zuUHn1xF%j$eVs*zm?dSTelfQ*;0~jogeNe}jPuB8Hs}~YBW~*mQVtjSFbIcS1+e;b
zO^JN%)ADj55!-(-Y`~#06I#_$sVR!AS(*=L?fAj<=T+CZk7aHpJM37a!qg~DmaHSE
z)8e~VgStboQ}B*e0@&XQ(nQapWd&7ke)W6ikjR@iL`lb#6@RLP-IQhAah}$JZMj#g
z^fWpo&cdg=1r7Tm`bFKc9tknk_8NLUC~S!-NJV3_&}<T>#r^Ae%*ofp^V#;I_k$SR
zwRZCV*|n`K+(fw#I+?-jD{qEhH8vS-Q3cEQ7Fq~Jbqs(%QKb+}Righ#OJKpL9$~?F
zfWNET@zW<viSZv$*8w9MTN<vx_?~*ks;rp%^0=}mbXlqLNmF!E#^;FILq~fJSTyBk
z1*$(1^HO(J)7OrMDW*9P{kW+o*^??ZB31&<?i6}x#973YCV-`7%4=oM_9x~X9b%Z>
zpLfzzlUTYgf<H{-T56T~7xW2w>MwKK(6-Uga*VsyC}<>)<m(q1R**p~7YPPAD1xjC
z9Mjk<Sx7|T6<2u|M>tT=BEH88@jS@1ct6hvvhgjIM`X$7E*2K+!U<NbCH6HTzU@8r
z!7YXNnx0w{JO)gA7JKpMBuW-pH77cN4C9ul+^wz)kVSNJcM~hLeIZq$4HWkzUIW;f
zjsO9+!PGQ_%NfOk8M~pomBBYE<zEi=%2u?F92GqNY!Tbq!uwPk!gNFg^x}M%dqv}S
zgskT$nZxe!NqxvB=CqHTI)cqzqUOpRZ9Eo`)FLMx6ACMI**7c-oksUI%NIUkS2LTB
z4@i6#`-uT{Q<UaL?wOl{&+=efJ%PXdlt4vB7@9XRxSG^f;#-JVdT#|b8Xf$XA{@1s
zQhmsFbPA$J0B5Okunfr*hAnrE7HDQ{24v^bJS9>2?Z8vC1tgLLmQ=#Fett*{B1h!u
zuiA)8*1TQrn^HMvf_{VDy#xb#5kP6JAQ|?NV^qMCehL5O8(HnH1e9RuR#A%_`L2UB
z-(HbZQ4VjhPw8TX5*mNb5P6F=r2$ewxKg?1;A^iJkHDR(cZZcs(PpWp?3<(oZ7!|O
z@{9g(--YdbkcEH$^>aPa>fpvWVYtK9L4-w0uQv)GsStCW-H4O7sZt&Xv6W^r9S1@X
zoA)4uOsWK`*goKTK-dl7vFHH{N>kG`5E)|%8H~9+;W}LP-ku>a_<?Bqcou}#HyTvC
zvPVy!pU%L4OUN0MbVla{1#?pP;6xSVpEwM}`k!#m-UdJsp5@VD-R&IDu1=<>Bl-U+
z;#yqaG~Imo)G(yup|4MAxQ0}RJPu-MDT||a)VL^@QK}d&WOmOYz;W_s1U0ZuAlDnP
zaK-%-Xn^GAf)sL+Pi9G!fdhn_Vy}-rGPIm$9^6eH&d9JqnGKP7Y`j;X*ahPPRMWj~
ze#TZ@@C=(*Ft&hUhZL%qJ3ae_AKJzGV!%RvdRfQTpi`9V;Iy*HFR*WPjRo4&Q)bRM
zqN3PIPX5WZI-XH6ye?|5tvehfBJO=8;G6`P)KiMf1i;^gExnnb`{}?C-7J`yDG5{y
zh_y+x?wwYXrqIXx!OWk4U)Z><u%;d=m}YV12VmG==$SDUw%VY*l{`Zx!V;!{Nn3|L
zcyJ8O+eX=o;&oV;_eQa9`b_k0OAVfISqhD>NpT{?lqL5O>6@jn0(Ab-uI<e;C075D
zENrdt&|hX<KSg60!?mN!1H^%BM$ffpbC3{E>6`eI5YHTUmoiRQoXXybE8FQe*`f=j
z7V$eB?vtZn67x^yW?64XjRk?{H2s4`$tz_<sKizR$A6QsbErCi$eR%uzD9aSWc)5?
zCc2)G5AK7~^&A2I>pjKXhDb{AA$BSRe^!37-q6n}gvmIgx<vOnUb0|#nEyQSL%`FH
zc@9oqp(tZr8X?_LT__Cp$p>d3cw+f39<5JwIAR}bC<=J277VGXQ6a#b-hBbds4?Bu
zx&01<1j&3nHeM*6MRjGqB$S9(xRFv9+1bQ2Ssp*Y_jjH%YiU>>`jKCia4v|*e=^+$
zvcIg`IZDlV31_#%;F=d%+jiGi-~!KqQloE-x5*YwmL@p_J;p=%4PEHLyBcAGbB!u3
zGUgPFu9HP8xn=uVsznth&lald<!WkNIoPgr%XH0ezjjA_ZN+2}S7dc}xaIR@Sp&c$
z#pAoJAXgb%-sP7LJOL2I1tK8yJ6&joRJ4h%lXq|H=l5`hNKM3_;C`l6$L5lt@GN?@
z=^>TB^mto==OeYEDsrf<-#w|U0c8{lhDe$clzljzi}Oc%tNUk?nl~0;n*Z%_ON#gi
zQT4yKo2H)XerDy<<;3(8mRni@2Yem2yAlhZ?HG^=_Z)m?aR*bG&Q>(V@|0X42t&a?
zds*f4Z!iWx2-{M3OxkNY0uiszHXGM0H{HqY<l)pbwY%i_0*LGZC5|1FU64G5=~x6m
z2-QxU;?M16RAa1!AIUZ@c8)UK&@OTX-AP?ffYzviJ^Wi1vrlYm2}(RuydeA)8Biia
zBkC-+kyjxg{l3MP`-l2rynt?S^;hi%YC^Dp=Nz*C5MH(T@9ze)ERlwE94K0EwLzJe
z9ZP<;Xw6^5(+sR^I-!(W$y*A4k*xb_g9&7NgLkph`&U3@;sd{Ixy`@)^(NpC@(T#_
z@{-g+Ogms=z6_nq(u6O%CU9HQ<V93MU&)Sm8Y|RyVckYM2XFl{#J~gWk^liRN_3rk
z%1yPa&0ftOkJ%NPB8R|l{|jtI$99}IdOA(iGUp1APW+IT6JYVUc)lZ=q`*r|tiJrO
z@_4U{?^=rQ)2@*>Vl#oDkdX_1(=5@_pbiWGbt!N{zKsE`kE^46L{Rr~!Py3wW~#=t
z9`>s1W=l4~xZSmiZ7f~BA`Gs<J!Lm(dk4rw3#b|ypHj`nom%cBDWr=5U4mvD!}gLP
zk)c|XaJ;o{L8^i&e?4R7`2;iY%1oSTGOtJAJ{%plz(;be3UmpCZyv6`KT()iF|UZ8
zkDr<am8T-8o8esIW>_AO_-Qv3Ec0D8PZ%Ev>-|M|z3X2vwk4}$p7>SA&SPZ^j}vv#
zKc>&TiJOnLrbvg}_PK|93-NW)`MHPK4y!%#NLE;4+lbB_1pP$fVQPzoE)quzl2$st
zk0T|@XOL7toLEFTk|nZ0Vgsc019JnG=2-Uc8r)&9Rt*ji<VB{l_hD9GZW2m~blMC7
zep6J{@K*`)xOm4RUuoMQM{CE48Mj?&9>}DPAA1A!uo%UxA{(e@UjEf(B+4hL#7O2s
zJTAqe4Q00jGe5fHx_%HsI#Gqt#>ysABUq0gxZjUL&lF5+52_rV`~C`f9emkdtKvGG
zYczsV<WA2@mg1?<@JwI5AutXQB2!>VQ%bBTZT)3m_t??3*~rE9_ag-rP6yT3cGvNx
zarp!(p`%<K-q_GWsL!XdUs>hT@%l*Udi$*|#|@ngzef?~2j9)iYT?m79mEa3d)7~w
z;sGf|9)xft&2V<+>LgK5Iaajuqjukl7lO#(M1p(LyxZ6N8L#K7KcjK#=uai+vKsN4
z45>gOT5guHwxHx6Mg6P;Z4X$lpByFKd1feg>p~fyy^NdcuK-EJY8r;kmps^dmuCG?
z_?u(-x~A$PPdX@IctQkd?+01}y{2+cq@`<w>4Cfv445Ppnc_@>qyGgG$@eozuIGr<
z9(=T}g-va_vV35Qqc)V9C0k0I+mPztOn&Rsa#VQZOdAL1eJ((Z1Z8BO`(Mb8nuYTZ
zkHDUJ(&yF`RXjeHSlGFM^Q-v!8-tiaoaEyTy1;Z<KWzd}XlyWIQZU73zfAAXu&@Gv
zr~w5umxoQ3<WT>UxMqdkY``MZFL`JOp*q5dCRawDJ`f)^WsWf6-wrOTxzr_G18+&+
z2!4NF_<X^4h75FV+;2je4vO`+I7VX^6nIp~<x0GgWVvHE{`MQTZrC4T`pmGx@j0To
z)QBVgj#6Olmgwqsk*FLuCs=(ZSHHe?ns@8qReNZe`hjXu!4l;d#n-}lLY3>ubkG>2
zUP{Qp54gtQlz1m=fr;Dr74!zo5689FJ)z7Asv!Nd5AE7~-VzuYRG&8=NEnSX<^5j~
zT%mY;4fXuP=YdCZoD|2?gKAbT2T%4StENq`jl49ZUuX8Rqe~dJ1VA0dm5+XCD~;RG
z!4`Jcip2xGMJ4IzTulD{1enl5Zng;N;Lz|OGrmCf;hw#ok^6O1I$sCaup)YA+};I8
z;mQDU?%6S}rZvC5hXtCJf4gNwcxdX(B0X*feh+5`3-b8S&r?OQB`K3>4OGUJCgog@
zadVXrnW?7SgK%&?OQlv&s)KNUkehpekL)>x@KmOl1=E?MEIYg<F7A{Yb2lE#N^GZR
zhV*#dOh9Tw1|XtF6gw#FL?q}%ExFYDvWrZmhv4SeK#!80t%FjI=?@O)&HGz*lqzpf
zND<N3!M*`s0j~2gy!aKH?ASB{$>=!!Ze8l2gAH;wSXJ3l+eeSA8QZY~HK&>$Z}}kl
z14yr7Ek1v)^O}89nq?+(7xkeZgp@xD>=i_-4_f}Mai25b&zZ=3CYSG~>iC39gQFAj
zLTO$gAxc^RtJw#nh<=iy@mn(XL)%2_N`lIv#-dIf&5?0hl%MlF8Iz>?iHVExD&Nvf
zchS3F@#YL<)x`#OOes2qs1Lxs?7u<fX9a#1g_yn!d5EMO7+HH#H&6^EulzjN!W$5K
zjBY+B^1LXK`;bSdsX9&fC^fCxy}!0e4R3BDTNSLtQv=cMfR_P`%06$oU-Y78D5*Lx
zlyckvEuccP?po49z{Ics0Zpm{ss1oe-k4s(eJI$K`6Kxl6jC_ML;!Ta<tdh`h<mf_
z$6f+EwNBPchB?2^(@`t(OXnk+Pw?K=P!54YJAjiGdcwsAk%pRyRON;HLRNyk@`=&2
zGtpXp7g2+C0d6V#)h0V_X!R%{F;K*4hOm+(r8yvQ@@WECHLez6Zy;E{XxO=__zwwm
z5u+i7QwK1CmUa3x+@|Km6SWVL(0t*-jBJHnXR&0F+D$FB{^G34$upoNn;XE|K0il%
zessC;cQjwcl-Wt?Y+@jn5j-WC{9Q}N0fv8%u2p6~_@psbD(eJk9bw^&yq99qP{h<l
zk(Hy~vV2Y_&=|kk+3A6xy8nY|$dY$_tW_hx>k@;Zb1R)V*Cl<&SM0?n?{4R9ORQc2
zpoX1&8wNR#NLBdeCUvDTY~fG)j}%-h$c&02xJI#p{4f!K%k3z}_IBU|-pOxw3=(k$
z{ZjZAhfT`o%tg}ImY8McAfD3h%YvtIDtScZpV8GJVWrJZ`KG^NLC(C5QydnbIwaAJ
z%2Q4-Z7uvzNeS&7&;B9<2j9tw5r_&=q~x|)kcRkwg=7DuD^Z>;XKBey+jvrUG(|^%
zMk3h!v<X`-UI03AOMW@;nTR*fq;s$!En+P;(9uV2TLeO)SkOy$vf0}YaZsNr99qGB
zPS)BCeB9SBGUcTtch-yW&1Bi70Mfh0McF`mB<0J1se01i=0vFEkCg@#dL=9foKmmP
zM{f*kEE*K5hh%~vuY_l^b+HxtD#Lc!N=PSAn!ZogSDP}Esnrk;Ypq-SIcc)RR=I8I
z*t!2g;rFMZkr!Uedtm(Y)u#7K)qB;$ay-zOV}uNX6l%E985O<;37LP@#Ogu1e5M}8
zLGg<82OcyR=o34d^>k_B#>a`e1=b#t1U?w*^ao_?5UBO(<D-}<7R{Q;V#)&t;ml!s
zasst5dR5>Q|7KyD$11DGO+|Aj5|*Q0bVkf)(E_KIn5FIB(ez<QwToF5^T@8+b|>?-
zk7&+Z>%K0R&&+s5)BW~S%5NE3eqEf_rVzL!haW5e-5_6FN}h4esl$VmeJxC7Udpff
z3oBV-I{1O9S5B+oq29QI+&Tuw*+HEuP}~(PnrS2@+yq@r6u#VLnX0=L;nX;A_WW-&
zz9LRYkbij(A5RdZy2EbV`m1J%)MK1{%Uqb|cxc~Zc+sx!Eq_#D##-AK^0t+5R<^Nb
zHnVkLIbiDouiN~!1wDKinC8^f)m?*yddx<7f6|BDS3wk;kX0wHO$1nH+b1a52l@b5
zj-S-RKnvPMwQSJ%ONL0kJ**&p!P3-6Zp3%M3v>t+!Zl&FV$t;ex~VPlVntgVm=sOs
z!uFVv%0cn}Y7CM^;H>oxiVQp;DQ7%4Oo(6+)@KK0dw#1oK<icJv*?;Uc(|-l$zgN%
zUwA1feP3Nov)g-7kn3EN9-qkjN`_Nju+DLNp7n|MhIcugZ|?Y$F8oZX5x6ME!_STp
zvUaF(_Q81gqK5>vcvf#==RNRr4|t&r{lHCuJV>sCmKDN9luunGPSWoQKo^;v2iSS!
zm}4jj#gXubwuyh>Cb$y35ap`lksb!bf=2DB9aTRho7S=F9154*{CNpZC&5fF*2{c^
zi|p}p4DB})Qs}OdB`U$+po}7lIL1~CSz+-MrarjNRhDWq>QGvW4x<Zo&h&mGBtoGG
zqS+m;6M%;ZBb>I1Vwp-Mz#F7&*v*G?f1*7qBU*b>F|cP3n0;TeV0-gD*f1*0r5OTU
z!gDPhwxT7P>ZSt%e&uSL9j<K2CW5WZXgTTPf6oAnHV<Dn&ITo0?f?OJ7Ht!-VdgF^
z1kMjxx)Dk@1?nS&#tR4mJwN~qDm_ms^q8&ErtH9pW1WQFW!2LhZ^C;GOZWzz=JNx|
z693Ey#O1cV*X$qjN2fqjun@?N2e-nT+?BnYngPHQm~zg%PC>&U6K^@q>bV;3*ljf*
z<QiVV<anjG4f&-(Y&^GWTa7KHg5fzytJx<+)piFUfY3QjQy(0cMIuUCnMF0Ve#5W=
zHA&Up<gFE^@2*gky+E<?*8%gT3-$dl^rB6R!;<lP5{9yOW|y#E>nz9f1yx~&>rLiB
zWFE)uK{Na)|7|JIibJM_;@CRk(eP{{%D9@6RE3qpi+`k03gRdN5U{;v;ZOBc)}PlI
z-*6GZg>BXi$0-q>Pk>FE$FF;p%u<APdv3?{e!R(Vgo6#$vU;0(l=P%c{!aJ(S&&-6
zV6;NxM)<?iH04F2wVvc*P@aQ&`H-|Qdtz$RltT(F`5h|)_n4j4YT8pj>Zf2N2Yo9o
zy=C+2Gh=8TP`0!Pq4@Z4RXzra(vHJrWDcTc!WEYig&k*yE<prD-J;~KPg)OZXx~EZ
z!;^TgqeQ6@1=;yC>*ue|YxSLPFl&!Zm~6*7NI!OY`-_P)e<+c`LBzH%FIR7qRzdCu
zrA4bt8zMiuxh3@U3s8;lu~>n-flxJ$lfh7VC6*Hd_}l(1UI7Zm`-vxn&X|5JDyCE_
zVTj)xb`y;^q0+jI=8TMa0{LE++%3Z3+1EttAg~r$lmKM!b=aI&z!^v5<Z{`6I3Wk#
z#Sz}|lkRGnMq(sk7dm;!vz>~$!OhxCYr1$<&UQ`Bd&CR;SaQLzOeX&dv^<l+Nr1KF
zvcnKnv0BVdI!$@n`LDSAl^m6UvnuSY5@+zhBVCZ(Agf(pJo!E%J#lz$x_(*M3{EFb
zk)S#Rz~ML~HZvUR<4VFTV`ByM0~dO+Qw~7=J0>c%3KD*RS6B0PoN*J(QRzB{P!*9~
zXXpS~f;+5@Un6;_tK!IRooQ(R8c~2VW6-d){m}5t0)wzgi|HFoxHVmQp$T}1y%5lC
z_RN5ujb|18&dT_2wMHC>R~*&%9<0P6CCW%$lshTXDE+ZlkQk7_ePa+MczdzqG6oP!
z<+GvY1tg3f%M@JHBwm(~1rL%xeK=ju0DzJI;{xWqsn<Zjk3znO0V<qzxd*)66kxll
zQtQF9#Fc)fuu{qFOw(eRR%H`u`2+riUKm?#aWL*j?k}k7t_i;e%ib*^TTNYY^6k?-
zpeNxEgnALu^N~Ul^w__Yl@Ka9jXnuAOd(4<Y3Y9^>Po2k%nw+cp+=&363GEq3BIR-
zv}(3W4&Rf@<n`+(gPS%?3S!*T-DeOPr0-FeaR^x$?VB*YF%jvYV{!(j3S-s+qlN_$
zAy}~cvto=uZWnNp+1X2Pgl?O3xk%Xqh>(HcZ$ypi&m0*ItJU?_{=9x!w<F{MrVLb`
zgBNcSVd(PN0jDPrF9DeWsbQgXRd4;f6~4gkfx0CmM;Ld5I}*!%GkgR;j+nIGv>jMh
zF!;)6JhDg4HhZWUt^xs|-baRIvWd32PX=i<8@ngeE4L|I8sbq55epjJ2$Gs}$6|od
z4PNxy6#^;up#kjm4^Oju#x24fHQfr?C(cU&m$gMZ#bv%_?9&4IX~B>S#s9sJfuqB|
zd#GFN{3F&nZQFESt*28GC~iBwTV(czUxHc4NUe8y-KGncOBK}d{B2Vx^_7*24zhbp
zz*EXa4_zffuW8gpBIuk}BtQqgl$J@LC7z&-*|vohXCmNCFr+vp<N_eXr%=ZU5dMVH
z3rrV5j@%_Sh9j{Q>WD3zI*L@F8iEZhyHj#D0I&7p0J_5{r;o0)Br6np;6G;r&hw^7
z!?Z)MnWGy?2xx^bfDNg(^@!5|Ik8~7r1X+DDYICi0HcWaL{fqD^}`~knb`Dz0pQ$x
z;D7)CNnngZAUMWu)BhVGOvs=@3qFq2p2g(Po%Wxq#D{Ut?*6+hv5A_KxPa7Qwo8+b
zJ|O^1mpA}I3yn<#mV>_3>vtkM2Bm|o0Q4MSw>dQF&#-1)`b(HZ3T#q&p?2++s<SN=
zTqfuw%e~}IwRIt}gfw)$F1$idNb$D?=mj2gr9okHWGQR>0nQao;YpXhrm)RIb2p_;
zLhHA7J?e9>Mfq(-O1p81hw14AvC6lvpm|exWvE*r9y9PW0dWTTA3dR0ohK-4`G8Iy
zY;PQkRhgskIFa2jKg=GVHYoJaHq_?yI*zTI>XUIj7hXnsiF}bUcF;sCqrH*5St{Yr
zvsT~TMQiIR`Uf=_u7J`{bwk3j0sIt<zlZJNYAnxDiAZpSegUDwM=XL^Hqy2dgMAsE
zBYq<y6=+d$>{gj{Wjz;GX(<H3(YB4dr@vpn9qPNK|KZ-L4Lam4P;r+5d;UPf3eCP2
ze-q>?4L05s^o@kztr_&IBMl^qulhT5=rO$c$a2z+7w2=o89LEWNt$l!^3{cMH5+tJ
z<QE0dz<LMG1Jcr>nD=r9a@}8s2<~$&9(1j+r{A?2E12&6y15V|7u&LDq(UAPQyzM&
z+_|%6dqe~%h%D+xKtfkqp+sc+_$oT5476Y7J!Zg3Mmy&Z$0iT@%974&A6-?b44v5#
zFw||X{1h6uDtah&#2kgn|EkfXfTo!BukNbt3ftnQl8j#?P!L=vo`HO-q3uR^V1bpG
zb4nx^K_V;a{V>QKM>3UWiGL3BFs@`+RVZC4(@v9eMrr>*MLAeA&|%feMr}6rD|J6^
zjyZq<rI||{`RdkNWhn*!r&%7VoxZ!U^y#UFsCh>QE7Pj4V!!%w&##EL<BTHANdVh{
z^(3Bqfn{G&DwUcioeqg`8#<gn%z9vN=NHj-Jym4edez!8ab()!tvq6=6|PE<>`M53
zBLi%sAagYs8&cPu4O*#b#khZ<EvdwqAWCBx*ummhSPaHo`rvQ3b=`;$CF>e;yB~t)
zI+_x2V+RiwO<TjNR=Q!p;@!G&*xfE6`m(F+NJ@=lkytQ;y@x4QaWG{+W}FG=yJx&)
z#nIqujt9|MUs)S*9wdE`nP2;qnvr1&n8+SQUNaD@dSY82BGyH{eNW%=1eiZ6LcGI@
zBrBTRpM=<bDjfsQe)D~0_Ocxhs%-G`kdEg54(NV|BTXtUiC3@3DfWOUkaVOtwh+7s
z4}h=37if5%|7Y~H48Fs%RgdPxE|j|4U4R^yGA3<cEZY_;&?2tec3qGjCqgY4wm8*D
zR@q=DNi570)FSz&_p3my`83S3u(EFR_*Y|dw;La1Iqna=;8+uQkv6l@Lh(odbY^Kf
z6!d=>hjmT7=|kOq=RjoPT(Ep1P`1v+Rs@JpKlg{0_Uxf}ugwMCFzFS)dD?7Lh)+Ta
zkJ#OH7HM{x0AltX)}QA=ST2QK)k@nr?==TC{-FU84({>VmRXIYNi+-Fu^WEvNA?)Q
z$*HtX-kF$RUlS5;T{jtJG9gYd3U-mqK;~7`a4Y3YrB=6GEldjk#`ogPz(-4CWd!mu
zdIOjVAu`*$+6QdpY;rkk6FI1>FYXA$ht$n|xW7Y+G8-dOzlm})wdETug<Vc>!nXPS
zF{@8Er%kL4-{Nvfo?8h*Y60Y8dj6z<w-5pd)mT-bE+jr2Ed&`RT;VoP{h3~_qa1bE
zV*P;bi}Mm`r?DCH<a<|)U62`LZU?e>-+VpXBmQvQLs0+62!&p>`5`UU#bw@NK6V5S
zy9ApXP%@~Lj-@hySx0}3kc?RguI9$K2i}7TVsg!ZwzGhFrvOEG(uia~`khU^>H#cX
zgeQGKrCr^d*iG)REdLpr>@=pD?7p5`PlsWkOWXlzKP{4w_eCq|54rY8Dx)4U!I^Ge
z9YEi>X>$m5`hF<GPu`A<u<mD@C?B)<>v-}7gmw-5PmC9ifRs~FQLFxzxR(rMUzk6f
z8uOrhqP?rvQ<h}RSg|q|2JO65Y2{n-)kluv=sl-19t+m;AGJ9_DF~i0T+w!+nvO`N
z6@pYaMX-hN=a-B#yz9Ms%Y!`=(vhdVaeD;F7c?WH+<Zei42W+j%NQmUn%lzC3u)2F
zSf<K*&s8~zz6he!H^gVo6~f48MsPkR)_S`Ki#DgGEPcKdIIR)IyC&?|-=4sBR<o&T
zKM<Ii_u7CM-X?|`H^3a-`_k$rnP#1`KnbQt)I|<iT%rH`X=Ng0H(DDldZBuHAFMR#
zVL-|Ood5TP`u6I9)tzRP0vQ=`b`JPm9fn>{R}<EB7NM-t%jSlf96~tb6#C2lQUWQG
zjE{%)8B-Hg38<i2Z)CJu0MX>Rf1F=K;@liQ9^}|o%J@!ZU?0i$$-xA}oMmu&!@-3v
z=))lpsc%fG1yiL?T8Ti^NwG4%L-4>y^(w6fRbH3XQ`wNnot<rfZ`*sU*#`R4Z(`~Y
zC?mn4Q5AEwTG}_=S$ixOJ{>kw1k-VWE26Ndn2XtTD%6fu;uyW7*f+!!$#aZ(;^vX?
zuBE=m_h$;c1Ww@nxb3OG?FF`*JV(o@ilydA_B0~V;yG5YsAR~xq9kLie~aY=ZFjSB
z9{&X&R=7VwL<zZKe&s6Vv&c-&AIBs^DUiBr&>n9<mhU6?&(NS*g7SHskn8*SUu(kL
zw`J%avI&h6#%~oA3sCV)<SbwEx?CSOMa__%M#C{`!9aq26bpbkahbb_(WjuMqybu<
z*BbaZRJB95DK+kc=0!RQGE9cMH(`(DV_zdLB=aJuRscUeOI99hJKjlU(!DOd0*{GO
zdi}QUD>7*&U#_l53FGn8^bv#*Od|g5+xQ?03>D#cFYc0&Sncze&0(LQIZi6^XkHMo
z3ESg3Qyl84+uH4dJ4(zcP9$bX@*|yX%)Rc47%TT3$l{*0XfL~mvphd$h7_Ph=6XP3
zyGLcUoR8L#9Nq*J{6pZcgJnX<R;i1*-@k2EZFaT2J+rFC_+2C*Xfl4hEN7-0lN3eu
z&z)-?e-4;@d&z5XlC%iW&v}Zi>wGA8+w<b#>>WOX;>AKLJO|+(C&HkKm_!l~sjxth
z>mVs-$(U+E>M*NP!mk3t_z8bzEI6V2@7P}jVKd^Ww={Ip;q;u%@#=BkyoK|@8=J{^
zfh;6JijjtEs<6?!K7|PpIU1>zuXovlTj%1uP_Nhml#gU=p3k``tvKUTst&P5sIT>8
zcY|me2isml?eEaNcey!GSy}^~T=B@SSiOC}7{5Yuwjz4BY#Zws9wPap>DW`T;+1gJ
zRX^btNJztb;HpnZVX<ps+9p^W(oj^+<*brxuX8k%ZVkkuqWMoY;!L1~Q$)$qq#Mf^
zZO+my&r*Ube2Ae@RtouH-9>eWDAi9yAq$z$I3n4#E?++ioCJ1ie<|hv+@wuUh4r2U
zIn2u)Dds}}w<z~kWS2pGtg(3;436M%)0`50j2J9Dgf3%%GeS%oE7SA{l3CM7)h3F@
z0Kqwa2HYd|2`tv6+Z<><xxRA3LG!6f^SJrTKSJ^|tV^O7v2%MlfRySQt?CjWgt&VS
zcYFSJ5z5X&DcoQZhC8`)voXgy{||5D&4MA+zA0jOd=Lm6v$0wpx)}()m`F$fN2J?r
zGsQW<H}`<p>LAiRz?u7|lx%J)fu*LO$MJ%UMkUn}eu6ndURl-@n)9z$ByAWg#vf$}
zxY9~H+%UvUU~WB}W}d0Ht6;NbcmFf&a%=6euJcA&19zv5sTgO8biUx>?F&4;s}&fJ
zPXbO#7g?kI5{V&mzh_m$F!^7KSB8<er;_brq(GmZF?r>xLRy%ljKtP+)2fzv6-sJr
zkNGh*<oniq>{&>);NTv^GFK?oi`K7f@>JgblHKj}VfqJ0*dBSAK6n{&gMeA0K^&g;
zERxr@`5df7m}aZmANdndMGI4n^)iX_E!;stb1zC(zO2d46l*X{LOsP1;R6lvA(?0Z
zQH;S%vqsQ(K*wd%Pf3PP<D3olBH*zxmm@M58JONs8PxutkZP3MG10B6fkKz;3x7@z
z8IFQ@g@@?8v5P#rwkmr*mPz1$8`zFVDFw=Dx0Om?+6n1ZhgAl%Gr{)sa!iB=z*W{~
z_}a!O?Z(~1pa__A16zUUYQm;AQE1%8O|uf>C)3lD=-0JD<^Q$^uER98e36iWpN2g=
z9sK+IcM8iZSJMDl@!Jyxz8Z|~CY<Zp*=-Lr>A4NXw0>S=hgkesJ-3nZRF426<G2y(
zJXwZ&ox)57khr=$$|m*kX#u)ofaoXVz(SCIj+?p3%97ayCiVcW3j;w0R%<$S`)0Ml
zG;WTy6am~Q4=S031nKIa;1pQp8`qxwBA}Bxyo#2vjzy?RUf&~qc<_RUSwX4f%&R7V
zhcC+v^m>NuD<2lzxst&M3WpdjimXs^ZNVcLQ~p?Qbu*<UM6&1Y%5oiR0ql;ki(eH!
z`w%|fwcVbV>sS~ngbUR9Xk-bVqoR>2Yc7ZBm~H8gFi9rt=Yj~GF)UwQA^#5TxJCd1
zC>LEXztr|82?Xc#N}K@<Y8kp9QlDyE8f;EISQ2~P0&V>Q=II!;c7*j5bQSQ$0p^t4
zcThLV?8iU=grK*0B1h55L`J{|BMJ{CEm3(Ce;v&DuA#k}tGQN%h)aRLc<QwCBr*g(
ze2^po4rO<3m8$8t+VBo~>O4hTxtcPMF&V(pj8Wfkw4DH-=^)#D4rjeE`unEAp}&$u
zJ#r2C;^gR;WYx2-Rf~?k9r!tr;sP#1qFb@=?J=|$_lmM%BU)#^%wh)P`y(<I0#>B`
z4~v+1;7g1XI)f6qUhLwysYgr?MQ{SY#cLaI(Gw4C1pgUmyw^|_qL~Aj@Xk3+&a3UF
zMHWt}CrMf@1V%M!l1}@*#kt6}VEu+NfGh(VrFDLltd>)ubUdFNA~@enp&xZmZ4mff
ze-cj($bm0rjYqhUc_2`wO`F`pg^$q13s;sMKvP{Tul4{y*G0IW?D{cTuK>NfITw64
zpv}qiIG&VAM$LQ^=1@AolaPd-UPIqU7cIGPO2|dcOUhUxYWCua;E09T*7KGh(?M~x
z9SI0J@9Ut~bv*oy!Q(3tTz-)+>8Sy+$W`sh(tH<mndfd)O52INAj*=TvW9(IzZ~zi
z0~EP4YSivZ<y1E8QZ*V&vysTd#3ZOJnXOsVm4u;r8nKxj+ss>f^plx^K8U!0YeCgt
zP%dLzYt`?^mn(#}V0+<gnV_3vn@ugEy^%;LUqmiy_kI!b&?C*qJhyC$6nGcA8g`*L
zA{8}o_|OpGnr34*eQH&s-R#NqN4n8}akve@$3fry{<~&WL6+L=2Fpk3N*@|R;XwX&
z%q-Nl)2xz~hSB7?`TLqAj(Ao%#+0=%s*bO2o2Yi^!Ws)!XVM*?EOHv(UzRvFuX4n$
zxClAD3<@5SV=0=>X1Qsu?IVlSv=_?nH{+ksn!Y^A6eVV(h9wGB_sv!z(Dmt|i%n{r
z%GAI;yDn=d_EXLZRPW<CYw(D|M4xKH4I5v_hrG&;=<E07<Y(^K=lr>CnyA0uygw=)
zxP>lWBc+Fx`Ay4c*u1_^y}cdKjbuV3Ym{dH*G<j^aYNp$FKKFBPTj9BO!L_ZY)N6I
z`vw7vx?$7iivZiSJR^6Z_F%jcP`7-q^SkYH^$NU)ag*fz22m{}_5(ZHq4Eys5pEpc
zIC0~di$rdOPmfjE=~~#m@-JDb`ztuy<AF!Cg)4Mno4+8Hxw!zo!D?Zr&@rtcWn&;p
zq44x6m*t75N5*i|98e_Q9{x%!s(#HkLD$wiRkpMZYJ=kma^f^XJ%#l6M_ed2`$Zx<
z%O^%4bYd#1_vov!Au9<w#97LKsOVE8gER8l4515`ok&bcKySbvAc1-zO4AI^Ac{Tf
zPzcNzFrCicE&v77a8T$JdQ%C>pg}6n9af8MZ^8trTZEVZDE!pe!#}~91_yN<6c;2v
zKmn_ig^7!9dxtHYGLgl|Tp6z*002c;Nk*;!002ozDgX!o000I65&;7M0RR910RR91
z8UY0W0RR91RsaA18vz9X0RR91UH||9C;<Zi0RR910ssI2F#!Sq5dZ)HW&i*HX@>*=
z0RR91cmMzZ00000hK2zE=mP)%hK2zE=mP)%aA9d~bS`dXbRab@FfK7O000C40FVa&
z1ONa4FfubR0iXi_0RR91|Nj600-yu{0RR91fCm5o1E2%|0RR91I0OIy00000a{DN~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/LobbyScreens/janishootout.webp.yml b/Resources/Textures/LobbyScreens/janishootout.webp.yml
new file mode 100644
index 000000000000..dabd6601f786
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/janishootout.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true

From 468728c995f6e760058242d2a20318cfd4727f7d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 8 Jun 2024 23:30:57 +0000
Subject: [PATCH 380/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c9b2aa7b89fe..b7e3286806f1 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: You can now move again if you stop being pulled while in cuffs.
-    type: Fix
-  id: 6204
-  time: '2024-03-22T01:59:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26312
 - author: lzk228
   changes:
   - message: Snoring is now a trait in character preference menu.
@@ -3851,3 +3844,10 @@
   id: 6703
   time: '2024-06-08T23:00:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28603
+- author: Psychpsyo
+  changes:
+  - message: New lobby background art!
+    type: Add
+  id: 6704
+  time: '2024-06-08T23:29:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28724

From 5f91c3f27f2d6d8cb67413d2e85f3fa13a38d89a Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Sat, 8 Jun 2024 19:57:07 -0400
Subject: [PATCH 381/568] Strip markdown from silicon laws before saying them
 (#28596)

---
 Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index 4135490416f7..4e412df85813 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -9,6 +9,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Silicons.Laws.Ui;
 
@@ -27,6 +28,8 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
         var identifier = law.LawIdentifierOverride ?? $"{law.Order}";
         var lawIdentifier = Loc.GetString("laws-ui-law-header", ("id", identifier));
         var lawDescription = Loc.GetString(law.LawString);
+        var lawIdentifierPlaintext = FormattedMessage.RemoveMarkupPermissive(lawIdentifier);
+        var lawDescriptionPlaintext = FormattedMessage.RemoveMarkupPermissive(lawDescription);
 
         LawNumberLabel.SetMarkup(lawIdentifier);
         LawLabel.SetMessage(lawDescription);
@@ -46,7 +49,7 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
 
         localButton.OnPressed += _ =>
         {
-            _chatManager.SendMessage($"{lawIdentifier}: {lawDescription}", ChatSelectChannel.Local);
+            _chatManager.SendMessage($"{lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Local);
         };
 
         LawAnnouncementButtons.AddChild(localButton);
@@ -73,9 +76,9 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
                 switch (radioChannel)
                 {
                     case SharedChatSystem.CommonChannel:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifier}: {lawDescription}", ChatSelectChannel.Radio); break;
+                        _chatManager.SendMessage($"{SharedChatSystem.RadioCommonPrefix} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
                     default:
-                        _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifier}: {lawDescription}", ChatSelectChannel.Radio); break;
+                        _chatManager.SendMessage($"{SharedChatSystem.RadioChannelPrefix}{radioChannelProto.KeyCode} {lawIdentifierPlaintext}: {lawDescriptionPlaintext}", ChatSelectChannel.Radio); break;
                 }
             };
 

From fb1ab6469a443b97e202ed5d6d680f6083171be0 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 9 Jun 2024 02:33:40 +0000
Subject: [PATCH 382/568] saltern update (#28773)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/saltern.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 42315996240a..09df7eeb527e 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -5397,7 +5397,7 @@ entities:
   - uid: 1537
     components:
     - type: Transform
-      pos: 47.5,7.5
+      pos: 46.5,7.5
       parent: 31
 - proto: AnomalyScanner
   entities:
@@ -26748,14 +26748,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,8.5
       parent: 31
-  - uid: 9867
+  - uid: 7105
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -34.5,-0.5
       parent: 31
-    - type: EntityStorage
-      open: True
 - proto: ClosetWallMaintenanceFilledRandom
   entities:
   - uid: 9863
@@ -28341,6 +28339,11 @@ entities:
       parent: 31
 - proto: CrateEngineeringAMEShielding
   entities:
+  - uid: 7464
+    components:
+    - type: Transform
+      pos: 48.5,8.5
+      parent: 31
   - uid: 8990
     components:
     - type: Transform
@@ -61220,6 +61223,13 @@ entities:
     - type: Transform
       pos: 25.5,6.5
       parent: 31
+- proto: VendingMachineCuraDrobe
+  entities:
+  - uid: 9049
+    components:
+    - type: Transform
+      pos: 11.5,-29.5
+      parent: 31
 - proto: VendingMachineDetDrobe
   entities:
   - uid: 5653

From 8d52f6b617757eae801c325fb1f75e14f626a393 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 10 Jun 2024 01:51:02 +1200
Subject: [PATCH 383/568] Fix admin menu objects list (#28787)

---
 .../Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
index 90559707f92c..c8606ca80d5e 100644
--- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
@@ -132,9 +132,7 @@ private void GenerateButton(ListData data, ListContainerButton button)
         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.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(args, data);
         button.AddChild(entry);
     }
 

From ad9d18771e490019716ca94e0cd1b8f38cc9a91a Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 10 Jun 2024 01:53:03 +1200
Subject: [PATCH 384/568] Make `MakeAntag()` log errors instead of throwing
 exceptions (#28771)

Make `MakeAntag()` log errors instead of throw
---
 Content.Server/Antag/AntagSelectionSystem.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 55c66e893341..d2bc26f20d34 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -264,7 +264,7 @@ public bool TryMakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? se
     /// </summary>
     public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? session, AntagSelectionDefinition def, bool ignoreSpawner = false)
     {
-        var antagEnt = (EntityUid?) null;
+        EntityUid? antagEnt = null;
         var isSpawner = false;
 
         if (session != null)
@@ -285,17 +285,16 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
         {
             var getEntEv = new AntagSelectEntityEvent(session, ent);
             RaiseLocalEvent(ent, ref getEntEv, true);
-
-            if (!getEntEv.Handled)
-            {
-                throw new InvalidOperationException($"Attempted to make {session} antagonist in gamerule {ToPrettyString(ent)} but there was no valid entity for player.");
-            }
-
             antagEnt = getEntEv.Entity;
         }
 
         if (antagEnt is not { } player)
+        {
+            Log.Error($"Attempted to make {session} antagonist in gamerule {ToPrettyString(ent)} but there was no valid entity for player.");
+            if (session != null)
+                ent.Comp.SelectedSessions.Remove(session);
             return;
+        }
 
         var getPosEv = new AntagSelectLocationEvent(session, ent);
         RaiseLocalEvent(ent, ref getPosEv, true);
@@ -313,6 +312,8 @@ public void MakeAntag(Entity<AntagSelectionComponent> ent, ICommonSession? sessi
             if (!TryComp<GhostRoleAntagSpawnerComponent>(player, out var spawnerComp))
             {
                 Log.Error($"Antag spawner {player} does not have a GhostRoleAntagSpawnerComponent.");
+                if (session != null)
+                    ent.Comp.SelectedSessions.Remove(session);
                 return;
             }
 

From c549573f7aa6ca2c66f05a3f55f1001bb6791530 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 9 Jun 2024 11:55:21 -0400
Subject: [PATCH 385/568] add default page support for the guidebook (#28772)

---
 .../Guidebook/Controls/GuidebookWindow.xaml.cs | 18 ++++++++++++++++++
 Content.Shared/CCVar/CCVars.cs                 |  6 ++++++
 2 files changed, 24 insertions(+)

diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index f5ee1200cc68..9ff189e79069 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -4,10 +4,12 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using Content.Client.UserInterface.Systems.Info;
+using Content.Shared.CCVar;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 
@@ -16,6 +18,8 @@ namespace Content.Client.Guidebook.Controls;
 [GenerateTypedNameReferences]
 public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
 {
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
     [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
 
@@ -34,6 +38,20 @@ public GuidebookWindow()
         };
     }
 
+    protected override void Opened()
+    {
+        base.Opened();
+
+        var guideProto = _configuration.GetCVar(CCVars.DefaultGuide);
+        if (_prototypeManager.TryIndex<GuideEntryPrototype>(guideProto, out var guideEntry))
+        {
+            if (Tree.Items.FirstOrDefault(x => x.Metadata is GuideEntry entry && entry.Id == guideProto) is { } item)
+                Tree.SetSelectedIndex(item.Index);
+            else
+                ShowGuide(guideEntry);
+        }
+    }
+
     private void OnSelectionChanged(TreeItem? item)
     {
         if (item != null && item.Metadata is GuideEntry entry)
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 43139dc1ca91..a872a3d4e7b2 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -26,6 +26,12 @@ public sealed class CCVars : CVars
         public static readonly CVarDef<string> RulesFile =
             CVarDef.Create("server.rules_file", "DefaultRuleset", CVar.REPLICATED | CVar.SERVER);
 
+        /// <summary>
+        ///     Guide entry that is displayed by default when a guide is opened.
+        /// </summary>
+        public static readonly CVarDef<string> DefaultGuide =
+            CVarDef.Create("server.default_guide", "NewPlayer", CVar.REPLICATED | CVar.SERVER);
+
         /*
          * Ambience
          */

From 346ac44a28dca541139a87ac367bf9d8f9dbc54c Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sun, 9 Jun 2024 12:26:48 -0400
Subject: [PATCH 386/568] Open the guidebook when people with less than an hour
 playing join the round (#28774)

* Open the guidebook when people with less than an hour playing join the round

* Filter for gameplayState

* Fix tests

* tweaks

* saltern update (#28773)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Fix admin menu objects list (#28787)

* Make `MakeAntag()` log errors instead of throwing exceptions (#28771)

Make `MakeAntag()` log errors instead of throw

* add default page support for the guidebook (#28772)

* Probably a better way to handle this

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---
 .../Guidebook/Controls/GuidebookWindow.xaml   |  2 +-
 .../Controls/GuidebookWindow.xaml.cs          | 16 -------------
 .../Guidebook/GuidebookUIController.cs        | 24 ++++++++++++++++---
 Resources/Locale/en-US/guidebook/guides.ftl   |  2 +-
 Resources/Prototypes/Guidebook/station.yml    |  1 -
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
index b52eacfa7226..69534af7f6a3 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -2,7 +2,7 @@
                 xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                SetSize="850 700"
+                SetSize="900 700"
                 MinSize="100 200"
                 Resizable="True"
                 Title="{Loc 'guidebook-window-title'}">
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 9ff189e79069..c904a9c78986 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -18,8 +18,6 @@ namespace Content.Client.Guidebook.Controls;
 [GenerateTypedNameReferences]
 public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
 {
-    [Dependency] private readonly IConfigurationManager _configuration = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
     [Dependency] private readonly DocumentParsingManager _parsingMan = default!;
 
@@ -38,20 +36,6 @@ public GuidebookWindow()
         };
     }
 
-    protected override void Opened()
-    {
-        base.Opened();
-
-        var guideProto = _configuration.GetCVar(CCVars.DefaultGuide);
-        if (_prototypeManager.TryIndex<GuideEntryPrototype>(guideProto, out var guideEntry))
-        {
-            if (Tree.Items.FirstOrDefault(x => x.Metadata is GuideEntry entry && entry.Id == guideProto) is { } item)
-                Tree.SetSelectedIndex(item.Index);
-            else
-                ShowGuide(guideEntry);
-        }
-    }
-
     private void OnSelectionChanged(TreeItem? item)
     {
         if (item != null && item.Metadata is GuideEntry entry)
diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
index 61195f3a9a7e..03ea47827f63 100644
--- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
+++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
@@ -3,11 +3,15 @@
 using Content.Client.Guidebook;
 using Content.Client.Guidebook.Controls;
 using Content.Client.Lobby;
+using Content.Client.Players.PlayTimeTracking;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.CCVar;
 using Content.Shared.Guidebook;
 using Content.Shared.Input;
+using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Configuration;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Prototypes;
@@ -19,21 +23,25 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered<LobbyS
 {
     [UISystemDependency] private readonly GuidebookSystem _guidebookSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
+
+    private const int PlaytimeOpenGuidebook = 60;
 
     private GuidebookWindow? _guideWindow;
     private MenuButton? GuidebookButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.GuidebookButton;
 
     public void OnStateEntered(LobbyState state)
     {
-        HandleStateEntered();
+        HandleStateEntered(state);
     }
 
     public void OnStateEntered(GameplayState state)
     {
-        HandleStateEntered();
+        HandleStateEntered(state);
     }
 
-    private void HandleStateEntered()
+    private void HandleStateEntered(State state)
     {
         DebugTools.Assert(_guideWindow == null);
 
@@ -42,6 +50,14 @@ private void HandleStateEntered()
         _guideWindow.OnClose += OnWindowClosed;
         _guideWindow.OnOpen += OnWindowOpen;
 
+        if (state is LobbyState &&
+            _jobRequirements.FetchOverallPlaytime() < TimeSpan.FromMinutes(PlaytimeOpenGuidebook))
+        {
+            OpenGuidebook();
+            _guideWindow.RecenterWindow(new(0.5f, 0.5f));
+            _guideWindow.SetPositionFirst();
+        }
+
         // setup keybinding
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.OpenGuidebook,
@@ -160,6 +176,8 @@ public void OpenGuidebook(
         if (GuidebookButton != null)
             GuidebookButton.SetClickPressed(!_guideWindow.IsOpen);
 
+        selected ??= _configuration.GetCVar(CCVars.DefaultGuide);
+
         if (guides == null)
         {
             guides = _prototypeManager.EnumeratePrototypes<GuideEntryPrototype>()
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 838d2ce4a620..4bef8970b4fc 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -56,7 +56,7 @@ guide-entry-yourfirstcharacter = Your First Character
 guide-entry-controls = Controls
 guide-entry-radio = Radio and Speech
 
-guide-entry-references = Tables and References
+guide-entry-references = Tables & References
 guide-entry-drinks = Drinks
 guide-entry-foodrecipes = Food Recipes
 guide-entry-chemicals = Chemicals
diff --git a/Resources/Prototypes/Guidebook/station.yml b/Resources/Prototypes/Guidebook/station.yml
index 9570b617c0c3..d868a6b58fc0 100644
--- a/Resources/Prototypes/Guidebook/station.yml
+++ b/Resources/Prototypes/Guidebook/station.yml
@@ -3,7 +3,6 @@
   name: guide-entry-ss14
   text: "/ServerInfo/Guidebook/SpaceStation14.xml"
   children:
-  - Controls
   - Jobs
   - Survival
   - Antagonists

From bcf1069c7b31ddf26ca613897cdbdbeac27dba70 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 9 Jun 2024 16:27:56 +0000
Subject: [PATCH 387/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b7e3286806f1..34e1d9be25dc 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: lzk228
-  changes:
-  - message: Snoring is now a trait in character preference menu.
-    type: Tweak
-  id: 6205
-  time: '2024-03-22T07:00:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26322
 - author: liltenhead
   changes:
   - message: reduced the odds of budget insulated gloves being insulated and increased
@@ -3851,3 +3844,11 @@
   id: 6704
   time: '2024-06-08T23:29:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28724
+- author: AJCM-git
+  changes:
+  - message: When people with less than an hour playing join the game, the guidebook
+      is automatically opened for them.
+    type: Tweak
+  id: 6705
+  time: '2024-06-09T16:26:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28774

From 1490fc36d3be1bbc49c854e3d79d6399e63a1160 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:02:35 -0400
Subject: [PATCH 388/568] Redo new player & controls guidebooks (#28794)

---
 Resources/Locale/en-US/guidebook/guides.ftl   |  2 +-
 .../Guidebook/NewPlayer/Controls/Controls.xml | 72 +++++++++++--------
 .../Guidebook/NewPlayer/NewPlayer.xml         | 44 ++++++++----
 3 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 4bef8970b4fc..dcd5ee04b627 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -50,7 +50,7 @@ guide-entry-command = Command
 guide-entry-service = Service
 
 guide-entry-newplayer = New? Start here!
-guide-entry-charactercreation = Character Creation
+guide-entry-charactercreation = Creating Characters
 guide-entry-species = Species
 guide-entry-yourfirstcharacter = Your First Character
 guide-entry-controls = Controls
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
index 94cd325b86de..72a3d63c6f61 100644
--- a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
@@ -1,48 +1,62 @@
 <Document>
 # Controls
 
-<Box Orientation="Vertical">You can change the keybinds at any time here:</Box>
+<Box>You can change your keybinds at any time here:</Box>
 <Box Orientation="Vertical"><CommandButton Text="ui-options-tab-controls" Command="options 1"/></Box>
 
-## Basic controls
-We shall politely assume you already know how WASD to walk works.
-Beyond that, there's a handful primary interactions in SS14, ordered by importance:
+## Movement
+You can move around the game world by using [color=yellow][bold][keybind="MoveUp"][keybind="MoveLeft"][keybind="MoveDown"][keybind="MoveRight"][/bold][/color].
+When holding down [color=yellow][bold][keybind="Walk"][/bold][/color], you'll walk, stopping you from slipping on the ground.
 
-- [color=#a4885c][keybind="Use"/][/color] to pick up items and activate objects like buttons or computers, and [color=#a4885c][keybind="ActivateItemInWorld"/][/color] to activate items. You can also press [color=#a4885c]alt[/color] while doing this to trigger alternate interactions for some objects.
-- You can also quickly activate items you're holding by pressing [color=#a4885c][keybind="ActivateItemInHand"/][/color] and [color=#a4885c][keybind="AltActivateItemInHand"/][/color] respectively.
-- [color=#a4885c][keybind="UIRightClick"/][/color] to open the context menu. You can then either left click an entry just like you would in the world, or right click it again to open the verb menu, which gives you more complex ways to interact with an object.
-- You can [color=#a4885c][keybind="ExamineEntity"/][/color] objects to examine them, and get their name and a detailed (though often humorous) description.
+You can switch walking to a [color=cyan]toggle[/color] in the controls menu.
 
-You can quickly try out these controls with the monkey below (note: clicking it only works in-game and not in the lobby), and at any point in this guidebook if you're shown an entity, [color=#a4885c][keybind="ExamineEntity"/] to examine will always work[/color]:
+[color=cyan]Pulling[/color] objects is done with [color=yellow][bold][keybind="TryPullObject"][/bold][/color].
+While pulling, you can drag an object to your mouse cursor using [color=yellow][bold][keybind="MovePulledObject"][/bold][/color].
+Pressing [color=yellow][bold][keybind="ReleasePulledObject"][/bold][/color] releases the item you are currently dragging.
 
+You may find yourself in a situation with [color=#EB2D3A][bold]low gravity.[/bold][/color]
+This will cause your character to drift around when moving.
+When off-station, you will be unable to control your direction.
+[bold]Throwing objects[/bold] or [bold]spraying a fire-extinguisher[/bold] can help propel yourself while in this state.
 
-<GuideEntityEmbed Entity="MobGuidebookMonkey" Interactive="True" Caption=""/>
+## Interactions
+General interactions are done with [color=yellow][bold][keybind="Use"][/bold][/color].
+These are [bold]context-sensitive[/bold] and are affected by the item in your active hand.
+You can also use [color=yellow][bold][keybind="AltActivateItemInWorld"][/bold][/color] to perform [bold]alternate interactions[/bold].
 
-## Inventory
-In order to move items around in your inventory and between containers, you can click the item (or item name) to move it to your active hand, and then click the spot you want it to go (either a slot in your HUD, or the container).
+To perform [color=cyan]basic interactions[/color], use [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color].
+This is like [bold]interacting with nothing in hand[/bold].
+Pressing [color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color] has the same effect with the currently held item.
+It's most used for performing basic interaction while holding something, such as opening a door when your hands are full.
+
+Hovering over an entity and pressing [color=yellow][bold][keybind="UIRightClick"/][/bold][/color] brings up the [color=cyan]context menu[/color].
+This not only allows you to sort through large piles of items, but also to perform [bold]additional interactions.[/bold]
 
-The items in your hands are only active one at a time, in order to swap between what you're currently using, you can press [color=#a4885c][keybind="SwapHands"/][/color] on your keyboard to change active hands.
+[color=cyan]Examining[/color] things is done with [color=yellow][bold][keybind="ExamineEntity"][/bold][/color], which brings up a window with the object's name, a small description, and any other relevant details.
+[italic]Examining things around you can help you learn what they do and what properties they have[/italic].
 
-Opening containers in your inventory is easy as well, either hover over the item and activate it with [color=#a4885c][keybind="ActivateItemInWorld"/][/color] or click on the bag icon in the bottom right corner of the slot it is in.
+## Hands
+Using [color=yellow][bold][keybind="Use"][/bold][/color] on items in the world will pick them up and put them into your active hand.
+You can swap which hand is currently active using [color=yellow][bold][keybind="SwapHands"][/bold][/color].
 
-When you open a container a window will pop up showing the contents of the container and how much space it has available to hold things.
-All items have an assigned size, some too large to fit into most or all containers.
+You can [color=cyan]drop[/color] the item you are holding using [color=yellow][bold][keybind="Drop"][/bold][/color] or alternatively [color=cyan]throw it[/color] to your cursor with [color=yellow][bold][keybind="ThrowItemInHand"][/bold][/color].
 
-To drop items, you can press [color=#a4885c][keybind="Drop"/][/color], and to drop them more violently (also known as throwing), you can press [color=#a4885c][keybind="ThrowItemInHand"/][/color].
+## Inventory
+You can [color=cyan]open[/color] you inventory using [color=yellow][bold][keybind="OpenInventoryMenu"][/bold][/color].
+Each slot on your HUD can be filled with an appropriate [bold]item[/bold] or [bold]piece of clothing[/bold].
 
-A slightly advanced way to manage your inventory is to use [color=#a4885c]Shift + B[/color]. If your active hand is currently empty, this hotkey will pull out the latest item that was put in your bag. If you have an item in your hand - samek hotkey will put said item into your bag.
-Hotkey [color=#a4885c]Shift + E[/color] works exactly the same, but uses your belt as storage.
-## Actions
-To the left in your HUD there's a bar showing various actions you can take.
-You can hover over each one to see a name and description for the action that tells you what it is and how it works.
-You can click on an action to invoke it, or press a number key at any time to invoke the action without clicking on it.
+Two of the slots on the hotbar correspond to your [bold]bag and belt[/bold].
+You can open them using [color=yellow][bold][keybind="ActivateItemInWorld"][/bold][/color] on them or by clicking the icon in the [bold]bottom-right[/bold].
 
-In order to rearrange your actions, simply drag and drop them to other slots, right click to remove them, and press the gear icon at the top of the bar to open a menu to (re)add them.
-You have 10 pages of actions total that you can switch between by pressing [color=#a4885c]shift-(number)[/color].
-Additionally, you can press the lock icon to prevent the action bar from being modified.
+Pressing [color=yellow][bold][keybind="MoveStoredItem"][/bold][/color] will [color=cyan]take an item out[/color] of the bag.
+Holding it down will let you [color=cyan]drag[/color] the item to a different spot.
+While dragging, pressing [color=yellow][bold][keybind="RotateStoredItem"][/bold][/color] will [color=cyan]rotate[/color] the item.
 
-## Movement
-There's a good few things that can modify your movement, most notably slipping (which requires you to walk with [color=#a4885c]shift[/color] to avoid, usually.) and a lack of gravity.
-Slipping simply stuns you for a bit, but no gravity can be deadly if you're off station and wander more than about 1.5m away from the nearest wall or solid structure, as you'll lose your grip and no longer be able to move without throwing something.
+You can still do all regular interactions with items in your bag, including [color=cyan]examining[/color] and opening the [color=cyan]context menu[/color].
+
+## Camera
+The camera can [color=cyan]zoom[/color] in and out with [color=yellow][bold][keybind="ZoomIn"][/bold][/color] and [color=yellow][bold][keybind="ZoomOut"][/bold][/color] and can be reset with [color=yellow][bold][keybind="ResetZoom"][/bold][/color].
+Similarly, you can [color=cyan]rotate[/color] it left and right with [color=yellow][bold][keybind="CameraRotateLeft"][/bold][/color] and [color=yellow][bold][keybind="CameraRotateRight"][/bold][/color].
+You can recenter it to the grid's rotation using [color=yellow][bold][keybind="CameraReset"][/bold][/color].
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml b/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml
index 303230593bd2..50a102befffa 100644
--- a/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml
@@ -1,28 +1,42 @@
 <Document>
-# Welcome!
+# Welcome to Space Station 14!
 
-Welcome to the alpha build of Space Station 14!
-You have just started your shift aboard a Nanotrasen space station. You and your crewmates should cooperate, perform your jobs the best you can and have fun.
+You've just begun your shift aboard a Nanotrasen space station.
+You and your fellow crewmates are tasked with working together, surviving, and having fun!
 
-We hope you enjoy the game, and this entry will serve to guide you on how to learn to play.
+[bold]Make sure to follow all server rules.[/bold] You can ask questions or report rule breaks to the [color=#EB2D3A][bold]admin team[/bold][/color] by using the [bold]admin help menu[/bold]. ([italic]accessible by pressing [/italic][color=yellow][bold][keybind="OpenAHelp"/][/bold][/color])
 
-There's quite a bit to read, but SS14 is in itself a very large and in-depth game, and hopefully these guides help you enjoy it to its fullest.
+More detailed guides about [italic]specific jobs[/italic] and [italic]mechanics[/italic] can be found [textlink="here." link="SS14"/]
 
-This entry and its subentries contain simple and broad information new players need to play the game on most servers.
+This guide can be reopened at any time using [color=yellow][bold][keybind="OpenGuidebook"][/bold][/color].
 
-Some information given here may be repeated or further touched upon in the Station and Shifts entry, [textlink="which can be found here." link="SS14"]
+## Basic Controls
+The following are the controls you'll need for regular gameplay:
 
-## How to use this guidebook
-This guidebook contains [color=#a4885c]step-by-step instructions[/color] on how to perform tasks, [color=#a4885c]tables of components[/color] one might require,
-or simply [color=#a4885c]tips, tricks and guidelines[/color] on how to perform your job.
+- Run using [color=yellow][bold][keybind="MoveUp"][keybind="MoveLeft"][keybind="MoveDown"][keybind="MoveRight"][/bold][/color]. Hold down [color=yellow][bold][keybind="Walk"][/bold][/color] to walk
 
-You can refresh yourself on your job before starting your shift or reference certain pages as needed, [textlink="such as recipes for cocktails" link="Drinks"].
+- Examine the world around you with [color=yellow][bold][keybind="ExamineEntity"][/bold][/color]
 
-## Wait, what's Space Station 14?
-Space Station 14 is a free (forever) open source remake of the infamous Space Station 13, hoping to provide an improved experience for both newcomers and old players alike. Space Station 14 is designed as a fully moddable experience that you can modify to your liking with custom servers, adding entire swaths of new content for people to explore.
+- Interact with the world using [color=yellow][bold][keybind="Use"][/bold][/color]
 
-Please make sure you understand the server rules (F1) and if you have any questions, consult this guide, your colleagues on shift in person or over radio or via discord. You can also ask admins for help (ahelp) by hitting the escape key > admin help and typing a message to any online admins. Especially do this if you witness someone breaking rules.
+- Hovering over an entity and pressing [color=yellow][bold][keybind="UseSecondary"][/bold][/color] shows the [italic]context menu[/italic], which contains additional interactions
 
-[color=#a4885c]To reiterate, you are all a crew of people who work together[/color] and you should not be harming each other unless you have an extremely good reason (such as self-defence) and even then, you should call security over radio.
+- Swap hands using [color=yellow][bold][keybind="SwapHands"][/bold][/color] and activate the currently held item with [color=yellow][bold][keybind="ActivateItemInHand"][/bold][/color]
+
+- Drop held items with [color=yellow][bold][keybind="Drop"][/bold][/color] or throw them using [color=yellow][bold][keybind="ThrowItemInHand"][/bold][/color]
+
+- Pull and release things with [color=yellow][bold][keybind="TryPullObject"][/bold][/color] and [color=yellow][bold][keybind="ReleasePulledObject"][/bold][/color]
+
+A more comprehensive list can be found on the [textlink="controls" link="Controls"] page.
+
+## What is SS14?
+Space Station 14 is a multiplayer game about paranoia and chaos on a space station and a remake of the cult-classic Space Station 13.
+
+Join dozens of other players on an intricately designed and simulated space station, immersing yourself in roleplay and dealing with threats along the way.
+
+SS14 is an [italic]open-source game[/italic] developed by people [bold]just like you![/bold]
+It receives [color=lime]daily updates[/color] and may at times be [color=#EB2D3A][bold]unstable.[/bold][/color]
+
+[italic]If you want to report bugs or help with development, join the discord and learn how to get started.[/italic]
 
 </Document>

From b51e787fd7e4b5c9711e152538fd4e366ca5d2ec Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 9 Jun 2024 14:03:47 -0400
Subject: [PATCH 389/568] new station and shifts guide (#28799)

---
 .../ServerInfo/Guidebook/SpaceStation14.xml   | 55 +++++++++++++++----
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/Resources/ServerInfo/Guidebook/SpaceStation14.xml b/Resources/ServerInfo/Guidebook/SpaceStation14.xml
index 5d449032a164..3955c8d0da77 100644
--- a/Resources/ServerInfo/Guidebook/SpaceStation14.xml
+++ b/Resources/ServerInfo/Guidebook/SpaceStation14.xml
@@ -1,20 +1,51 @@
-<Document>
-# Space Station 14
+<Document>
+# Station and Shifts
 
-This entry marks the beginning of the advanced guidebook entries. Most information found here only applies to offical Wizard's Den servers, or servers that are similar to it.
-Other servers may have their own guidebooks that you should read for relevant information.
+Every round of SS14 is a [bold]self-contained shift[/bold] that takes place on one of many different stations.
 
-If you're just here to play, that's great! The [color=#a4885c]Still new?[/color] section of this entry will help you out.
+Rounds typically last from [color=cyan]45 to 90 minutes[/color], but players are free to leave and join at any point during a round.
 
-## Still new?
-[textlink="Completely lost? Click here to start at the beginning." link="NewPlayer"]
+## Shuttle Terminal
+If you join in the middle of a shift, you will likely spawn on the [color=lime]shuttle terminal[/color].
+Here you can grab drinks, conversate with other players, and wait for the shuttle to take you to the station.
 
-[textlink="Don't know how to perform a job? Click here to jump to a list of departments." link="Jobs"]
+Screens on the walls will give you an ETA for the shuttle.
+When it arrives, simply walk on to be transported to the station.
 
-[textlink="Keep dying? Click here to see a survival guide." link="Survival"]
+Make sure to stay inside the terminal and to not stand in the shuttle landing zone. [color=#EB2D3A][bold]You can be crushed by shuttles flying in[/bold][/color]
 
-## Contributing
-If you're looking to do a bit more with the game, you can join our [color=#5865f2]Discord[/color] server and find our [color=#627597]GitHub[/color] page in the lobby.
+## Navigation
+Every station has a wide variety of locations to visit.
+These range from specific departments where work happens to common areas where you can relax and chat with others.
+
+<Box>
+  <GuideEntityEmbed Entity="StationMap"/>
+  <GuideEntityEmbed Entity="SignDirectionalDorms" Caption="Directional Signs"/>
+  <GuideEntityEmbed Entity="SignBridge" Caption="Marker Signs"/>
+</Box>
+
+[color=cyan]Station maps[/color] give you an overview of the entire station with colored markers denoting locations of different things.
+Regular [color=cyan]signs[/color] on walls can point you to different departments.
+
+## Leaving the Station
+At the end of the shift [color=gray](barring a [color=red][bold]nuclear disaster[/bold][/color])[/color], you will leave the station via the [color=lime]evac shuttle[/color].
+When it's called, an announcement will play on the station alerting the crew and signaling its [color=cyan]arrival in 10 minutes.[/color]
+Once it arrives, you'll need to make your way over to it, board it, and then survive the trip to [bold]Central Command[/bold].
+
+The round doesn't officially end until you reach [bold]Central Command[/bold]
+
+<Box>
+  <GuideEntityEmbed Entity="CryogenicSleepUnit"/>
+</Box>
+
+If you need to leave a round early, you can do so through a [color=lime]cyrogenic sleep unit[/color].
+Simply going inside and leaving the game will store your belongings and ensure that they are not stolen or misused.
+
+## More Info
+Learning the controls? [textlink="Click here to read about the different controls" link="Controls"]
+
+Don't know how to perform a job? [textlink="Click here to jump to a list of departments" link="Jobs"]
+
+Keep dying? [textlink="Click here to see a survival guide" link="Survival"]
 
-Not all jobs or concepts will have guides yet, so if you're an experienced player we strongly encourage you to [color=#a4885c]contribute[/color]!
 </Document>

From fffa1dfd3fc9e1bd9b74099054018f1a02dc70e9 Mon Sep 17 00:00:00 2001
From: Thomas <87614336+Aeshus@users.noreply.github.com>
Date: Sun, 9 Jun 2024 13:28:46 -0500
Subject: [PATCH 390/568] Update Cargo Guidebook (#28775)

---
 .../ServerInfo/Guidebook/Cargo/Cargo.xml      |  87 ++++++--
 .../Guidebook/Cargo/CargoBounties.xml         |  48 +++--
 .../ServerInfo/Guidebook/Cargo/Salvage.xml    | 185 +++++++++++++-----
 .../Guidebook/Cargo/TradeStation.xml          |  10 -
 4 files changed, 231 insertions(+), 99 deletions(-)
 delete mode 100644 Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml

diff --git a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
index 6c74d02d2152..526dd35ffed4 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
@@ -1,9 +1,13 @@
 <Document>
-# Cargo
-The supply department, more commonly known simply as [color=#b18644]Cargo[/color], is in charge of keeping the station stocked up on necessary resources, such as fuel and raw materials. Though, they are not restricted to simple goods, and can order a wide variety of different items from off-station. The point is, it's [color=#b18644]Cargo[/color]'s job to get the rest of the station what they need.
+  # Cargo
 
-## Personnel
-[color=#b18644]Cargo[/color]'s staff is made up of Cargo Technicians and Salvage Technicans. Cargo is run by the Quartermaster.
+  The Supply department, also known as [color=cyan]Cargo[/color], supplies the station with necessary resources, such as fuel and raw materials, and comfort resources, such as lottery tickets and plushies.
+
+  They raise the [color=cyan]spesos[/color] (the currency of the station) for this through many methods, such as taking bounties, selling miscellaneous items, and salvaging, allowing them to purchase a wide variety of equipment from off-station for any crew member's needs. It is Cargo's job to fulfill the needs of the rest of the station.
+
+  ## Personnel
+
+  Cargo is made up of [color=cyan]Cargo Technicians[/color] and [color=cyan]Salvage Specialists[/color] and is led by the [color=cyan]Quartermaster[/color].
 
   <Box>
     <GuideEntityEmbed Entity="ToyFigurineCargoTech" Caption="Cargo Tech"/>
@@ -11,31 +15,76 @@ The supply department, more commonly known simply as [color=#b18644]Cargo[/color
     <GuideEntityEmbed Entity="ToyFigurineQuartermaster" Caption="QM"/>
   </Box>
 
-## Ordering
+  ## Making Money
+
+  The main struggle of any Cargo department is not having enough money.
+
+  Cargo makes their money by selling things at the [color=cyan]Trading Station[/color]. Almost everything on the station has economic value that you can sell, as seen via the [color=cyan]appraisal tool[/color]. That value then further increases when you sell it as part of a [textlink="bounty" link="CargoBounties"].
+
+  <Box>
+    <GuideEntityEmbed Entity="AppraisalTool"/>
+    <GuideEntityEmbed Entity="CargoPallet"/>
+    <GuideEntityEmbed Entity="CrateGenericSteel"/>
+  </Box>
+
+  Upon finding something valuable, bring it to the [color=cyan]Cargo Bay[/color]. If it fits inside a [color=cyan]Crate[/color], find an empty crate and put the items in it.
+
+  If the [color=cyan]Cargo Shuttle[/color] is away, you can put all the items you want to sell onto the [color=cyan]Cargo Pallets[/color]. Once the shuttle has docked at the station, you load the crates and everything else to be sold onto it.
+
   <Box>
+    <GuideEntityEmbed Entity="ComputerPalletConsole"/>
+    <GuideEntityEmbed Entity="CargoPalletSell"/>
     <GuideEntityEmbed Entity="ComputerCargoOrders"/>
   </Box>
-Every transaction you make will begin at a [color=#a4885c]cargo request computer[/color], from which you can make orders for specific products. Making any order requires [color=#118C4F]spesos[/color], the currency of the station. To make an order, click the "request" button next to whatever you need, type an appropriate reason for why you're ordering it, and hit "approve" when it appears below the request list.
 
-## Piloting
-Orders are shipped to the station via the [color=#a4885c]Trade Station[/color], and then transported with the cargo shuttle, a remotely piloted shuttle that cargo uses to transport goods back and forth from the trade station. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color] either on the station, or the shuttle itself.
+  After the shuttle is loaded, fly it to the Trade Station. There, move the sellable items onto the green [color=cyan]Cargo Selling Pallets[/color], and then go to the [color=cyan]Cargo Sale Computer[/color] and click [italic]"Sell"[/italic].
+
+  Now, you can take those spesos and bring them back to the station and deposit them into the [color=cyan]Cargo Request Computer[/color].
+
+  You can also make even more money by completing [textlink="bounties" link="CargoBounties"] or selling valuable items from [textlink="salvage" link="Salvage"].
+
+  ## Ordering
+
   <Box>
-    <GuideEntityEmbed Entity="ComputerCargoShuttle"/>
+    <GuideEntityEmbed Entity="ComputerCargoOrders"/>
   </Box>
-After clicking the computer, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
 
-- First, disconnect any airlocks that are connected to the dock.
-- Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
-- Then pilot the shuttle to the [textlink="Trade Station" link="TradeStation"].
+  Every order begins at a [color=cyan]Cargo Request Computer[/color]. First and foremost, making an order requires that Cargo has enough spesos. If Cargo doesn't have the money, get some.
+
+  It is also the sole discretion of Cargo to fulfill any given request. If Cargo is tight on spesos, they are free to deny requests that are not immediately necessary.
+
+  To make an order, click the name of whatever is requested, provide the recipient, type an appropriate reason for why they need it, and then press "Approve" on the order.
+
+  Sometimes a public Cargo Request Computer exists, in which case all you need to do is approve orders that people make themselves.
 
-## Making Money
-So, you want to order something, but don't have the money for it? You just need to sell something! Almost everything on the station has economic value, which an [color=#a4885c]appraisal tool[/color] can read out to you.
   <Box>
-    <GuideEntityEmbed Entity="AppraisalTool"/>
-    <GuideEntityEmbed Entity="CargoPallet"/>
+    <GuideEntityEmbed Entity="CargoPalletBuy"/>
+    <GuideEntityEmbed Entity="PaperCargoInvoice"/>
   </Box>
-After finding something worth selling, place it on the cargo shuttle, and then fly it to the [textlink="Trade Station" link="TradeStation"]. Then sell the item and collect the spesos from the terminal. You can also make even more money by completing [textlink="bounties" link="CargoBounties"] or selling valuable items from [textlink="salvage" link="Salvage"].
 
-[textlink="Still broke? Click here to learn about bounties, another source of income." link="CargoBounties"]
+  Then, to collect the order, it must be transported back to the station from the [color=cyan]Trading Station[/color].
+
+  In the Trading Station, on the [color=cyan]Cargo Buying Pallets[/color], is a crate holding that order. Load it onto the shuttle and fly it back.
+
+  Once it is at the Cargo Dock, you can read the [color=cyan]Cargo Invoice[/color] label on it to find out the intended recipient. Finally, deliver it to them.
+
+  ## Piloting
+
+  Orders are delivered to the station via the orbiting [color=cyan]Trade Station[/color] and are transported to the main station by the [color=cyan]Cargo Shuttle[color]. The shuttle does not fly itself, so it must either be piloted in the shuttle or remotely.
+
+  <Box>
+    <GuideEntityEmbed Entity="ComputerCargoShuttle"/>
+  </Box>
+
+  To fly the shuttle, you must first find the [color=cyan]Cargo Shuttle Console[/color]. One is inside the Cargo Bay, and the other is inside the Cargo Shuttle.
+
+  After interacting with the computer, there should be a navigation view from the shuttle. Here are the steps for piloting the shuttle to and from the Trading Station:
+
+  - First, switch to the [color=yellow]"DOCK"[/color] screen and [color=yellow]undock[/color] any airlocks between the shuttle and the station.
+  - Now, with the shuttle disconnected, you can pilot it. [italic]Remember that you are flying in space and momentum is conserved[/italic].
+  - The controls are [color=yellow][keybind="ShuttleStrafeUp"][/color] and [color=yellow][keybind="ShuttleStrafeDown"][/color] for strafing up and down, [color=yellow][keybind="ShuttleStrafeLeft"][/color] and [color=yellow][keybind="ShuttleStrafeRight"][/color] for strafing left and right, and [color=yellow][keybind="ShuttleRotateLeft"][/color] and [color=yellow][keybind="ShuttleRotateRight"][/color] for turning left and right. To brake, press [color=yellow][keybind="ShuttleBrake"][/color].
+  - Then pilot the shuttle to the [color=cyan]Trade Station[/color].
+  - Once you are there, [color=yellow]dock[/color] to the airlocks and you are done.
 
+  [textlink="Learn about bounties, a way to maximize your on-station profits." link="CargoBounties"]
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
index af858ca6d08b..7e74d5d796e4 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
@@ -1,29 +1,45 @@
 <Document>
   # Cargo Bounties
-  [textlink="Cargo" link="Cargo"] can always make money selling items whenever they feel like it. However, there are ways to make even more money by being more selective about what and when you're selling. One of these ways is [color=#a4885c]bounties[/color].
+  While [textlink="Cargo" link="Cargo"] can make [color=cyan]spesos[color] selling just about anything, more spesos can be made by fulfilling [color=cyan]bounties[/color] found through the Cargo Bounty Computer.
+
+  ## Starting Bounties
 
   <Box>
     <GuideEntityEmbed Entity="ComputerCargoBounty"/>
+    <GuideEntityEmbed Entity="PaperCargoBountyManifest"/>
   </Box>
-  Every station has a fixed amount of bounties that are globally available. These can be checked at the [color=#a4885c]cargo bounty computer[/color], which shows the following information about them:
-  - What items are needed to fulfill the bounty
-  - How much money do you get for completing the bounty
-  - How much time is left before the bounty expires
 
-  Assuming that you are able to aquire all of the items for it in a time efficient and low-cost manner, you will be able to complete the bounty and get a significantly higher payout than you would be selling the items conventionally.
+  To start a bounty, open the bounty screen by interacting with the [color=cyan]Cargo Bounty Computer[/color]. The Cargo Bounty Computer maintains a list of all the current bounties and lets you either print out a label or skip it.
+
+  - Printing the label gives you a [color=cyan]Bounty Manifest[/color] listing the goods that need to be acquired. You can print out infinite Bounty Manifests, so ensure you are not repeating the same work as another Cargo Technician.
+
+  - Skipping a bounty replaces that bounty with a new one, as there can only be six active bounties at any time. Skipping has a 15-minute cooldown and voids that bounty, which may anger other Cargo Technicians working on it.
+
+  ## Fulfilling Bounties
 
-  ## Completing Bounties
   <Box>
     <GuideEntityEmbed Entity="PaperCargoBountyManifest"/>
     <GuideEntityEmbed Entity="CrateGenericSteel"/>
-    <GuideEntityEmbed Entity="CargoPallet"/>
+    <GuideEntityEmbed Entity="AppraisalTool"/>
   </Box>
-  Once you have collected the items you need for a bounty, completing it is a simple process:
-  - Place all of the items inside of the crate and [bold]close it![/bold]
-  - Get the bounties manifest label by clicking the [color=#a4885c]print label[/color] button on corresponding entry on the cargo bounty computer.
-  - Place the label on the crate containing the items.
-  - Move the crate onto the cargo shuttle.
-  - Sell it.
-
-  And there you go! After you follow these steps, the bounty should disappear from the computer and a new one will take its place.
+
+  With the [color=cyan]Bounty Manifest[/color], it is now up to you to collect the required goods. Most departments will give you what you need by asking for it with a Bounty Manifest.
+
+  Once you have collected the goods, return to the cargo bay and put the goods inside an empty [color=cyan]Crate[/color]. After everything is in the crate, close it, and then apply the Bounty Manifest to it.
+
+  To verify the completion of a bounty, use the [color=cyan]Appraisal Tool[/color] on it. It should say that it confirms that the bounty has been completed.
+
+  ## Selling Bounties
+
+  <Box>
+    <GuideEntityEmbed Entity="PaperCargoBountyManifest"/>
+    <GuideEntityEmbed Entity="CrateGenericSteel"/>
+    <GuideEntityEmbed Entity="CargoPalletSell"/>
+  </Box>
+
+  Once you have verified that you have completed the bounty, follow the same steps as selling anything else.
+
+  Just transport it to the [color=cyan]Trading Station[/color], sell it, and you are done!
+
+  When you return, there should be a new bounty to take its place.
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
index a8a7ffcea16b..1d1bdf3f1841 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
@@ -1,57 +1,134 @@
 <Document>
-# Salvage
-
-Salvage is one of Cargo's key sources of income... until atmos comes along with a bajillion dollars worth of frezon. Until then though, your main job will be making them money, and totally not making a shuttle
-
-## How to prepare for a salvage
-
-Firstly you need a few things before you can commence on your salvaging.
-
-<Box>
-<GuideEntityEmbed Entity="ClothingOuterHardsuitSpatio"/>
-<GuideEntityEmbed Entity="ClothingShoesBootsMag"/>
-</Box>
-Your Hardsuit is important, as it provides EVA protection. Meaning the lack of pressure and tempurature of space wont kill you. It will also provide minor defense against any space fauna you may encounter. The magboots will ensure you can move smoothly on a salvage and pull things in and out. They also make you slip proof!
-
-<Box>
-<GuideEntityEmbed Entity="JetpackBlue"/>
-<GuideEntityEmbed Entity="JetpackMini"/>
-</Box>
-Jetpacks will be needed to move thoughout space, since without floors and gravity, you will not be able to move. Its fueled by gases like oxygen, nitrogen, water vapor, or other gases that can be found in canisters.
-
-<Box>
-<GuideEntityEmbed Entity="ClothingMaskGasExplorer"/>
-<GuideEntityEmbed Entity="OxygenTankFilled"/>
-<GuideEntityEmbed Entity="NitrogenTankFilled"/>
-</Box>
-Internals will be important, given all species need to breathe, and space doesnt have any gases. Your mask is used to connect the gas tank to your mouth to breath, while the gas tanks hold consumable gases and can be refilled at gas canisters. All species breathe oxygen (blue + yellow tanks) except slimes, which need nitrogen (red tanks)
-
-<Box>
-<GuideEntityEmbed Entity="WeaponCrusher"/>
-<GuideEntityEmbed Entity="WeaponCrusherDagger"/>
-<GuideEntityEmbed Entity="WeaponProtoKineticAccelerator"/>
-</Box>
-The crusher devices are your first and last line of defense against space fauna and other things that want to bring cargo harm. While the dagger is just a standard knife, the crusher is has a special property that if you shoot something with it, then follow up with a melee attack, it deals 2x more damage. The protokinetic accelerator is like a recharging weapon that can provide thrust in the scenerio that your jetpack runs dry, or mine for you.
-
-<Box>
-<GuideEntityEmbed Entity="Pickaxe"/>
-<GuideEntityEmbed Entity="MiningDrill"/>
-<GuideEntityEmbed Entity="OreBag"/>
-<GuideEntityEmbed Entity="ClothingBeltUtilityFilled"/>
-</Box>
-The pickaxe and mining drill are both useful for mining rocks or breaking structures quickly.
-The ore bag magnetises nearby ore and automatically picks it up if equipped to a belt slot.
-The utility belt can be useful for holding miscellaneous items when not occupied by your ore bag.
-
-## How to make money as a salvager
-<Box>
-<GuideEntityEmbed Entity="SalvageMagnet"/>
-</Box>
-<Box>
-<GuideEntityEmbed Entity="ComputerSalvageExpedition"/>
-</Box>
-There are 2 primary forms of income for salvage. The magnet and Expeditions.
-The salvage magnet, when activated, calls in one of many random salvages to be generated somewhere within space. Once you find the salvage, you will need to fight off any present space fauna as well as loot it as much possible. A salvage will only be present for 4 minutes, before dissapearing, taking everything unlooted with it. And in worse case scenerios, will take the bodies of other salvagers in critical condition or dead. Afterwards, the magnet needs some time to recharge before being usable again.
-Expeditions are like adventures that you can do with your salvage buddies. First you must pick a mission from the salvage console, each of which of varying difficulty and reward. Afterwards you must FTL to the location via a shuttle. Once you arrive, the chat will tell you in which direction the dungeon of the salvage is, and you must go and conquer the dangers and gain the loot!
+  # Salvage
 
+  [color=cyan]Salvage[/color] is one of Cargo's key, but also most dangerous, sources of income. Salvage extracts money from [color=cyan]Space Debris[/color] and going on [color=cyan]Planetary Expeditions[/color].
+
+  While risky because of the dangers of space and alien planets, with the proper preparation and teamwork, any Salvage Team can make a lot of money for Cargo.
+
+  ## Preperations
+
+  Before embarking on a Salvage mission, ensure you are prepared with all the required equipment. Otherwise, you will die before seeing any profits!
+
+  <Box>
+    <GuideEntityEmbed Entity="SuitStorageSalv"/>
+    <GuideEntityEmbed Entity="LockerSalvageSpecialist"/>
+    <GuideEntityEmbed Entity="VendingMachineSalvage"/>
+  </Box>
+
+  Everything needed before leaving the station is provided inside Salvage's starting room. While Science can research better weapons and equipment, it is best to be equipped with something rather than nothing.
+
+  <Box>
+    <GuideEntityEmbed Entity="ClothingOuterHardsuitSpatio"/>
+    <GuideEntityEmbed Entity="ClothingShoesBootsMag"/>
+    <GuideEntityEmbed Entity="VendingMachineTankDispenserEVA"/>
+  </Box>
+
+  The most basic equipment you need is the EVA setup.
+
+  - [color=cyan]Spationaut Hardsuit[/color]: This keeps you alive in space. [italic]Remember to activate the helmet so you can breathe and turn on its built-in flashlight[/italic].
+  - [color=cyan]Magboots[/color]: These provide you with gravity when exploring space debris while also making you slip-proof.
+  - [color=cyan]Oxygen/Nitrogen[/color]: Depending on your species, you will need [color=cyan]Nitrogen[/color] (slimes) or [color=cyan]Oxygen[/color] (every other species). The [color=cyan]Gas Tank Dispenser[/color] has all the tanks needed, so stock up. Be warned that the Salvage Shuttle doesn't always have air, so you might start asphyxiating before even getting to space
+
+  <Box>
+    <GuideEntityEmbed Entity="WeaponProtoKineticAccelerator"/>
+  </Box>
+
+  All Salvage Specialists must be armed, in case they need to defend themselves from hostiles.
+
+  - [color=cyan]Proto-Kinetic Accelerator[/color]: This gun has infinite ammunition, allowing you to slowly mine and fly through space.
+
+  <Box>
+    <GuideEntityEmbed Entity="Pickaxe"/>
+    <GuideEntityEmbed Entity="OreBag"/>
+  </Box>
+
+  Mining (on asteroids or expeditions) requires its own basic set.
+
+  - [color=cyan]Pickaxe[/color]: This is required for mining at any reasonable speed when wielded. Also, it works as a melee weapon!
+  - [color=cyan]Ore Bag[/color]: When equipped with the belt, this magnetizes nearby ore and automatically picks it up for you.
+
+  <Box>
+    <GuideEntityEmbed Entity="FultonBeacon"/>
+    <GuideEntityEmbed Entity="Fulton"/>
+  </Box>
+
+  Before looting (space wrecks or expeditions), set up Fultons to transport large objects or dead Salvage Technicians.
+
+  - [color=cyan]Fulton Beacon[/color]: Unfold this to the shuttle, and all Fulton-attached objects will fly to it within 15 tiles.
+  - [color=cyan]Fulton[/color]: After linking with the Fulton Beacon, attach a Fulton to the object, and after one minute, it will fly to the Fulton Beacon.
+
+  <Box>
+    <GuideEntityEmbed Entity="RadioHandheld"/>
+    <GuideEntityEmbed Entity="HandheldGPSBasic"/>
+    <GuideEntityEmbed Entity="ClothingBeltUtilityFilled"/>
+  </Box>
+
+  Finally, there are also some helpful but not required equipment that is available to Salvage.
+
+  - [color=cyan]Handheld Radio[/color]: This lets you communicate with other Salvage Specialists even if regular radio communications are unavailable. It is essential for Salvage coordination while in space or on expeditions.
+  - [color=cyan]Global Positioning System[/color]: This gives you an absolute position of yourself, allowing you to pinpoint your exact location. If you get lost in space, this can let you organize a rescue mission or can help you get back to the shuttle when lost on an expedition.
+  - [color=cyan]Utility Belt[/color]: This holds all the equipment you will need to loot machines and the like from space wrecks and expeditions.
+
+  ## Space Debris
+
+  Once prepared, it is time to go and explore the stars.
+
+  Before immediately doing expeditions, it is good practice to start with space debris so that the crew gets used to their job.
+
+  [color=cyan]Space Debris[/color] is generally much safer than expeditions and provides many basic materials (such as steel, glass, etc) in short supply at the start of the shift.
+
+  <Box>
+    <GuideEntityEmbed Entity="SalvageMagnet"/>
+  </Box>
+
+  The [color=cyan]Salvage Magnet[/color] is the machine that brings space debris into nearby space.
+
+  The Salvage Magnet provides six offers: the first 3 are [color=cyan]Asteroids[/color], and the last 3 are [color=cyan]Space Wrecks[/color]. The offers then refresh every 3 minutes until claimed, after which the space debris is brought in for the next [bold]6 minutes[/bold].
+
+  The Salvage Magnet provides information on the types of resources on an asteroid, which can help you decide which to prioritize based on the current needs of the station.
+
+  During the 6 minutes, fly to the debris, extract all profit possible, and then fly back to the station. [italic]You will die if you don't return to the shuttle in time[/italic]!
+
+  There are two main activities that you do with the Salvage Magnet:
+
+  <Box>
+    <GuideEntityEmbed Entity="Pickaxe"/>
+    <GuideEntityEmbed Entity="OreBag"/>
+    <GuideEntityEmbed Entity="OreProcessor"/>
+  </Box>
+
+  - [color=cyan]Asteroid Mining[/color]: This is the safest option for money as there are no hostiles. All you need to do is fly around and mine the ore with your [color=cyan]Pickaxe[/color] and [color=cyan]Ore Bag[/color]. Once you have collected all the ore, you can refine it into materials through the [color=cyan]Ore Processor[/color].
+
+  <Box>
+    <GuideEntityEmbed Entity="Wrench"/>
+    <GuideEntityEmbed Entity="Fulton"/>
+    <GuideEntityEmbed Entity="WeaponProtoKineticAccelerator"/>
+  </Box>
+
+  - [color=cyan]Space Wreck Salvaging[/color]: These are slightly more dangerous as there are hostiles. Keep your distance from hostiles and shoot at them with the [color=cyan]Proto-Kinetic Accelerator[/color]. You will mainly be looting equipment and machines through [color=cyan]Wrenches[/color] and [color=cyan]Fultons[/color].
+
+  ## Planetary Expeditions
+
+  Finally, [color=cyan]Planetary Expeditions[/color] are the most dangerous but profitable way for Salvage to make money.
+
+  <Box>
+    <GuideEntityEmbed Entity="ComputerSalvageExpedition"/>
+    <GuideEntityEmbed Entity="CoordinatesDisk"/>
+    <GuideEntityEmbed Entity="ComputerShuttle"/>
+  </Box>
+
+
+  First, use the [color=cyan]Salvage Expedition Computer[/color] to select an expedition. Every 30 seconds, the missions cycle and provide certain information like the [color=yellow]difficulty[/color] and [color=yellow]types of enemies[/color].
+
+  After weighing your options, pick the expedition that best suits the station's needs and the crew's abilities.
+
+  Once you claim the expedition mission, a [color=cyan]Coordinates Disk[/color] will be ejected, which needs to be inserted into the [color=cyan]Shuttle Console[/color].
+
+  Once inside the Shuttle Console, switch to [color=yellow]Map mode[/color]. Then, click "[color=yellow]Scan for Nearby Objects[/color]". Now, on the drop-down menu on the bottom left of the console UI, click on [color=yellow]the planet's name[/color]. Finally, enable [color=yellow]FTL[/color], click on the [color=yellow]planet on the map[/color], and you will begin FTL travel.
+
+  Once you have landed on the planet, you will have [bold]11 minutes[/bold] to spend between [color=cyan]Mining[/color] and [color=cyan]Dungeon Looting[/color]
+
+  - [color=cyan]Expedition Mining[/color]: Mining during expeditions provides access to a wide range of resources, but also increases the risk of getting lost or encountering environmental and hostile threats.
+
+  - [color=cyan]Dungeon Looting[/color]: Dungeon Looting is where you make the most profit. When you touch down on the planet, the direction of the dungeon will be announced over the radio. Next, break into the dungeon, kill all the hostiles, and secure any loot. [color=cyan]Fultons[/color] become especially handy as you will be transferring whole machines and anomalies. The rewards from Dungeon Looting are expensive equipment to sell and exclusive technologies, such as [color=yellow]cloning[/color]. As an addition, the corpses of the hostiles can also be used and sold!
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml b/Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml
deleted file mode 100644
index bde0506b17b8..000000000000
--- a/Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Document>
-  # Trade Station
-  The Trade Station is seperate from the station, usually floating around in space visible on the scanner and shuttle computer. It is self maintaining, and self powered with solar pannels, so cargo doesn't need to do anything for it to work.
- 
-  ## Selling
-  Using the [color=#a4885c]cargo shuttle[/color], you are able to transport items and bounties to sell at the trade station by flying the shuttle (explained in [textlink="cargo" link="Cargo"]) and docking it to the trade station. Then you bring the objects to sell over the cargo pallets, go to the computer inbetween the 2 sets of pallets and sell what can be sold. Dont worry, you can't sell yourself! Then [color=#118C4F]Spessos[/color] should come out of the computer, and can be inserted into the Quartermasters Digiboard or the Cargo Computer to be added to the Bank.  
-  
-  ## Collecting Orders
-  All cargo orders are sent to the [color=#a4885c]Trade Station[/color] to be [color=#a4885c]collected[/color], this includes items sent by centcom. To collect them you have to travel to the Trade station and they should be there on the cargo pallets in a crate, ready to be taken back to the station.
-</Document>

From f4e80b0daecaa4c330f49d44ac608a0f0cb52e0c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 9 Jun 2024 18:29:52 +0000
Subject: [PATCH 391/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 34e1d9be25dc..c5ed9267b1be 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: liltenhead
-  changes:
-  - message: reduced the odds of budget insulated gloves being insulated and increased
-      the damage multipliers on bad gloves.
-    type: Tweak
-  id: 6206
-  time: '2024-03-22T08:20:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26318
 - author: BlitzTheSquishy
   changes:
   - message: Irish Coffee recipe adjusted to be more logical
@@ -3852,3 +3844,12 @@
   id: 6705
   time: '2024-06-09T16:26:48.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28774
+- author: Aeshus
+  changes:
+  - message: Salvage has a comprehensive guide.
+    type: Add
+  - message: Cargo's guide is up-to-date.
+    type: Tweak
+  id: 6706
+  time: '2024-06-09T18:28:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28775

From 3ceb92a0c43d3815d65c8124cd6bea3be5140455 Mon Sep 17 00:00:00 2001
From: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Date: Sun, 9 Jun 2024 19:58:10 +0100
Subject: [PATCH 392/568] SS14-28662 Add Baby Jail: a Jail for Babies (inverse
 panic bunker) (#28763)

---
 .../Administration/UI/AdminMenuWindow.xaml    |   4 +-
 .../Administration/UI/AdminMenuWindow.xaml.cs |   8 +-
 .../BabyJailTab/BabyJailStatusWindow.xaml     |   6 +
 .../BabyJailTab/BabyJailStatusWindow.xaml.cs  |  18 +++
 .../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     |  54 ++++++-
 .../Connection/ConnectionManager.cs           |  66 +++++++++
 .../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      |   6 +
 Resources/Locale/en-US/generic.ftl            |   1 +
 19 files changed, 530 insertions(+), 5 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 311d67b826c7..d3d3df02d936 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/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
index c3ea67a3edb9..f3aa2572f2f9 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -21,8 +21,12 @@ public AdminMenuWindow()
             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"));
+            /*
+             * 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(6, Loc.GetString("admin-menu-baby-jail-tab"));
+            MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-players-tab"));
+            MasterTabContainer.SetTabTitle(8, Loc.GetString("admin-menu-objects-tab"));
         }
 
         protected override void Dispose(bool disposing)
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 000000000000..3432f11669fd
--- /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}">
+    <Label Name="MessageLabel" Access="Public" Text="{Loc admin-ui-baby-jail-is-enabled}" />
+</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 000000000000..4e5f679b458e
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
@@ -0,0 +1,18 @@
+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 : DefaultWindow
+{
+    public BabyJailStatusWindow()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
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 000000000000..dd770c2be53c
--- /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 000000000000..aa9d6ced9517
--- /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 3d8235591ad4..e12ce0ab011c 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 60935e8f06ad..3510a5422e3c 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -889,6 +889,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 000000000000..058b67ca5289
--- /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 a1a6b33ebcb7..a12d106880cf 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,14 +71,25 @@ 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.PanicBunkerShowReason, OnPanicBunkerShowReasonChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, 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.
+             */
+
+            // 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);
+
             SubscribeLocalEvent<IdentityChangedEvent>(OnIdentityChanged);
             SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
             SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetached);
@@ -249,6 +261,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;
@@ -267,24 +290,42 @@ private void OnPanicBunkerCountDeadminnedAdminsChanged(bool enabled)
             UpdatePanicBunker();
         }
 
-        private void OnShowReasonChanged(bool enabled)
+        private void OnPanicBunkerShowReasonChanged(bool enabled)
         {
             PanicBunker.ShowReason = 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
@@ -326,6 +367,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 cd89f48d49f7..2211a245322b 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
 {
@@ -125,6 +128,10 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             }
         }
 
+        /*
+         * 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)
         {
@@ -202,6 +209,14 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 }
             }
 
+            if (_cfg.GetCVar(CCVars.BabyJailEnabled) && adminData == null)
+            {
+                var result = await IsInvalidConnectionDueToBabyJail(userId, e);
+
+                if (result.IsInvalid)
+                    return (ConnectionDenyReason.BabyJail, result.Reason, null);
+            }
+
             var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
                             ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
                             status == PlayerGameStatus.JoinedGame;
@@ -231,6 +246,57 @@ 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);
+
+            var isAccountAgeInvalid = record == null || 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 fcf5b1c25cd7..67367b94b7f5 100644
--- a/Content.Server/GameTicking/GameTicker.StatusShell.cs
+++ b/Content.Server/GameTicking/GameTicker.StatusShell.cs
@@ -46,6 +46,12 @@ private void GetStatusResponse(JsonNode jObject)
                 jObject["players"] = _playerManager.PlayerCount;
                 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 000000000000..56d5ce516265
--- /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 a872a3d4e7b2..491e5343959b 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -320,6 +320,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 000000000000..5a9d94905175
--- /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 c759e4c2cb16..03b2046a9e15 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 000000000000..ad58e436b39c
--- /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 = The baby jail is currently enabled.
+
+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 7f4afce8b965..88b6442e3956 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -39,3 +39,9 @@ panic-bunker-account-denied = This server is in panic bunker mode, often enabled
 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
+
+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 {$hours} hours
+
diff --git a/Resources/Locale/en-US/generic.ftl b/Resources/Locale/en-US/generic.ftl
index d9c1305e4160..350409788521 100644
--- a/Resources/Locale/en-US/generic.ftl
+++ b/Resources/Locale/en-US/generic.ftl
@@ -10,6 +10,7 @@ generic-error = error
 generic-invalid = invalid
 
 generic-hours = hours
+generic-minutes = minutes
 
 generic-playtime-title = Playtime
 

From de07c291de827bd8a2e843974d4362a13be3bb89 Mon Sep 17 00:00:00 2001
From: Julian Giebel <juliangiebel@live.de>
Date: Sun, 9 Jun 2024 21:18:54 +0200
Subject: [PATCH 393/568] Implement map text (#28705)

---
 Content.Client/MapText/MapTextComponent.cs    | 20 +++++
 Content.Client/MapText/MapTextOverlay.cs      | 85 +++++++++++++++++++
 Content.Client/MapText/MapTextSystem.cs       | 81 ++++++++++++++++++
 Content.Server/MapText/MapTextComponent.cs    |  6 ++
 Content.Server/MapText/MapTextSystem.cs       | 28 ++++++
 .../MapText/SharedMapTextComponent.cs         | 51 +++++++++++
 Content.Shared/MapText/SharedMapTextSystem.cs |  6 ++
 .../en-US/mapping/map-text-component.ftl      |  2 +
 .../Prototypes/Entities/Markers/map_text.yml  | 11 +++
 9 files changed, 290 insertions(+)
 create mode 100644 Content.Client/MapText/MapTextComponent.cs
 create mode 100644 Content.Client/MapText/MapTextOverlay.cs
 create mode 100644 Content.Client/MapText/MapTextSystem.cs
 create mode 100644 Content.Server/MapText/MapTextComponent.cs
 create mode 100644 Content.Server/MapText/MapTextSystem.cs
 create mode 100644 Content.Shared/MapText/SharedMapTextComponent.cs
 create mode 100644 Content.Shared/MapText/SharedMapTextSystem.cs
 create mode 100644 Resources/Locale/en-US/mapping/map-text-component.ftl
 create mode 100644 Resources/Prototypes/Entities/Markers/map_text.yml

diff --git a/Content.Client/MapText/MapTextComponent.cs b/Content.Client/MapText/MapTextComponent.cs
new file mode 100644
index 000000000000..f70b3c8dd4a4
--- /dev/null
+++ b/Content.Client/MapText/MapTextComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.MapText;
+using Robust.Client.Graphics;
+
+namespace Content.Client.MapText;
+
+[RegisterComponent]
+public sealed partial class MapTextComponent : SharedMapTextComponent
+{
+    /// <summary>
+    /// The font that gets cached on component init or state changes
+    /// </summary>
+    [ViewVariables]
+    public VectorFont? CachedFont;
+
+    /// <summary>
+    /// The text currently being displayed. This is either <see cref="SharedMapTextComponent.Text"/> or the
+    /// localized text <see cref="SharedMapTextComponent.LocText"/> or
+    /// </summary>
+    public string CachedText = string.Empty;
+}
diff --git a/Content.Client/MapText/MapTextOverlay.cs b/Content.Client/MapText/MapTextOverlay.cs
new file mode 100644
index 000000000000..70e708bba8b2
--- /dev/null
+++ b/Content.Client/MapText/MapTextOverlay.cs
@@ -0,0 +1,85 @@
+using System.Numerics;
+using Content.Shared.MapText;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.RichText;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.MapText;
+
+/// <summary>
+/// Draws map text as an overlay
+/// </summary>
+public sealed class MapTextOverlay : Overlay
+{
+    private readonly IConfigurationManager _configManager;
+    private readonly IEntityManager _entManager;
+    private readonly IUserInterfaceManager _uiManager;
+    private readonly SharedTransformSystem _transform;
+    public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+
+    public MapTextOverlay(
+        IConfigurationManager configManager,
+        IEntityManager entManager,
+        IUserInterfaceManager uiManager,
+        SharedTransformSystem transform,
+        IResourceCache resourceCache,
+        IPrototypeManager prototypeManager)
+    {
+        _configManager = configManager;
+        _entManager = entManager;
+        _uiManager = uiManager;
+        _transform = transform;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.ViewportControl == null)
+            return;
+
+        args.DrawingHandle.SetTransform(Matrix3x2.Identity);
+
+        var scale = _configManager.GetCVar(CVars.DisplayUIScale);
+
+        if (scale == 0f)
+            scale = _uiManager.DefaultUIScale;
+
+        DrawWorld(args.ScreenHandle, args, scale);
+
+        args.DrawingHandle.UseShader(null);
+    }
+
+    private void DrawWorld(DrawingHandleScreen handle, OverlayDrawArgs args, float scale)
+    {
+        if ( args.ViewportControl == null)
+            return;
+
+        var matrix = args.ViewportControl.GetWorldToScreenMatrix();
+        var query = _entManager.AllEntityQueryEnumerator<MapTextComponent>();
+
+        // Enlarge bounds to try prevent pop-in due to large text.
+        var bounds = args.WorldBounds.Enlarged(2);
+
+        while(query.MoveNext(out var uid, out var mapText))
+        {
+            var mapPos = _transform.GetMapCoordinates(uid);
+
+            if (mapPos.MapId != args.MapId)
+                continue;
+
+            if (!bounds.Contains(mapPos.Position))
+                continue;
+
+            if (mapText.CachedFont == null)
+                continue;
+
+            var pos = Vector2.Transform(mapPos.Position, matrix) + mapText.Offset;
+            var dimensions = handle.GetDimensions(mapText.CachedFont, mapText.CachedText, scale);
+            handle.DrawString(mapText.CachedFont, pos - dimensions / 2f, mapText.CachedText, scale, mapText.Color);
+        }
+    }
+}
diff --git a/Content.Client/MapText/MapTextSystem.cs b/Content.Client/MapText/MapTextSystem.cs
new file mode 100644
index 000000000000..96ce8f93c29a
--- /dev/null
+++ b/Content.Client/MapText/MapTextSystem.cs
@@ -0,0 +1,81 @@
+using Content.Shared.MapText;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.RichText;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.MapText;
+
+/// <inheritdoc/>
+public sealed class MapTextSystem : SharedMapTextSystem
+{
+    [Dependency] private readonly IConfigurationManager _configManager = default!;
+    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+
+    private MapTextOverlay _overlay = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<MapTextComponent, ComponentStartup>(OnComponentStartup);
+        SubscribeLocalEvent<MapTextComponent, ComponentHandleState>(HandleCompState);
+
+        _overlay = new MapTextOverlay(_configManager, EntityManager, _uiManager, _transform, _resourceCache, _prototypeManager);
+        _overlayManager.AddOverlay(_overlay);
+
+        // TODO move font prototype to robust.shared, then use ProtoId<FontPrototype>
+        DebugTools.Assert(_prototypeManager.HasIndex<FontPrototype>(SharedMapTextComponent.DefaultFont));
+    }
+
+    private void OnComponentStartup(Entity<MapTextComponent> ent, ref ComponentStartup args)
+    {
+        CacheText(ent.Comp);
+        // TODO move font prototype to robust.shared, then use ProtoId<FontPrototype>
+        DebugTools.Assert(_prototypeManager.HasIndex<FontPrototype>(ent.Comp.FontId));
+    }
+
+    private void HandleCompState(Entity<MapTextComponent> ent, ref ComponentHandleState args)
+    {
+        if (args.Current is not MapTextComponentState state)
+            return;
+
+        ent.Comp.Text = state.Text;
+        ent.Comp.LocText = state.LocText;
+        ent.Comp.Color = state.Color;
+        ent.Comp.FontId = state.FontId;
+        ent.Comp.FontSize = state.FontSize;
+        ent.Comp.Offset = state.Offset;
+
+        CacheText(ent.Comp);
+    }
+
+    private void CacheText(MapTextComponent component)
+    {
+        component.CachedFont = null;
+
+        component.CachedText = string.IsNullOrWhiteSpace(component.Text)
+            ? Loc.GetString(component.LocText)
+            : component.Text;
+
+        if (!_prototypeManager.TryIndex<FontPrototype>(component.FontId, out var fontPrototype))
+        {
+            component.CachedText = Loc.GetString("map-text-font-error");
+            component.Color = Color.Red;
+
+            if(_prototypeManager.TryIndex<FontPrototype>(SharedMapTextComponent.DefaultFont, out var @default))
+                component.CachedFont = new VectorFont(_resourceCache.GetResource<FontResource>(@default.Path), 14);
+            return;
+        }
+
+        var fontResource = _resourceCache.GetResource<FontResource>(fontPrototype.Path);
+        component.CachedFont = new VectorFont(fontResource, component.FontSize);
+    }
+}
diff --git a/Content.Server/MapText/MapTextComponent.cs b/Content.Server/MapText/MapTextComponent.cs
new file mode 100644
index 000000000000..2af958348484
--- /dev/null
+++ b/Content.Server/MapText/MapTextComponent.cs
@@ -0,0 +1,6 @@
+using Content.Shared.MapText;
+
+namespace Content.Server.MapText;
+
+[RegisterComponent]
+public sealed partial class MapTextComponent : SharedMapTextComponent;
diff --git a/Content.Server/MapText/MapTextSystem.cs b/Content.Server/MapText/MapTextSystem.cs
new file mode 100644
index 000000000000..5632c06e1a1f
--- /dev/null
+++ b/Content.Server/MapText/MapTextSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.MapText;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.MapText;
+
+/// <inheritdoc/>
+public sealed class MapTextSystem : SharedMapTextSystem
+{
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<MapTextComponent, ComponentGetState>(GetCompState);
+    }
+
+    private void GetCompState(Entity<MapTextComponent> ent, ref ComponentGetState args)
+    {
+        args.State = new MapTextComponentState
+        {
+            Text = ent.Comp.Text,
+            LocText = ent.Comp.LocText,
+            Color = ent.Comp.Color,
+            FontId = ent.Comp.FontId,
+            FontSize = ent.Comp.FontSize,
+            Offset = ent.Comp.Offset
+        };
+    }
+}
diff --git a/Content.Shared/MapText/SharedMapTextComponent.cs b/Content.Shared/MapText/SharedMapTextComponent.cs
new file mode 100644
index 000000000000..7b8a02da6f88
--- /dev/null
+++ b/Content.Shared/MapText/SharedMapTextComponent.cs
@@ -0,0 +1,51 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.MapText;
+
+/// <summary>
+/// This is used for displaying text in world space
+/// </summary>
+
+[NetworkedComponent, Access(typeof(SharedMapTextSystem))]
+public abstract partial class SharedMapTextComponent : Component
+{
+    public const string DefaultFont = "Default";
+
+    /// <summary>
+    /// The text to display. This will override <see cref="LocText"/>.
+    /// </summary>
+    [DataField]
+    public string? Text;
+
+    /// <summary>
+    /// The localized-id of the text that should be displayed.
+    /// </summary>
+    [DataField]
+    public LocId LocText = "map-text-default";
+    // TODO VV: LocId editing
+
+    [DataField]
+    public Color Color = Color.White;
+
+    [DataField]
+    public string FontId = DefaultFont;
+
+    [DataField]
+    public int FontSize = 12;
+
+    [DataField]
+    public Vector2 Offset = Vector2.Zero;
+}
+
+[Serializable, NetSerializable]
+public sealed class MapTextComponentState : ComponentState
+{
+    public string? Text { get; init;}
+    public LocId LocText { get; init;}
+    public Color Color { get; init;}
+    public string FontId { get; init; } = default!;
+    public int FontSize { get; init;}
+    public Vector2 Offset { get; init;}
+}
diff --git a/Content.Shared/MapText/SharedMapTextSystem.cs b/Content.Shared/MapText/SharedMapTextSystem.cs
new file mode 100644
index 000000000000..da2adf16cf3b
--- /dev/null
+++ b/Content.Shared/MapText/SharedMapTextSystem.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.MapText;
+
+/// <summary>
+/// This handles registering the map text overlay, caching the text font and handling component state
+/// </summary>
+public abstract class SharedMapTextSystem : EntitySystem;
diff --git a/Resources/Locale/en-US/mapping/map-text-component.ftl b/Resources/Locale/en-US/mapping/map-text-component.ftl
new file mode 100644
index 000000000000..0a4d54b4857e
--- /dev/null
+++ b/Resources/Locale/en-US/mapping/map-text-component.ftl
@@ -0,0 +1,2 @@
+map-text-default = Use VV to change the displayed text
+map-text-font-error = "Error - invalid font"
diff --git a/Resources/Prototypes/Entities/Markers/map_text.yml b/Resources/Prototypes/Entities/Markers/map_text.yml
new file mode 100644
index 000000000000..e8496138ac32
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/map_text.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: MapText
+  parent: MarkerBase
+  name: map text
+  placement:
+    mode: PlaceFree
+  components:
+  - type: MapText
+  - type: Sprite
+    state: pink
+

From 50d83b936046d44b33cee28019dbe49eb814223e Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 9 Jun 2024 16:01:05 -0400
Subject: [PATCH 394/568] Cap scramble tag (#28804)

---
 Content.Client/UserInterface/RichText/ScrambleTag.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/RichText/ScrambleTag.cs b/Content.Client/UserInterface/RichText/ScrambleTag.cs
index 77b7b2514513..a93af993caa1 100644
--- a/Content.Client/UserInterface/RichText/ScrambleTag.cs
+++ b/Content.Client/UserInterface/RichText/ScrambleTag.cs
@@ -14,6 +14,8 @@ public sealed class ScrambleTag : IMarkupTag
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    private const int MaxScrambleLength = 32;
+
     public string Name => "scramble";
 
     public string TextBefore(MarkupNode node)
@@ -29,8 +31,9 @@ public string TextBefore(MarkupNode node)
         var seed = (int) (_timing.CurTime.TotalMilliseconds / rate);
         var rand = new Random(seed + node.GetHashCode());
         var charOptions = chars.ToCharArray();
+        var realLength = MathF.Min(length.Value, MaxScrambleLength);
         var sb = new StringBuilder();
-        for (var i = 0; i < length; i++)
+        for (var i = 0; i < realLength; i++)
         {
             var index = rand.Next() % charOptions.Length;
             sb.Append(charOptions[index]);

From 1bb9d9451fcd410f172222666eb2a0514cdd2288 Mon Sep 17 00:00:00 2001
From: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Date: Sun, 9 Jun 2024 21:45:47 +0100
Subject: [PATCH 395/568] Panic Bunker uses minutes not hours (#28805)

* Panic Bunker uses minutes not hours

* Fixing an instance of hours
---
 .../BabyJailTab/BabyJailStatusWindow.xaml     |  2 +-
 .../BabyJailTab/BabyJailStatusWindow.xaml.cs  |  7 ++++--
 .../Tabs/PanicBunkerTab/PanicBunkerTab.xaml   |  8 +++----
 .../PanicBunkerTab/PanicBunkerTab.xaml.cs     | 22 +++++++++----------
 .../Commands/PanicBunkerCommand.cs            | 22 +++++++++----------
 Content.Server/Administration/ServerApi.cs    |  2 +-
 .../Administration/Systems/AdminSystem.cs     |  8 +++----
 .../Connection/ConnectionManager.cs           |  6 ++---
 .../Events/PanicBunkerChangedEvent.cs         |  4 ++--
 Content.Shared/CCVar/CCVars.cs                |  4 ++--
 .../administration/commands/panicbunker.ftl   | 16 +++++++-------
 .../administration/ui/tabs/babyjail-tab.ftl   |  2 +-
 .../ui/tabs/panicbunker-tab.ftl               |  2 +-
 .../Locale/en-US/connection-messages.ftl      |  4 ++--
 14 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
index 3432f11669fd..b8034faf52ab 100644
--- a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
@@ -2,5 +2,5 @@
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab"
     Title="{Loc admin-ui-baby-jail-window-title}">
-    <Label Name="MessageLabel" Access="Public" Text="{Loc admin-ui-baby-jail-is-enabled}" />
+    <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
index 4e5f679b458e..9e1d53818f24 100644
--- a/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
@@ -1,4 +1,6 @@
-using Robust.Client.AutoGenerated;
+using Content.Client.Message;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
@@ -9,10 +11,11 @@ namespace Content.Client.Administration.UI.Tabs.BabyJailTab;
  */
 
 [GenerateTypedNameReferences]
-public sealed partial class BabyJailStatusWindow : DefaultWindow
+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/PanicBunkerTab/PanicBunkerTab.xaml b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml
index 89827d064246..ee7ba4d34ff6 100644
--- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml
@@ -31,12 +31,12 @@
             <BoxContainer Orientation="Horizontal" Margin="2">
                 <Label Text="{Loc admin-ui-panic-bunker-min-account-age}" MinWidth="175" />
                 <LineEdit Name="MinAccountAge" MinWidth="50" Margin="0 0 5 0" />
-                <Label Text="{Loc generic-hours}" />
+                <Label Text="{Loc generic-minutes}" />
             </BoxContainer>
             <BoxContainer Orientation="Horizontal" Margin="2">
-                <Label Text="{Loc admin-ui-panic-bunker-min-overall-hours}" MinWidth="175" />
-                <LineEdit Name="MinOverallHours" MinWidth="50" Margin="0 0 5 0" />
-                <Label Text="{Loc generic-hours}" />
+                <Label Text="{Loc admin-ui-panic-bunker-min-overall-minutes}" MinWidth="175" />
+                <LineEdit Name="MinOverallMinutes" MinWidth="50" Margin="0 0 5 0" />
+                <Label Text="{Loc generic-minutes}" />
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
index f6212cd5ee10..c3bcf3ffa09f 100644
--- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
@@ -12,7 +12,7 @@ public sealed partial class PanicBunkerTab : Control
     [Dependency] private readonly IConsoleHost _console = default!;
 
     private string _minAccountAge;
-    private string _minOverallHours;
+    private string _minOverallMinutes;
 
     public PanicBunkerTab()
     {
@@ -25,9 +25,9 @@ public PanicBunkerTab()
         MinAccountAge.OnFocusExit += args => SendMinAccountAge(args.Text);
         _minAccountAge = MinAccountAge.Text;
 
-        MinOverallHours.OnTextEntered += args => SendMinOverallHours(args.Text);
-        MinOverallHours.OnFocusExit += args => SendMinOverallHours(args.Text);
-        _minOverallHours = MinOverallHours.Text;
+        MinOverallMinutes.OnTextEntered += args => SendMinOverallMinutes(args.Text);
+        MinOverallMinutes.OnFocusExit += args => SendMinOverallMinutes(args.Text);
+        _minOverallMinutes = MinOverallMinutes.Text;
     }
 
     private void SendMinAccountAge(string text)
@@ -42,16 +42,16 @@ private void SendMinAccountAge(string text)
         _console.ExecuteCommand($"panicbunker_min_account_age {minutes}");
     }
 
-    private void SendMinOverallHours(string text)
+    private void SendMinOverallMinutes(string text)
     {
         if (string.IsNullOrWhiteSpace(text) ||
-            text == _minOverallHours ||
-            !int.TryParse(text, out var hours))
+            text == _minOverallMinutes ||
+            !int.TryParse(text, out var minutes))
         {
             return;
         }
 
-        _console.ExecuteCommand($"panicbunker_min_overall_hours {hours}");
+        _console.ExecuteCommand($"panicbunker_min_overall_minutes {minutes}");
     }
 
     public void UpdateStatus(PanicBunkerStatus status)
@@ -68,10 +68,10 @@ public void UpdateStatus(PanicBunkerStatus status)
         CountDeadminnedButton.Pressed = status.CountDeadminnedAdmins;
         ShowReasonButton.Pressed = status.ShowReason;
 
-        MinAccountAge.Text = status.MinAccountAgeHours.ToString();
+        MinAccountAge.Text = status.MinAccountAgeMinutes.ToString();
         _minAccountAge = MinAccountAge.Text;
 
-        MinOverallHours.Text = status.MinOverallHours.ToString();
-        _minOverallHours = MinOverallHours.Text;
+        MinOverallMinutes.Text = status.MinOverallMinutes.ToString();
+        _minOverallMinutes = MinOverallMinutes.Text;
     }
 }
diff --git a/Content.Server/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
index de3f3cbaea2b..18aed7e3f083 100644
--- a/Content.Server/Administration/Commands/PanicBunkerCommand.cs
+++ b/Content.Server/Administration/Commands/PanicBunkerCommand.cs
@@ -139,7 +139,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         if (args.Length == 0)
         {
             var current = _cfg.GetCVar(CCVars.PanicBunkerMinAccountAge);
-            shell.WriteLine(Loc.GetString("panicbunker-command-min-account-age-is", ("hours", current / 60)));
+            shell.WriteLine(Loc.GetString("panicbunker-command-min-account-age-is", ("minutes", current)));
         }
 
         if (args.Length > 1)
@@ -148,30 +148,30 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!int.TryParse(args[0], out var hours))
+        if (!int.TryParse(args[0], out var minutes))
         {
             shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
             return;
         }
 
-        _cfg.SetCVar(CCVars.PanicBunkerMinAccountAge, hours * 60);
-        shell.WriteLine(Loc.GetString("panicbunker-command-min-account-age-set", ("hours", hours)));
+        _cfg.SetCVar(CCVars.PanicBunkerMinAccountAge, minutes);
+        shell.WriteLine(Loc.GetString("panicbunker-command-min-account-age-set", ("minutes", minutes)));
     }
 }
 
 [AdminCommand(AdminFlags.Server)]
-public sealed class PanicBunkerMinOverallHoursCommand : LocalizedCommands
+public sealed class PanicBunkerMinOverallMinutesCommand : LocalizedCommands
 {
     [Dependency] private readonly IConfigurationManager _cfg = default!;
 
-    public override string Command => "panicbunker_min_overall_hours";
+    public override string Command => "panicbunker_min_overall_minutes";
 
     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)));
+            var current = _cfg.GetCVar(CCVars.PanicBunkerMinOverallMinutes);
+            shell.WriteLine(Loc.GetString("panicbunker-command-min-overall-minutes-is", ("minutes", current)));
         }
 
         if (args.Length > 1)
@@ -180,13 +180,13 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!int.TryParse(args[0], out var hours))
+        if (!int.TryParse(args[0], out var minutes))
         {
             shell.WriteError(Loc.GetString("shell-argument-must-be-number"));
             return;
         }
 
-        _cfg.SetCVar(CCVars.PanicBunkerMinOverallHours, hours);
-        shell.WriteLine(Loc.GetString("panicbunker-command-overall-hours-age-set", ("hours", hours)));
+        _cfg.SetCVar(CCVars.PanicBunkerMinOverallMinutes, minutes);
+        shell.WriteLine(Loc.GetString("panicbunker-command-overall-minutes-age-set", ("minutes", minutes)));
     }
 }
diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs
index d0f23db637b4..f1f09d4b5037 100644
--- a/Content.Server/Administration/ServerApi.cs
+++ b/Content.Server/Administration/ServerApi.cs
@@ -41,7 +41,7 @@ public sealed partial class ServerApi : IPostInjectInit
         CCVars.PanicBunkerCountDeadminnedAdmins.Name,
         CCVars.PanicBunkerShowReason.Name,
         CCVars.PanicBunkerMinAccountAge.Name,
-        CCVars.PanicBunkerMinOverallHours.Name,
+        CCVars.PanicBunkerMinOverallMinutes.Name,
         CCVars.PanicBunkerCustomReason.Name,
     ];
 
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index a12d106880cf..e5b6e9c3eaa0 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, OnPanicBunkerShowReasonChanged, true);
             Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
-            Subs.CVar(_config, CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, 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.
@@ -304,7 +304,7 @@ private void OnBabyJailShowReasonChanged(bool enabled)
 
         private void OnPanicBunkerMinAccountAgeChanged(int minutes)
         {
-            PanicBunker.MinAccountAgeHours = minutes / 60;
+            PanicBunker.MinAccountAgeMinutes = minutes;
             SendPanicBunkerStatusAll();
         }
 
@@ -314,9 +314,9 @@ private void OnBabyJailMaxAccountAgeChanged(int minutes)
             SendBabyJailStatusAll();
         }
 
-        private void OnPanicBunkerMinOverallHoursChanged(int hours)
+        private void OnPanicBunkerMinOverallMinutesChanged(int minutes)
         {
-            PanicBunker.MinOverallHours = hours;
+            PanicBunker.MinOverallMinutes = minutes;
             SendPanicBunkerStatusAll();
         }
 
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 2211a245322b..f22ff9b7d584 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -186,9 +186,9 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                             ("reason", Loc.GetString("panic-bunker-account-reason-account", ("minutes", minMinutesAge)))), null);
                 }
 
-                var minOverallHours = _cfg.GetCVar(CCVars.PanicBunkerMinOverallHours);
+                var minOverallMinutes = _cfg.GetCVar(CCVars.PanicBunkerMinOverallMinutes);
                 var overallTime = ( await _db.GetPlayTimes(e.UserId)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall);
-                var haveMinOverallTime = overallTime != null && overallTime.TimeSpent.TotalHours > minOverallHours;
+                var haveMinOverallTime = overallTime != null && overallTime.TimeSpent.TotalMinutes > minOverallMinutes;
 
                 // Use the custom reason if it exists & they don't have the minimum time
                 if (customReason != string.Empty && !haveMinOverallTime && !bypassAllowed)
@@ -200,7 +200,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 {
                     return (ConnectionDenyReason.Panic,
                         Loc.GetString("panic-bunker-account-denied-reason",
-                            ("reason", Loc.GetString("panic-bunker-account-reason-overall", ("hours", minOverallHours)))), null);
+                            ("reason", Loc.GetString("panic-bunker-account-reason-overall", ("minutes", minOverallMinutes)))), null);
                 }
 
                 if (!validAccountAge || !haveMinOverallTime && !bypassAllowed)
diff --git a/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs b/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
index f809b67bc8d2..786f645a7f03 100644
--- a/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
+++ b/Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
@@ -10,8 +10,8 @@ public sealed class PanicBunkerStatus
     public bool EnableWithoutAdmins;
     public bool CountDeadminnedAdmins;
     public bool ShowReason;
-    public int MinAccountAgeHours;
-    public int MinOverallHours;
+    public int MinAccountAgeMinutes;
+    public int MinOverallMinutes;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 491e5343959b..2ae5c6bd5bd7 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -304,8 +304,8 @@ public static readonly CVarDef<bool>
         /// <summary>
         /// Minimal overall played time.
         /// </summary>
-        public static readonly CVarDef<int> PanicBunkerMinOverallHours =
-            CVarDef.Create("game.panic_bunker.min_overall_hours", 10, CVar.SERVERONLY);
+        public static readonly CVarDef<int> PanicBunkerMinOverallMinutes =
+            CVarDef.Create("game.panic_bunker.min_overall_minutes", 600, CVar.SERVERONLY);
 
         /// <summary>
         /// A custom message that will be used for connections denied to the panic bunker
diff --git a/Resources/Locale/en-US/administration/commands/panicbunker.ftl b/Resources/Locale/en-US/administration/commands/panicbunker.ftl
index c16748c9926a..2ea07370ee56 100644
--- a/Resources/Locale/en-US/administration/commands/panicbunker.ftl
+++ b/Resources/Locale/en-US/administration/commands/panicbunker.ftl
@@ -23,12 +23,12 @@ cmd-panicbunker_show_reason-help = Usage: panicbunker_show_reason
 panicbunker-command-show-reason-enabled = The panic bunker will now show a reason to users it blocks from connecting.
 panicbunker-command-show-reason-disabled = The panic bunker will no longer show a reason to users it blocks from connecting.
 
-cmd-panicbunker_min_account_age-desc = Gets or sets the minimum account age in hours that an account must have to be allowed to connect with the panic bunker enabled.
-cmd-panicbunker_min_account_age-help = Usage: panicbunker_min_account_age <hours>
-panicbunker-command-min-account-age-is = The minimum account age for the panic bunker is {$hours} hours.
-panicbunker-command-min-account-age-set = Set the minimum account age for the panic bunker to {$hours} hours.
+cmd-panicbunker_min_account_age-desc = Gets or sets the minimum account age in minutes that an account must have to be allowed to connect with the panic bunker enabled.
+cmd-panicbunker_min_account_age-help = Usage: panicbunker_min_account_age <minutes>
+panicbunker-command-min-account-age-is = The minimum account age for the panic bunker is {$minutes} minutes.
+panicbunker-command-min-account-age-set = Set the minimum account age for the panic bunker to {$minutes} minutes.
 
-cmd-panicbunker_min_overall_hours-desc = Gets or sets the minimum overall playtime in hours that an account must have to be allowed to connect with the panic bunker enabled.
-cmd-panicbunker_min_overall_hours-help = Usage: panicbunker_min_overall_hours <hours>
-panicbunker-command-min-overall-hours-is = The minimum overall playtime for the panic bunker is {$hours} hours.
-panicbunker-command-min-overall-hours-set = Set the minimum overall playtime for the panic bunker to {$hours} hours.
+cmd-panicbunker_min_overall_minutes-desc = Gets or sets the minimum overall playtime in minutes that an account must have to be allowed to connect with the panic bunker enabled.
+cmd-panicbunker_min_overall_minutes-help = Usage: panicbunker_min_overall_minutes <minutes>
+panicbunker-command-min-overall-minutes-is = The minimum overall playtime for the panic bunker is {$minutes} minutes.
+panicbunker-command-min-overall-minutes-set = Set the minimum overall playtime for the panic bunker to {$minutes} minutes.
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 ad58e436b39c..46dce54c1fc8 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/babyjail-tab.ftl
@@ -10,7 +10,7 @@ admin-ui-baby-jail-show-reason-tooltip = Show the user why they were blocked fro
 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 = The baby jail is currently enabled.
+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/administration/ui/tabs/panicbunker-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl
index 730d0c2e3b34..26349263ac8d 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/panicbunker-tab.ftl
@@ -16,7 +16,7 @@ admin-ui-panic-bunker-show-reason = Show Reason
 admin-ui-panic-bunker-show-reason-tooltip = Show the user why they were blocked from connecting by the panic bunker.
 
 admin-ui-panic-bunker-min-account-age = Min. Account Age
-admin-ui-panic-bunker-min-overall-hours = Min. Overall Playtime
+admin-ui-panic-bunker-min-overall-minutes = Min. Overall Playtime
 
 admin-ui-panic-bunker-is-enabled = The panic bunker is currently enabled.
 
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index 88b6442e3956..f1596d90152b 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -38,10 +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 {$hours} hours
+baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$minutes} $minutes
 

From d741968714bbf742f749140b2b93ec0ba435bbf1 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Sun, 9 Jun 2024 16:32:10 -0500
Subject: [PATCH 396/568] Temporarily update server configs (#28780)

* update configs

* Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

* Update Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml

* LF

* Apply suggestions from code review

Co-authored-by: Julian Giebel <juliangiebel@live.de>

* Update Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml

Co-authored-by: Julian Giebel <juliangiebel@live.de>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Co-authored-by: Julian Giebel <juliangiebel@live.de>
---
 .../ConfigPresets/WizardsDen/leviathan.toml   |  4 ----
 .../ConfigPresets/WizardsDen/lizard.toml      |  4 ----
 .../ConfigPresets/WizardsDen/salamander.toml  |  2 +-
 .../ConfigPresets/WizardsDen/wizardsDen.toml  |  6 ++---
 .../WizardsDen/wizardsDenCoreOnly.toml        | 22 +++++++++++++++++++
 .../WizardsDen/wizardsDenGateway.toml         | 20 +++++++++++++++++
 .../WizardsDen/wizardsDenLRPTide.toml         | 17 ++++++++++++++
 7 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
 create mode 100644 Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
 create mode 100644 Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml

diff --git a/Resources/ConfigPresets/WizardsDen/leviathan.toml b/Resources/ConfigPresets/WizardsDen/leviathan.toml
index 7560833f13af..a1a0e5b704d6 100644
--- a/Resources/ConfigPresets/WizardsDen/leviathan.toml
+++ b/Resources/ConfigPresets/WizardsDen/leviathan.toml
@@ -4,10 +4,6 @@
 
 [game]
 hostname = "[EN] Wizard's Den Leviathan [US East 1]"
-panic_bunker.enabled = false
-panic_bunker.disable_with_admins = false
-panic_bunker.enable_without_admins = false
-panic_bunker.custom_reason = ""
 
 [hub]
 tags = "lang:en,region:am_n_e,rp:low"
diff --git a/Resources/ConfigPresets/WizardsDen/lizard.toml b/Resources/ConfigPresets/WizardsDen/lizard.toml
index 72688efbf9c4..2e3809a87dc9 100644
--- a/Resources/ConfigPresets/WizardsDen/lizard.toml
+++ b/Resources/ConfigPresets/WizardsDen/lizard.toml
@@ -4,10 +4,6 @@
 
 [game]
 hostname = "[EN] Wizard's Den Lizard [US West]"
-panic_bunker.enabled = false
-panic_bunker.disable_with_admins = false
-panic_bunker.enable_without_admins = false
-panic_bunker.custom_reason = ""
 
 [hub]
 tags = "lang:en,region:am_n_w,rp:low"
diff --git a/Resources/ConfigPresets/WizardsDen/salamander.toml b/Resources/ConfigPresets/WizardsDen/salamander.toml
index e5948b6ca610..632dcae7161a 100644
--- a/Resources/ConfigPresets/WizardsDen/salamander.toml
+++ b/Resources/ConfigPresets/WizardsDen/salamander.toml
@@ -1,7 +1,7 @@
 # Configuration preset used on Wizard's Den Salamander
 
 [game]
-desc = "Official English Space Station 14 servers. Roleplay required, you must be whitelisted through Discord to play if there are more than 15 online players."
+desc = "Official English Space Station 14 servers. Medium roleplay ruleset. You must be whitelisted through Discord to play if there are more than 15 online players."
 hostname = "[EN] Wizard's Den Salamander [US West RP]"
 soft_max_players = 130
 
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index ed2781f21008..7b2897fa2047 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -2,14 +2,14 @@
 # Loaded before server-specific config presets by configuration.
 
 [game]
-desc             = "Official English Space Station 14 servers. Vanilla, low roleplay."
+desc             = "Official English Space Station 14 servers. Vanilla, roleplay ruleset."
 lobbyenabled     = true
 soft_max_players = 80
 panic_bunker.enabled = true
-panic_bunker.disable_with_admins = true
+panic_bunker.disable_with_admins = false
 panic_bunker.enable_without_admins = true
 panic_bunker.show_reason = true
-panic_bunker.custom_reason = "You have not played on Wizard's Den server long enough to connect to this server. Please play on Wizard's Den Lizard or Wizard's Den Leviathan until you have more playtime."
+panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on another Wizard's Den server for now."
 
 [infolinks]
 bug_report = "https://github.com/space-wizards/space-station-14/issues/new/choose"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
new file mode 100644
index 000000000000..0adf4c4f6c1b
--- /dev/null
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
@@ -0,0 +1,22 @@
+# Configuration preset layer for "Core Only" Wizard's Den servers.
+# Intended to be loaded after wizardsDen.toml
+
+# hostname is a placeholder
+# needs region tag
+
+[game]
+soft_max_players = 50
+hostname = "[EN] Wizard's Den Red Firefly"
+desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
+panic_bunker.enabled = false
+panic_bunker.disable_with_admins = false
+panic_bunker.enable_without_admins = false
+panic_bunker.custom_reason = ""
+panic_bunker.enabled = true
+panic_bunker.show_reason = true
+panic_bunker.max_overall_minutes = 15
+[server]
+rules_file = "CoreRuleset"
+
+[hub]
+tags = "lang:en,rp:none"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
new file mode 100644
index 000000000000..9fcba254f7a5
--- /dev/null
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
@@ -0,0 +1,20 @@
+# Configuration preset layer for gateway Wizard's Den servers.
+# Intended to be loaded after wizardsDen.toml
+
+# hostname is a placeholder
+# needs region tag
+
+[game]
+hostname = "[EN][New Player Server] Wizard's Den Farm Grass Hopper"
+desc = "Official English Space Station 14 servers for new players. Vanilla, roleplay ruleset."
+panic_bunker.enabled = false
+panic_bunker.disable_with_admins = false
+panic_bunker.enable_without_admins = false
+panic_bunker.custom_reason = ""
+baby_jail.enabled = true
+baby_jail.show_reason = true
+baby_jail.max_overall_minutes = 15
+baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!"
+baby_jail.whitelisted_can_bypass = true
+[hub]
+tags = "lang:en,rp:low"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
new file mode 100644
index 000000000000..6019bc2eed2a
--- /dev/null
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
@@ -0,0 +1,17 @@
+# Configuration preset layer for "Core Only" Wizard's Den servers.
+# Intended to be loaded after wizardsDen.toml
+
+# hostname is a placeholder
+# needs region tag
+
+[game]
+soft_max_players = 50
+hostname = "[EN] Wizard's Den Granite Flea"
+desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
+panic_bunker.enabled = false
+panic_bunker.disable_with_admins = false
+panic_bunker.enable_without_admins = false
+panic_bunker.custom_reason = ""
+
+[hub]
+tags = "lang:en,rp:low"

From edd13ad82f063c955a6e20f2c4beafcf9147903e Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 10 Jun 2024 09:48:47 +1200
Subject: [PATCH 397/568] Fix wizardsDenCoreOnly.toml (#28807)

Fix wizardsDenCoreOnly
---
 Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
index 0adf4c4f6c1b..78c3318d08a3 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
@@ -8,7 +8,6 @@
 soft_max_players = 50
 hostname = "[EN] Wizard's Den Red Firefly"
 desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
-panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
 panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""

From 08040204107529d704c559d7cab5788751bfe737 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 10 Jun 2024 00:13:29 +0200
Subject: [PATCH 398/568] FUCK (#28808)

---
 Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
index 78c3318d08a3..ae6ad2864dbc 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
@@ -13,7 +13,8 @@ panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
 panic_bunker.enabled = true
 panic_bunker.show_reason = true
-panic_bunker.max_overall_minutes = 15
+panic_bunker.min_overall_minutes = 15
+
 [server]
 rules_file = "CoreRuleset"
 

From e95fb9aa7f82115929c5dce6785c914b076c0bc9 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Sun, 9 Jun 2024 23:41:04 +0000
Subject: [PATCH 399/568] Disable panic bunker for servers (#28812)

* Disable panic bunker for servers

* Add disabled stuff back in to be reenabled later
---
 Resources/ConfigPresets/WizardsDen/wizardsDen.toml         | 5 +----
 Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index 7b2897fa2047..ecf2aa819439 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -1,13 +1,10 @@
-# Base configuration preset used on all Wizard's Den servers.
+# Base configuration preset used on all Wizard's Den servers.
 # Loaded before server-specific config presets by configuration.
 
 [game]
 desc             = "Official English Space Station 14 servers. Vanilla, roleplay ruleset."
 lobbyenabled     = true
 soft_max_players = 80
-panic_bunker.enabled = true
-panic_bunker.disable_with_admins = false
-panic_bunker.enable_without_admins = true
 panic_bunker.show_reason = true
 panic_bunker.custom_reason = "You have not played on a Wizard's Den server long enough to connect to this server. Please play on another Wizard's Den server for now."
 
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
index ae6ad2864dbc..71394825e25d 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
@@ -8,10 +8,7 @@
 soft_max_players = 50
 hostname = "[EN] Wizard's Den Red Firefly"
 desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
-panic_bunker.disable_with_admins = false
-panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
-panic_bunker.enabled = true
 panic_bunker.show_reason = true
 panic_bunker.min_overall_minutes = 15
 

From 7032c0106ab7ffb8459790d7c09e07a0f9a2be4d Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Sun, 9 Jun 2024 22:13:26 -0500
Subject: [PATCH 400/568] Fix description of temp servers and add region tags
 (#28811)

* Fix description of LRP temp servers

* update regions
---
 .../ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml      | 4 ++--
 Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml | 4 ++--
 Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
index 71394825e25d..630025fc5db1 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenCoreOnly.toml
@@ -6,7 +6,7 @@
 
 [game]
 soft_max_players = 50
-hostname = "[EN] Wizard's Den Red Firefly"
+hostname = "[EN] Wizard's Den Red Firefly [US East]"
 desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
 panic_bunker.custom_reason = ""
 panic_bunker.show_reason = true
@@ -16,4 +16,4 @@ panic_bunker.min_overall_minutes = 15
 rules_file = "CoreRuleset"
 
 [hub]
-tags = "lang:en,rp:none"
+tags = "lang:en,region:am_n_e,rp:none"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
index 9fcba254f7a5..2d085c816c35 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml
@@ -5,7 +5,7 @@
 # needs region tag
 
 [game]
-hostname = "[EN][New Player Server] Wizard's Den Farm Grass Hopper"
+hostname = "[EN][New Player Server] Wizard's Den Farm Grass Hopper [US East]"
 desc = "Official English Space Station 14 servers for new players. Vanilla, roleplay ruleset."
 panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
@@ -17,4 +17,4 @@ baby_jail.max_overall_minutes = 15
 baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!"
 baby_jail.whitelisted_can_bypass = true
 [hub]
-tags = "lang:en,rp:low"
+tags = "lang:en,region:am_n_e,rp:low"
diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
index 6019bc2eed2a..21abbf2e3f07 100644
--- a/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDenLRPTide.toml
@@ -1,4 +1,4 @@
-# Configuration preset layer for "Core Only" Wizard's Den servers.
+# Configuration preset layer for LRP temporary Wizard's Den servers.
 # Intended to be loaded after wizardsDen.toml
 
 # hostname is a placeholder
@@ -6,12 +6,12 @@
 
 [game]
 soft_max_players = 50
-hostname = "[EN] Wizard's Den Granite Flea"
-desc = "Official English Space Station 14 servers. Vanilla, core ruleset."
+hostname = "[EN] Wizard's Den Granite Flea [US East]"
+desc = "Official English Space Station 14 servers. Vanilla, roleplay ruleset."
 panic_bunker.enabled = false
 panic_bunker.disable_with_admins = false
 panic_bunker.enable_without_admins = false
 panic_bunker.custom_reason = ""
 
 [hub]
-tags = "lang:en,rp:low"
+tags = "lang:en,region:am_n_e,rp:low"

From bc5a6279f508d2f3d1c90b2f948a138c1490063c Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:19:24 +0200
Subject: [PATCH 401/568] Fixes a typo in the glossary (#28818)

independance -> independence

Co-authored-by: John Doe <johndoe@gmail.com>
---
 Resources/ServerInfo/Guidebook/Glossary.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml
index 3186737d3a64..dad3b0513584 100644
--- a/Resources/ServerInfo/Guidebook/Glossary.xml
+++ b/Resources/ServerInfo/Guidebook/Glossary.xml
@@ -35,7 +35,7 @@ The main area of the security department. This is where prisoners are brought an
 Short for Captain.
 
 ## Cargonia
-Reference to cargo declaring independance. Against the rules.
+Reference to cargo declaring independence. Against the rules.
 
 ## CE
 Short for Chief Engineer, the head of the Engineering Department.

From b60c9a8fe83a9e2fcac709428a42ef725369ac8e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 10 Jun 2024 13:20:31 +0000
Subject: [PATCH 402/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c5ed9267b1be..7188eab2e50a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: BlitzTheSquishy
-  changes:
-  - message: Irish Coffee recipe adjusted to be more logical
-    type: Tweak
-  id: 6207
-  time: '2024-03-22T08:23:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26327
 - author: SlamBamActionman
   changes:
   - message: Space glue/lube tubes can now be used through the right-click menu.
@@ -3853,3 +3846,10 @@
   id: 6706
   time: '2024-06-09T18:28:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28775
+- author: Zonespace27
+  changes:
+  - message: Fixed a typo under the "Cargonia" header in the glossary.
+    type: Fix
+  id: 6707
+  time: '2024-06-10T13:19:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28818

From 63ad5e0b838cf2891d89ddc1bb100afb327b4545 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 10 Jun 2024 09:20:58 -0400
Subject: [PATCH 403/568] enable search filters on drinks guidebook (#28815)

---
 Resources/Prototypes/Guidebook/references.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Guidebook/references.yml b/Resources/Prototypes/Guidebook/references.yml
index 19f490001ba1..502961fb2e65 100644
--- a/Resources/Prototypes/Guidebook/references.yml
+++ b/Resources/Prototypes/Guidebook/references.yml
@@ -12,6 +12,7 @@
   id: Drinks
   name: guide-entry-drinks
   text: "/ServerInfo/Guidebook/ReferenceTables/Drinks.xml"
+  filterEnabled: True
 
 - type: guideEntry
   id: FoodRecipes

From d3d8a9e59c10b920fee3629651b2f03f6fc8ddd4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 10 Jun 2024 13:22:04 +0000
Subject: [PATCH 404/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7188eab2e50a..4baaa019195c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SlamBamActionman
-  changes:
-  - message: Space glue/lube tubes can now be used through the right-click menu.
-    type: Tweak
-  id: 6208
-  time: '2024-03-22T09:37:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26002
 - author: RenQ
   changes:
   - message: brought back the classic long bedhead as an alternative to the current
@@ -3853,3 +3846,10 @@
   id: 6707
   time: '2024-06-10T13:19:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28818
+- author: EmoGarbage404
+  changes:
+  - message: Fixed drinks page not having a search bar.
+    type: Fix
+  id: 6708
+  time: '2024-06-10T13:20:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28815

From f571e230378e5d5d11bcf61c4f4127b14c43e454 Mon Sep 17 00:00:00 2001
From: dffdff2423 <dffdff2423@gmail.com>
Date: Mon, 10 Jun 2024 21:48:23 -0500
Subject: [PATCH 405/568] Enable save button on changing job unavailable
 preference (#28839)

Enable save button on changing unavailable pref

Fix an issue where the save button was disabled when just changing your job unavailable preference
---
 Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 8ee25d6880b2..18f986fc7ddf 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -372,6 +372,7 @@ public HumanoidProfileEditor(
             {
                 PreferenceUnavailableButton.SelectId(args.Id);
                 Profile = Profile?.WithPreferenceUnavailable((PreferenceUnavailableMode) args.Id);
+                SetDirty();
             };
 
             _jobCategories = new Dictionary<string, BoxContainer>();

From 3c2b1affeffaa89babb644d0cfa9c227f3cf0553 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 11 Jun 2024 02:49:30 +0000
Subject: [PATCH 406/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 4baaa019195c..2b334e2ec1e9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: RenQ
-  changes:
-  - message: brought back the classic long bedhead as an alternative to the current
-      one.
-    type: Add
-  id: 6209
-  time: '2024-03-22T17:35:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26336
 - author: metalgearsloth
   changes:
   - message: Fix NPCs getting stuck on railings.
@@ -3853,3 +3845,10 @@
   id: 6708
   time: '2024-06-10T13:20:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28815
+- author: Aquif
+  changes:
+  - message: It is now possible to save after chaining you job unavailable preference.
+    type: Fix
+  id: 6709
+  time: '2024-06-11T02:48:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28839

From 2b2883005d0765bc465bdff121d99e624a91578b Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 11 Jun 2024 07:55:37 +0200
Subject: [PATCH 407/568] Fix some wideswing animations (#28819)

* Fix some wideswing animations

* 2
---
 Resources/Prototypes/Entities/Objects/Fun/toys.yml              | 1 +
 Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index def1ad3b6b6d..86060b1bbeea 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1222,6 +1222,7 @@
     - type: StaminaDamageOnHit
       damage: 8
     - type: MeleeWeapon
+      wideAnimationRotation: -135
       damage:
         types:
           Blunt: 0
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 7f593353bb51..592fe56b4758 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -128,7 +128,7 @@
         shader: unshaded
         map: [ "blade" ]
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: 145
     attackRate: 1
     hidden: true
     damage:

From 41a0ffba38e367f4f0d134e7acfb1493adaf04f6 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 11 Jun 2024 11:33:36 +0200
Subject: [PATCH 408/568] Add reward line in bounty label (#28853)

---
 Content.Server/Cargo/Systems/CargoSystem.Bounty.cs    | 1 +
 Resources/Locale/en-US/cargo/cargo-bounty-console.ftl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index 554b349b9ba6..4cbf2e63be8f 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -124,6 +124,7 @@ public void SetupBountyLabel(EntityUid uid, EntityUid stationId, CargoBountyData
                 ("item", Loc.GetString(entry.Name)))}");
             msg.PushNewline();
         }
+        msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward)));
         _paperSystem.SetContent(uid, msg.ToMarkup(), paper);
     }
 
diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
index bf7868e3df70..4314cbf44960 100644
--- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl
@@ -9,6 +9,7 @@ bounty-console-manifest-entry =
         [1] {$item}
         *[other] {$item} x{$amount}
     }
+bounty-console-manifest-reward = Reward: ${$reward}
 bounty-console-description-label = [color=gray]{$description}[/color]
 bounty-console-id-label = ID#{$id}
 

From b6d7a6a8e26570aa1bb12f9a9d277fda57f4112f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 11 Jun 2024 09:34:42 +0000
Subject: [PATCH 409/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2b334e2ec1e9..11957f2b62d4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Fix NPCs getting stuck on railings.
-    type: Fix
-  id: 6210
-  time: '2024-03-23T01:42:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26351
 - author: Ubaser
   changes:
   - message: You can now purchase a set of 4 throwing knives in the uplink as a bundle
@@ -3852,3 +3845,10 @@
   id: 6709
   time: '2024-06-11T02:48:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28839
+- author: lzk228
+  changes:
+  - message: Added reward info in cargo bounty label.
+    type: Tweak
+  id: 6710
+  time: '2024-06-11T09:33:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28853

From bd42c2b56aa6efc22e0a1ed8aba12d6f0964e24b Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 11 Jun 2024 18:18:30 -0400
Subject: [PATCH 410/568] Fix nearest beacon messages reporting the opposite
 direction (#28869)

* Fix nearest beacon messages reporting the opposite direction

* Lets document that method, shall we?
---
 Content.Server/Pinpointer/NavMapSystem.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index 424b6427de4b..da9ab20a39ab 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -431,6 +431,10 @@ public bool TryGetNearestBeacon(MapCoordinates coordinates,
         return beacon != null;
     }
 
+    /// <summary>
+    /// Returns a string describing the rough distance and direction
+    /// to the position of <paramref name="ent"/> from the nearest beacon.
+    /// </summary>
     [PublicAPI]
     public string GetNearestBeaconString(Entity<TransformComponent?> ent)
     {
@@ -440,6 +444,11 @@ public string GetNearestBeaconString(Entity<TransformComponent?> ent)
         return GetNearestBeaconString(_transformSystem.GetMapCoordinates(ent, ent.Comp));
     }
 
+    /// <summary>
+    /// Returns a string describing the rough distance and direction
+    /// to <paramref name="coordinates"/> from the nearest beacon.
+    /// </summary>
+
     public string GetNearestBeaconString(MapCoordinates coordinates)
     {
         if (!TryGetNearestBeacon(coordinates, out var beacon, out var pos))
@@ -451,10 +460,11 @@ public string GetNearestBeaconString(MapCoordinates coordinates)
 
         // get the angle between the two positions, adjusted for the grid rotation so that
         // we properly preserve north in relation to the grid.
-        var dir = (pos.Value.Position - coordinates.Position).ToWorldAngle();
+        var offset = coordinates.Position - pos.Value.Position;
+        var dir = offset.ToWorldAngle();
         var adjustedDir = (dir - gridOffset).GetDir();
 
-        var length = (pos.Value.Position - coordinates.Position).Length();
+        var length = offset.Length();
         if (length < CloseDistance)
         {
             return Loc.GetString("nav-beacon-pos-format",

From c5b30a384f0e1cd2cbf24b880df3dd424780eb13 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 11 Jun 2024 22:19:37 +0000
Subject: [PATCH 411/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 11957f2b62d4..66fdb9e6b38e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Ubaser
-  changes:
-  - message: You can now purchase a set of 4 throwing knives in the uplink as a bundle
-      for 12 TC.
-    type: Add
-  id: 6211
-  time: '2024-03-23T04:13:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26026
 - author: ElectroJr
   changes:
   - message: Fixed a bug where partially airtight entities (e.g., thin windows or
@@ -3852,3 +3844,11 @@
   id: 6710
   time: '2024-06-11T09:33:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28853
+- author: Tayrtahn
+  changes:
+  - message: Announcements for the location of the evac shuttle, the armed nuke, and
+      more will no longer send you in the opposite direction.
+    type: Fix
+  id: 6711
+  time: '2024-06-11T22:18:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28869

From 3d2589366415d17aa5d2b3091f7936d6938eb1f9 Mon Sep 17 00:00:00 2001
From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Wed, 12 Jun 2024 03:07:37 +0200
Subject: [PATCH 412/568] Cluster Update (#28854)

Changes armoury, cargo job slot
---
 Resources/Maps/cluster.yml            | 318 +++++++++++++-------------
 Resources/Prototypes/Maps/cluster.yml |   2 +-
 2 files changed, 155 insertions(+), 165 deletions(-)

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index a9f601114c60..78fdcc4fd1c0 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -3972,7 +3972,8 @@ entities:
           9,2:
             0: 30464
           9,3:
-            0: 119
+            0: 103
+            2: 16
           9,-1:
             0: 62591
           9,4:
@@ -4100,32 +4101,32 @@ entities:
             0: 65520
           10,-4:
             1: 8738
-            2: 8
-            3: 2048
+            3: 8
+            4: 2048
           10,-3:
             1: 8738
-            3: 2056
+            4: 2056
           10,-2:
             1: 8738
-            4: 8
-            5: 2048
+            5: 8
+            6: 2048
           10,-5:
             1: 8750
-            3: 2048
+            4: 2048
           11,-4:
-            2: 3
-            3: 768
+            3: 3
+            4: 768
             1: 34952
           11,-3:
-            3: 771
+            4: 771
             1: 34952
           11,-2:
-            4: 3
-            5: 768
+            5: 3
+            6: 768
             1: 34952
           11,-5:
             1: 34959
-            3: 768
+            4: 768
           12,-4:
             1: 12834
           12,-3:
@@ -4160,11 +4161,11 @@ entities:
             1: 7983
           8,-6:
             1: 61713
-            3: 204
+            4: 204
           9,-7:
             1: 20263
           9,-6:
-            3: 17
+            4: 17
             1: 62660
           10,-7:
             1: 4369
@@ -4359,7 +4360,7 @@ entities:
             0: 4352
           -1,16:
             1: 1
-            2: 128
+            3: 128
           -2,17:
             1: 8
           -1,17:
@@ -4397,6 +4398,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -8213,13 +8229,6 @@ entities:
     - type: Transform
       pos: -14.475516,-1.6162148
       parent: 1
-- proto: BoxBeanbag
-  entities:
-  - uid: 5430
-    components:
-    - type: Transform
-      pos: 38.515625,12.538095
-      parent: 1
 - proto: BoxBodyBag
   entities:
   - uid: 5351
@@ -8506,18 +8515,6 @@ entities:
     - type: Transform
       pos: -12.516884,19.876278
       parent: 1
-- proto: BoxLethalshot
-  entities:
-  - uid: 5428
-    components:
-    - type: Transform
-      pos: 38.48653,12.471226
-      parent: 1
-  - uid: 5429
-    components:
-    - type: Transform
-      pos: 38.502155,12.596226
-      parent: 1
 - proto: BoxLightbulb
   entities:
   - uid: 7667
@@ -8539,20 +8536,6 @@ entities:
     - type: Transform
       pos: 12.611424,-0.37101722
       parent: 1
-- proto: BoxMagazinePistol
-  entities:
-  - uid: 5423
-    components:
-    - type: Transform
-      pos: 37.484375,13.569345
-      parent: 1
-- proto: BoxMagazinePistolSubMachineGun
-  entities:
-  - uid: 5421
-    components:
-    - type: Transform
-      pos: 36.5625,13.600595
-      parent: 1
 - proto: BoxMouthSwab
   entities:
   - uid: 5906
@@ -54901,6 +54884,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,-30.5
       parent: 1
+- proto: GunSafePistolMk58
+  entities:
+  - uid: 5421
+    components:
+    - type: Transform
+      pos: 38.5,13.5
+      parent: 1
+- proto: GunSafeShotgunKammerer
+  entities:
+  - uid: 5423
+    components:
+    - type: Transform
+      pos: 38.5,12.5
+      parent: 1
+- proto: GunSafeSubMachineGunDrozd
+  entities:
+  - uid: 5435
+    components:
+    - type: Transform
+      pos: 38.5,11.5
+      parent: 1
 - proto: Handcuffs
   entities:
   - uid: 5063
@@ -56196,18 +56200,6 @@ entities:
     - type: Transform
       pos: 29.556211,16.447828
       parent: 1
-- proto: MagazinePistolSubMachineGun
-  entities:
-  - uid: 5311
-    components:
-    - type: Transform
-      pos: 18.504484,15.628139
-      parent: 1
-  - uid: 5312
-    components:
-    - type: Transform
-      pos: 18.77011,15.612514
-      parent: 1
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
   - uid: 1865
@@ -56222,25 +56214,37 @@ entities:
       parent: 1
 - proto: MagazineRifle
   entities:
-  - uid: 5432
+  - uid: 5428
+    components:
+    - type: Transform
+      pos: 36.271854,13.401509
+      parent: 1
+  - uid: 5429
+    components:
+    - type: Transform
+      pos: 36.50623,13.401509
+      parent: 1
+  - uid: 5431
     components:
     - type: Transform
-      pos: 38.28125,11.49122
+      pos: 36.72498,13.417134
       parent: 1
   - uid: 5433
     components:
     - type: Transform
-      pos: 38.421875,11.506845
+      pos: 36.646854,13.526509
       parent: 1
-  - uid: 5434
+- proto: MagazineShotgunBeanbag
+  entities:
+  - uid: 5436
     components:
     - type: Transform
-      pos: 38.59375,11.506845
+      pos: 38.602123,10.763362
       parent: 1
-  - uid: 5435
+  - uid: 7547
     components:
     - type: Transform
-      pos: 38.75,11.506845
+      pos: 38.602123,10.482112
       parent: 1
 - proto: MaintenanceFluffSpawner
   entities:
@@ -58143,6 +58147,65 @@ entities:
     - type: Transform
       pos: 35.5,-2.5
       parent: 1
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 5404
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,11.5
+      parent: 1
+  - uid: 5405
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,12.5
+      parent: 1
+  - uid: 5406
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,10.5
+      parent: 1
+  - uid: 5407
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,13.5
+      parent: 1
+  - uid: 5418
+    components:
+    - type: Transform
+      pos: 37.5,10.5
+      parent: 1
+  - uid: 5424
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,13.5
+      parent: 1
+  - uid: 5427
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,13.5
+      parent: 1
+  - uid: 5430
+    components:
+    - type: Transform
+      pos: 36.5,10.5
+      parent: 1
+  - uid: 5432
+    components:
+    - type: Transform
+      pos: 38.5,10.5
+      parent: 1
+  - uid: 5434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,13.5
+      parent: 1
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 1743
@@ -67603,10 +67666,10 @@ entities:
     - type: Transform
       pos: 23.5,13.5
       parent: 1
-  - uid: 9331
+  - uid: 5422
     components:
     - type: Transform
-      pos: 38.5,10.5
+      pos: 37.5,13.5
       parent: 1
 - proto: SuitStorageWarden
   entities:
@@ -68483,6 +68546,11 @@ entities:
     - type: Transform
       pos: 0.5,18.5
       parent: 1
+  - uid: 5312
+    components:
+    - type: Transform
+      pos: 36.5,13.5
+      parent: 1
   - uid: 5314
     components:
     - type: Transform
@@ -68513,30 +68581,10 @@ entities:
     - type: Transform
       pos: 23.5,5.5
       parent: 1
-  - uid: 5404
-    components:
-    - type: Transform
-      pos: 36.5,13.5
-      parent: 1
-  - uid: 5405
-    components:
-    - type: Transform
-      pos: 37.5,13.5
-      parent: 1
-  - uid: 5406
-    components:
-    - type: Transform
-      pos: 38.5,13.5
-      parent: 1
-  - uid: 5407
-    components:
-    - type: Transform
-      pos: 38.5,12.5
-      parent: 1
   - uid: 5409
     components:
     - type: Transform
-      pos: 38.5,11.5
+      pos: 38.5,10.5
       parent: 1
   - uid: 5551
     components:
@@ -79771,15 +79819,17 @@ entities:
       parent: 1
 - proto: WeaponLaserCarbine
   entities:
-  - uid: 5424
+  - uid: 5425
     components:
     - type: Transform
-      pos: 38.328125,13.694345
+      rot: 1.5707963267948966 rad
+      pos: 38.039623,10.575862
       parent: 1
-  - uid: 5425
+  - uid: 5426
     components:
     - type: Transform
-      pos: 38.375,13.58497
+      rot: 1.5707963267948966 rad
+      pos: 38.30525,10.607112
       parent: 1
 - proto: WeaponPistolMk58
   entities:
@@ -79788,46 +79838,12 @@ entities:
     - type: Transform
       pos: 29.446836,16.541578
       parent: 1
-  - uid: 5422
-    components:
-    - type: Transform
-      pos: 37.46875,13.61622
-      parent: 1
-  - uid: 5436
-    components:
-    - type: Transform
-      pos: 37.546875,13.55372
-      parent: 1
 - proto: WeaponRifleLecter
   entities:
-  - uid: 5431
-    components:
-    - type: Transform
-      pos: 38.533405,11.484736
-      parent: 1
-- proto: WeaponShotgunKammerer
-  entities:
-  - uid: 5426
-    components:
-    - type: Transform
-      pos: 38.470905,12.377476
-      parent: 1
-  - uid: 5427
-    components:
-    - type: Transform
-      pos: 38.54903,12.330601
-      parent: 1
-- proto: WeaponSubMachineGunDrozd
-  entities:
-  - uid: 5310
-    components:
-    - type: Transform
-      pos: 18.660734,15.690639
-      parent: 1
-  - uid: 5418
+  - uid: 5311
     components:
     - type: Transform
-      pos: 36.546875,13.694345
+      pos: 36.459354,13.651509
       parent: 1
 - proto: WeaponSubMachineGunWt550
   entities:
@@ -80012,6 +80028,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-20.5
       parent: 1
+- proto: WindoorSecureArmoryLocked
+  entities:
+  - uid: 5310
+    components:
+    - type: Transform
+      pos: 36.5,13.5
+      parent: 1
 - proto: WindoorSecureCargoLocked
   entities:
   - uid: 7243
@@ -80219,23 +80242,6 @@ entities:
     - type: DeviceLinkSink
       links:
       - 12487
-  - uid: 12003
-    components:
-    - type: Transform
-      pos: 36.5,13.5
-      parent: 1
-  - uid: 12004
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,12.5
-      parent: 1
-  - uid: 12005
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,11.5
-      parent: 1
 - proto: WindoorServiceLocked
   entities:
   - uid: 3375
@@ -80604,22 +80610,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,13.5
       parent: 1
-  - uid: 12000
-    components:
-    - type: Transform
-      pos: 38.5,12.5
-      parent: 1
-  - uid: 12001
-    components:
-    - type: Transform
-      pos: 38.5,11.5
-      parent: 1
-  - uid: 12002
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 38.5,12.5
-      parent: 1
 - proto: Wirecutter
   entities:
   - uid: 6073
diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml
index 10a12c4f44e2..0841a12b1d54 100644
--- a/Resources/Prototypes/Maps/cluster.yml
+++ b/Resources/Prototypes/Maps/cluster.yml
@@ -52,7 +52,7 @@
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]
-            CargoTechnician: [ 1, 1 ]
+            CargoTechnician: [ 2, 2 ]
             #civillian
             Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]

From d6399446b6bd1da1cd70c0b140d3c4c3b1c2eba9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 12 Jun 2024 01:08:43 +0000
Subject: [PATCH 413/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 66fdb9e6b38e..c3dd6af5738f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ElectroJr
-  changes:
-  - message: Fixed a bug where partially airtight entities (e.g., thin windows or
-      doors) could let air leak out into space.
-    type: Fix
-  id: 6212
-  time: '2024-03-23T16:34:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/22521
 - author: Killerqu00
   changes:
   - message: Cable Coils are now small in size, taking only 1x2 space in containers.
@@ -3852,3 +3844,10 @@
   id: 6711
   time: '2024-06-11T22:18:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28869
+- author: Boaz1111
+  changes:
+  - message: Refactors Cluster's Armoury
+    type: Tweak
+  id: 6712
+  time: '2024-06-12T01:07:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28854

From 9a32a1949c57d9b22583ff345c64a2c0f622e805 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Wed, 12 Jun 2024 01:04:43 -0500
Subject: [PATCH 414/568] Removes Trials of Mana grassland sprites: Bare
 Minimum Edition (#28868)

* replace the grass sprites. again

* Fix dirt

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
---
 Resources/Prototypes/Tiles/planet.yml         |   6 ++++++
 .../Objects/Tiles/tile.rsi/astrograss.png     | Bin 1926 -> 1983 bytes
 .../Textures/Objects/Tiles/tile.rsi/grass.png | Bin 997 -> 344 bytes
 .../Objects/Tiles/tile.rsi/grassjungle.png    | Bin 778 -> 713 bytes
 .../Tiles/Planet/Grass/attributions.yml       |   9 +++------
 .../Tiles/Planet/Grass/double_edge.png        | Bin 5719 -> 2094 bytes
 .../Textures/Tiles/Planet/Grass/grass.png     | Bin 10610 -> 2230 bytes
 .../Tiles/Planet/Grass/single_edge.png        | Bin 5140 -> 2015 bytes
 .../Tiles/Planet/Grass/triple_edge.png        | Bin 6741 -> 2020 bytes
 .../Textures/Tiles/Planet/dirt.rsi/dirt.png   | Bin 418 -> 768 bytes
 .../Textures/Tiles/Planet/dirt.rsi/meta.json  |   4 ++--
 Resources/Textures/Tiles/grassjungle.png      | Bin 297 -> 536 bytes
 12 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml
index 5a158bdcfc84..ccb3fb61dacd 100644
--- a/Resources/Prototypes/Tiles/planet.yml
+++ b/Resources/Prototypes/Tiles/planet.yml
@@ -2,6 +2,12 @@
   id: FloorPlanetDirt
   name: tiles-dirt-floor
   sprite: /Textures/Tiles/Planet/dirt.rsi/dirt.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   isSubfloor: true
   footstepSounds:
     collection: FootstepAsteroid
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png
index f548ef7ace97cfefdb8f052cba32c53c36d67631..1b2d76a3e485a9c07514fd63ac95c60a63e41cb4 100644
GIT binary patch
delta 270
zcmZqU-_O5c6QiSIfKQ04p^sW{or_bdQB=3DN0Cize?ZRk1gA7(&mx<k23H0KhVO|j
zQ-KtBNswRge>h<9@@M?C`8FdTYyC=37sn6_|EH5~avcufaCscI_ve59cZOS9lAP{G
zZ*DA}^U-PBU+=%t8)~nuu4bCuv5GU_xO{r?hrgoYzaG81_Jl<z<iaiIqa{pI6{{az
z;xuba4k)-VTb9F3Y5(^Lt2xR`f*u@^o6g{UtB}XfxN!~FyNK00uCZus78AL#s)w`0
ze!u&{JegZEsvQq!9+((=lkaQ{L&S!IT`aw`7@|~fKXmeKU;qDb?q8-2@BNQ3Dr%}V
S+eHBV!{F)a=d#Wzp$P!NczI?3

delta 213
zcmV;`04o2#4~7r0vH>X%P)t-sG(;puTrgyMH+r8U0000*0h)pU000GaQchF<|Ns90
z`?d~Kv-1HC1%HT1L_t(IPvw$94uBvG1Zm;_Z+2(Z7(>y!Hd2T?44Bx)OZ^RK_d4EQ
zK#R<XV5nzY8_(H^3#iXPb}}1sWk_#^tN>+1PBlt{3qq>Wpu*!tY2XeJ>g5qWdj~2*
zMklmL_job@R)%!IXFwH(Jyz<w&VbHkt1!12z{|s|#U2E_{twIg0x-q~lrRj-LAuN}
P00000NkvXXu0mjfImK6}

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grass.png b/Resources/Textures/Objects/Tiles/tile.rsi/grass.png
index 696d0eb5432202496fbb4c2859ba86cb87ff2a0f..e866fb2cd92e605704bdccdc6e0b5c3bd25d1a9c 100644
GIT binary patch
delta 308
zcmaFLeuHU(WF|8M1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKQ04
zp^sW{or_bdQB=3DN0Cize?ZRk1gA7(&mx<k23Me}?};r_ffRR1kYDhBIAHMdXZ$o#
zQM{gErKgKyh=u>tNjJF;2XMGN4%_?lKmR+!EiFk-_oFvA7SH+UwC%6=U+E3C*H%|E
z&F)ymnQvS^z4*glQSo1oUR`^_q7!oAmh;gPCaH?mk1lbVH6{lXT$nA(;ik0z`-IgT
z<t0H6j>t`C@V-^Z<7eEshU;C#>K)fuv^I;0+*sAa=}@xY{a~KVEg990hcgdMjJ?Ts
zHijW$!@(|=-dPM$s<$6H`L?hBe>nFq(}wr{M;H|~)tc=hfZk#7boFyt=akR{04lG7
AQ2+n{

delta 986
zcmV<0110>}0_6vg8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00WmvL_t(|
zob8s$a^hwbMvn#%5|ac7kPU8EI_YHF)o<ZEw-;WxymD3CPPYx1!OVjIjVM1nfIC&H
zRC?jNk*cnSbBFKVU*&(ccYt?*cYvQC;OgosIbM?_L6&7CNq<676neeh$$xoyNe~1l
ze;9^%p2y*EINjge+(@Yajz8c08B>T=y6riY??tk4!2IKi`coabpwO`gkX5k08N52L
zm@|uc+o$oZ%;(^9a(8$4Cd8Wns;Z*P9^Laf_LI%x*8%3=4H{F0{-*`GFhCpBDES(_
zPfMDeI!Wwd9DjD~9O?9astiO?M5stK#x~Ql0q4&qV`t2?ctFRX*stJ;FZ7%#)}TTp
zyUZ^_%7Y8x-LsT-=>W3XEH8~2)jl*=7P~k>i9>3AM*wZfCoxIrbH3J?wN_ZqDv1}P
zM-q`1r_VsQ+ZA=MBgqmAXGB<tX)ewQVjsmju=_B^8h=$;n^WwU8m?%@>bS;EKCme*
zFx5&rfMbVGSg~%bs0{Kbhdi<5GHiP|j|OqM%&IUYKXH%(k3}N{ZBA`y<4o#AnIDSa
zZGfZPv_qE6yurBCp|sbD$<XQ)aW#ciu|vhRSzo&3o=UXWD&8)`__ra=mj*d4CBRYh
z%T`|mWq*OGQ(PzXZJ*30Ptcyw9G|hOF3I%_d~1m0mM}!Ql0d+Ttm%@K4&XR=LPZm@
z%47c(u_<dbml2BL;pT)-44mw&#MWG64qL1*CgeJB-m@8eoSgzloq_5shX_hEp^vfK
zv99{4!<=YDmzpocmI<lsvM5@JzRDq{07_;<UVo1GH})pL!@~peRe-UVscvlceoSQS
zk;UL~Mhzx^xJW{B#&edLvqsediX#1s4=&|L^E8%I0km2zW{W+u<`8QRv96I5^;e1s
z!`cMvYY|lvYRG%Yx<u)<iW+6fua{)R208ACQ~>+^9!)%Q(YJUJQ7OAM)}qMv%;o&S
zrhoIhOY5u5sJx>wYBDNxXhwCc*E5E{bje4>bO65ZGq<N0V)|J_hl3bEl9pi`?lDU-
z^;a<+^+ZIiASD5M)*uLV-1Z1RGRUOOKpe+dFJ}~RiA8;vml4{d=!dOIBAU#tk1&^I
z^npcUZV7V<m1M<ItmbSKpE8&V;QIPn`cvY4Nj3uHXh&7d#gfr94PX4k$P@@T`nIR@
zKp|Gx90D@OW{rIA@9)!{2aa}od;4QCr?8*@NcIl!4)9;wKLqrz3NSP*NB{r;07*qo
IM6N<$g4<Kv)c^nh

diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png b/Resources/Textures/Objects/Tiles/tile.rsi/grassjungle.png
index 8f3407369ba34bb363a2aa72ba6894af5ae5bb12..e78f89273fbdac00c9ea549767bd0cd8411c5ea8 100644
GIT binary patch
delta 700
zcmV;t0z>_Z2FV4G8Gi!+002a!ipBr{0fK2mLr_UWLm*IcZ)Rz1WdHyu&y|r&C`3^l
z#(yp%k1WhWSlk6xNJy3pB}Gkx@>;m}j(ODFJJY=*8%t%YEIc+|3ma>;7Pd+$kCL68
z6|s@7|GA@PQlp$YonPNM-`6?c0qr1d*<M8t*iO!kj)nEvxqo@R>X}+v(CDVxu)OSW
zBr-wC@o`I;T5q~k7XKUdv1QMKGF^Dc%DOq>CE<b9TvqXpaL7s;G2v6;PFF4{e6Msf
z&o7D-0c$EV<W5INghRr5qKM5Rwvw(b+%Mb~vmMFTX7e0Vyr$SruUJ3#R4=Ssc4nrO
zF0+*}#+f97j(^DtDbnQVlGPE#BP#ph68`4E9}$-+t`wFyM#*4f1b);X{O;C^_x0wJ
z>cUX@<oj>!P_+eLo4)^f==)zsQ2q!PPQjl!fWddsHw#+ZJ~XVu*=0d9x8ZyPnjW%-
zYXnlcOf4RV*Aw}sIcU6wnuUCCKl>ct!L)QWaRs}3(0`GT?8OrAt}gEF&oe=Pguek-
z>T;Y?6DeT;001FSOjJcNOeRx)L_%dUT8m9cay(s+P;8fALS{2bay(LiMF0Q*_hE#U
z0000BbW%=J|NsC0|NsC0|Nj6=PXY1(000SaNLh0L01m?d01m?e$8V@)0001~Nkl<Z
zI8Wu0*?$VdPzXfhR=xTE5AHFvgknP9TeE?4obf`o{Y(8Duzl96djgw?stIp1cb9YU
z{S_Db;_BAq1T0k0+C#;30vdR$;?fB=fn!i`(3>3yMk2rWkgEuHbW-5N9+v=1+Hnj{
zGl8rM?pUk1)&wfE78Ka3j0tqVN5O6!+8iZ_;We4SkzLsi&0GLju)&H1jhX;jCEMXb
iO^2`l!)^Tnu<uXA0U;?SgFaXQ0000<MNUMnLSTa05=0~b

delta 765
zcmV<Z0s{TX1&Ric8Gi-<0047(dh`GQ0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ
z#a~mUMJo<=5Ov5<ovet8IBFG&P$AR`tvZ-oKcPuOlH%ehxE37zSgbm@IP2=*DhPrf
zAZ~6>iY`*(|B^zB7!Qv7@$TN^?j0c1%S<&p#sO8cjAT3}rhhZ5V&E0s7=(Z^1Z8IG
zbCQ&R=lHsZkFR%8p5=Y+&(V|3nGEoW#IsB{EaDB~=}k-LyiXivMLA1+PCRPR1&JTI
zuDJZhx!|zCGs8wIIZqrW77J~xv@t6hD)AI?B&%waFQi@0a^B*smaD9JPyWJCPFq>#
zI?W-(v4|x|5PzYdiW17O5T#Wk#YB?!V;=qi$1jmfAy)~E91EyGh3xpj|KNAGW`1(Q
zO$x<;&KKMM7zP5nK%-{c-^aGyI05|6z?IhWSL(pbC+W487C8cXw}Ff6mZt0hmpefJ
zlP(*wBl&3x`8@D`M&FbH`fh=)HMh6sK29Hi6m^xj0e=n-fsq1buY0^Z*xuW}XPW)}
z09WdAoS+OoCIA2dK}keGR9J=Wm9c8WFc60SmcD|Bf*?b(W;FIt$RlLWYxF_-8rky*
zfetnvyS78Y)WHwoPG`>7v!psH6sm8D&${^kr8`MLB9Zv-+=UVryG_qy<1D(SRbzTC
zvK#<#dVf9!zwb@h9v*uD-vl&hOd5JUzIZk6eS_=eDoWgED1_JDVz=pyvqLOr7{lfK
zHh%>;BuXYY6jSZx``HGxh9eV2mJfmymvyC@_7N-rJ(HLe36<m~B{0sStSgjt1>-Da
zU+_HbceVk!<l1bxm>i2KL39)T7EwK*opvE8?{?}QFwSDVT#Y`;x7$>`W6z4H9(e!!
z7`^8^K|6ls|7RQMnigHt4l5wd@g_CSqR8^m3f-&;Y5Q?;GDk5llg#(=;2WH};Us*f
vKfN!4_x1ki(DNB-MyA9<J0Our{0Y7QG-keJ3MNjb00000NkvXXu0mjfM$2lT

diff --git a/Resources/Textures/Tiles/Planet/Grass/attributions.yml b/Resources/Textures/Tiles/Planet/Grass/attributions.yml
index e7d9481b8acc..1749225e1a95 100644
--- a/Resources/Textures/Tiles/Planet/Grass/attributions.yml
+++ b/Resources/Textures/Tiles/Planet/Grass/attributions.yml
@@ -1,7 +1,4 @@
-- files:
-  - grass.png
-  - double_edge.png
-  - single_edge.png
+- files: ["grass.png", "triple_edge.png", "double_edge.png", "single_edge.png"]
   license: "CC-BY-SA-3.0"
-  copyright: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82"
-  source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82"
+  copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49. double_edge, single_edge, and triple_edge modified from grass by github user @Flareguy"
+  source: "https://github.com/space-wizards/space-station-14/pull/27912"
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/Planet/Grass/double_edge.png b/Resources/Textures/Tiles/Planet/Grass/double_edge.png
index b41e55af7c56979368a5ecd16096fc8c308745b4..218751211c6ec519a2a0ec9eaeec8ce64d297180 100644
GIT binary patch
delta 1186
zcmcbvvrb@wWIZzj1B1(wu44=gjLn(O&H<jz&I$oV`DvLssSFGn=ci8e)o=-vIa<#)
z(M@a_NB4G#uw^Yva!g#hE}hY6ZvB35#=>W|m#dYfy;E1~)a2CY=B&9Hbwg`u%@m!r
zYdU(r{CO{JI$7%JwYUGQzR$b7_qo#ph3u%jQ1OVed!4;*TVK{c=?VMnGeK=tW~zhv
z-8(KdDvmcl7J9cv<tu4*|L^^Er77E~Rm~>j*_=He_7vRDvRhu^Zjqw*O7mgxLqB&t
zjhgi(ix22`8QZakq@D0Q($?a9C~8?tuaKFztoM#^i#eNePV)PRTP&^c-8ePYu>Rf3
zIEk1I%O817zj;g}*~g%>zU?5FcgjiOiC4vrs;d3IX!K9)zP+ZNbBy<lM-pk0+;_h(
z{`a7Kd)}_)yC;bBIDMV`eD7B0vtl*5Rrj7Rd|oT-_*6OOhU@=Nj9>P5?~A;0==X&U
zeCg9&&)#VJ%$ren;$`1E@2N)2FHQE$J7KQ6@T1hLH155B-xSxdbH2>_!&UY@eSxy_
z&EnL1vC+3~&rkpJucMCn<d33LE0Z^_0Y;2yfKP~PP=l*yk&RQDacqBpN0Ci%oeNNA
z*4KCkAjMu1<QM!O3>c)mncaXwoCO|{#S9F5M?jcysy3fA0|V=($<plpjJ%Vx*j<=;
zxfCX^XLnKt(m-HSl#*uUl3JWxlvz-cnV+Ws;wL8MmzLNnDNPpT(3|YeVL!QxLuc|X
z4mECtirk#MVylwOw6w{J9AY9MhQ6VmfxZ${rXsfhC?UtFG})fhV{#X#!{oD^9<~Z8
z$yRRpMY)MULo;&|(^K^e^3s(Q+&z5*tQ-S8ZIz7l44~YAoWznepi*0<@XWlF{PJR@
z$#Gmt^$@jTsYS&=H-gj~8t55WC@Fv(VC7$wnVMIU2y(uyk|D?`1y;^Qsfi`|MIrh5
zIkrk5ixfb5l<XkB2KpPQ$k*4(BeNK&suC^?4Upi}LL?yt1wC*u<zy-pm$;UdSS2Py
z>?%$yOHEON3MOYH=B1~m*edBOO}6BAm|V}THF-U^qOF2Hicut+Bt6-fM-^(CjH0EL
ziHQ=5kv96ED1*Cr@<ATqdT88&Wso8l>=20hAQv|v&qlw(3K$T%sU?XZo_$3@VsdtB
zi9%`~&>uxg_I7IX#clu-RlKK*V~B<S+ipXlBL*DItv)~gPu}b>_1Ua!U1O$$QC$;u
z*NCVmRlOI8ZraIvh}ku;>8r0DTicc7rHa+tJR`pCFIu+hjKj(pqlt$l)`sUUJ}aNi
m_~#mHn0Q2N!dLx(uS|y-#h5svg+hULF?hQAxvX<aXaWGh54sir

literal 5719
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

diff --git a/Resources/Textures/Tiles/Planet/Grass/grass.png b/Resources/Textures/Tiles/Planet/Grass/grass.png
index 006a76e64ed0d0ff6520c9e21cef9cce5a18efb8..b6d6e8b4dbbd01edfaaddde0b76e5bbdb1f5e9bf 100644
GIT binary patch
delta 1316
zcmewqv`uh=L_G^L0|SEwPp%jP17lOBvvYu_v$H}#QGQxxPAX91{M3oQ8ZLn{N9);o
zO*R?0ZmQ@`bmcr5<h(@VY|pHNhpO|>1bm+Na_`I>ovCX#ec1SM>xPYK*@>&Cd<xvO
zWs{QGrO*5GulQt5iQfME^_^<J@AJ4Do9ATiEZv)MlU3bJ?rQy{m65tXd^*BjNh++E
zomZ!2H*LYIA3K)1tu?pR>i*xm?8~BTr(QLioM&^JJ~VxJkfpf3!rdZA?`7u0;D>qc
zdKxwBOBNr|@7ip~9+Gy$^N3r^;X_f|ntHj+rptI&I9N>DmUEI{#d}WJo@F;qiJqNb
zy-K`I?Cs1Qmr~0N&anjh)Gtm9NSP_aT9vZZwXpMK-IlKXcfb30pBA`ow9LXS@}SfA
zzbov2++92S<$G<_)<psTpH$}06}Z#1-uL`(n=gCTE3c?+;okiw-m+m~`9<^7Q7Q7X
zu0MRUX^rIVf_;p+{FQev)~*aoQ<&U%UHIoRku5RKk7HJDpI_VeUO_R|H}2rOD7lhU
z)#`nxc1vqj|Nh)_U;bi#+wY?FO7GOvf$<_8;1l8+T<79ZWE0ix>y&DgGd&@;KOm^V
z)hW%`v&hD0;%9lFGR^{z$YKTtz9S&aI8~cZnt_4k)#MgYe@5QPmqlHedASrOONcqK
z0BMEE(PHwG>%{aXZxFMe{8>zAva-0^WM6UZ$u;7dlUIm)O#UqHFxgDPV{)T}7{7wM
zr*D9jV}Pfvl98T)(&RM~5|fWhDCt1N!%~ZiGxPI6a)t(aMixp6C7EeyR{lkqsd*)d
zC15E-rO9%VvbG?bLBOUWx4_re$|JM5B)_QA4kiqgC`w7Q3QjFV5`qfmWKPbP6cth^
zE^#d@u}aQJ%u7#Au~pJnn!HHTVe$(}t;rHniuDTmNIGrw(M_|_$7V4^ol9zQa#3ah
z$h}}QAfiDoZa^MTpA}GNZfZ#)h-Y6>keHmETB4Ae2XsP_lD%C~*OS@6tW&?&)5S5w
z<M`Ce)_D&U1lS%h&eCPnw!PumU&y!Nrm%{(?lPalkD0dZWav+3f6ME}v7|p~$xlfJ
zi|4cBSlj!jcFtX}HsSV)M`@MUqc|Klu;qzxoHBPk=*7sBZ6Nh6_V2x|kzW!;4@#|g
zdWd7e{9oRYycx{3ks=FwvYq%(f9d;LpL0;)oMXl^5%D1DC5hFOwQq{$s&eey5Wc1{
z_;8r_wOE-PHkFNRTXSMoHEZ7p-{{e1+92>-uSZq>|M8whXJ@2p&%7NJaj)~B)Cs4f
zHs%YTFpBY9JFsOz%F?Qhzh)HwW6yrz60AAJF0S#+^uLFsrp0Rioi3%Qdwr778pW^L
z?&kGT91nkm|7|wy5xR7@NW#B2xu?l=iQyrQt;eQhNmwTH`s?UDjmgUXKG*4hR85te
zb$9vMt9QDOOZ|F!y4-$!q`@&U;cEe(ZPQk4&hW2n=`g)=qdNcW)@kdd);F2<T)3ri
zG4;Ov`I{2g0_MI}o>$Jda@*@)t)_R%J5x)p&-?avcj)&B=bcp^C+F%;t!b-D=Dip`
z-8=8#^ckzxM>zKtKdrnQU9gsI&GYnKpCf~MOYeODYOzLf`=ni~ji+6lrye>d_%Gw9
Xmm2#YyIy|=%ufuSu6{1-oD!M<Cm|_H

literal 10610
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
TP9-`1uL+>5X{1rD<{0%qYL|cL

diff --git a/Resources/Textures/Tiles/Planet/Grass/single_edge.png b/Resources/Textures/Tiles/Planet/Grass/single_edge.png
index 437c0907709db10afd936c0d3652225d4282ea66..60bbf65c79d6c67bf89ad0ddb9ec704902ae9d5d 100644
GIT binary patch
delta 1080
zcmbQDai4#Jay?^nrn7T^r?ay{Kv8~LW=<*tgU0!(6MZ#Y0%eZYvrTjpTgK77T_S8*
z%aR-um##}^G@4t#-<z@UneF9jWohr!)jBmfHM%)#ZbseET3RzjXYHDf-Y<XNOPfxX
zdV1~cKdbNaF7JKr^gtmyDlb$#qU>I0uiMs_PkO>W`%F+<m6=-aV1D<GOO1--&5woN
ztx@?(THXJ9e_d(Hc4}3#$#^zr&xbt)_p|JlSGZfG=)KZ>82r%BT~DKCeaYej`d!9$
z>>+6<Jdd=sI3J2y*3v6vCNAr}Biv%nrks=fKH?TjD||OjjWw))w=zy5X2bGFUej+L
z(@6F)=xjU4<(+a;c;Z#D`lG69zb_j76T5G(splNyJ>!u?nk4t#?~DIEDBqs9Yx(X8
zB0WxDCqLi2)%mPgO>Wh_=L?_L$~rz(j=ACb{}bbv{oVT_uN?Y)VFO?Kbl0;t+CKAU
z)SY<Q_s)B&5%WuvJ@ZbOt1kQ~^(u{f@837YHSC-(v;J_EeP5uge6u+9UTpL&f!p)b
z|NQHyV?Oz#=+w&OjcX?R3X3zbZklYv>d(kKxtrC6nU_mp@&#5WWgra%Hbp6ERxYW<
z$wiq3C7Jno3Lt)BQhsTPt&-AYGd8`+8Ep2GSF`C%zRjjKnU!6eOQ9k+C$HG5BDY|&
z0J|7xMPh-zp`L-h(&PkokIAdq9VWkH_pnt+Nw#v!FUm~>8k3oun4YR%ke9Bc;O^-g
zVC5L#X{%(UX8`2}<Rq4)0hQV+g=gla<d+vKO|Iuqs)wizOD!q}x(cM;&_K_~LP?<{
zGcC=^zbG>`uOt!VU|S_aC7_cEtelHd6HD@oLh|!-Y?VM3DS-4S*+KjX^eIr0udkIy
zW-(AzC0rO91i`6=NJ0t<df<S`$y6vVaV;ycN=$~>Rh(FsnxX_1OwLHmOHWO)RRVfG
ziqm280#2>T7dRDd74%VzBH1MA$st^-P}8LAO%1FJER|5qw9yB}60(zR^s)I4q7Er`
z!R~^H2D!Kac|d)jn9NNrNd)oiD+&^mvr|hHQuBb`DpIny+Z<o~`62@YgNvt&V@QO1
za>rZ#AMYbmKF?2VV7Pqwb-$!bitB<qj0|!C_pO&o@<(X&GzA)PxgFGyU|pObg5WT7
bNJub*@^U@bKGWC@G>^g4)z4*}Q$iB}%zTw*

literal 5140
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
S(GVRHL+U?Ya&Y$2HGcw?E~}>i

diff --git a/Resources/Textures/Tiles/Planet/Grass/triple_edge.png b/Resources/Textures/Tiles/Planet/Grass/triple_edge.png
index 3fd2a39a8f5ccd6922c8c5b475e6a192263a2512..d19d64ba363eb2caede1f85f96da6e334748ab5c 100644
GIT binary patch
delta 1170
zcmca=@`QhaWIZzj1B1(wu44=gjLn(O&H<jz&I$oV`DvLssSFGn=ci8e)o=-vIa<#)
z(M@a_NB4G#uw^Yva!g#hE}hY6ZvB35#=>W|m#dYfy;E1~)a2CY=B&9Hbwg`u%@m!r
zYdU(r{CO{JI$7%JwYUGQzR$b7_qo#ph3u%jQ1OVed!4;*TVK{c=?VMnGeK=tW~zhv
z-8(KdDvmcl7J9cv<tu4*|L^^Er77E~Rm~>j*_=He_7vRDvRhu^Zjqw*O7mgxLqB&t
zjhgi(ix22`8QZakq@D0Q($?a9C~8?tuaKFztoM#^i#eNePV)PRTP&^c-8ePYu>Rf3
zIEk1I%O817zj;g}*~g%>zU?5FcgjiOiC4vrs;d3IX!K9)zP+ZNbBy<lM-pk0+;_h(
z{`a7Kd)}_)yC;bBIDMV`eD7B0vtl*5Rrj7Rd|oT-_*6OOhU@=Nj9>P5?~A;0==X&U
zeCg9&&)#VJ%$ren;$`1E@2N)2FHQE$J7KQ6@T1hLH155B-xSxdbH2>_!&Ua(Z-KJ%
z&EnL1vC+3~&rkpJucMCn<d33LE0Z^_0Y;2yfKP~PP=l*yk&RQDad4fBN0Cize*jRX
z_2pSpAjMu1<QM!O3>c)mncXIz7Z+z@c{O=1mp>!#<TqR{%)DF*lMT6@lz}u5*c7Ft
zS-GSZCl_TFlw{`TDS-HiN%^HEwn|Eqr*rE~KFMuAnTJPbvJH>g<TM^_E`^HRoV;SI
zirj+9g*;-M6^RA<hI$72N|O)rcueNub(rkW>tU;ql5FLcUzD2&G$u1QF+EkkATM1>
z!QIn0z{)Ye(^kny&j88|$Vn_o11hyu3eU_-$uBQfn*4xQNgSd!EVZZ@=qiwULjye{
z3#G~Oe4>-h`D9Zd&Ift`=n!9DE04_LlKi4dJD4!kXThn3NJ3D-oJ@t{64$a4tHflG
zmu;1b6U$Oll%Rsi8Hsu6sVTNfKrij)bC}G?uQl0_U$I_6AIT&eeNZ?dn{K0z%^?tV
zNZ|`M10ova;s)da^?|}NH?<@Y#Ivs`NKDR7Em26#13IBd$=>df!TPJfh^@ct>Eak-
z;omwrTCCZC!==&T`~D~Q9IJm_Yzkb=seCv&>6zgAM3)~~`vv689GND^%$fNpp?|KD
z&y4Dy#!UZb6tk&J_|V%VBBwd!Rl|e)rZqPk6<80t6;8Z!+TK~w$?&)WSA5KahP110
zfeiDKI_~W9TzmR>QgXqo4I!&uKdIhatg@5$!mK+@Q`B^yD+n8Jnr-Vb+1uFh#GVX3
z;Rb*GFR#wOchMI(qR4%SBRRO_ZJ@CDtk4PSJ+r<`K1n+|WzjX~-9N8MrYu_LdTon4
t_aF7QY0J;bbu6EA%G)JJ<LH(u=A2HUbo;xvnt)zq@O1TaS?83{1ORIu)cybf

literal 6741
zcmeHKc{r5o`yX4DB1w{UOj@L2%nW0OA<S5^FWHLB%ESz227?r`7fy(TD6K-u(qc&m
z*&-o@h$1c42wCd;jymVm_51#FuIu;xubJzedEa~a-1q%??&rDgH{Qm|L{vmZ1Ox(!
znwjG4fPXOe5?TlRvO+@UKp>(15C><r9U%zp$MmJrd?;Xcupb3X;n1ic5T~!`EG=+5
zS}f|@tRyRHgjcO`cxmvZN0Po`Q`+9v$q!5?^Bo#FW~V_AaZu~yZ>vF>-=>+DahsJ#
zorzVPXo-XyhekeDefV18^y1a>=%mTY>ie2tJ-?TqPJLa;e1rYw|4MJGw$bQ*cd3@u
zV;y?>yNBKNA3)i@BhMh^#Fy*Ogepz7^M$J0Bp-Czi>|)k@pfBdUFuOi;|G0jieIL_
z`YIOxPL!ZH^>VJ~@KK%IWFB|@_Qe*y#yhjp4FMyr(l<8h4Wx_zG4*=x=$5^%M~*B8
zcJ6XG?=-)>{8qkbXj0`Xv}p!?EcBK07lkwOOBp#vH8)?5E!&FqKmIHgwpyt9sZZ|>
zUi7q0WB>J7)#ZfXL@4{C4-D!apIn0LoBC6y)H+t=%?GD91N2*Bchf}!UmVHE2_3H>
z5&gRE)<?4jzJwu`M-o1|&#YgnXx(vmWqR8oos!VW`&XfXz6XmL^Nh@#SV}?Z-Ye|I
znf{eIL2ud~=g?8l!je|Bs1|iMbEyp}e(R%H!8k~Na7w-5*@--_G)=rn1l==!=e&{d
z%DO&;t+cgRA97MaXw$*<kDNF1=25F(c-<U1bUS??6;yC`@~EFEe_@=g^!vz#O+L4~
zioTfL4lUT+NUsa4-=G||*WAPYs6e4O|JO@@4BKo`H^5y~ZnnE*tZ0-bO-k64p!r48
zB1O`EKl+SA=@TXMB=l&ud2z#*WUu}4JI);1fBg(rRn_U3Tc(XStL;ulec21U)}pe$
z3)UOmLdLI;xrfLz79)<G((Y`^KZTiy+K;fv^uLnnnHgYEKH4T??s$kcdcZO4Vqo3U
z=qg|Lc;dN!)A#jrxWq~oY<kI_T^G;toJBm0<k$&;%j_Q)`xyBpWD^6oNIp4PXKMR6
z=0N>En8inOuVCOKdEAzJ`hT`vnifVaSf56S3~W5ToX{V1P4ro1%_bd}YX;T2y-vj9
z;^8sF%;Iffo1WiRCQ9T;kC+s8R~etmPwEr!&^`BTX(Xf7EazT-aFK1gHT{&MW-Z@D
z!OFoD6Axv4L3-DcCrNf^&!hRmQzRVo%TwdSSf$?d60^fK@5Ws`z2inDcZs??tbm!?
z{7!ZzO0DlO!mr#u?x?V#`>7_{uwERj$b5#)uGQhmetPizjVOHfJ<)D@f=l`K#e0Y&
zLLeL0HV5)+uM>>^r`xL|`yNQQy|U!UPxws3x1j9gQwpQb`4OYs3uvC{Y1xVw?5#Zu
zbl?IeSOutUGBZ5ev+r^7gGVn{RP#2eY%ebsH&Au4R_)%aJf;Y?Q>)5tuDj~kKMe7D
z3*TX9$*j@9oFKH}Pgig6-+wf!wnaHK<}g;ROa~e&NH~=8VBOQGT-@@<yZP-sJ*L}a
zmht1KPnea{F8bKBd(J2wDwepp^g8w?-;M0!_oMqG6jD0sl@trRbx)j?aH7W^mwMhb
zeG8k_YS-5dzUOW{d+g0veyy6yy2gYQkuzuI6T5cZO&3YYdS|oqeIUZ*hT`;T`h-Gp
zf}>Kn1qx-3a?rZ!;?ngb<a9%m<3PETXlB5i#@3{U_&CVX#%pQ2pA)V&<$ftQ;T+$z
zy_pPRqWWco{mqkV1CgalThSIGe=J?-DUU~XqF%z@PUIf$8kQLeu@fy3a#Ofp_9&j$
zVKpUExt=N?S(-XDpIJQJKx0)U&3V6R??bzN4X(&MZ0#&r*QR!0Y9d3O55%BLLN8w%
zJy1WgD}6&)1;3EXH-~aLp&5mnNhkH*%JX%n)^?`%-Bz}8iQhx+lh`s8Cw(&nlAyAj
zkhHvDGW+?V)Nr<s?JC{l+HLr5(eo{5G`ssdD~aWBa~#8BR=CUfkb6!}CDMlxi?=PS
zd9H9Ls&+~Aa*85n+^TQF(5^`Ng-mu;Yb4c7ZhOE=H0icFXQ<2Th*{ze-4Dczn%|yZ
znvb|H65CsT^kRyupzo}~PN`=XSFqivwsWmng9oG9B%z}BW>X_8&Rh6sG;e&?xssG!
zaKx_lfJf8uJyF@0Zn>X%E2+aGJ#>lTZEqgW4=0t{ed+9*VfQkUn_Z7@o@Y2?JY93A
zLoU59u59nRYvE*~a#9LYZuk*LV?r(zO&h#4&|fszH%k(EkW9akhw5vt6)sA=1*Jo-
zDR`skuJYCjpYmmbT0-Qomjqn)fB4iR`lnJq<nqYb$_14~>X1A=@z0rcPirRis5;uY
zhCX^}+U#?KA9HsWe|a0h5SE6q@A$uVT0iL)DGS!0(>HQumCg^jzPvDTf~V&RCmL<7
zSR%aH>1?6O$@1!$VPtvsbDPyUv#gtkkIZHv_4%kP&ufzF43_*0^@wwJTNbq9KJJl%
zMy8AlLm$ahcTF&?&ZC90;8j}QN3Xb??VQ8XN*+n~T8{;(E=L;-BOCUES0BVIir?w8
z3{west`?Ajm^jPyeA=GVm)EB8P$|@WDs;7R*0J0=u&!GdW^n^@YJ)7lOq{01@yFY?
zt_sBM%CHLVc*QuDawe&3s}(NEtoD^+`(PGl;{IxanbQ82u3DAJ`$b(whRJbQ!OcY?
z-BFL@PmWP@#gW9RT^S!2q}~ljb#~Y+(|P7S6FPdD2Xy4)FV9}B91<J4R`R(EM@!tD
z^JIws-jL{+W?J#{&9Y&J`M4d?HJ2WZW3JZKj~ZvmpeJAfuifs%<m3mqQa0-^q)kCb
zv25tZcMoGjlAyVPsDetlXYSu_=T-_h?%DNW5NkPQX0OtBc_8_T%E_3p1>5Ar3WM&~
zdlkb%W!?KNpge?{rXbzmnpXQaHmqDxhb;^5Yp*CMY)GQmbE>lEw7-hq87&MfxT-kj
z#&>O4_Ok2LwY>WJ;v7~WmeEn6E4E>NccEc#|75Uv*p)l*<s~7)py2gS;%`OuV|L(%
z3kXx}Wn+~X=GJo#^SIfq<(yde9ad%4dE%(V{-?D)0r&69!YrQ|y7BRBIT{LrfYMv`
zZCZI}o$EH8zg|cd&$)4Iz(Y2hU~)40<jP&O+2fa-muvH?@@OCsPc+TQ$i~db=&vyc
z7;dt|PGe2$_Q^FIwm%8kBDg*QL%wDug~Ri2y-wV;H?6|(hS<)GV+N@)$_)*+eo*bj
zTh0M~{yong9uVi(-zS%oE$Mct{@addDGdd=g*OA$jRQLSu4QB%2|UGDK;72t?C_ZE
z)X?t4|1=pC15?$oPrfSEH7$2|VS47X+MlIWPgc<(Y1z%7TvOdfb{%98e15Qu-M(C}
z<d`P;n)O=agqrC}Q$X)1s$C#f;QTgtXLImt@mtPbq<e`jPi^9_#?>Vh*w*~v?=oD~
z-~x4WnLWP}{V=;C<u#^_P+t<IEg`OypCHjvB7Wh(_6A(ae7?e0gT`ENhDEW2G+N3g
zLZo@-#J7i2jJB1Ls4U4-yb)Xbze@99f+CFDDuDf5>Cd~E8=+b>db2ws)4J0e3O&j{
z$Kc!g9BMhprxp|*vC9pvZ1Sl~@>B58>Zux)^>YKf1KteZwy<nH5beW}FYC0m`Hk17
zRZq@L7S9iU#deKP2{tb>TN+M`YXbAAG!2+Loh>aeBwxB3f$U49sB!3iz+4If>FRU*
z2qbR`8%(5l(im9CROJH*m`27zoHQ+AmVQPQFPdoxlVTrY<v<GYCZWj?eLWFf4h8_A
zQ`iJBhwj5*VK`XG8ZHL7=Ze)K;58GrHx}Y-X#+O$Wm3RMHKZC0is#S*;SfC$ur8BK
z#n|DDe?S0FScn&!?T1lU4+;uW3qq**GCkEb&}g(e46Y7`LjemYE11D1aG(s<b}qzs
z3><|;V$%HBG+zdoi%B5*2C%UZ2%rc5l^@;D((-S32I~h403Yfcf}gsE8cdx|SO3|A
z#l{B$AU_iNuO2K1V0>4%qp*Afm?R25kiuYZ{~3Zz`rF?xfa$YV4w<A*@uAQGQx*_a
z<Cl;oW|lU8dvGc6q|yD>ya2L)v1HSz|B&@dZd}b;IX@=?xc`m&i}hc%uNebYmX;Wt
zFDZbVo*51c;l{_1eMvMjX6=?hLc(BV5&}wwktt9lOj8R=fRi+UJ0yZaMk6)JMAT1E
zW(*daz#vh$Pyo0Z4ZtC4QZ+R-wa`#4geDw{q-qhNL?S{P3a3ygC>UCUKq4T1g0N=N
zfUYF?{G1gRiVQ#@G!bYx2}Xtz;YckgQUi&EqRB`C6iuX}U_>gJj38*OL6J!qV_znn
z04yhsPVl6t`!PJ%6kNhF1~z6`2wV;JkHp4@z@`EYz#gD6$i6|We^d@MI>nw%;PR=V
zh0;KwkSG`m2}5WjkpCDtQkX2D7rCe!Fg3XLnufbD7@!=0S^~FI0f03*Pz}b2Ng=R(
znGU|bK3E7hDKOV_t--;%-<QRd#sVyYxjp}*>+LE2-=Ds30w3C%3JhLrTnvHqJqU{s
zNFlEU0{p(KNL~bnCk5EyKU(T9IqknJ7X?lwq7d3>C`?<63PqCOBw)qKFen;9MxaO}
zEuuD>_$xZgm&y(zFewI}K&3!6Kntx^1K$0EOqE~lgS;qQreMJS)__Cd2nP)<jHU(#
ziGryAC{~@jr~j%}SN;F+p}S`A(;)!(eU|};3vgDc|9x2f;EPM)|M2r;9sY+A0O;RA
z{uRH!>H1CAzhdBD8UOCC-*o*e2L6@t@9z44qf6wU*BuH2n1F(SmzkpJXAZ!N&^n^I
z2@dp)`^~GqnhHpS{Y+h0Adpx+_u@IDDkcjE1=(hnc)_<DwhAEB-D38i1A%yr&2R<|
z&UNKZ8pZiA@i2qj^E(9>bGPG6<-#LV)OLXnU|1U}&GA<IGT;J&aZybE6uy-hJ$yyn
zBb^N;@nscR;kU4eskX-~$Ab1;P)88o?Fl|mhnA96qq#tBZJQ0qChdB<Voeh#8|Rh9
z18Tb4<?n@(;pEW`>&^IYFXPugp4^)#lOZ-<>W$w$H{daLqDI!IzM%bctNmD=%|3~N
z1GZPJL2;?37l$Nx@Eh@&AFOx7ij{V^IC%C8PTpyHD+l6dZqiNcnz1Xl^m^4SY#uSx
z$eAYCCHPBJi^ru3`AY=j!(~U&;vIaxI9=MIF`nL1is_(DQOF)6fp9_XD;~v!#dlE)
z{e8xYyKWv4(w2)2d~;(HA=gc{RL4nf#&%mx8F(%_e0a3+IG<RoS89vWw|og@Nh)jT
zCiC8CZu=z<6Uh#o?UkhtMwz$Fd~f;vS3RjBC1K&#Asr{4qD#@WiOYM8TzE=}^>;P&
z3c_^=oAQK}8e9Bz9L?{;Y>f_#EiI2_*bnoH26&;)wa!HG+8F_n^^n{Yt_#c?D|>el
z;Clwwk3^F@1p!|1)!|ChhrjF_6X&&C&!t^Aq&M9SxijHB?;#7r``c#mz4JUZUs4yA
z>GUTT;vO77_E6=l7Z2VlODLj3cmf}(mOhpJzLKY)U31%HB>~4XC6LaW8MhLqX12o(
zV7~Hm)ylhNWx=;{i{xX?{=uRdp?o#Y)OV4l)z$A?OfQ3GX4A_&USCH}-waM*3#)v6
a@^0gW#u}=zYlSJ$WFRxV6|UIOBl17mjRyt*

diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png b/Resources/Textures/Tiles/Planet/dirt.rsi/dirt.png
index 28d1862456e4bec146b4b6aebce88deaa75f81b6..653614fc41d8b655d54389e41cacd4a6c6e45eb3 100644
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq004jh001Be0{{R3?fifj00001b5ch_0Itp)
z=>Px#3{Xr|MMW?lHzpTMIVme05`~IJga7~nqDe$SR9J<jS6h<9APlod_rLQt1lbah
z%yyTLmJq*@1&Ksv#%Fx~64w|j*T0PW5mTTwkdb^A;qgYqa@s5r`uj}859*(yW5zi|
zpmn037zrwjh&zI559PNs?lhR6<#EkHDPLxdP;0CaGZqDr>B8O7jTMi6t<mXm$-+e$
z9y14638uIhjY_b~{xW(yq(o_Z1KVuXMG1(K6{aNNW^UCkx#8CE$~jVs90H(K7+PpU
zKFTvR#}>0RJ&Yyo(`q3)R#_AlmuL#j(5k&Om?dCFJAt?`&?&ZzV!3|5Y_L>>IH(1Z
z(Yb3%BG<tEvcYsfB-_{Mg24p`HsYfbVtLXAd*(#x^h>(DYWSF~E9C+kMgo9u=wX~V
zaikblelUW$f1!RS$k0nRnafLqy>nu}k>JoU!^Udz76VDTVj1rz!^Vk;au_r{0oQdC
zBjI?nJuJ#<_mcM$Cz^3lyA>jW`FSUo+P#N|EY;l`Cq`i~b*KxEutzbq7})wWcj~t=
zmIT&2!@bG#d?l;shFe(&6P0z@oEJ{qwor(Y1ZgNGN{ZwhL~6Pk?3EK25Fdy#y0+5&
zg3_&x_BR4HZ7@1)JVJ>QWv=PKIdLbF=h~ba%)&&bvPJMHu;Vz3D-SyjyrJXNU|uH~
zr91<eUge-rvD_X`{oyG%>JLZLxDK#jeTy?YOSeaL)R7@h4YnQUVu@FR(T1&L-e{&T
z6wJK-tif7sAw@O1U#5zRe{rRHJ0$?Cf@nNl=@`H_m&)gJl3jpa`sJn8fi%@0ijmJZ
z1@+4Yd$3Wu_YoF{L$m{2J}lhU;=#6j4dD61Mv82O+59mwHL~q`edErzU^qtOJT-_Q
yn330y%f<D3gXM%$mtA+7)A;Y_wIS*cpZ7nq2@<kJlaK`f0000<MNUMnLSTXo{9UR5

literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001BW001BY0{{R34iu7S0000CP)t-sa9}W)
zfJn%&Xiz{f)#T>50001HdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS
z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ8S0M2U+NNEHLQhFqL!
zMTxno5Vo>{tDg(lQ~((38NTfBdR71c0N+VOK~xx(9Z$PW#6T1r3qM3?q<tsR#nHho
zVl#rb;>}vOxlb|~r6A!Ba6lOs&;f-|0t?ZMM)T1igi1y_B09OJBDvT?647-TgAk*U
z#^l`*y)+hd%w$lw?8hLD;8KzvT0-$<{;7L`O$<lw6DW*I8?oe^TA`q%KS48i>-5i5
zLESQUsTlZAdg0)sn4IBXr-v=uijB;E{pOfVZ${N;q@EYmh`c@xoW(&mT8IlwUn~s$
zm!DR<Qbt_bmQ3%6OYKdMeSKqU+bgY`{qQjq14O{7f1kf|DPG@y0XLaPL7&KdDgXcg
M07*qoM6N<$f>!ad+5i9m

diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
index c70bafbd1b60..57ea3f50a51d 100644
--- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/20d0b1fab9002c32e5267f16ba2b5cbf4b6f1e07/icons/turf/flooring/dirt.dmi",
+  "copyright": "https://github.com/FortunaSS13/Fortuna Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt.",
   "size": {
     "x": 32,
     "y": 32
@@ -11,4 +11,4 @@
       "name": "dirt"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Tiles/grassjungle.png b/Resources/Textures/Tiles/grassjungle.png
index 31e75cd6742a0c9492510ddd3f91835ff7c5324d..3cd34ffb64a03b2025057f55bb6775401aa10dde 100644
GIT binary patch
delta 523
zcmV+m0`&c<0+<Al7=Hu<0001iRA<Kk0004VQb$4nuFf3k00004XF*Lt006O%3;baP
z0000RP)t-sQ+`B9ay(j#O+sZdY?okNk5E#8MM7pXNpd_)k@Ft_000SaNLh0L01m?d
z01m?e$8V@)0004oNkl<ZD9;s7Idb425NsgX5KuV>$<7h-1Ao^00(+|#5jx@cfFwS^
z@ocj-H4}98^Z{_rH@ymukClm?Kw;ac;%0f*S_nbFje?+jQxsMTFc^(}SHE{{7JXPn
zKrI(WfPU&PWi<f$vM53s*MuIH>3zN!!a0OyN^v1Iwl}$wZP8Xj$c4RvQ^QtE)?FNI
z8c3*R<5C@5VSiu6A{ijWz6)c?$N!j|f-%chGS^Zp@5F#CRLr{xB@b8_FfAxqsa~u;
zX0JcsL{ll0K3+j)k}oW~R{AeBLRzjRB}o0s(Tx^Dxc*iDV3d&Vmcw{z9AgxuF~TUd
z#*}IpIpc}NrJPG`?Y>h8@aY-tEZ#L&b1xqK^5wgq*MB6$*kVG>_n0P=)KeZIqQ>5P
zYp%6?)p!+*(Ap@`W#2!~DTL}=AMw0%NVQ$pFWh&DWpvk`_U*g(C|3_DxwEB`&rokf
zUtKP_1z%#Sz9PptdBVK~*J_yM?tGS1V;%Q>Jr22*)LosjqdiZmKdG>aDH3P5dH?_b
N07*qoL<FuvV1nZr;7|Yn

delta 282
zcmV+#0p<Rf1gQd$7=Ho-0000E6q08E000S4OjJcqa#<HXBP>}vlxvT50002nNkl<Z
z7?ll=F;2rk6hx;nQaYNrpbrwqFya7Kl=<RsMZsF^-hv{QIKWu3JBn{9oRY0a?>!BA
zR*O3JIDUIt3p?B>QsLN&g4~bjoOxO_V{HqAZ%Au0+VqJJrhm*d5x!WIfetN;(qT*3
zLud9zgbib(cJTFN*Jgky9qb-3m0&6b#XXxhd>@-2oS;2z+P8wN)}jTJ`OIA_-jC|`
z$Qk)Tg}Ec{*D$}R!ZWL88ZNyOe+Qz@(s({KVTt&9RExG7(@P0NxcK9S18ZXBguzus
gb5v&gquu@i!xOb>W*jwp6951J07*qoM6N<$g0#_jmjD0&


From 90354fa6d3c5a4e77273fc621f011f7adaae6e73 Mon Sep 17 00:00:00 2001
From: Deserty0 <86846189+Deserty0@users.noreply.github.com>
Date: Wed, 12 Jun 2024 20:32:11 +1000
Subject: [PATCH 415/568] Fix "no materials loaded" messege in lathes (#28885)

fix
---
 Content.Client/Materials/UI/MaterialStorageControl.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
index 31d99624a8a7..0237b86db76d 100644
--- a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
+++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs
@@ -87,6 +87,6 @@ protected override void FrameUpdate(FrameEventArgs args)
         }
 
         _currentMaterials = mats;
-        NoMatsLabel.Visible = ChildCount == 1;
+        NoMatsLabel.Visible = MaterialList.ChildCount == 1;
     }
 }

From a0f709918d9848116dfeafc86b5005c3d5bb65cf Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 12 Jun 2024 10:33:18 +0000
Subject: [PATCH 416/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c3dd6af5738f..1a9b4a8f746a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Killerqu00
-  changes:
-  - message: Cable Coils are now small in size, taking only 1x2 space in containers.
-    type: Tweak
-  id: 6213
-  time: '2024-03-23T17:30:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26361
 - author: Tayrtahn
   changes:
   - message: Clumsy characters can no longer avoid bonking their heads by using the
@@ -3851,3 +3844,10 @@
   id: 6712
   time: '2024-06-12T01:07:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28854
+- author: Deserty0
+  changes:
+  - message: '"no materials loaded" messege now appears in lathes!'
+    type: Fix
+  id: 6713
+  time: '2024-06-12T10:32:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28885

From 94bf301a8bbf975763904121d5f5dfa5c15ec7f6 Mon Sep 17 00:00:00 2001
From: Robert V <vincerob@oregonstate.edu>
Date: Wed, 12 Jun 2024 06:32:57 -0700
Subject: [PATCH 417/568] Comms Consoles without CanShuttle can no longer
 recall (#28803)

Consoles without CanShuttle can no longer recall
---
 .../Communications/CommunicationsConsoleSystem.cs           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 61a18fe3d524..7502c889e1ca 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -199,9 +199,13 @@ private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
             if (_emergency.EmergencyShuttleArrived || !_roundEndSystem.CanCallOrRecall())
                 return false;
 
+            // Ensure that we can communicate with the shuttle (either call or recall)
+            if (!comp.CanShuttle)
+                return false;
+
             // Calling shuttle checks
             if (_roundEndSystem.ExpectedCountdownEnd is null)
-                return comp.CanShuttle;
+                return true;
 
             // Recalling shuttle checks
             var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);

From 9b40bcc1d9cd63938ccd9833628c23761feef456 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 12 Jun 2024 13:34:04 +0000
Subject: [PATCH 418/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1a9b4a8f746a..49b6eb739c17 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Clumsy characters can no longer avoid bonking their heads by using the
-      Climb verb.
-    type: Fix
-  - message: Clumsy characters are less likely to bonk their heads when trying to
-      climb.
-    type: Tweak
-  id: 6214
-  time: '2024-03-23T19:29:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24977
 - author: nikthechampiongr
   changes:
   - message: Door remotes can now only control doors specific to their type and do
@@ -3851,3 +3840,11 @@
   id: 6713
   time: '2024-06-12T10:32:11.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28885
+- author: robertGN
+  changes:
+  - message: Syndicate communications consoles can no longer recall the emergency
+      shuttle.
+    type: Fix
+  id: 6714
+  time: '2024-06-12T13:32:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28803

From 8c514b90fde39594a59babd76086008b6c8635c3 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:10:53 +0000
Subject: [PATCH 419/568] fix pda ui troll (#28896)

* fix pda ui troll

* bruh

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Client/PDA/PdaBoundUserInterface.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs
index 07352b512b0e..f8f4c67076cd 100644
--- a/Content.Client/PDA/PdaBoundUserInterface.cs
+++ b/Content.Client/PDA/PdaBoundUserInterface.cs
@@ -21,8 +21,16 @@ public PdaBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         protected override void Open()
         {
             base.Open();
+
+            if (_menu == null)
+                CreateMenu();
+
+            _menu?.OpenCenteredLeft();
+        }
+
+        private void CreateMenu()
+        {
             _menu = new PdaMenu();
-            _menu.OpenCenteredLeft();
             _menu.OnClose += Close;
             _menu.FlashLightToggleButton.OnToggled += _ =>
             {

From ca39135c99e51a2db89a9d9088ed34d666256ecc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 12 Jun 2024 18:12:00 +0000
Subject: [PATCH 420/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 49b6eb739c17..5d69c23f6b07 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: Door remotes can now only control doors specific to their type and do
-      not use the access of their user.
-    type: Tweak
-  id: 6215
-  time: '2024-03-24T00:48:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26371
 - author: DrSmugleaf
   changes:
   - message: Empty marking categories are now hidden in the markings picker.
@@ -3848,3 +3840,10 @@
   id: 6714
   time: '2024-06-12T13:32:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28803
+- author: deltanedas
+  changes:
+  - message: Fixed opening the PDA UI sometimes breaking.
+    type: Fix
+  id: 6715
+  time: '2024-06-12T18:10:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28896

From b091a55d7d1e24962fdc2c924e0ae2ac8e4a14ee Mon Sep 17 00:00:00 2001
From: dragonryan06 <71857681+dragonryan06@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:05:56 -0400
Subject: [PATCH 421/568] Add new icon for Remove Evidence verb (#28898)

---
 .../Forensics/Systems/ForensicsSystem.cs        |   3 ++-
 .../Interface/VerbIcons/ATTRIBUTION.txt         |   3 +++
 .../Textures/Interface/VerbIcons/bubbles.svg    |   1 +
 .../Interface/VerbIcons/bubbles.svg.192dpi.png  | Bin 0 -> 13294 bytes
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Interface/VerbIcons/bubbles.svg
 create mode 100644 Resources/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png

diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 3304330acabc..cd4e2edaecae 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Random;
 using Content.Shared.Verbs;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Forensics
 {
@@ -125,7 +126,7 @@ private void OnUtilityVerb(Entity<CleansForensicsComponent> entity, ref GetVerbs
             var verb = new UtilityVerb()
             {
                 Act = () => TryStartCleaning(entity, user, target),
-                IconEntity = GetNetEntity(entity),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png")),
                 Text = Loc.GetString(Loc.GetString("forensics-verb-text")),
                 Message = Loc.GetString(Loc.GetString("forensics-verb-message")),
                 // This is important because if its true using the cleaning device will count as touching the object.
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 0b8ae856bd82..5b1320b450a8 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -7,3 +7,6 @@ https://game-icons.net/1x1/lorc/padlock.html
 
 unlock.svg by Delapouite under CC BY 3.0
 https://game-icons.net/1x1/delapouite/padlock-open.html
+
+bubbles.svg by Lorc under CC BY 3.0
+https://game-icons.net/1x1/lorc/bubbles.html
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/bubbles.svg b/Resources/Textures/Interface/VerbIcons/bubbles.svg
new file mode 100644
index 000000000000..8744443c2c84
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/bubbles.svg
@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M0 0h512v512H0z" fill="#000000" fill-opacity="0.01"></path><g class="" style="" transform="translate(0,0)"><path d="M82.055 26.807c-33.127 0-60.182 27.057-60.182 60.183 0 33.126 27.055 60.182 60.182 60.182 33.126 0 60.18-27.056 60.18-60.182 0-33.127-27.054-60.183-60.18-60.183zm13.85 21.043c16.15 5.665 27.64 20.98 27.64 39.14 0 23.025-18.465 41.49-41.49 41.49-23.025 0-41.49-18.465-41.49-41.49 0-.55.02-1.097.04-1.642 6.067 8.444 15.966 13.95 27.157 13.95 18.46 0 33.425-14.966 33.425-33.427 0-6.638-1.943-12.82-5.28-18.02zm158.058 11.855c-58.15.002-105.123 47.627-105.123 105.71 0 48.528 32.96 89.51 77.738 101.726-8.41 17.653-13.498 37.277-13.498 58.294 0 76.485 62.51 138.998 138.996 138.998h.004c76.485 0 138.412-62.562 138.412-138.998 0-38.083-15.76-72.427-40.658-97.454 16.358-14.68 26.643-36.147 26.643-59.648 0-43.695-35.733-79.426-79.428-79.426-20.743 0-39.395 8.335-53.43 21.41-18.555-30.156-51.717-50.61-89.657-50.61zm0 18.69c34.466 0 64.11 20.527 78.127 49.697-2.174 5.54-3.38 11.563-3.38 17.873 0 27.04 21.918 48.96 48.958 48.96s48.96-21.92 48.96-48.96c0-14.81-6.586-28.073-16.978-37.05 27.496 5.802 48.137 30.194 48.137 59.417 0 21.225-10.98 40.403-27.336 51.186l-10.354 6.826 9.418 8.07c25.745 22.062 42.29 54.548 42.29 91.02 0 66.374-53.402 120.308-119.724 120.308h-.004c-57.162 0-105.154-40.103-117.322-93.642 15.684 22.5 41.747 37.226 71.254 37.226 47.94 0 86.8-38.862 86.8-86.8 0-47.94-38.86-86.8-86.8-86.8-28.382 0-53.578 13.625-69.416 34.688-39.414-8.176-69.063-43.066-69.063-85 0-.494.01-.985.017-1.476 9.545 23.694 32.734 40.425 59.846 40.425 35.627 0 64.51-28.88 64.51-64.508 0-28.533-18.534-52.723-44.214-61.232 2.07-.148 4.162-.228 6.273-.228zm-148.018 163.44c-7.16-.028-14.436.883-21.668 2.82C40.2 256.47 14.415 302.08 26.203 346.076c6.57 24.52 23.502 43.28 44.84 53.198-6.084 12.932-7.977 27.963-3.982 42.87 9.028 33.693 44.24 53.447 77.813 44.45 33.573-8.995 53.595-43.677 44.6-77.25-3.488-13.016-10.86-23.98-20.496-32.017 16.684-19.844 24.108-47.014 16.87-74.027v-.003c-9.596-35.817-41.55-59.943-76.84-61.395-1.017-.042-2.04-.064-3.062-.068zm0 18.665c.794.002 1.586.018 2.375.05 27.367 1.083 52.01 19.727 59.475 47.585 6.445 24.055-2.003 47.964-19.39 63.7l-9.663 8.743 11.383 6.346c10.19 5.68 18.04 15.104 21.295 27.256 6.393 23.86-7.526 47.97-31.383 54.36-20.92 5.606-42.49-4.383-51.775-22.935 6.85 3.057 14.754 3.877 22.564 1.784 18.086-4.847 28.82-23.438 23.973-41.525-4.847-18.085-23.437-28.816-41.523-23.97-2.766.74-5.36 1.807-7.752 3.14-19.715-6.628-35.476-22.17-41.27-43.797-.678-2.524-1.18-5.05-1.548-7.572 10.962 18.105 32.915 27.61 54.387 21.857 26.044-6.978 41.5-33.75 34.52-59.796-4.7-17.548-18.392-30.275-34.788-34.586 3.055-.432 6.1-.647 9.12-.64z" fill="#fff" fill-opacity="1"></path></g></svg>
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png
new file mode 100644
index 0000000000000000000000000000000000000000..87badd270b2d0ad51ba5500fbfc9d0406c96b58f
GIT binary patch
literal 13294
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
BK7RlJ

literal 0
HcmV?d00001


From 35e5a96b7ebb73c67b3fade4d6ed731028dfc551 Mon Sep 17 00:00:00 2001
From: Partmedia <kevinz5000@gmail.com>
Date: Wed, 12 Jun 2024 14:56:07 -0800
Subject: [PATCH 422/568] Fix queued deletion check (singulo loosing at beyond
 PA 1 but only on live servers) (#28906)

Fix queued deletion check
---
 .../Singularity/EntitySystems/EventHorizonSystem.cs       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index d7b83d443991..e6c627f353e2 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -116,10 +116,12 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr
     /// </summary>
     public void ConsumeEntity(EntityUid hungry, EntityUid morsel, EventHorizonComponent eventHorizon, BaseContainer? outerContainer = null)
     {
-        if (!EntityManager.IsQueuedForDeletion(morsel) // I saw it log twice a few times for some reason?
-        && (HasComp<MindContainerComponent>(morsel)
+        if (EntityManager.IsQueuedForDeletion(morsel)) // already handled, and we're substepping
+            return;
+
+        if (HasComp<MindContainerComponent>(morsel)
             || _tagSystem.HasTag(morsel, "HighRiskItem")
-            || HasComp<ContainmentFieldGeneratorComponent>(morsel)))
+            || HasComp<ContainmentFieldGeneratorComponent>(morsel))
         {
             _adminLogger.Add(LogType.EntityDelete, LogImpact.Extreme, $"{ToPrettyString(morsel)} entered the event horizon of {ToPrettyString(hungry)} and was deleted");
         }

From 1aa5e023d4b30c05b715a92c07a47f26a0b26f70 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 12 Jun 2024 22:57:13 +0000
Subject: [PATCH 423/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5d69c23f6b07..0eac0b307cae 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: DrSmugleaf
-  changes:
-  - message: Empty marking categories are now hidden in the markings picker.
-    type: Tweak
-  id: 6216
-  time: '2024-03-24T04:01:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26377
 - author: Baptr0b0t
   changes:
   - message: Fix access of command door remote. The captain must control his station.
@@ -3847,3 +3840,10 @@
   id: 6715
   time: '2024-06-12T18:10:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28896
+- author: notafet
+  changes:
+  - message: The singularity is now safe to operate up to PA level 3.
+    type: Fix
+  id: 6716
+  time: '2024-06-12T22:56:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28906

From 12911d292f307485476f943d3e33adb0b67e76f8 Mon Sep 17 00:00:00 2001
From: bibbly <thomaspisklak@gmail.com>
Date: Wed, 12 Jun 2024 22:09:10 -0400
Subject: [PATCH 424/568] Reach Fixes (#28913)

various small changes to Reach
---
 Resources/Maps/reach.yml | 987 +++++++++++++++++++--------------------
 1 file changed, 474 insertions(+), 513 deletions(-)

diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml
index 9cc0887d173c..b2632d97e3a9 100644
--- a/Resources/Maps/reach.yml
+++ b/Resources/Maps/reach.yml
@@ -30,12 +30,13 @@ entities:
     - type: MetaData
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
     - type: Broadphase
     - type: OccluderTree
     - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
   - uid: 407
     components:
     - type: MetaData
@@ -54,7 +55,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: bQAAAAAATgAAAAABLwAAAAABLwAAAAADLwAAAAAALwAAAAADLwAAAAABLwAAAAADLwAAAAADLwAAAAACLwAAAAABLwAAAAABTgAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAATgAAAAABTgAAAAABTgAAAAACTgAAAAADTgAAAAADTgAAAAADTgAAAAADTgAAAAABTgAAAAAATgAAAAAATgAAAAADTgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAPAAAAAAATQAAAAAATQAAAAADHwAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bQAAAAAATgAAAAABLwAAAAABLwAAAAADLwAAAAAALwAAAAADLwAAAAABLwAAAAADLwAAAAADLwAAAAACLwAAAAABLwAAAAABTgAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAATgAAAAABTgAAAAABTgAAAAACTgAAAAADTgAAAAADTgAAAAADTgAAAAADTgAAAAABTgAAAAAATgAAAAAATgAAAAADTgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAPAAAAAAATQAAAAAATQAAAAADHwAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -62,7 +63,7 @@ entities:
           version: 6
         -2,0:
           ind: -2,0
-          tiles: AAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAbAAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAbAAAAAAAbgAAAAABbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAbAAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAbAAAAAAAbgAAAAABbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
@@ -113,42 +114,42 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            263: 3,7
+            261: 3,7
         - node:
             color: '#FFFFFFFF'
             id: Bot
           decals:
             4: 5,-11
-            260: 0,12
-            261: 0,13
-            262: 3,13
-            392: -24,0
-            393: -22,0
-            396: -23,-3
-            397: -19,-5
-            398: -19,-3
-            399: -19,3
-            402: -17,-1
+            258: 0,12
+            259: 0,13
+            260: 3,13
+            389: -24,0
+            390: -22,0
+            393: -23,-3
+            394: -19,-5
+            395: -19,-3
+            396: -19,3
+            399: -17,-1
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            388: -22,1
-            389: -24,-1
-            395: -22,-3
-            400: -17,3
-            401: -17,4
+            385: -22,1
+            386: -24,-1
+            392: -22,-3
+            397: -17,3
+            398: -17,4
         - node:
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            390: -22,-1
-            391: -24,1
+            387: -22,-1
+            388: -24,1
         - node:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            394: -23,0
+            391: -23,0
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
@@ -167,23 +168,23 @@ entities:
             color: '#D381C996'
             id: BrickTileSteelCornerNe
           decals:
-            294: -2,11
+            292: -2,11
         - node:
             color: '#D381C996'
             id: BrickTileSteelCornerNw
           decals:
-            288: -6,8
-            295: -3,11
+            286: -6,8
+            293: -3,11
         - node:
             color: '#D381C996'
             id: BrickTileSteelCornerSw
           decals:
-            289: -6,7
+            287: -6,7
         - node:
             color: '#D381C996'
             id: BrickTileSteelInnerNw
           decals:
-            298: -3,8
+            296: -3,8
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineE
@@ -193,28 +194,28 @@ entities:
             color: '#D381C996'
             id: BrickTileSteelLineE
           decals:
-            291: -2,8
-            292: -2,9
-            293: -2,10
+            289: -2,8
+            290: -2,9
+            291: -2,10
         - node:
             color: '#D381C996'
             id: BrickTileSteelLineN
           decals:
-            299: -4,8
-            300: -5,8
+            297: -4,8
+            298: -5,8
         - node:
             color: '#D381C996'
             id: BrickTileSteelLineS
           decals:
-            285: -3,7
-            286: -4,7
-            287: -5,7
+            283: -3,7
+            284: -4,7
+            285: -5,7
         - node:
             color: '#D381C996'
             id: BrickTileSteelLineW
           decals:
-            296: -3,10
-            297: -3,9
+            294: -3,10
+            295: -3,9
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteBox
@@ -229,7 +230,7 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNe
           decals:
-            341: 24,4
+            338: 24,4
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNe
@@ -240,14 +241,14 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            364: 19,1
-            366: 16,5
+            361: 19,1
+            363: 16,5
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerNw
           decals:
-            339: 21,3
-            340: 22,4
+            336: 21,3
+            337: 22,4
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNw
@@ -259,12 +260,12 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            365: 14,5
+            362: 14,5
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerSe
           decals:
-            337: 23,-1
+            334: 23,-1
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSe
@@ -274,12 +275,12 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            368: 19,-1
+            365: 19,-1
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteCornerSw
           decals:
-            338: 21,-1
+            335: 21,-1
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSw
@@ -289,17 +290,17 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            367: 14,-1
+            364: 14,-1
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteEndE
           decals:
-            342: 25,3
+            339: 25,3
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
           decals:
-            347: 24,3
+            344: 24,3
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNe
@@ -309,12 +310,12 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerNe
           decals:
-            378: 16,1
+            375: 16,1
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNw
           decals:
-            348: 22,3
+            345: 22,3
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNw
@@ -324,7 +325,7 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerSe
           decals:
-            346: 23,3
+            343: 23,3
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSe
@@ -339,8 +340,8 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
           decals:
-            344: 23,1
-            345: 23,2
+            341: 23,1
+            342: 23,2
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
@@ -355,14 +356,14 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
           decals:
-            374: 16,4
-            375: 16,3
-            376: 16,2
+            371: 16,4
+            372: 16,3
+            373: 16,2
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineN
           decals:
-            349: 23,4
+            346: 23,4
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineN
@@ -378,12 +379,12 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineN
           decals:
-            377: 17,1
+            374: 17,1
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineS
           decals:
-            343: 24,3
+            340: 24,3
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
@@ -396,14 +397,14 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
           decals:
-            369: 18,-1
-            370: 15,-1
+            366: 18,-1
+            367: 15,-1
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineW
           decals:
-            350: 21,1
-            351: 21,2
+            347: 21,1
+            348: 21,2
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
@@ -422,75 +423,75 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
           decals:
-            371: 14,1
-            372: 14,2
-            373: 14,3
+            368: 14,1
+            369: 14,2
+            370: 14,3
         - node:
             color: '#FFFFFFFF'
             id: Bushd1
           decals:
-            328: -7.978216,-5.1518655
+            325: -7.978216,-5.1518655
         - node:
             color: '#FFFFFFFF'
             id: Bushd4
           decals:
-            329: -7.978216,-3.5581155
-            330: -11.993841,-5.2456155
-            331: -12.025091,-4.3549905
+            326: -7.978216,-3.5581155
+            327: -11.993841,-5.2456155
+            328: -12.025091,-4.3549905
         - node:
             color: '#FFFFFFFF'
             id: Bushe1
           decals:
-            332: -12.025091,-3.1831155
+            329: -12.025091,-3.1831155
         - node:
             color: '#FFFFFFFF'
             id: Bushf1
           decals:
-            327: -7.946966,-2.8081155
+            324: -7.946966,-2.8081155
         - node:
             color: '#FFFFFFFF'
             id: Bushf2
           decals:
-            326: -7.993841,-4.4956155
+            323: -7.993841,-4.4956155
         - node:
             color: '#FFFFFFFF'
             id: Bushf3
           decals:
-            325: -12.009466,-3.3393655
+            322: -12.009466,-3.3393655
         - node:
             color: '#FFFFFFFF'
             id: Bushh2
           decals:
-            334: -8.009466,-3.7456155
-            335: -7.993841,-4.8862405
+            331: -8.009466,-3.7456155
+            332: -7.993841,-4.8862405
         - node:
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            319: -7.946966,-4.9018655
+            316: -7.946966,-4.9018655
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            320: -7.931341,-4.0424905
-            323: -12.025091,-4.7612405
-            324: -11.931341,-2.7299905
+            317: -7.931341,-4.0424905
+            320: -12.025091,-4.7612405
+            321: -11.931341,-2.7299905
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            321: -7.962591,-3.2768655
-            322: -11.978216,-3.7612405
+            318: -7.962591,-3.2768655
+            319: -11.978216,-3.7612405
         - node:
             color: '#FFFFFFFF'
             id: Bushl3
           decals:
-            333: -11.993841,-4.5581155
+            330: -11.993841,-4.5581155
         - node:
             color: '#FFFFFFFF'
             id: Bushm3
           decals:
-            336: -7.978216,-3.8862405
+            333: -7.978216,-3.8862405
         - node:
             color: '#52B4E996'
             id: CheckerNESW
@@ -515,11 +516,10 @@ entities:
             color: '#D4D4D428'
             id: CheckerNWSE
           decals:
-            302: -18,2
-            303: -18,3
-            304: -18,4
-            305: -19,3
-            306: -17,3
+            300: -18,3
+            301: -18,4
+            302: -19,3
+            303: -17,3
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -527,14 +527,14 @@ entities:
             5: 4,-16
             6: 4,-15
             7: 4,-14
-            259: 0,11
+            257: 0,11
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
             222: -18,-4
-            275: 1,13
+            273: 1,13
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -550,31 +550,29 @@ entities:
             224: -17,-2
             225: -17,-4
             226: -17,-5
-            227: -18,2
-            228: -18,3
-            229: -18,4
-            230: -19,2
-            231: -21,-2
-            232: -21,-1
-            233: -22,2
-            234: -21,3
-            265: 0,7
-            266: 0,8
-            267: 1,9
-            268: 1,10
-            269: 1,11
-            270: 1,13
-            271: 3,7
-            272: 0,6
-            276: 1,12
-            277: 2,10
-            278: 2,12
-            279: 2,8
-            280: 2,8
-            281: 2,7
-            282: 1,8
-            283: 0,8
-            284: 1,7
+            227: -18,3
+            228: -18,4
+            229: -21,-2
+            230: -21,-1
+            231: -22,2
+            232: -21,3
+            263: 0,7
+            264: 0,8
+            265: 1,9
+            266: 1,10
+            267: 1,11
+            268: 1,13
+            269: 3,7
+            270: 0,6
+            274: 1,12
+            275: 2,10
+            276: 2,12
+            277: 2,8
+            278: 2,8
+            279: 2,7
+            280: 1,8
+            281: 0,8
+            282: 1,7
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -584,8 +582,8 @@ entities:
             10: 2,-13
             11: 2,-14
             223: -19,-3
-            273: 0,7
-            274: 1,10
+            271: 0,7
+            272: 1,10
         - node:
             color: '#52B4E996'
             id: FullTileOverlayGreyscale
@@ -604,19 +602,19 @@ entities:
             color: '#FFFFFFFF'
             id: Grasse2
           decals:
-            310: -7.978216,-5.0112405
-            311: -7.962591,-4.3393655
-            312: -7.978216,-3.1987405
-            313: -11.962591,-3.2924905
-            314: -12.025091,-4.2456155
-            318: -11.993841,-2.9487405
+            307: -7.978216,-5.0112405
+            308: -7.962591,-4.3393655
+            309: -7.978216,-3.1987405
+            310: -11.962591,-3.2924905
+            311: -12.025091,-4.2456155
+            315: -11.993841,-2.9487405
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            315: -12.025091,-4.9799905
-            316: -8.025091,-3.7299905
-            317: -8.025091,-2.8706155
+            312: -12.025091,-4.9799905
+            313: -8.025091,-3.7299905
+            314: -8.025091,-2.8706155
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale
@@ -628,18 +626,18 @@ entities:
             42: 10,5
             43: 11,5
             44: 12,5
-            356: 25,2
+            353: 25,2
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale
           decals:
-            242: 1,5
-            243: 2,5
+            240: 1,5
+            241: 2,5
         - node:
             color: '#D381C928'
             id: HalfTileOverlayGreyscale
           decals:
-            240: -2,5
+            238: -2,5
         - node:
             color: '#EFD58F96'
             id: HalfTileOverlayGreyscale
@@ -661,7 +659,7 @@ entities:
             54: 3,3
             55: 2,3
             56: 1,3
-            357: 25,-1
+            354: 25,-1
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale180
@@ -689,7 +687,7 @@ entities:
             35: -2,2
             36: -2,4
             37: -2,3
-            360: 24,1
+            357: 24,1
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
@@ -719,15 +717,15 @@ entities:
             22: 0,-1
             23: 0,1
             24: 0,2
-            237: 0,-14
-            238: 0,-12
-            358: 26,0
-            359: 26,1
+            235: 0,-14
+            236: 0,-12
+            355: 26,0
+            356: 26,1
         - node:
             color: '#EFB34128'
             id: HalfTileOverlayGreyscale90
           decals:
-            239: 0,-13
+            237: 0,-13
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
@@ -740,25 +738,25 @@ entities:
             color: '#FFFFFFFF'
             id: HatchSmall
           decals:
-            235: 1,0
-            236: -3,-8
+            233: 1,0
+            234: -3,-8
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            264: 2,13
+            262: 2,13
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale
           decals:
-            246: 0,7
-            247: 0,8
-            248: 0,9
-            249: 0,10
-            250: 0,11
-            251: 0,12
-            252: 0,13
+            244: 0,7
+            245: 0,8
+            246: 0,9
+            247: 0,10
+            248: 0,11
+            249: 0,12
+            250: 0,13
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale180
@@ -768,7 +766,7 @@ entities:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale270
           decals:
-            241: -2,5
+            239: -2,5
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
@@ -778,9 +776,9 @@ entities:
             color: '#9FED5896'
             id: QuarterTileOverlayGreyscale270
           decals:
-            307: -5,-9
-            308: -6,-8
-            309: -7,-7
+            304: -5,-9
+            305: -6,-8
+            306: -7,-7
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
@@ -790,17 +788,17 @@ entities:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
           decals:
-            253: 2,13
-            254: 2,12
-            255: 2,11
-            256: 2,10
-            257: 2,9
-            258: 2,8
+            251: 2,13
+            252: 2,12
+            253: 2,11
+            254: 2,10
+            255: 2,9
+            256: 2,8
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            353: 24,2
+            350: 24,2
         - node:
             color: '#EFD58F96'
             id: ThreeQuarterTileOverlayGreyscale
@@ -810,7 +808,7 @@ entities:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            352: 26,-1
+            349: 26,-1
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -825,7 +823,7 @@ entities:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            355: 24,-1
+            352: 24,-1
         - node:
             color: '#EFD58F96'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -835,7 +833,7 @@ entities:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            354: 26,2
+            351: 26,2
         - node:
             color: '#EFD58F96'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -845,12 +843,12 @@ entities:
             color: '#FFFFFFFF'
             id: VentSmall
           decals:
-            301: -16,0
+            299: -16,0
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleSE
           decals:
-            290: -2,7
+            288: -2,7
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
@@ -870,7 +868,7 @@ entities:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleE
           decals:
-            381: 19,0
+            378: 19,0
         - node:
             color: '#EFD58F96'
             id: WarnLineGreyscaleE
@@ -885,19 +883,19 @@ entities:
             color: '#A4610696'
             id: WarnLineGreyscaleN
           decals:
-            244: 3,5
-            245: 0,5
+            242: 3,5
+            243: 0,5
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleN
           decals:
-            363: 18,1
+            360: 18,1
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleS
           decals:
-            361: 17,-1
-            362: 16,-1
+            358: 17,-1
+            359: 16,-1
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleW
@@ -907,8 +905,8 @@ entities:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleW
           decals:
-            379: 14,0
-            380: 14,4
+            376: 14,0
+            377: 14,4
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -946,9 +944,9 @@ entities:
             154: 5,14
             155: 5,15
             156: 5,16
-            382: 14,-5
-            383: 14,-4
-            384: 14,-3
+            379: 14,-5
+            380: 14,-4
+            381: 14,-3
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -1009,203 +1007,209 @@ entities:
             144: 9,14
             145: 9,15
             146: 9,16
-            385: 19,-5
-            386: 19,-4
-            387: 19,-3
+            382: 19,-5
+            383: 19,-4
+            384: 19,-3
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
-          -1,-1:
-            0: 65535
-          0,0:
-            0: 65535
-          -1,0:
-            0: 65535
-          0,-1:
-            0: 65535
           -4,-2:
-            0: 65280
+            0: 57344
+          -5,-2:
+            0: 57344
           -4,-1:
-            0: 65535
+            0: 61166
+          -5,-1:
+            0: 61167
+          -4,0:
+            0: 57583
           -3,-2:
-            0: 65280
+            0: 61440
           -3,-1:
-            0: 65535
+            0: 65279
+          -3,0:
+            0: 61183
           -2,-2:
-            0: 65535
+            0: 61676
           -2,-1:
-            0: 65535
+            0: 65279
+          -2,0:
+            0: 63999
           -2,-3:
-            0: 60544
+            0: 32768
+            1: 128
           -1,-3:
-            0: 65535
+            0: 56556
           -1,-2:
-            0: 65535
+            0: 56543
+          -1,-1:
+            0: 64989
+          -1,0:
+            0: 56831
           -1,-4:
-            0: 60544
+            0: 32768
+          0,-4:
+            0: 62720
+            1: 4
+          0,-3:
+            0: 21781
+          0,-2:
+            0: 55805
+          0,-1:
+            0: 55773
+          0,0:
+            0: 61919
           0,1:
-            0: 65535
+            0: 62975
+          -1,1:
+            0: 62685
           0,2:
             0: 65535
+          -1,2:
+            0: 61311
           0,3:
-            0: 65535
+            0: 29439
+          0,4:
+            0: 7
+          -1,3:
+            0: 58886
           1,0:
-            0: 65535
+            0: 61663
           1,1:
-            0: 65535
-          1,2:
-            0: 65535
+            0: 60671
           1,3:
-            0: 65535
+            0: 65262
+          1,-1:
+            0: 55807
+          1,2:
+            0: 61166
+          1,4:
+            0: 34959
           2,0:
-            0: 65535
+            0: 61663
           2,1:
-            0: 65535
+            0: 61951
           2,2:
-            0: 65535
+            0: 65399
           2,3:
-            0: 65535
+            0: 30719
+          2,-1:
+            0: 56831
+          2,4:
+            0: 7
           3,0:
-            0: 65535
+            0: 56543
           3,1:
-            0: 8191
+            0: 223
           3,2:
-            0: 4369
+            0: 4864
           3,3:
-            0: 4369
-          -4,0:
-            0: 65535
+            0: 4115
+          3,-1:
+            0: 53725
+          3,4:
+            1: 1
+          4,0:
+            0: 54783
+          4,1:
+            0: 221
+          -5,0:
+            0: 61166
           -4,1:
-            0: 65535
+            0: 238
+            1: 57344
+          -5,1:
+            0: 19534
+            1: 4352
           -4,2:
-            0: 243
-          -3,0:
-            0: 65535
+            1: 243
+          -5,2:
+            1: 15
           -3,1:
-            0: 65535
+            0: 239
+            1: 61440
           -3,2:
-            0: 241
-          -2,0:
-            0: 65535
+            1: 241
           -2,1:
-            0: 65535
+            0: 57567
           -2,2:
-            0: 36095
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 65535
-          -1,3:
-            0: 36079
-          0,-4:
-            0: 65532
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
+            1: 16
+            0: 2188
+          -1,4:
+            0: 174
           1,-4:
             0: 65535
           1,-3:
-            0: 65535
+            0: 61695
           1,-2:
-            0: 65535
-          1,-1:
-            0: 65535
-          2,-4:
-            0: 63993
-            1: 6
-            2: 1536
+            0: 61695
+          1,-5:
+            0: 33280
           2,-3:
-            0: 65535
+            0: 28895
           2,-2:
-            0: 65535
-          2,-1:
-            0: 65535
+            0: 61687
+          2,-4:
+            2: 6
+            3: 1536
           3,-4:
-            0: 13105
+            1: 8737
+            0: 256
           3,-3:
-            0: 13107
+            0: 4097
+            1: 8738
           3,-2:
-            0: 65331
-          3,-1:
-            0: 65535
+            0: 53248
+            1: 34
+          4,-2:
+            0: 61440
+          4,-1:
+            0: 62463
           -8,0:
-            0: 63342
+            1: 4160
+            0: 8750
           -8,1:
-            0: 63
+            0: 1
+            1: 8
+          -8,-1:
+            0: 8737
+            1: 16408
           -7,0:
-            0: 64751
+            0: 29799
           -7,1:
-            0: 143
+            1: 143
+          -7,-1:
+            0: 25712
+            1: 15
           -6,0:
-            0: 65535
+            0: 61439
           -6,1:
-            0: 3327
-          -5,0:
-            0: 65535
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 15
-          -8,-2:
-            0: 12288
-          -8,-1:
-            0: 26623
-          -7,-1:
-            0: 60671
+            1: 3184
+          -6,-1:
+            0: 65504
           -7,-2:
-            0: 32768
+            1: 32768
           -6,-2:
-            0: 64512
-          -6,-1:
-            0: 65535
-          -5,-2:
-            0: 65280
-          -5,-1:
-            0: 65535
+            1: 31744
           0,-5:
-            0: 34816
-          1,-5:
-            0: 65280
+            1: 2048
           2,-5:
-            0: 65280
-          0,4:
-            0: 2191
-          1,4:
-            0: 53247
-          1,5:
-            0: 52428
-          2,4:
-            0: 8191
-          2,5:
-            0: 4369
-          3,4:
-            0: 1
-          4,0:
-            0: 65535
-          4,1:
-            0: 4095
+            0: 512
+            1: 2048
           5,0:
-            0: 65535
+            0: 61167
           5,1:
-            0: 511
+            0: 14
+          5,-1:
+            0: 58606
           6,0:
-            0: 65535
+            0: 14199
           6,1:
-            0: 55
-          4,-2:
-            0: 65280
-          4,-1:
-            0: 65535
-          5,-2:
-            0: 61696
-          5,-1:
-            0: 65535
-          6,-2:
-            0: 12288
+            0: 1
           6,-1:
-            0: 65527
+            0: 28721
+            1: 128
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1222,6 +1226,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1263,15 +1282,11 @@ entities:
     - type: Transform
       pos: 7.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1537
     components:
     - type: Transform
       pos: 6.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: AirlockAtmosphericsGlassLocked
   entities:
   - uid: 1561
@@ -1286,6 +1301,20 @@ entities:
     - type: Transform
       pos: 1.5,-12.5
       parent: 407
+- proto: AirlockBrigGlassLocked
+  entities:
+  - uid: 1927
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,4.5
+      parent: 407
+  - uid: 2064
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,0.5
+      parent: 407
 - proto: AirlockCaptainLocked
   entities:
   - uid: 1859
@@ -1507,16 +1536,6 @@ entities:
     - type: Transform
       pos: 18.5,2.5
       parent: 407
-  - uid: 1927
-    components:
-    - type: Transform
-      pos: 13.5,0.5
-      parent: 407
-  - uid: 2064
-    components:
-    - type: Transform
-      pos: 13.5,4.5
-      parent: 407
 - proto: AirlockSecurityLocked
   entities:
   - uid: 2122
@@ -1760,13 +1779,17 @@ entities:
     - type: Transform
       pos: 19.5,4.5
       parent: 407
-- proto: BlastDoor
+- proto: BlastDoorScience
   entities:
-  - uid: 1250
+  - uid: 198
     components:
     - type: Transform
-      pos: -4.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: -5.5,10.5
       parent: 407
+    - type: DeviceLinkSink
+      links:
+      - 1251
 - proto: BluespaceBeaker
   entities:
   - uid: 1740
@@ -1828,6 +1851,14 @@ entities:
     - type: Transform
       pos: -12.730633,3.8739996
       parent: 407
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 1982
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,2.5
+      parent: 407
 - proto: CableApcExtension
   entities:
   - uid: 363
@@ -5744,13 +5775,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 23.5,-0.5
       parent: 407
-- proto: chem_master
-  entities:
-  - uid: 1732
-    components:
-    - type: Transform
-      pos: 6.5,1.5
-      parent: 407
 - proto: ChemDispenser
   entities:
   - uid: 1733
@@ -5765,6 +5789,13 @@ entities:
     - type: Transform
       pos: 11.5,1.5
       parent: 407
+- proto: ChemMaster
+  entities:
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 407
 - proto: CircuitImprinter
   entities:
   - uid: 1490
@@ -5854,10 +5885,10 @@ entities:
       parent: 407
 - proto: ClosetToolFilled
   entities:
-  - uid: 1790
+  - uid: 1594
     components:
     - type: Transform
-      pos: -18.5,3.5
+      pos: -16.5,1.5
       parent: 407
 - proto: ClosetWallEmergencyFilledRandom
   entities:
@@ -5990,18 +6021,13 @@ entities:
     - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitRd
   entities:
-  - uid: 1981
+  - uid: 1988
     components:
     - type: Transform
       parent: 1980
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 2218
-    components:
-    - type: Transform
-      pos: -4.567293,7.5605726
-      parent: 407
 - proto: ClothingOuterHardsuitSalvage
   entities:
   - uid: 1970
@@ -6147,6 +6173,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,10.5
       parent: 407
+    - type: DeviceLinkSource
+      linkedPorts:
+        1985:
+        - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
 - proto: ComputerCargoOrders
   entities:
   - uid: 1963
@@ -6232,12 +6262,27 @@ entities:
       parent: 407
 - proto: ComputerResearchAndDevelopment
   entities:
-  - uid: 1988
+  - uid: 1974
+    components:
+    - type: Transform
+      pos: -1.5,12.5
+      parent: 407
+- proto: ComputerRoboticsControl
+  entities:
+  - uid: 1983
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,9.5
       parent: 407
+- proto: ComputerSalvageExpedition
+  entities:
+  - uid: 2218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,15.5
+      parent: 407
 - proto: ComputerShuttle
   entities:
   - uid: 1939
@@ -6253,6 +6298,13 @@ entities:
     - type: Transform
       pos: 2.5,11.5
       parent: 407
+- proto: ComputerShuttleSalvage
+  entities:
+  - uid: 2278
+    components:
+    - type: Transform
+      pos: 0.5,16.5
+      parent: 407
 - proto: ComputerStationRecords
   entities:
   - uid: 1639
@@ -6312,7 +6364,7 @@ entities:
   - uid: 1035
     components:
     - type: Transform
-      pos: -2.5,12.5
+      pos: -5.5,8.5
       parent: 407
 - proto: CrateEngineeringCableBulk
   entities:
@@ -6484,24 +6536,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,0.5
       parent: 407
-  - uid: 1194
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-6.5
-      parent: 407
-  - uid: 1195
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-5.5
-      parent: 407
-  - uid: 1196
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-5.5
-      parent: 407
   - uid: 1205
     components:
     - type: Transform
@@ -6521,12 +6555,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,0.5
       parent: 407
-  - uid: 1191
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 407
   - uid: 1204
     components:
     - type: Transform
@@ -6665,6 +6693,11 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 407
+  - uid: 1191
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 407
   - uid: 1192
     components:
     - type: Transform
@@ -6895,6 +6928,14 @@ entities:
     - type: Transform
       pos: -16.5,-0.5
       parent: 407
+- proto: DisposalYJunction
+  entities:
+  - uid: 1194
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 407
 - proto: DogBed
   entities:
   - uid: 1885
@@ -6911,7 +6952,7 @@ entities:
       parent: 407
 - proto: DoorRemoteResearch
   entities:
-  - uid: 1982
+  - uid: 1196
     components:
     - type: Transform
       parent: 1980
@@ -7225,8 +7266,6 @@ entities:
     - type: Transform
       pos: 10.5,-15.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: GasMinerOxygen
   entities:
   - uid: 1256
@@ -7234,8 +7273,6 @@ entities:
     - type: Transform
       pos: 10.5,-13.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: GasMixer
   entities:
   - uid: 1264
@@ -7247,8 +7284,6 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.78
       inletOneConcentration: 0.22
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasMixerFlipped
@@ -7259,8 +7294,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-14.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: GasPassiveVent
   entities:
   - uid: 238
@@ -7269,24 +7302,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-13.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 239
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-15.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1538
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-15.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: GasPipeBend
   entities:
   - uid: 1265
@@ -8612,55 +8639,41 @@ entities:
     - type: Transform
       pos: 5.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1530
     components:
     - type: Transform
       pos: 5.5,-13.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1531
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-14.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1532
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-15.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1542
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-15.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1543
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-14.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
   - uid: 1544
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-13.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: GasPressurePump
   entities:
   - uid: 1271
@@ -8668,8 +8681,6 @@ entities:
     - type: Transform
       pos: 5.5,-11.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasVentPump
@@ -8680,8 +8691,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-11.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1274
@@ -8690,8 +8699,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-11.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1288
@@ -8700,8 +8707,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1333
@@ -8709,8 +8714,6 @@ entities:
     - type: Transform
       pos: 18.5,3.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1334
@@ -8718,8 +8721,6 @@ entities:
     - type: Transform
       pos: 17.5,1.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1335
@@ -8728,8 +8729,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,0.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1336
@@ -8738,8 +8737,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1337
@@ -8748,8 +8745,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1338
@@ -8758,8 +8753,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1339
@@ -8768,8 +8761,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-0.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1340
@@ -8778,8 +8769,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-3.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1341
@@ -8788,8 +8777,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-7.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1343
@@ -8797,8 +8784,6 @@ entities:
     - type: Transform
       pos: 22.5,1.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1344
@@ -8807,8 +8792,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 24.5,0.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1345
@@ -8817,8 +8800,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 22.5,-2.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1355
@@ -8827,8 +8808,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-2.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1377
@@ -8837,8 +8816,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1395
@@ -8846,8 +8823,6 @@ entities:
     - type: Transform
       pos: 5.5,16.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1397
@@ -8855,8 +8830,6 @@ entities:
     - type: Transform
       pos: -0.5,4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1398
@@ -8864,8 +8837,6 @@ entities:
     - type: Transform
       pos: -1.5,8.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1399
@@ -8873,8 +8844,6 @@ entities:
     - type: Transform
       pos: 0.5,8.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1446
@@ -8882,8 +8851,6 @@ entities:
     - type: Transform
       pos: -17.5,0.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1447
@@ -8892,8 +8859,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,0.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1448
@@ -8902,8 +8867,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,3.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1449
@@ -8911,8 +8874,6 @@ entities:
     - type: Transform
       pos: -17.5,6.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1450
@@ -8921,8 +8882,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-2.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1465
@@ -8931,8 +8890,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,3.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1466
@@ -8941,8 +8898,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1467
@@ -8951,8 +8906,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,4.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1470
@@ -8961,8 +8914,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-3.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2258
@@ -8970,8 +8921,6 @@ entities:
     - type: Transform
       pos: 15.5,5.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: GeigerCounter
   entities:
   - uid: 1795
@@ -9486,6 +9435,11 @@ entities:
     - type: Transform
       pos: 3.5,2.5
       parent: 407
+  - uid: 2012
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 407
 - proto: Gyroscope
   entities:
   - uid: 1120
@@ -9508,11 +9462,6 @@ entities:
 - proto: HandTeleporter
   entities:
   - uid: 1813
-    components:
-    - type: Transform
-      pos: -2.4206839,7.756456
-      parent: 407
-  - uid: 1983
     components:
     - type: Transform
       parent: 1980
@@ -9752,7 +9701,7 @@ entities:
   - uid: 1980
     components:
     - type: Transform
-      pos: -5.5,8.5
+      pos: -2.5,11.5
       parent: 407
     - type: ContainerContainer
       containers:
@@ -9760,9 +9709,9 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 1982
-          - 1981
-          - 1983
+          - 1813
+          - 1988
+          - 1196
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -9788,6 +9737,9 @@ entities:
     - type: Transform
       pos: -3.5,10.5
       parent: 407
+    - type: DeviceLinkSink
+      links:
+      - 1986
 - proto: MachineCentrifuge
   entities:
   - uid: 2220
@@ -9880,8 +9832,6 @@ entities:
     - type: Transform
       pos: 11.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: OreProcessor
   entities:
   - uid: 2009
@@ -9896,8 +9846,6 @@ entities:
     - type: Transform
       pos: 10.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: PartRodMetal
   entities:
   - uid: 1552
@@ -9932,10 +9880,13 @@ entities:
     - type: Transform
       pos: 8.5,-10.5
       parent: 407
-    - type: AtmosDevice
-      joinedGrid: 407
 - proto: PlasmaReinforcedWindowDirectional
   entities:
+  - uid: 1250
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 407
   - uid: 1976
     components:
     - type: Transform
@@ -9948,12 +9899,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,9.5
       parent: 407
-  - uid: 1978
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,8.5
-      parent: 407
 - proto: PlasmaTankFilled
   entities:
   - uid: 1938
@@ -10870,10 +10815,10 @@ entities:
       parent: 407
 - proto: RandomArtifactSpawner
   entities:
-  - uid: 2012
+  - uid: 1978
     components:
     - type: Transform
-      pos: -3.5,9.5
+      pos: -4.5,10.5
       parent: 407
 - proto: RandomBoard
   entities:
@@ -10925,10 +10870,10 @@ entities:
       parent: 407
 - proto: ResearchAndDevelopmentServer
   entities:
-  - uid: 1974
+  - uid: 1981
     components:
     - type: Transform
-      pos: -1.5,12.5
+      pos: -2.5,12.5
       parent: 407
 - proto: ResearchDisk10000
   entities:
@@ -11542,6 +11487,11 @@ entities:
     - type: Transform
       pos: 6.5,19.5
       parent: 407
+  - uid: 2210
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 407
 - proto: SignalButton
   entities:
   - uid: 1251
@@ -11549,9 +11499,14 @@ entities:
     - type: Transform
       pos: -5.5,9.5
       parent: 407
+    - type: DeviceLinkSource
+      linkedPorts:
+        198:
+        - Pressed: Toggle
   - uid: 1255
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -19.5,2.5
       parent: 407
     - type: DeviceLinkSource
@@ -11770,7 +11725,7 @@ entities:
     - type: Transform
       pos: 16.59669,-4.5284977
       parent: 407
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 1778
     components:
@@ -12770,10 +12725,10 @@ entities:
       parent: 407
 - proto: VendingMachineTankDispenserEngineering
   entities:
-  - uid: 1932
+  - uid: 1595
     components:
     - type: Transform
-      pos: -16.5,1.5
+      pos: -16.5,2.5
       parent: 407
 - proto: VendingMachineTankDispenserEVA
   entities:
@@ -12782,10 +12737,10 @@ entities:
     - type: Transform
       pos: 2.5,-13.5
       parent: 407
-  - uid: 1805
+  - uid: 1788
     components:
     - type: Transform
-      pos: -16.5,2.5
+      pos: -18.5,3.5
       parent: 407
 - proto: VendingMachineYouTool
   entities:
@@ -13616,11 +13571,6 @@ entities:
     - type: Transform
       pos: -5.5,9.5
       parent: 407
-  - uid: 198
-    components:
-    - type: Transform
-      pos: -5.5,10.5
-      parent: 407
   - uid: 199
     components:
     - type: Transform
@@ -14170,6 +14120,11 @@ entities:
     - type: Transform
       pos: 1.5,17.5
       parent: 407
+  - uid: 2211
+    components:
+    - type: Transform
+      pos: -5.5,11.5
+      parent: 407
 - proto: WallShuttleDiagonal
   entities:
   - uid: 382
@@ -14296,6 +14251,12 @@ entities:
       parent: 407
 - proto: WindoorSecureCargoLocked
   entities:
+  - uid: 1195
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,13.5
+      parent: 407
   - uid: 1968
     components:
     - type: Transform
@@ -14356,10 +14317,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,-1.5
       parent: 407
-  - uid: 1788
+  - uid: 1790
     components:
     - type: Transform
-      pos: -17.5,2.5
+      pos: -17.5,3.5
       parent: 407
   - uid: 1855
     components:
@@ -14529,16 +14490,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-7.5
       parent: 407
-  - uid: 1594
-    components:
-    - type: Transform
-      pos: -16.5,2.5
-      parent: 407
-  - uid: 1595
-    components:
-    - type: Transform
-      pos: -18.5,2.5
-      parent: 407
   - uid: 1596
     components:
     - type: Transform
@@ -14653,12 +14604,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,2.5
       parent: 407
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: -16.5,3.5
+      parent: 407
   - uid: 1918
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,2.5
       parent: 407
+  - uid: 1932
+    components:
+    - type: Transform
+      pos: -18.5,3.5
+      parent: 407
   - uid: 2096
     components:
     - type: Transform

From dc0327c3c0c7834823aeaf7e11eef6993e5fdc77 Mon Sep 17 00:00:00 2001
From: Partmedia <kevinz5000@gmail.com>
Date: Wed, 12 Jun 2024 18:15:15 -0800
Subject: [PATCH 425/568] Update PA admin warnings (#28911)

With singulo fixed, PA strength 3 and below (level 2) are now safe.
Update the admin logging to reflect this.
---
 .../ParticleAcceleratorSystem.ControlBox.cs              | 9 ++++-----
 Content.Shared/CCVar/CCVars.cs                           | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
index f3cff9f2e729..80f398c0a79e 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs
@@ -159,11 +159,10 @@ public void SetStrength(EntityUid uid, ParticleAcceleratorPowerState strength, E
             var impact = strength switch
             {
                 ParticleAcceleratorPowerState.Standby => LogImpact.Low,
-                ParticleAcceleratorPowerState.Level0 => LogImpact.Medium,
-                ParticleAcceleratorPowerState.Level1 => LogImpact.High,
-                ParticleAcceleratorPowerState.Level2
-                or ParticleAcceleratorPowerState.Level3
-                or _ => LogImpact.Extreme,
+                ParticleAcceleratorPowerState.Level0
+                    or ParticleAcceleratorPowerState.Level1
+                    or ParticleAcceleratorPowerState.Level2 => LogImpact.Medium,
+                ParticleAcceleratorPowerState.Level3 => LogImpact.Extreme,
             };
 
             _adminLogger.Add(LogType.Action, impact, $"{ToPrettyString(player):player} has set the strength of {ToPrettyString(uid)} to {strength}");
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 2ae5c6bd5bd7..f3025f326aa8 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -822,7 +822,7 @@ public static readonly CVarDef<bool>
         ///     Minimum particle accelerator strength to create an admin alert message.
         /// </summary>
         public static readonly CVarDef<int> AdminAlertParticleAcceleratorMinPowerState =
-            CVarDef.Create("admin.alert.particle_accelerator_min_power_state", 3, CVar.SERVERONLY);
+            CVarDef.Create("admin.alert.particle_accelerator_min_power_state", 5, CVar.SERVERONLY); // strength 4
 
         /// <summary>
         ///     Should the ban details in admin channel include PII? (IP, HWID, etc)

From 0e32d632faf27dd6903369237328dffbaa96dc0a Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Wed, 12 Jun 2024 21:15:43 -0500
Subject: [PATCH 426/568] Make automatic gasps not create a chat message
 (#28907)

No chat gasp
---
 Content.Server/Body/Systems/RespiratorSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 4e6c02edbd64..900920a14fe3 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -95,7 +95,7 @@ public override void Update(float frameTime)
                 if (_gameTiming.CurTime >= respirator.LastGaspEmoteTime + respirator.GaspEmoteCooldown)
                 {
                     respirator.LastGaspEmoteTime = _gameTiming.CurTime;
-                    _chat.TryEmoteWithChat(uid, respirator.GaspEmote, ignoreActionBlocker: true);
+                    _chat.TryEmoteWithChat(uid, respirator.GaspEmote, ChatTransmitRange.HideChat, ignoreActionBlocker: true);
                 }
 
                 TakeSuffocationDamage((uid, respirator));

From d322a82bdf7ff4be344d6c8350ad8867b4c625aa Mon Sep 17 00:00:00 2001
From: Stalen <33173619+stalengd@users.noreply.github.com>
Date: Thu, 13 Jun 2024 05:17:07 +0300
Subject: [PATCH 427/568] Pets toggle internals fix (#28904)

---
 Content.Server/Body/Systems/InternalsSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 0e568b77cb48..922d48f13ed2 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -262,7 +262,7 @@ private short GetSeverity(InternalsComponent component)
         // 3. in-hand tanks
         // 4. pocket/belt tanks
 
-        if (!Resolve(user, ref user.Comp1, ref user.Comp2, ref user.Comp3))
+        if (!Resolve(user, ref user.Comp2, ref user.Comp3))
             return null;
 
         if (_inventory.TryGetSlotEntity(user, "back", out var backEntity, user.Comp2, user.Comp3) &&

From 865810c6e122cb2f4f8eb601c17bf9b84690f890 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Wed, 12 Jun 2024 21:17:35 -0500
Subject: [PATCH 428/568] New Sprites for Tranq Shells + Add consistancy to
 printing Tranqs (#28903)

* New Sprites for Tranq

* Add consistancy to secfab print
---
 .../Weapons/Guns/Ammunition/Boxes/shotgun.yml   |   2 +-
 .../Guns/Ammunition/Cartridges/shotgun.yml      |   6 +++---
 .../Entities/Structures/Machines/lathe.yml      |   6 +++---
 .../Prototypes/Recipes/Lathes/security.yml      |  16 ++++++++--------
 Resources/Prototypes/Research/arsenal.yml       |   2 +-
 .../Objects/Storage/boxes.rsi/meta.json         |  11 +++++++----
 .../Storage/boxes.rsi/shelltranquilizer.png     | Bin 0 -> 266 bytes
 .../Casings/shotgun_shell.rsi/meta.json         |   6 ++++++
 .../shotgun_shell.rsi/tranquilizer-spent.png    | Bin 0 -> 450 bytes
 .../Casings/shotgun_shell.rsi/tranquilizer.png  | Bin 0 -> 425 bytes
 10 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index 63ad52c0320e..063937aee9a9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -126,4 +126,4 @@
     - type: Sprite
       layers:
         - state: boxwide
-        - state: shellslug
+        - state: shelltranquilizer
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 e26c4e954043..57b95cb9016b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseShellShotgun
   name: shell (.50)
   parent: BaseCartridge
@@ -114,7 +114,7 @@
   components:
   - type: Sprite
     layers:
-      - state: practice
+      - state: tranquilizer
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgunTranquilizer
@@ -129,7 +129,7 @@
   - type: SolutionTransfer
     maxTransferAmount: 7
   - type: SpentAmmoVisuals
-    state: "practice"
+    state: "tranquilizer"
     
 - type: entity
   id: ShellShotgunImprovised
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 537c42346eae..ab3cf20ac3d6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -334,6 +334,7 @@
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
+      - BoxShellTranquilizer
       - ExplosivePayload
       - GrenadeBlast
       - GrenadeEMP
@@ -361,7 +362,6 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
-      - ShellTranquilizer
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
       - TelescopicShield
@@ -747,6 +747,7 @@
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
+      - BoxShellTranquilizer
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast
@@ -774,7 +775,6 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
-      - ShellTranquilizer
       - ShuttleGunDusterCircuitboard
       - ShuttleGunFriendshipCircuitboard
       - ShuttleGunPerforatorCircuitboard
@@ -828,6 +828,7 @@
         - BoxLethalshot
         - BoxShotgunFlare
         - BoxShotgunSlug
+        - BoxShellTranquilizer
         - MagazineBoxLightRifle
         - MagazineBoxMagnum
         - MagazineBoxPistol
@@ -841,7 +842,6 @@
         - MagazineShotgun
         - MagazineShotgunEmpty
         - MagazineShotgunSlug
-        - ShellTranquilizer
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumEmpty
     - type: MaterialStorage
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 1efbd3b42dc9..1e6b70f94366 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -139,16 +139,16 @@
     Steel: 100
 
 - type: latheRecipe
-  id: ShellTranquilizer
-  result: ShellTranquilizer
+  id: BoxShellTranquilizer
+  result: BoxShellTranquilizer
   category: Ammo
-  completetime: 4
+  completetime: 5
   materials:
-    Plastic: 15
-    Steel: 10
-    Glass: 5
-    Plasma: 10
-    Silver: 5
+    Plastic: 240
+    Steel: 160
+    Glass: 80
+    Plasma: 160
+    Silver: 80
 
 - type: latheRecipe
   id: TargetHuman
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 97b0c1e82b15..5a55a34cdfae 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -58,7 +58,7 @@
   cost: 5000
   recipeUnlocks:
   - MagazineShotgunBeanbag
-  - ShellTranquilizer 
+  - BoxShellTranquilizer 
   - BoxBeanbag 
   - WeaponDisabler
 
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 788c43845cd5..f30d9c9ae727 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -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
         },
@@ -200,6 +200,9 @@
         {
             "name": "shelluranium"
         },
+        {
+            "name": "shelltranquilizer"
+        },
         {
             "name": "shelltoy"
         },
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png
new file mode 100644
index 0000000000000000000000000000000000000000..96990098bfd2199eff0defdc0fb385efdf20e941
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7eVe
z#W5tJHTlo~|MrI+n3geat-Zpym`|egzzSwJS%X&%2OltqC5dcQQ~w|S^-D^DRY61I
zv+wVD_CG(DsuI>S;U=>j6Hs{pyTDYAt>@+>PN?}c<slz4bMv*&&s91FnOs^Am<kKG
zxoc_`m}w@pFa#<d0D^+*-(_vLFI`IM41Ckj-<d9PgEdD|0to8rEPN(OC?2r5r4Mn!
u9%csJ$x&^a8*T{zUCWmm;hE;^%b*2ha{w_2Tne5HqC8#wT-G@yGywo3(OI+r

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
index 9274592a7f2c..a7aa232decff 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
@@ -60,6 +60,12 @@
         },
         {
             "name": "depleted-uranium-spent"
+        },
+        {
+            "name": "tranquilizer"
+        },
+        {
+            "name": "tranquilizer-spent"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer-spent.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f05d6388de55bbf325c4c54d6fa9b29d7d7ef80
GIT binary patch
literal 450
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq^l~
z)5S3)qV?^yjoybHM2>&VUn)E2mB{x5?GSF(mr5e%JlDj^ScR$FjFI8e%G+hNv-IVY
zEA<B+EUC^s8<OD_D8R+%#IDXd-+7IK#gj={j-MV(ds4CA|6QL7r(ohVQ}fGTBm|g~
z9C&6(J@{zz<#mZw!#&YG+nf~_F|RXkiIL3Xb6)FWazLdf&~Y8l^yUAy?q^t%6CL*S
z1b_XmuiF#Xa?IT(rX*=rV?Q@7XO@hN`HmZVKIfO*D)=<%!po(+9yhn?gs<-Lo!siy
z?6}q~Z-?Lc+n4#+9bB0Dm!zKTdVC^pzy9s1T{)$@C!K$;ni;w1^7H8P3j&r-c_YF0
zdD+S0z2|=4l;l6G*qk(Rds^`SllIzzPp125s<tIEJlLh@y>^=XJBx{jn3>f&E@rqa
z3^-64`_6mmiHA`P4LN4NO>chQbK+scJw*{gqnSQ0n7?1X5Y>2pMg1qsK1M?YHkTFr
q+TO~FO-%Luz@X<#jqptK^<~fkvN?bl1TF<n22q}_elF{r5}E+|>bCX(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/tranquilizer.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eaa42de8440c5dde25c427a0076a49e4d40010c
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq~J{
z)5S3)qV?@Gdym5oBJK4PQ`XI1y@bWnWbzJ+mkLE&vyXQ@G1J_!a)+h$&eWGrDt5O|
zez)*>*a}4ji=CwfmmXTSOnWrtv@3TJ|Ggsi@3ni%|H~*HGD=QeS)!f5x~4%i!{@=<
zW#39~^&I#i_v1{K=L~L}H^PhfK2*f57D{6>{&7oAptNE4>!LUMEH>vdyY;+&{0_d^
z_Et7wN~Y(I(ud2}iY?pMzxlMt_V)8nk7zKjvy+*-bqgy{>Ei2$uYBJ)YuSn4wJt~X
zj_Ir4Dqvs`4D~bj%n0_fn&<Ok#ckDPB1a2-@+M6<XVtxuHQh@vIE#<J)u1U{ETV<o
z@q)yhjt3z>g{$T;GqCm~?!9{~J5XV|Q2gPAb?56{o+eiqNLcKgQe1IhhM`QuH8}^3
zBWq+iS`D=JhH=*!|2tWn1M;3hN51{#?QfF%S^|L~%$FMBnda-upao=e05J$$3Z4w2
NJYD@<);T3K0RWkEtX%*A

literal 0
HcmV?d00001


From 7d4586b27bc56a040e0ff76065a55d525b6d7a9f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 02:18:41 +0000
Subject: [PATCH 429/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0eac0b307cae..97573417838b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: Baptr0b0t
-  changes:
-  - message: Fix access of command door remote. The captain must control his station.
-    type: Fix
-  id: 6217
-  time: '2024-03-24T05:19:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26378
-- author: ElectroJr
-  changes:
-  - message: Fixed the cargo & emergency shuttle not being airtight.
-    type: Fix
-  id: 6218
-  time: '2024-03-24T16:17:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26382
 - author: DoutorWhite
   changes:
   - message: The icon representing the critical status has been changed
@@ -3847,3 +3833,19 @@
   id: 6716
   time: '2024-06-12T22:56:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28906
+- author: stalengd
+  changes:
+  - message: Players can now correctly toggle internals on pets.
+    type: Fix
+  id: 6717
+  time: '2024-06-13T02:17:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28904
+- author: Cojoke-dot
+  changes:
+  - message: Tranquilizer Shotguns shells now have a unique sprite
+    type: Tweak
+  - message: You now print boxes of Tranquilizer Boxes rather than a single shell
+    type: Tweak
+  id: 6718
+  time: '2024-06-13T02:17:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28903

From 1d4d6c33317f58f05180abb63ddf6419f5296d25 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Wed, 12 Jun 2024 19:19:10 -0700
Subject: [PATCH 430/568] Fix gauze stopping if it stops bleeding (#28844)

delete a line

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 Content.Server/Medical/HealingSystem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index fb6883dfd12c..ed33e60dac48 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -70,7 +70,6 @@ entity.Comp.DamageContainerID is not null &&
             _bloodstreamSystem.TryModifyBleedAmount(entity.Owner, healing.BloodlossModifier);
             if (isBleeding != bloodstream.BleedAmount > 0)
             {
-                dontRepeat = true;
                 _popupSystem.PopupEntity(Loc.GetString("medical-item-stop-bleeding"), entity, args.User);
             }
         }

From 020b2919ac1f7009f7e829eb685d02c69979a555 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 02:20:16 +0000
Subject: [PATCH 431/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 97573417838b..5f0b14025857 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: DoutorWhite
-  changes:
-  - message: The icon representing the critical status has been changed
-    type: Tweak
-  - message: Medical Hud death icon animation fixed
-    type: Fix
-  id: 6219
-  time: '2024-03-24T16:38:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26391
 - author: ChaseFlorom
   changes:
   - message: removed cannabis thief objective.
@@ -3849,3 +3840,10 @@
   id: 6718
   time: '2024-06-13T02:17:35.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28903
+- author: Plykiya
+  changes:
+  - message: Gauze continues to heal even when you stop someone's bleeding.
+    type: Fix
+  id: 6719
+  time: '2024-06-13T02:19:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28844

From 22b1ec9775a3f4618c3faa780507eee0c1e02c7d Mon Sep 17 00:00:00 2001
From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Date: Wed, 12 Jun 2024 19:20:28 -0700
Subject: [PATCH 432/568] added a new sprite for the super synthesizer.
 (#28884)

---
 .../Fun/Instruments/instruments_percussion.yml    |   3 ++-
 .../Fun/Instruments/h_synthesizer.rsi/meta.json   |  13 ++++++++++++-
 .../h_synthesizer.rsi/super-inhand-left.png       | Bin 0 -> 558 bytes
 .../h_synthesizer.rsi/super-inhand-right.png      | Bin 0 -> 538 bytes
 .../Instruments/h_synthesizer.rsi/supersynth.png  | Bin 0 -> 610 bytes
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/super-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/super-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/supersynth.png

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index b09ea96f7b42..a6eaa128d60e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -140,7 +140,8 @@
     respectMidiLimits: false
   - type: Sprite
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: icon
+    state: supersynth
   - type: Item
+    heldPrefix: super
     size: Normal
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
diff --git a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json
index 96e5157f936f..2c3dac1d21f3 100644
--- a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331",
+  "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331. Supersynth sprite made by moomoobeef.",
   "states": [
     {
       "name": "icon"
@@ -17,6 +17,17 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "supersynth"
+    },
+    {
+      "name": "super-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "super-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/super-inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/super-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f2631cc4ccb239f3b0aa0b12d6c97ecf637942c
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$=t)FDRCt{2+ObN*KpY0}uhLB@6qgE4S%MF6OW(n{;Ls_r(AB|N@GX>Xf`f~T
ziwK<^x?~fZ>5hO(rgM;!wkGW*cWpiWeoHiPx$pk@HyJJf5fKp)(ON<X9mlcWb&h3m
z9BUy&qg;Ew!-U4V073|z=Q*a+X={^#n#%JWO}c;`u<HOmO(v7t-5GoVOxt%lo$XBa
zo8AH@Pt!L55O4>WhceKt^^MvCf5Y2ge(|n3DhJPIGu`cWA*F=P@%ZKi=^*-Xy=a{3
zvh(Xi<Mc;cr-P`qZt+D?==p2_(ChUo=U@2~NRnjX2mqtesPtGB+9#VkUzT~5$^s~*
zkYyPFAj>i+r68qTIA{Jhl?E1z;IkkH7X#R|{c>id)XM9&HhtFsl>Ri<na^dr_~mgn
zx!NDkPj$0xg~@evcWJ%&`Ej<|`Tcc+c$;T(nZ?%~M?^$KL_|bHL_~js>t5ipVD|=n
z`S%3~j_>XH;5xwfhY-OP0QlM@jmD|=v8@+e0bD+YDARVmKv5JL0Hl=YKfD8Iwi&uB
z&K)47M3N*J4u?MSSn=5fP8TwFAJ~2e9G+c$&;5FS+A`<N-?p5BRy~BaQGosaN$K2g
wkGHkvc6tWv^4o&C3$5Z*0Pe*T5fKIL6G3kfqA%<3%>V!Z07*qoM6N<$g7|U<_W%F@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/super-inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/super-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7f2d36c1e053c4b96d190750240912f94d9c4c7
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005uNkl<Zc-rln
zF-rq67>2);LP6o+aH+U;$uG#_;_M)}6&yO<9}w*7;OwvHpmcV1E<$IKEH??ZgCqn*
zI>qUZwqAR^UM{xY`z*O$NxtUG`zD2aL;wH)0001#f^%+#5Vq<#LI}$_cNV8n_l0wo
z04XIi#!!_i5JFgE%x)&2_6qR9csypcP5=>65Co|mYIzFGp9C)A?d2YjSi!}n%UrE~
z5CoNYG%s#qi)~}C?9>^?Htu#<*88{16H-c17=|0Q?RLBHkDE*;mWUR{YPDJ{FA1Gt
z{7Vs8^VrG)^Mm*M{mhn#D2k$mwhVb=NhwR&p|R<N=bx2QG@VY<mWa~NTI+>(TI;PQ
zuC@L(*1A7oNfM6kyY4JdwTI(whZTvlPRh%6_`Dfz)UUbfi|^MLFB_T5I8sW+Ik$-t
z-p{Xd`>afWd4BYgfU4pcW4z4)0000000000004kG;<|Ff7pM<_b{$fC3nax0`$V(s
z0Lj%>(L1?+sQ};g0Xv}ppCoD<ogGjZhD1b}H3NU50H3Sh>-8v#B2r5ESHSV@gZ;R>
zV#%|wTjY5LgF&i**=%OZsGxAi!_$k*qwZ_;#C%y`nY_9IrwZ^f(N$ETw!PW}ao-OB
c0021U2RLN(Lt@gBNdN!<07*qoM6N<$f)B>`c>n+a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/supersynth.png b/Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi/supersynth.png
new file mode 100644
index 0000000000000000000000000000000000000000..4aa9f3249e6bf831985ebc90828267573a65cfe5
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%97#k$R9J<@mp^C|Q5?rViGmR6!3_~h5tM=;Iw;*7t|G1laWKSD&c!j4lS3z`
zY;{TI9(B!H1aAluC}s(z{;LR@Aw%Gfrc@<yDDU~Zq?g`ZU*d1NdnEVyzR&Ny`;%i1
zwe+en8Xx=dVl4-7eje}(*KS6}j`lnHI6rSVz;F=GK0qA&u=Ac^+tcT{{{cT}HZ<3`
z0R_Lc`;<qQ)~CXa2aq$rzIv69@4iiigTWT0(Jsq~0R`W%_9(S$iQz^9$eH`TkK;Ir
z;c&(lWYsP!vjGJ!wQFoxdzs*w1IU>>j)U*}!0|0M4IDDGAWr+yeuv>8q`Uqk)iqNY
zh+FLn{^9w3MxPHSo_t0E#I1G-w{4qWSMsSsB+_-7b_G|}@AtX$`fZ|ioN6G6cH6db
zT{i-kPrS?ll4^HdmwLS(fhXMwu|LYHJ?%C;(SW?kq}84V4sdQ7ywz$Eh9UR<e5Z4H
zh2KBF8qqE*VqjdmWmyD4pwCUiL977@FILO+DxTKAb^DqA!|uZ+;B4AuO}v(u+BLQ+
z-UJw6^YJHcyn*Iw!3Z3LfyI}bqkLfj*@9BLrbB#LS!8*qs~4gPIEXb6Y<mm`q5fzn
zR?86s%R5~Fqwq+8gJvTqL-Z>D?qtPk8Hj$-n5xJw7!Lu*ZRk}z<LXtNc%h4T*GATZ
wGWo)S9-9R`Hh>JFY8LRR0aOTeJPSC$U(6QHnO$%C&Hw-a07*qoM6N<$f>_xYIsgCw

literal 0
HcmV?d00001


From ab8b3ecec2a139069c3ee76d5961f1b5758edae2 Mon Sep 17 00:00:00 2001
From: geraeumig <171753363+geraeumig@users.noreply.github.com>
Date: Thu, 13 Jun 2024 04:23:15 +0200
Subject: [PATCH 433/568] Fix magazine sprites after Auto Eject (#28859)

Co-authored-by: geraeumig <alfenos@proton.me>
---
 .../Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
index 9eb290ab65c0..61a4820e5b3c 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs
@@ -146,13 +146,14 @@ private void OnMagazineTakeAmmo(EntityUid uid, MagazineAmmoProviderComponent com
     private void FinaliseMagazineTakeAmmo(EntityUid uid, MagazineAmmoProviderComponent component, int count, int capacity, EntityUid? user, AppearanceComponent? appearance)
     {
         // If no ammo then check for autoeject
-        if (component.AutoEject && count == 0)
+        var ejectMag = component.AutoEject && count == 0;
+        if (ejectMag)
         {
             EjectMagazine(uid, component);
             Audio.PlayPredicted(component.SoundAutoEject, uid, user);
         }
 
-        UpdateMagazineAppearance(uid, appearance, true, count, capacity);
+        UpdateMagazineAppearance(uid, appearance, !ejectMag, count, capacity);
     }
 
     private void UpdateMagazineAppearance(EntityUid uid, MagazineAmmoProviderComponent component, EntityUid magEnt)

From d9bac82402507c78852d2c37292403d5a3136ae3 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Thu, 13 Jun 2024 02:24:08 +0000
Subject: [PATCH 434/568] localize RoleBriefing (#28824)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Server/Roles/RoleBriefingSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Roles/RoleBriefingSystem.cs b/Content.Server/Roles/RoleBriefingSystem.cs
index c05366e150ea..17b62a08b379 100644
--- a/Content.Server/Roles/RoleBriefingSystem.cs
+++ b/Content.Server/Roles/RoleBriefingSystem.cs
@@ -11,6 +11,6 @@ public override void Initialize()
 
     private void OnGetBriefing(EntityUid uid, RoleBriefingComponent comp, ref GetBriefingEvent args)
     {
-        args.Append(comp.Briefing);
+        args.Append(Loc.GetString(comp.Briefing));
     }
 }

From d865bffff3ea620d0562422c869c6e2a02cf68b1 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Wed, 12 Jun 2024 23:45:52 -0500
Subject: [PATCH 435/568] Fix .30 ammo listing wrong number of bullets in
 uplink (#28919)

---
 Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 1b9fa8aff93b..f4a32004c67b 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -92,7 +92,7 @@ uplink-speedloader-magnum-name = Speedloader (.45 magnum AP)
 uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python.
 
 uplink-mosin-ammo-name = Ammunition box (.30 rifle)
-uplink-mosin-ammo-desc = A box of 50 cartridges for the surplus rifle.
+uplink-mosin-ammo-desc = A box of 60 cartridges for the surplus rifle.
 
 uplink-sniper-ammo-name = Ammunition box (.60 antimateriel)
 uplink-sniper-ammo-desc = A box of 10 cartridges for the Hristov sniper rifle.

From 249e4a9c15c8e3960dd1cd77db4ad4090bf6609d Mon Sep 17 00:00:00 2001
From: Doomsdrayk <robotdoughnut@comcast.net>
Date: Thu, 13 Jun 2024 00:30:39 -0600
Subject: [PATCH 436/568] 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 | 32 +++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index cb95c1d7e780..a0c9d04ff7b6 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,21 +215,27 @@ 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);
+                }
+
+                return false;
             }
-
-            foreach (var existingVirtual in virtuals)
-            {
-                QueueDel(existingVirtual);
-            }
-
-            return false;
         }
 
         if (TryComp(used, out UseDelayComponent? useDelay)

From d38ad122622a21199eec86e58c704b6aa397482f Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:31:21 +1200
Subject: [PATCH 437/568] Fix `playtime_addrole` command printing the wrong
 time (#28783)

---
 .../Administration/Commands/PlayTimeCommands.cs     |  2 +-
 .../PlayTimeTracking/PlayTimeTrackingManager.cs     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs
index 42bc8635c4d2..f16eab2727ce 100644
--- a/Content.Server/Administration/Commands/PlayTimeCommands.cs
+++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs
@@ -93,7 +93,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         _playTimeTracking.AddTimeToTracker(player, role, TimeSpan.FromMinutes(minutes));
-        var time = _playTimeTracking.GetOverallPlaytime(player);
+        var time = _playTimeTracking.GetPlayTimeForTracker(player, role);
         shell.WriteLine(Loc.GetString("cmd-playtime_addrole-succeed",
             ("username", userName),
             ("role", role),
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index bfd6172f4c0d..bc2f891c7253 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -370,6 +370,19 @@ public bool TryGetTrackerTimes(ICommonSession id, [NotNullWhen(true)] out Dictio
         return true;
     }
 
+    public bool TryGetTrackerTime(ICommonSession id, string tracker, [NotNullWhen(true)] out TimeSpan? time)
+    {
+        time = null;
+        if (!TryGetTrackerTimes(id, out var times))
+            return false;
+
+        if (!times.TryGetValue(tracker, out var t))
+            return false;
+
+        time = t;
+        return true;
+    }
+
     public Dictionary<string, TimeSpan> GetTrackerTimes(ICommonSession id)
     {
         if (!_playTimeData.TryGetValue(id, out var data) || !data.Initialized)

From 99f2e6ffa8c66ed33a0fb1a77b3cf8a157d9dbbb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 06:31:45 +0000
Subject: [PATCH 438/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5f0b14025857..74de6c10c98b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: ChaseFlorom
-  changes:
-  - message: removed cannabis thief objective.
-    type: Remove
-  id: 6220
-  time: '2024-03-24T22:02:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26412
 - author: SoulFN
   changes:
   - message: The borg tool module now has an industrial welding tool.
@@ -3847,3 +3840,10 @@
   id: 6719
   time: '2024-06-13T02:19:10.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28844
+- author: Doomsdrayk
+  changes:
+  - message: Fixed guns appearing to cycle their bolt when wielded.
+    type: Fix
+  id: 6720
+  time: '2024-06-13T06:30:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28756

From 68dc1fb055e2b56c1f7ef0a4506341309d67e79e Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 13 Jun 2024 02:37:31 -0400
Subject: [PATCH 439/568] Fix ninja Spider Clan charge not getting a target
 (#28871)

---
 Resources/Prototypes/Objectives/ninja.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml
index 3c2fbcaca889..77628a68cf12 100644
--- a/Resources/Prototypes/Objectives/ninja.yml
+++ b/Resources/Prototypes/Objectives/ninja.yml
@@ -51,6 +51,7 @@
     icon:
       sprite: Objects/Weapons/Bombs/spidercharge.rsi
       state: icon
+  - type: SpiderChargeCondition
 
 - type: entity
   parent: [BaseNinjaObjective, BaseSurviveObjective]

From 8791f98f0bed4f44ee55651cbaae7e81d6014341 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Wed, 12 Jun 2024 23:38:43 -0700
Subject: [PATCH 440/568] Fix playtime on player tab getting set to Unknown
 (#28876)

Update play time on admin panel player tab after db loads
---
 Content.Server/Administration/Systems/AdminSystem.cs      | 8 +++++++-
 .../Players/PlayTimeTracking/PlayTimeTrackingManager.cs   | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index e5b6e9c3eaa0..16c079e4ba1d 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Forensics;
 using Content.Server.GameTicking;
 using Content.Server.Hands.Systems;
-using Content.Server.IdentityManagement;
 using Content.Server.Mind;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Popups;
@@ -70,6 +69,7 @@ public override void Initialize()
 
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
             _adminManager.OnPermsChanged += OnAdminPermsChanged;
+            _playTime.SessionPlayTimeUpdated += OnSessionPlayTimeUpdated;
 
             // Panic Bunker Settings
             Subs.CVar(_config, CCVars.PanicBunkerEnabled, OnPanicBunkerChanged, true);
@@ -200,6 +200,7 @@ public override void Shutdown()
             base.Shutdown();
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
             _adminManager.OnPermsChanged -= OnAdminPermsChanged;
+            _playTime.SessionPlayTimeUpdated -= OnSessionPlayTimeUpdated;
         }
 
         private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
@@ -446,5 +447,10 @@ keyStorage.Key is { } key &&
 
             _gameTicker.SpawnObserver(player);
         }
+
+        private void OnSessionPlayTimeUpdated(ICommonSession session)
+        {
+            UpdatePlayerList(session);
+        }
     }
 }
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index bc2f891c7253..381be45f95de 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -81,6 +81,8 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjec
 
     public event CalcPlayTimeTrackersCallback? CalcTrackers;
 
+    public event Action<ICommonSession>? SessionPlayTimeUpdated;
+
     public void Initialize()
     {
         _sawmill = Logger.GetSawmill("play_time");
@@ -217,6 +219,7 @@ private void SendPlayTimes(ICommonSession pSession)
         };
 
         _net.ServerSendMessage(msg, pSession.Channel);
+        SessionPlayTimeUpdated?.Invoke(pSession);
     }
 
     /// <summary>

From e02ef6825991ea56440074ec576152219de4e7fd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 06:39:49 +0000
Subject: [PATCH 441/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 82dada2fd289..1a46012bed35 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -298,5 +298,12 @@ Entries:
   id: 36
   time: '2024-06-08T10:40:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28664
+- author: ShadowCommander
+  changes:
+  - message: Player tab playtime no longer changes to Unknown when a player reconnects.
+    type: Fix
+  id: 37
+  time: '2024-06-13T06:38:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28876
 Name: Admin
 Order: 1

From 7f5476b5551a44a2138038bd785f43d307bf8fbc Mon Sep 17 00:00:00 2001
From: Doomsdrayk <robotdoughnut@comcast.net>
Date: Thu, 13 Jun 2024 12:10:56 -0600
Subject: [PATCH 442/568] Fix Drozd and C-20r unwielding on use-in-hand
 (#28728)

Make Drozd and C-20r not unwield on use
---
 .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index dd1e3e21f42a..b86356306cb3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -94,6 +94,7 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
   - type: Wieldable
+    unwieldOnUse: false
   - type: GunWieldBonus
     minAngle: -19
     maxAngle: -16
@@ -131,6 +132,7 @@
     - type: Clothing
       sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
     - type: Wieldable
+      unwieldOnUse: false
     - type: GunWieldBonus
       minAngle: -19
       maxAngle: -16

From 1bffa2aee7d28bf0cea0be69adf5424a424ffb4a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 18:12:03 +0000
Subject: [PATCH 443/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 74de6c10c98b..67ae17e0dac3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SoulFN
-  changes:
-  - message: The borg tool module now has an industrial welding tool.
-    type: Tweak
-  id: 6221
-  time: '2024-03-24T22:35:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26332
 - author: IProduceWidgets
   changes:
   - message: Ammo techfab now accepts ingot and cloth material types.
@@ -3847,3 +3840,10 @@
   id: 6720
   time: '2024-06-13T06:30:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28756
+- author: Doomsdrayk
+  changes:
+  - message: The Drozd and C-20r do not unwield on use again.
+    type: Fix
+  id: 6721
+  time: '2024-06-13T18:10:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28728

From 221cb73d8c24fdfff79ba1ab1d5d1de7e2dc579f Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 13 Jun 2024 14:21:48 -0400
Subject: [PATCH 444/568] Fix construction rotation (#28427)

---
 Content.Server/Construction/ConstructionSystem.Initial.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 08dd139ef4ce..6cc430b74f67 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -271,7 +271,7 @@ void ShutdownContainers()
             }
 
             var newEntityProto = graph.Nodes[edge.Target].Entity.GetId(null, user, new(EntityManager));
-            var newEntity = Spawn(newEntityProto, _transformSystem.ToMapCoordinates(coords), rotation: angle);
+            var newEntity = EntityManager.SpawnAttachedTo(newEntityProto, coords, rotation: angle);
 
             if (!TryComp(newEntity, out ConstructionComponent? construction))
             {

From 1559b080e4c78b105e84e331f69b6e6781d5cbfc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 18:22:55 +0000
Subject: [PATCH 445/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 67ae17e0dac3..04f991f5dae2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: IProduceWidgets
-  changes:
-  - message: Ammo techfab now accepts ingot and cloth material types.
-    type: Fix
-  id: 6222
-  time: '2024-03-25T00:43:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26413
 - author: Luminight
   changes:
   - message: Wooden fence gate sprites are no longer swapped.
@@ -3847,3 +3840,10 @@
   id: 6721
   time: '2024-06-13T18:10:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28728
+- author: EmoGarbage404
+  changes:
+  - message: Fixed constructed items rotating strangely.
+    type: Fix
+  id: 6722
+  time: '2024-06-13T18:21:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28427

From c3720f9fd9922c37c5434ad8e93b67734789db83 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Thu, 13 Jun 2024 20:36:38 +0200
Subject: [PATCH 446/568] Add order quantity to cargo invoice label (#28821)

---
 Content.Server/Cargo/Systems/CargoSystem.Orders.cs       | 1 +
 Resources/Locale/en-US/cargo/cargo-console-component.ftl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index c519362945e6..a288d7b07d4a 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -506,6 +506,7 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
                         "cargo-console-paper-print-text",
                         ("orderNumber", order.OrderId),
                         ("itemName", MetaData(item).EntityName),
+                        ("orderQuantity", order.OrderQuantity),
                         ("requester", order.Requester),
                         ("reason", order.Reason),
                         ("approver", order.Approver ?? string.Empty)),
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index 532481f4a233..3c032488b522 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -36,6 +36,7 @@ cargo-console-paper-print-name = Order #{$orderNumber}
 cargo-console-paper-print-text =
     Order #{$orderNumber}
     Item: {$itemName}
+    Quantity: {$orderQuantity}
     Requested by: {$requester}
     Reason: {$reason}
     Approved by: {$approver}

From 29fa18418ec56b6f9db9264fc607bf329ee85a67 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 13 Jun 2024 18:37:44 +0000
Subject: [PATCH 447/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 04f991f5dae2..1124ee7acf15 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Luminight
-  changes:
-  - message: Wooden fence gate sprites are no longer swapped.
-    type: Fix
-  id: 6223
-  time: '2024-03-25T00:55:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26409
 - author: Callmore
   changes:
   - message: Holoprojectors no longer come with a cell when made at a lathe.
@@ -3847,3 +3840,10 @@
   id: 6722
   time: '2024-06-13T18:21:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28427
+- author: lzk228
+  changes:
+  - message: Added order quantity to cargo invoice label.
+    type: Tweak
+  id: 6723
+  time: '2024-06-13T18:36:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28821

From ccd402d8d1cbb715f431a6c05dc51f0fa9d68b92 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Thu, 13 Jun 2024 22:21:24 +0200
Subject: [PATCH 448/568] Adjust softdrink restock crate name (#28934)

These contain restocks for multiple vendors, so change the name and description to reflect this.
---
 Resources/Prototypes/Catalog/Fills/Crates/vending.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index d54e103a70f2..378f8cb75884 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -132,8 +132,8 @@
 - type: entity
   id: CrateVendingMachineRestockRobustSoftdrinksFilled
   parent: CratePlastic
-  name: Robust Softdrinks restock crate
-  description: Contains two restock boxes for the Robust Softdrinks LLC vending machine.
+  name: beverage vendor restock crate
+  description: Contains restock boxes for beverage vending machines.
   components:
   - type: StorageFill
     contents:

From 4e8375e5f99e7ac4616f37bc3b497f9ef5924ee3 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:03:01 -0600
Subject: [PATCH 449/568] bagel update (#28946)

---
 Resources/Maps/bagel.yml | 220 ++++++++++++++++++++++++---------------
 1 file changed, 137 insertions(+), 83 deletions(-)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 5700fc82969f..3dfb5c154a19 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -504,8 +504,8 @@ entities:
             3339: -40,44
             3341: -36,30
             3762: -39,-8
-            3814: 8,43
-            3815: 8,51
+            3808: 8,43
+            3809: 8,51
         - node:
             color: '#FFFFFFFF'
             id: Arrows
@@ -527,8 +527,8 @@ entities:
             3351: -26,38
             3759: 47,-23
             3763: -40,-4
-            3810: -8,51
-            3811: -8,43
+            3806: -8,51
+            3807: -8,43
         - node:
             color: '#FFFFFFFF'
             id: ArrowsGreyscale
@@ -557,12 +557,12 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            3816: -7,46
-            3817: -7,47
-            3818: -7,48
-            3819: 7,46
-            3820: 7,47
-            3821: 7,48
+            3810: -7,46
+            3811: -7,47
+            3812: -7,48
+            3813: 7,46
+            3814: 7,47
+            3815: 7,48
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -675,7 +675,7 @@ entities:
             3493: 39,-13
             3539: 45,-9
             3672: -17,-54
-            3841: 2,27
+            3835: 2,27
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -714,8 +714,8 @@ entities:
             3254: 6,-36
             3349: -19,46
             3745: 50,-11
-            3834: -25,-1
-            3835: -25,0
+            3828: -25,-1
+            3829: -25,0
         - node:
             color: '#FFFFFFFF'
             id: BotLeftGreyscale
@@ -753,15 +753,15 @@ entities:
             color: '#FFFFFFFF'
             id: BotRightGreyscale
           decals:
-            3837: -29,-1
-            3838: -29,0
-            3839: -29,1
-            3852: 7,34
-            3853: 7,35
-            3854: 7,36
-            3855: 8,36
-            3858: 8,34
-            3859: 8,35
+            3831: -29,-1
+            3832: -29,0
+            3833: -29,1
+            3846: 7,34
+            3847: 7,35
+            3848: 7,36
+            3849: 8,36
+            3850: 8,34
+            3851: 8,35
         - node:
             color: '#79150096'
             id: Box
@@ -884,7 +884,7 @@ entities:
             2380: -14,11
             3038: 21,1
             3049: 23,1
-            3851: 6,37
+            3845: 6,37
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
@@ -901,9 +901,9 @@ entities:
             2989: -115,13
             3041: 23,0
             3325: 37,18
-            3848: 6,34
-            3849: 6,35
-            3850: 6,36
+            3842: 6,34
+            3843: 6,35
+            3844: 6,36
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -5520,22 +5520,22 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            3832: -33,21
+            3826: -33,21
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
-            3829: -31,21
+            3823: -31,21
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            3833: -33,19
+            3827: -33,19
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            3828: -31,19
+            3822: -31,19
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
@@ -5545,7 +5545,7 @@ entities:
             1366: -2,31
             3332: -2,24
             3392: -19,40
-            3827: -8,29
+            3821: -8,29
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
@@ -5555,7 +5555,7 @@ entities:
             2137: 2,24
             3380: -27,38
             3391: -15,40
-            3826: -5,29
+            3820: -5,29
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
@@ -5563,7 +5563,7 @@ entities:
             1053: -2,-78
             1364: -2,36
             3390: -19,42
-            3840: -29,-1
+            3834: -29,-1
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
@@ -5574,7 +5574,7 @@ entities:
             2568: 40,-35
             3379: -27,40
             3389: -15,42
-            3836: -25,-1
+            3830: -25,-1
         - node:
             color: '#52B4E996'
             id: WarnFullGreyscale
@@ -5649,7 +5649,7 @@ entities:
             3201: 56,11
             3388: -19,41
             3440: 1,-13
-            3831: -33,20
+            3825: -33,20
         - node:
             color: '#52B4E996'
             id: WarnLineGreyscaleE
@@ -5944,8 +5944,8 @@ entities:
             3381: -18,42
             3382: -17,42
             3383: -16,42
-            3822: -7,31
-            3823: -6,31
+            3816: -7,31
+            3817: -6,31
         - node:
             color: '#DE3A3A96'
             id: WarnLineS
@@ -5997,7 +5997,7 @@ entities:
             3378: -27,39
             3384: -15,41
             3441: -1,-13
-            3830: -31,20
+            3824: -31,20
         - node:
             color: '#DE3A3A96'
             id: WarnLineW
@@ -6065,14 +6065,14 @@ entities:
             3386: -17,40
             3387: -18,40
             3393: -43,-2
-            3824: -7,29
-            3825: -6,29
-            3842: 4,37
-            3843: 5,37
-            3844: 6,37
-            3845: -4,37
-            3846: -5,37
-            3847: -6,37
+            3818: -7,29
+            3819: -6,29
+            3836: 4,37
+            3837: 5,37
+            3838: 6,37
+            3839: -4,37
+            3840: -5,37
+            3841: -6,37
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -8110,7 +8110,7 @@ entities:
             1: 39312
           -12,8:
             4: 12
-            6: 3072
+            5: 3072
           -11,5:
             0: 63351
           -11,6:
@@ -8119,7 +8119,7 @@ entities:
           -11,8:
             4: 1
             1: 17476
-            6: 256
+            5: 256
           -11,7:
             1: 17484
           -10,5:
@@ -8222,10 +8222,10 @@ entities:
             0: 255
             1: 57344
           -8,11:
-            5: 816
+            6: 816
             1: 34952
           -9,11:
-            5: 2176
+            6: 2176
             1: 8738
           -8,12:
             1: 34959
@@ -8245,7 +8245,7 @@ entities:
           -6,11:
             0: 4095
           -6,12:
-            5: 61166
+            6: 61166
           -5,9:
             0: 65535
           -5,10:
@@ -8253,7 +8253,7 @@ entities:
           -5,11:
             0: 36863
           -5,12:
-            5: 30515
+            6: 30515
             0: 12
           -4,9:
             0: 65535
@@ -8263,7 +8263,7 @@ entities:
             0: 4095
           -4,12:
             0: 1
-            5: 65518
+            6: 65518
           -4,13:
             1: 61680
           -5,13:
@@ -8277,7 +8277,7 @@ entities:
           -5,15:
             1: 17487
           -3,12:
-            5: 13107
+            6: 13107
             1: 34944
           -3,13:
             1: 47792
@@ -8343,7 +8343,7 @@ entities:
             1: 61713
           -12,9:
             0: 16
-            5: 3084
+            6: 3084
           -13,9:
             1: 39305
           -13,10:
@@ -8353,18 +8353,18 @@ entities:
             0: 12544
           -12,10:
             3: 12
-            5: 3072
+            6: 3072
           -12,11:
-            5: 12
+            6: 12
           -11,9:
-            5: 257
+            6: 257
             1: 17476
           -11,10:
             3: 1
-            5: 256
+            6: 256
             1: 17476
           -11,11:
-            5: 1
+            6: 1
             1: 17476
           -11,12:
             1: 17487
@@ -8418,7 +8418,7 @@ entities:
             1: 15
           -13,12:
             1: 34952
-            6: 48
+            5: 48
             4: 12288
           -12,13:
             1: 61455
@@ -8452,11 +8452,11 @@ entities:
             1: 62671
           -7,14:
             1: 244
-            5: 57344
+            6: 57344
             0: 1024
           -7,15:
             1: 61440
-            5: 238
+            6: 238
             0: 1024
           -7,16:
             1: 65524
@@ -8515,7 +8515,7 @@ entities:
           -14,12:
             0: 1
             1: 8738
-            6: 128
+            5: 128
             4: 32768
           -17,12:
             0: 52232
@@ -9040,7 +9040,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -9055,7 +9055,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -9075,6 +9075,16 @@ entities:
     - type: GasTileOverlay
     - type: GridPathfinding
     - type: NavMap
+    - type: Joint
+      joints:
+        docking43669: !type:WeldJoint
+          bodyB: 60
+          bodyA: 7536
+          id: docking43669
+          localAnchorB: -47.5,-40
+          localAnchorA: 0.5,0
+          damping: 1559.7855
+          stiffness: 14000.604
   - uid: 943
     components:
     - type: MetaData
@@ -9356,6 +9366,16 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: GridPathfinding
+    - type: Joint
+      joints:
+        docking43669: !type:WeldJoint
+          bodyB: 60
+          bodyA: 7536
+          id: docking43669
+          localAnchorB: -47.5,-40
+          localAnchorA: 0.5,0
+          damping: 1559.7855
+          stiffness: 14000.604
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 2133
@@ -12011,6 +12031,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-0.5
       parent: 7536
+    - type: Docking
+      dockJointId: docking43669
+      dockedWith: 7332
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: False
+        DockStatus: True
 - proto: AirlockExternalLocked
   entities:
   - uid: 1435
@@ -13331,10 +13358,16 @@ entities:
     - type: Transform
       pos: -47.5,-39.5
       parent: 60
+    - type: Docking
+      dockJointId: docking43669
+      dockedWith: 8108
     - type: DeviceLinkSource
       linkedPorts:
         7316:
         - DoorStatus: DoorBolt
+      lastSignals:
+        DoorStatus: False
+        DockStatus: True
     - type: DeviceLinkSink
       links:
       - 7316
@@ -16567,7 +16600,7 @@ entities:
   - uid: 178
     components:
     - type: Transform
-      pos: -26.404684,-13.628057
+      pos: -26.426329,-14.112597
       parent: 60
 - proto: BoxLatexGloves
   entities:
@@ -56281,18 +56314,6 @@ entities:
     - type: Transform
       pos: 45.485657,-24.447033
       parent: 60
-- proto: chem_master
-  entities:
-  - uid: 2626
-    components:
-    - type: Transform
-      pos: 41.5,-26.5
-      parent: 60
-  - uid: 2627
-    components:
-    - type: Transform
-      pos: 41.5,-29.5
-      parent: 60
 - proto: ChemDispenser
   entities:
   - uid: 2520
@@ -56312,6 +56333,18 @@ entities:
     - type: Transform
       pos: 40.5,-28.5
       parent: 60
+- proto: ChemMaster
+  entities:
+  - uid: 2626
+    components:
+    - type: Transform
+      pos: 41.5,-26.5
+      parent: 60
+  - uid: 2627
+    components:
+    - type: Transform
+      pos: 41.5,-29.5
+      parent: 60
 - proto: ChessBoard
   entities:
   - uid: 5198
@@ -67347,17 +67380,17 @@ entities:
   - uid: 14454
     components:
     - type: Transform
-      pos: -26.766462,-13.446835
+      pos: -27.223204,-13.440722
       parent: 60
   - uid: 14618
     components:
     - type: Transform
-      pos: -26.953962,-13.46246
+      pos: -27.098204,-13.175097
       parent: 60
   - uid: 14625
     components:
     - type: Transform
-      pos: -26.860212,-13.30621
+      pos: -27.035704,-13.425097
       parent: 60
   - uid: 20082
     components:
@@ -68112,6 +68145,8 @@ entities:
     - type: Transform
       pos: -40.5,5.5
       parent: 60
+    - type: FaxMachine
+      name: RD Office
   - uid: 11100
     components:
     - type: Transform
@@ -68168,6 +68203,13 @@ entities:
       parent: 60
     - type: FaxMachine
       name: Library
+  - uid: 24176
+    components:
+    - type: Transform
+      pos: -26.5,-13.5
+      parent: 60
+    - type: FaxMachine
+      name: Security Fax
 - proto: FaxMachineCaptain
   entities:
   - uid: 15836
@@ -75245,11 +75287,15 @@ entities:
   - uid: 898
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -10.5,-22.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 899
     components:
     - type: Transform
@@ -75277,11 +75323,15 @@ entities:
   - uid: 902
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: -13.5,-22.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 903
     components:
     - type: Transform
@@ -82912,11 +82962,15 @@ entities:
   - uid: 8899
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 22.5,-31.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 8918
     components:
     - type: Transform
@@ -125617,7 +125671,7 @@ entities:
     - type: Transform
       pos: -2.5112958,-11.444662
       parent: 60
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 2257
     components:

From 222d3b532dddeab68b3b39ebd37af7c53d00b2ed Mon Sep 17 00:00:00 2001
From: MjrLandWhale <brandonemitch@gmail.com>
Date: Thu, 13 Jun 2024 18:25:02 -0500
Subject: [PATCH 450/568] Override under-pressure lock-out in air alarm "Fill"
 mode (#28909)

---
 .../Unary/Components/GasVentPumpComponent.cs  |  8 +++++++-
 .../Unary/EntitySystems/GasVentPumpSystem.cs  |  5 +++--
 .../Components/SharedVentPumpComponent.cs     | 13 ++++++++----
 .../Guidebook/Engineering/Fires.xml           | 20 ++++++++++++++++---
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
index 32cf1cac6f85..2ba4603a9bd0 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs
@@ -135,6 +135,10 @@ public float InternalPressureBound
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("depressurizePressure")]
         public float DepressurizePressure = 0;
+
+        // When true, ignore under-pressure lockout. Used to re-fill rooms in air alarm "Fill" mode.
+        [DataField]
+        public bool PressureLockoutOverride = false;
         #endregion
 
         public GasVentPumpData ToAirAlarmData()
@@ -146,7 +150,8 @@ public GasVentPumpData ToAirAlarmData()
                 PumpDirection = PumpDirection,
                 PressureChecks = PressureChecks,
                 ExternalPressureBound = ExternalPressureBound,
-                InternalPressureBound = InternalPressureBound
+                InternalPressureBound = InternalPressureBound,
+                PressureLockoutOverride = PressureLockoutOverride
             };
         }
 
@@ -158,6 +163,7 @@ public void FromAirAlarmData(GasVentPumpData data)
             PressureChecks = data.PressureChecks;
             ExternalPressureBound = data.ExternalPressureBound;
             InternalPressureBound = data.InternalPressureBound;
+            PressureLockoutOverride = data.PressureLockoutOverride;
         }
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index 7c12cf3f77f6..8951f8a9474d 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -108,7 +108,8 @@ private void OnGasVentPumpUpdated(EntityUid uid, GasVentPumpComponent vent, ref
                 // (ignoring temperature differences because I am lazy)
                 var transferMoles = pressureDelta * environment.Volume / (pipe.Air.Temperature * Atmospherics.R);
 
-                if (vent.UnderPressureLockout)
+                // Only run if the device is under lockout and not being overriden
+                if (vent.UnderPressureLockout & !vent.PressureLockoutOverride)
                 {
                     // Leak only a small amount of gas as a proportion of supply pipe pressure.
                     var pipeDelta = pipe.Air.Pressure - environment.Pressure;
@@ -280,7 +281,7 @@ private void OnExamine(EntityUid uid, GasVentPumpComponent component, ExaminedEv
                 return;
             if (args.IsInDetailsRange)
             {
-                if (pumpComponent.UnderPressureLockout)
+                if (pumpComponent.UnderPressureLockout & !pumpComponent.PressureLockoutOverride)
                 {
                     args.PushMarkup(Loc.GetString("gas-vent-pump-uvlo"));
                 }
diff --git a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
index 404c19786821..15fece204d07 100644
--- a/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Components/SharedVentPumpComponent.cs
@@ -13,6 +13,7 @@ public sealed class GasVentPumpData : IAtmosDeviceData
         public VentPressureBound PressureChecks { get; set; } = VentPressureBound.ExternalBound;
         public float ExternalPressureBound { get; set; } = Atmospherics.OneAtmosphere;
         public float InternalPressureBound { get; set; } = 0f;
+        public bool PressureLockoutOverride { get; set; } = false;
 
         // Presets for 'dumb' air alarm modes
 
@@ -22,7 +23,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = false
         };
 
         public static GasVentPumpData FillModePreset = new GasVentPumpData
@@ -32,7 +34,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere * 50,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = true
         };
 
         public static GasVentPumpData PanicModePreset = new GasVentPumpData
@@ -42,7 +45,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = false
         };
 
         public static GasVentPumpData ReplaceModePreset = new GasVentPumpData
@@ -53,7 +57,8 @@ public sealed class GasVentPumpData : IAtmosDeviceData
             PumpDirection = VentPumpDirection.Releasing,
             PressureChecks = VentPressureBound.ExternalBound,
             ExternalPressureBound = Atmospherics.OneAtmosphere,
-            InternalPressureBound = 0f
+            InternalPressureBound = 0f,
+            PressureLockoutOverride = false
         };
     }
 
diff --git a/Resources/ServerInfo/Guidebook/Engineering/Fires.xml b/Resources/ServerInfo/Guidebook/Engineering/Fires.xml
index e2c83956cc6b..916a89444fd4 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/Fires.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/Fires.xml
@@ -4,9 +4,23 @@
   Fires and spacings are an inevitability due to the highly flammable plasma gas and the endless vacuum of space present in and around the station, so it's important to know how to manage them.
 
   ## Spacing
-  Space is arguably the easier of the two to handle.
-  While it does render an area uninhabitable, it can be trivially solved by simply sealing the hole that resulted in the vacuum. After that, assuming distro vents and pipes have not been destroyed in some unfortunate accident, the room will slowly begin to repressurize.
-  Be aware; active spacings will slowly siphon the air out of the station's air reserves. If you find it impossible to fix structural damage due to some other hazard, make sure to limit the airflow to that room. (Currently only half-valid due to the Gas Miners infinitely replenishing most of the useful gases)
+  Space is arguably the easier of the two to handle. Be aware; active spacings will slowly siphon the air out of the station's air reserves. If you find it impossible to fix structural damage due to some other hazard, make sure to limit the airflow to that room. (Currently only half-valid due to the Gas Miners infinitely replenishing most of the useful gases)
+
+  While it does render an area uninhabitable, it can be trivially solved by simply following a two step process. Step one is to seal the hole that caused the vacuum.
+
+  Step two is to repressurize the affected area. Note that the affected area will NOT fill from the station's distro network by default. Some atmospheric devices, specifically air vents, have built-in safeguards that cause the device to be disabled if pressure in a room drops too low. This features prevents spacings from venting the distro network unintentionally.
+
+  As a result, there are three main options to repressurize the affected area:
+
+  1. Assuming distro vents and pipes have not been destroyed in some unfortunate accident, you may set surrounding air alarms to the "Fill" setting. This will cause connected air vents to override their safeguards and begin repressurizing the area.
+    - Be aware this setting also allows vents to OVERpressure a room, so this process must be monitored at all times.
+
+  2. Another option is to open any firelocks that were engaged in response to the original spacing. This will cause the pressure to equalize between both areas.
+    - This option generally causes more firelocks to engage in the surrounding area, potentially causing disruptions or making the second area unsafe for station crew.
+
+  3. The final option is to bring a canister into the spaced area and open its release valve. An air canister at 4500kpa can fully repressurize around 20-30 tiles before running out of gas.
+    - This option requires the canister be brought in from outisde (generally atmos) which can be slow and time consuming depending on the situation.
+
 
   ## Fires
   Fires can be dealt with through a multitude of ways, but some of the most effective methods include:

From 47bf64b883b26252df8873dd300defef2b610854 Mon Sep 17 00:00:00 2001
From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:10:17 -0400
Subject: [PATCH 451/568] Fix no combat knives in sec techfab (#28086)

---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index ab3cf20ac3d6..0ef76381f000 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -201,6 +201,7 @@
       - BoxLethalshot
       - BoxShotgunFlare
       - BoxShotgunSlug
+      - CombatKnife
       - MagazineBoxLightRifle
       - MagazineBoxMagnum
       - MagazineBoxPistol
@@ -709,6 +710,7 @@
       - BoxShotgunPractice 
       - BoxShotgunSlug
       - ClothingEyesHudSecurity
+      - CombatKnife
       - Flash
       - ForensicPad
       - Handcuffs

From ad3f1f77b7ebd940b93f3966e3a49e79188703ae Mon Sep 17 00:00:00 2001
From: osjarw <62134478+osjarw@users.noreply.github.com>
Date: Fri, 14 Jun 2024 05:01:32 +0300
Subject: [PATCH 452/568] Nodescanner now works with right click (#26873)

---
 .../Equipment/Systems/NodeScannerSystem.cs    | 36 +++++++++++++++----
 .../en-US/xenoarchaeology/node-scanner.ftl    |  3 +-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
index fc9ab2894294..b388f3a6d49a 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Xenoarchaeology.XenoArtifacts;
 using Content.Shared.Interaction;
 using Content.Shared.Timing;
+using Content.Shared.Verbs;
 
 namespace Content.Server.Xenoarchaeology.Equipment.Systems;
 
@@ -14,23 +15,44 @@ public sealed class NodeScannerSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<NodeScannerComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<NodeScannerComponent, BeforeRangedInteractEvent>(OnBeforeRangedInteract);
+        SubscribeLocalEvent<NodeScannerComponent, GetVerbsEvent<UtilityVerb>>(AddScanVerb);
     }
 
-    private void OnAfterInteract(EntityUid uid, NodeScannerComponent component, AfterInteractEvent args)
+    private void OnBeforeRangedInteract(EntityUid uid, NodeScannerComponent component, BeforeRangedInteractEvent args)
     {
-        if (!args.CanReach || args.Target == null)
+        if (args.Handled || !args.CanReach || args.Target is not {} target)
             return;
 
-        if (!TryComp<ArtifactComponent>(args.Target, out var artifact) || artifact.CurrentNodeId == null)
+        if (!TryComp<ArtifactComponent>(target, out var artifact) || artifact.CurrentNodeId == null)
             return;
 
-        if (args.Handled)
-            return;
+        CreatePopup(uid, target, artifact);
         args.Handled = true;
+    }
+
+    private void AddScanVerb(EntityUid uid, NodeScannerComponent component, GetVerbsEvent<UtilityVerb> args)
+    {
+        if (!args.CanAccess)
+            return;
 
-        var target = args.Target.Value;
+        if (!TryComp<ArtifactComponent>(args.Target, out var artifact) || artifact.CurrentNodeId == null)
+            return;
+
+        var verb = new UtilityVerb()
+        {
+            Act = () =>
+            {
+                CreatePopup(uid, args.Target, artifact);
+            },
+            Text = Loc.GetString("node-scan-tooltip")
+        };
 
+        args.Verbs.Add(verb);
+    }
+
+    private void CreatePopup(EntityUid uid, EntityUid target, ArtifactComponent artifact)
+    {
         if (TryComp(uid, out UseDelayComponent? useDelay)
             && !_useDelay.TryResetDelay((uid, useDelay), true))
             return;
diff --git a/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl b/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl
index 14b07941a64f..4a05414c4602 100644
--- a/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/node-scanner.ftl
@@ -1 +1,2 @@
-node-scan-popup = The node ID is {$id}
\ No newline at end of file
+node-scan-popup = The node ID is {$id}
+node-scan-tooltip = Scan artifact

From e481925ea4e5d10e215c2e87faa17dd6cb8a8993 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 02:02:39 +0000
Subject: [PATCH 453/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1124ee7acf15..25b97beffe3a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Callmore
-  changes:
-  - message: Holoprojectors no longer come with a cell when made at a lathe.
-    type: Tweak
-  id: 6224
-  time: '2024-03-25T00:55:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26405
 - author: IProduceWidgets
   changes:
   - message: The captain can now return his laser to the glass display box.
@@ -3847,3 +3840,10 @@
   id: 6723
   time: '2024-06-13T18:36:38.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28821
+- author: osjarw
+  changes:
+  - message: Added context menu action for scanning artifacts.
+    type: Add
+  id: 6724
+  time: '2024-06-14T02:01:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26873

From 57858cd6a558399c0ec19ffce932ed5967144eff Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Thu, 13 Jun 2024 21:04:45 -0500
Subject: [PATCH 454/568] Lasers passover objects like projectiles unless the
 target is clicked on (#28768)

* uh...

* fix

* alright, there we go

* Revert "alright, there we go"

This reverts commit 448180bfa58cc24c42a4d59ef34c017b9941f37b.

* Make lasers not hit certain objects and lying mobs unless clicked on

* comment

* Update Content.Server/Weapons/Ranged/Systems/GunSystem.cs

* an l vanished?

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
---
 .../Weapons/Ranged/Systems/GunSystem.cs           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index cb893299a935..7f7c7ba85574 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -17,6 +17,7 @@
 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;
@@ -202,6 +203,20 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                                 break;
 
                             var result = rayCastResults[0];
+
+                            // 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;
 

From af11bc3f51f3dfa3b278a813f7b4621c0cab97f2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 02:05:51 +0000
Subject: [PATCH 455/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 25b97beffe3a..96a868d131f4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: IProduceWidgets
-  changes:
-  - message: The captain can now return his laser to the glass display box.
-    type: Fix
-  id: 6225
-  time: '2024-03-25T00:58:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26398
 - author: IProduceWidgets
   changes:
   - message: More varieties of astro-grass are now available.
@@ -3847,3 +3840,10 @@
   id: 6724
   time: '2024-06-14T02:01:32.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/26873
+- author: Cojoke-dot
+  changes:
+  - message: Lasers now pass over things unless clicked like projectiles
+    type: Tweak
+  id: 6725
+  time: '2024-06-14T02:04:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28768

From f40267e68e7ac7891947546e4bbf480ea8ca4ba8 Mon Sep 17 00:00:00 2001
From: Repo <47093363+Titian3@users.noreply.github.com>
Date: Fri, 14 Jun 2024 14:10:41 +1200
Subject: [PATCH 456/568] Add trailing comments on multiline lists -
 editorconfig. (#28922)

Add trailing comments on multiline lists.
---
 .editorconfig | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 3e44d1a28115..a5dfab07a503 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,5 @@
 root = true
+
 [*]
 
 charset = utf-8
@@ -278,7 +279,7 @@ dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case
 dotnet_naming_style.t_upper_camel_case_style.required_prefix = T
 dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
 
-dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.constants_symbols.applicable_kinds = field
 dotnet_naming_symbols.constants_symbols.required_modifiers = const
 
@@ -317,20 +318,20 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
 
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
-dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
 
 dotnet_naming_symbols.property_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.property_symbols.applicable_kinds = property
 
-dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field
 
-dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
-dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
+dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly
 
 dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = *
-dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
+dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate
 
 dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
@@ -342,6 +343,7 @@ resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_keep_existing_attribute_arrangement = true
 resharper_wrap_chained_binary_patterns = chop_if_long
 resharper_wrap_chained_method_calls = chop_if_long
+resharper_csharp_trailing_comma_in_multiline_lists = true
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2

From c79849ae292690809e315b023ab95c33aaebbe56 Mon Sep 17 00:00:00 2001
From: crasg <109207982+Scruq445@users.noreply.github.com>
Date: Thu, 13 Jun 2024 19:12:24 -0700
Subject: [PATCH 457/568] Remove Rat King from MouseMigration and add it to
 it's own Event (#28872)

---
 Resources/Prototypes/GameRules/events.yml | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index d3b0971be081..04918578fa3e 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -234,6 +234,30 @@
       prob: 0.02
     - id: MobMouseCancer
       prob: 0.001
+# Events always spawn a critter regardless of Probability https://github.com/space-wizards/space-station-14/issues/28480 I added the Rat King to their own event with a player cap.
+
+- type: entity
+  id: KingRatMigration
+  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: 15 # Hopefully this is enough for the Rat King's potential Army
+  - type: VentCrittersRule
+    entries:
+    - id: MobMouse
+      prob: 0.02
+    - id: MobMouse1
+      prob: 0.02
+    - id: MobMouse2
+      prob: 0.02
+    - id: MobMouseCancer
+      prob: 0.001
     specialEntries:
     - id: SpawnPointGhostRatKing
       prob: 0.001

From 6c343ddae2a57e95b05ceecaaab9121eeddf843a Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 13 Jun 2024 22:15:29 -0400
Subject: [PATCH 458/568] Move SleepingSystem to Shared & cleanup (#28672)

* Move SleepingSystem to Shared & cleanup

* Remove empty OnShutdown handler
---
 Content.Client/Bed/SleepingSystem.cs          |   8 -
 Content.Server/Bed/BedSystem.cs               |   1 -
 Content.Server/Bed/Sleep/SleepingSystem.cs    | 254 --------------
 .../Damage/ForceSay/DamageForceSaySystem.cs   |   1 +
 .../Bed/Sleep/SharedSleepingSystem.cs         |  92 -----
 Content.Shared/Bed/Sleep/SleepingComponent.cs |  29 +-
 Content.Shared/Bed/Sleep/SleepingSystem.cs    | 314 ++++++++++++++++++
 .../Bed/Sleep}/SnoringComponent.cs            |   6 +-
 8 files changed, 339 insertions(+), 366 deletions(-)
 delete mode 100644 Content.Client/Bed/SleepingSystem.cs
 delete mode 100644 Content.Server/Bed/Sleep/SleepingSystem.cs
 delete mode 100644 Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
 create mode 100644 Content.Shared/Bed/Sleep/SleepingSystem.cs
 rename {Content.Server/Bed/Components => Content.Shared/Bed/Sleep}/SnoringComponent.cs (54%)

diff --git a/Content.Client/Bed/SleepingSystem.cs b/Content.Client/Bed/SleepingSystem.cs
deleted file mode 100644
index addf855bf362..000000000000
--- a/Content.Client/Bed/SleepingSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Server.Bed.Sleep;
-
-namespace Content.Client.Bed;
-
-public sealed class SleepingSystem : SharedSleepingSystem
-{
-
-}
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 49021c142f4f..ee43cff26de6 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Actions;
 using Content.Server.Bed.Components;
-using Content.Server.Bed.Sleep;
 using Content.Server.Body.Systems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs
deleted file mode 100644
index 5e4f0eddb526..000000000000
--- a/Content.Server/Bed/Sleep/SleepingSystem.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-using Content.Server.Popups;
-using Content.Server.Sound;
-using Content.Shared.Sound.Components;
-using Content.Shared.Actions;
-using Content.Shared.Audio;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Damage;
-using Content.Shared.Examine;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Slippery;
-using Content.Shared.StatusEffect;
-using Content.Shared.Stunnable;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Bed.Sleep
-{
-    public sealed class SleepingSystem : SharedSleepingSystem
-    {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
-        [Dependency] private readonly EmitSoundSystem _emitSound = default!;
-
-        [ValidatePrototypeId<EntityPrototype>] public const string SleepActionId = "ActionSleep";
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MobStateComponent, SleepStateChangedEvent>(OnSleepStateChanged);
-            SubscribeLocalEvent<SleepingComponent, DamageChangedEvent>(OnDamageChanged);
-            SubscribeLocalEvent<MobStateComponent, SleepActionEvent>(OnSleepAction);
-            SubscribeLocalEvent<ActionsContainerComponent, SleepActionEvent>(OnBedSleepAction);
-            SubscribeLocalEvent<MobStateComponent, WakeActionEvent>(OnWakeAction);
-            SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged);
-            SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb);
-            SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
-            SubscribeLocalEvent<SleepingComponent, ExaminedEvent>(OnExamined);
-            SubscribeLocalEvent<SleepingComponent, SlipAttemptEvent>(OnSlip);
-            SubscribeLocalEvent<SleepingComponent, ConsciousAttemptEvent>(OnConsciousAttempt);
-            SubscribeLocalEvent<ForcedSleepingComponent, ComponentInit>(OnInit);
-        }
-
-        /// <summary>
-        /// when sleeping component is added or removed, we do some stuff with other components.
-        /// </summary>
-        private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, SleepStateChangedEvent args)
-        {
-            if (args.FellAsleep)
-            {
-                // Expiring status effects would remove the components needed for sleeping
-                _statusEffectsSystem.TryRemoveStatusEffect(uid, "Stun");
-                _statusEffectsSystem.TryRemoveStatusEffect(uid, "KnockedDown");
-
-                EnsureComp<StunnedComponent>(uid);
-                EnsureComp<KnockedDownComponent>(uid);
-
-                if (TryComp<SleepEmitSoundComponent>(uid, out var sleepSound))
-                {
-                    var emitSound = EnsureComp<SpamEmitSoundComponent>(uid);
-                    if (HasComp<SnoringComponent>(uid))
-                    {
-                        emitSound.Sound = sleepSound.Snore;
-                    }
-                    emitSound.MinInterval = sleepSound.Interval;
-                    emitSound.MaxInterval = sleepSound.MaxInterval;
-                    emitSound.PopUp = sleepSound.PopUp;
-                }
-
-                return;
-            }
-
-            RemComp<StunnedComponent>(uid);
-            RemComp<KnockedDownComponent>(uid);
-            RemComp<SpamEmitSoundComponent>(uid);
-        }
-
-        /// <summary>
-        /// Wake up on taking an instance of damage at least the value of WakeThreshold.
-        /// </summary>
-        private void OnDamageChanged(EntityUid uid, SleepingComponent component, DamageChangedEvent args)
-        {
-            if (!args.DamageIncreased || args.DamageDelta == null)
-                return;
-
-            if (args.DamageDelta.GetTotal() >= component.WakeThreshold)
-                TryWaking(uid, component);
-        }
-
-        private void OnSleepAction(EntityUid uid, MobStateComponent component, SleepActionEvent args)
-        {
-            TrySleeping(uid);
-        }
-
-        private void OnBedSleepAction(EntityUid uid, ActionsContainerComponent component, SleepActionEvent args)
-        {
-            TrySleeping(args.Performer);
-        }
-
-        private void OnWakeAction(EntityUid uid, MobStateComponent component, WakeActionEvent args)
-        {
-            if (!TryWakeCooldown(uid))
-                return;
-
-            if (TryWaking(uid))
-                args.Handled = true;
-        }
-
-        /// <summary>
-        /// In crit, we wake up if we are not being forced to sleep.
-        /// And, you can't sleep when dead...
-        /// </summary>
-        private void OnMobStateChanged(EntityUid uid, SleepingComponent component, MobStateChangedEvent args)
-        {
-            if (args.NewMobState == MobState.Dead)
-            {
-                RemComp<SpamEmitSoundComponent>(uid);
-                RemComp<SleepingComponent>(uid);
-                return;
-            }
-            if (TryComp<SpamEmitSoundComponent>(uid, out var spam))
-                _emitSound.SetEnabled((uid, spam), args.NewMobState == MobState.Alive);
-        }
-
-        private void AddWakeVerb(EntityUid uid, SleepingComponent component, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess)
-                return;
-
-            AlternativeVerb verb = new()
-            {
-                Act = () =>
-                {
-                    if (!TryWakeCooldown(uid))
-                        return;
-
-                    TryWaking(args.Target, user: args.User);
-                },
-                Text = Loc.GetString("action-name-wake"),
-                Priority = 2
-            };
-
-            args.Verbs.Add(verb);
-        }
-
-        /// <summary>
-        /// When you click on a sleeping person with an empty hand, try to wake them.
-        /// </summary>
-        private void OnInteractHand(EntityUid uid, SleepingComponent component, InteractHandEvent args)
-        {
-            args.Handled = true;
-
-            if (!TryWakeCooldown(uid))
-                return;
-
-            TryWaking(args.Target, user: args.User);
-        }
-
-        private void OnExamined(EntityUid uid, SleepingComponent component, ExaminedEvent args)
-        {
-            if (args.IsInDetailsRange)
-            {
-                args.PushMarkup(Loc.GetString("sleep-examined", ("target", Identity.Entity(uid, EntityManager))));
-            }
-        }
-
-        private void OnSlip(EntityUid uid, SleepingComponent component, SlipAttemptEvent args)
-        {
-            args.Cancel();
-        }
-
-        private void OnConsciousAttempt(EntityUid uid, SleepingComponent component, ConsciousAttemptEvent args)
-        {
-            args.Cancel();
-        }
-
-
-        private void OnInit(EntityUid uid, ForcedSleepingComponent component, ComponentInit args)
-        {
-            TrySleeping(uid);
-        }
-
-        /// <summary>
-        /// Try sleeping. Only mobs can sleep.
-        /// </summary>
-        public bool TrySleeping(EntityUid uid)
-        {
-            if (!HasComp<MobStateComponent>(uid))
-                return false;
-
-            var tryingToSleepEvent = new TryingToSleepEvent(uid);
-            RaiseLocalEvent(uid, ref tryingToSleepEvent);
-            if (tryingToSleepEvent.Cancelled)
-                return false;
-
-            EnsureComp<SleepingComponent>(uid);
-            return true;
-        }
-
-        private bool TryWakeCooldown(EntityUid uid, SleepingComponent? component = null)
-        {
-            if (!Resolve(uid, ref component, false))
-                return false;
-
-            var curTime = _gameTiming.CurTime;
-
-            if (curTime < component.CoolDownEnd)
-            {
-                return false;
-            }
-
-            component.CoolDownEnd = curTime + component.Cooldown;
-            return true;
-        }
-
-        /// <summary>
-        /// Try to wake up.
-        /// </summary>
-        public bool TryWaking(EntityUid uid, SleepingComponent? component = null, bool force = false, EntityUid? user = null)
-        {
-            if (!Resolve(uid, ref component, false))
-                return false;
-
-            if (!force && HasComp<ForcedSleepingComponent>(uid))
-            {
-                if (user != null)
-                {
-                    _audio.PlayPvs("/Audio/Effects/thudswoosh.ogg", uid, AudioHelpers.WithVariation(0.05f, _robustRandom));
-                    _popupSystem.PopupEntity(Loc.GetString("wake-other-failure", ("target", Identity.Entity(uid, EntityManager))), uid, Filter.Entities(user.Value), true, Shared.Popups.PopupType.SmallCaution);
-                }
-                return false;
-            }
-
-            if (user != null)
-            {
-                _audio.PlayPvs("/Audio/Effects/thudswoosh.ogg", uid, AudioHelpers.WithVariation(0.05f, _robustRandom));
-                _popupSystem.PopupEntity(Loc.GetString("wake-other-success", ("target", Identity.Entity(uid, EntityManager))), uid, Filter.Entities(user.Value), true);
-            }
-            RemComp<SleepingComponent>(uid);
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
index 186fc91c46e9..bc61c5d141a8 100644
--- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
+++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Damage;
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.FixedPoint;
diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
deleted file mode 100644
index c6248c88f775..000000000000
--- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Damage.ForceSay;
-using Content.Shared.Eye.Blinding.Systems;
-using Content.Shared.Pointing;
-using Content.Shared.Speech;
-using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Bed.Sleep
-{
-    public abstract class SharedSleepingSystem : EntitySystem
-    {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly BlindableSystem _blindableSystem = default!;
-
-        [ValidatePrototypeId<EntityPrototype>] private const string WakeActionId = "ActionWake";
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<SleepingComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<SleepingComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
-            SubscribeLocalEvent<SleepingComponent, CanSeeAttemptEvent>(OnSeeAttempt);
-            SubscribeLocalEvent<SleepingComponent, PointAttemptEvent>(OnPointAttempt);
-        }
-
-
-        private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent args)
-        {
-            var ev = new SleepStateChangedEvent(true);
-            RaiseLocalEvent(uid, ev);
-            _blindableSystem.UpdateIsBlind(uid);
-            _actionsSystem.AddAction(uid, ref component.WakeAction, WakeActionId, uid);
-
-            // TODO remove hardcoded time.
-            _actionsSystem.SetCooldown(component.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f));
-        }
-
-        private void OnShutdown(EntityUid uid, SleepingComponent component, ComponentShutdown args)
-        {
-            _actionsSystem.RemoveAction(uid, component.WakeAction);
-            var ev = new SleepStateChangedEvent(false);
-            RaiseLocalEvent(uid, ev);
-            _blindableSystem.UpdateIsBlind(uid);
-        }
-
-        private void OnSpeakAttempt(EntityUid uid, SleepingComponent component, SpeakAttemptEvent args)
-        {
-            // TODO reduce duplication of this behavior with MobStateSystem somehow
-            if (HasComp<AllowNextCritSpeechComponent>(uid))
-            {
-                RemCompDeferred<AllowNextCritSpeechComponent>(uid);
-                return;
-            }
-
-            args.Cancel();
-        }
-
-        private void OnSeeAttempt(EntityUid uid, SleepingComponent component, CanSeeAttemptEvent args)
-        {
-            if (component.LifeStage <= ComponentLifeStage.Running)
-                args.Cancel();
-        }
-
-        private void OnPointAttempt(EntityUid uid, SleepingComponent component, PointAttemptEvent args)
-        {
-            args.Cancel();
-        }
-    }
-}
-
-
-public sealed partial class SleepActionEvent : InstantActionEvent {}
-
-public sealed partial class WakeActionEvent : InstantActionEvent {}
-
-/// <summary>
-/// Raised on an entity when they fall asleep or wake up.
-/// </summary>
-public sealed class SleepStateChangedEvent : EntityEventArgs
-{
-    public bool FellAsleep = false;
-
-    public SleepStateChangedEvent(bool fellAsleep)
-    {
-        FellAsleep = fellAsleep;
-    }
-}
diff --git a/Content.Shared/Bed/Sleep/SleepingComponent.cs b/Content.Shared/Bed/Sleep/SleepingComponent.cs
index cd468440f40d..cbea0a0516f0 100644
--- a/Content.Shared/Bed/Sleep/SleepingComponent.cs
+++ b/Content.Shared/Bed/Sleep/SleepingComponent.cs
@@ -1,31 +1,42 @@
 using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Bed.Sleep;
 
 /// <summary>
 /// Added to entities when they go to sleep.
 /// </summary>
-[NetworkedComponent, RegisterComponent, AutoGenerateComponentPause(Dirty = true)]
+[NetworkedComponent, RegisterComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause(Dirty = true)]
 public sealed partial class SleepingComponent : Component
 {
     /// <summary>
     /// How much damage of any type it takes to wake this entity.
     /// </summary>
-    [DataField("wakeThreshold")]
+    [DataField]
     public FixedPoint2 WakeThreshold = FixedPoint2.New(2);
 
     /// <summary>
     ///     Cooldown time between users hand interaction.
     /// </summary>
-    [DataField("cooldown")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan Cooldown = TimeSpan.FromSeconds(1f);
 
-    [DataField("cooldownEnd", customTypeSerializer:typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan CoolDownEnd;
+    [DataField]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan CooldownEnd;
 
-    [DataField("wakeAction")] public EntityUid? WakeAction;
+    [DataField]
+    [AutoNetworkedField]
+    public EntityUid? WakeAction;
+
+    /// <summary>
+    /// Sound to play when another player attempts to wake this entity.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier WakeAttemptSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg")
+    {
+        Params = AudioParams.Default.WithVariation(0.05f)
+    };
 }
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
new file mode 100644
index 000000000000..aac3e7bb18cc
--- /dev/null
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -0,0 +1,314 @@
+using Content.Shared.Actions;
+using Content.Shared.Damage;
+using Content.Shared.Damage.ForceSay;
+using Content.Shared.Examine;
+using Content.Shared.Eye.Blinding.Systems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Pointing;
+using Content.Shared.Popups;
+using Content.Shared.Slippery;
+using Content.Shared.Sound;
+using Content.Shared.Sound.Components;
+using Content.Shared.Speech;
+using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
+using Content.Shared.Verbs;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Bed.Sleep;
+
+public sealed partial class SleepingSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly BlindableSystem _blindableSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
+
+    public static readonly ProtoId<EntityPrototype> SleepActionId = "ActionSleep";
+    public static readonly ProtoId<EntityPrototype> WakeActionId = "ActionWake";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ActionsContainerComponent, SleepActionEvent>(OnBedSleepAction);
+
+        SubscribeLocalEvent<MobStateComponent, SleepStateChangedEvent>(OnSleepStateChanged);
+        SubscribeLocalEvent<MobStateComponent, WakeActionEvent>(OnWakeAction);
+        SubscribeLocalEvent<MobStateComponent, SleepActionEvent>(OnSleepAction);
+
+        SubscribeLocalEvent<SleepingComponent, DamageChangedEvent>(OnDamageChanged);
+        SubscribeLocalEvent<SleepingComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<SleepingComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
+        SubscribeLocalEvent<SleepingComponent, CanSeeAttemptEvent>(OnSeeAttempt);
+        SubscribeLocalEvent<SleepingComponent, PointAttemptEvent>(OnPointAttempt);
+        SubscribeLocalEvent<SleepingComponent, SlipAttemptEvent>(OnSlip);
+        SubscribeLocalEvent<SleepingComponent, ConsciousAttemptEvent>(OnConsciousAttempt);
+        SubscribeLocalEvent<SleepingComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb);
+        SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
+
+        SubscribeLocalEvent<ForcedSleepingComponent, ComponentInit>(OnInit);
+    }
+
+    private void OnBedSleepAction(Entity<ActionsContainerComponent> ent, ref SleepActionEvent args)
+    {
+        TrySleeping(args.Performer);
+    }
+
+    private void OnWakeAction(Entity<MobStateComponent> ent, ref WakeActionEvent args)
+    {
+        if (TryWakeWithCooldown(ent.Owner))
+            args.Handled = true;
+    }
+
+    private void OnSleepAction(Entity<MobStateComponent> ent, ref SleepActionEvent args)
+    {
+        TrySleeping((ent, ent.Comp));
+    }
+
+    /// <summary>
+    /// when sleeping component is added or removed, we do some stuff with other components.
+    /// </summary>
+    private void OnSleepStateChanged(Entity<MobStateComponent> ent, ref SleepStateChangedEvent args)
+    {
+        if (args.FellAsleep)
+        {
+            // Expiring status effects would remove the components needed for sleeping
+            _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "Stun");
+            _statusEffectsSystem.TryRemoveStatusEffect(ent.Owner, "KnockedDown");
+
+            EnsureComp<StunnedComponent>(ent);
+            EnsureComp<KnockedDownComponent>(ent);
+
+            if (TryComp<SleepEmitSoundComponent>(ent, out var sleepSound))
+            {
+                var emitSound = EnsureComp<SpamEmitSoundComponent>(ent);
+                if (HasComp<SnoringComponent>(ent))
+                {
+                    emitSound.Sound = sleepSound.Snore;
+                }
+                emitSound.MinInterval = sleepSound.Interval;
+                emitSound.MaxInterval = sleepSound.MaxInterval;
+                emitSound.PopUp = sleepSound.PopUp;
+                Dirty(ent.Owner, emitSound);
+            }
+
+            return;
+        }
+
+        RemComp<StunnedComponent>(ent);
+        RemComp<KnockedDownComponent>(ent);
+        RemComp<SpamEmitSoundComponent>(ent);
+    }
+
+    private void OnMapInit(Entity<SleepingComponent> ent, ref MapInitEvent args)
+    {
+        var ev = new SleepStateChangedEvent(true);
+        RaiseLocalEvent(ent, ref ev);
+        _blindableSystem.UpdateIsBlind(ent.Owner);
+        _actionsSystem.AddAction(ent, ref ent.Comp.WakeAction, WakeActionId, ent);
+
+        // TODO remove hardcoded time.
+        _actionsSystem.SetCooldown(ent.Comp.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f));
+    }
+
+    private void OnSpeakAttempt(Entity<SleepingComponent> ent, ref SpeakAttemptEvent args)
+    {
+        // TODO reduce duplication of this behavior with MobStateSystem somehow
+        if (HasComp<AllowNextCritSpeechComponent>(ent))
+        {
+            RemCompDeferred<AllowNextCritSpeechComponent>(ent);
+            return;
+        }
+
+        args.Cancel();
+    }
+
+    private void OnSeeAttempt(Entity<SleepingComponent> ent, ref CanSeeAttemptEvent args)
+    {
+        if (ent.Comp.LifeStage <= ComponentLifeStage.Running)
+            args.Cancel();
+    }
+
+    private void OnPointAttempt(Entity<SleepingComponent> ent, ref PointAttemptEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnSlip(Entity<SleepingComponent> ent, ref SlipAttemptEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnConsciousAttempt(Entity<SleepingComponent> ent, ref ConsciousAttemptEvent args)
+    {
+        args.Cancel();
+    }
+
+    private void OnExamined(Entity<SleepingComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange)
+        {
+            args.PushMarkup(Loc.GetString("sleep-examined", ("target", Identity.Entity(ent, EntityManager))));
+        }
+    }
+
+    private void AddWakeVerb(Entity<SleepingComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        var target = args.Target;
+        var user = args.User;
+        AlternativeVerb verb = new()
+        {
+            Act = () =>
+            {
+                TryWakeWithCooldown((ent, ent.Comp), user: user);
+            },
+            Text = Loc.GetString("action-name-wake"),
+            Priority = 2
+        };
+
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    /// When you click on a sleeping person with an empty hand, try to wake them.
+    /// </summary>
+    private void OnInteractHand(Entity<SleepingComponent> ent, ref InteractHandEvent args)
+    {
+        args.Handled = true;
+
+        TryWakeWithCooldown((ent, ent.Comp), args.User);
+    }
+
+    /// <summary>
+    /// Wake up on taking an instance of damage at least the value of WakeThreshold.
+    /// </summary>
+    private void OnDamageChanged(Entity<SleepingComponent> ent, ref DamageChangedEvent args)
+    {
+        if (!args.DamageIncreased || args.DamageDelta == null)
+            return;
+
+        if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold)
+            TryWaking((ent, ent.Comp));
+    }
+
+    /// <summary>
+    /// In crit, we wake up if we are not being forced to sleep.
+    /// And, you can't sleep when dead...
+    /// </summary>
+    private void OnMobStateChanged(Entity<SleepingComponent> ent, ref MobStateChangedEvent args)
+    {
+        if (args.NewMobState == MobState.Dead)
+        {
+            RemComp<SpamEmitSoundComponent>(ent);
+            RemComp<SleepingComponent>(ent);
+            return;
+        }
+        if (TryComp<SpamEmitSoundComponent>(ent, out var spam))
+            _emitSound.SetEnabled((ent, spam), args.NewMobState == MobState.Alive);
+    }
+
+    private void OnInit(Entity<ForcedSleepingComponent> ent, ref ComponentInit args)
+    {
+        TrySleeping(ent.Owner);
+    }
+
+    private void Wake(Entity<SleepingComponent> ent)
+    {
+        RemComp<SleepingComponent>(ent);
+        _actionsSystem.RemoveAction(ent, ent.Comp.WakeAction);
+
+        var ev = new SleepStateChangedEvent(false);
+        RaiseLocalEvent(ent, ref ev);
+
+        _blindableSystem.UpdateIsBlind(ent.Owner);
+    }
+
+    /// <summary>
+    /// Try sleeping. Only mobs can sleep.
+    /// </summary>
+    public bool TrySleeping(Entity<MobStateComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false))
+            return false;
+
+        var tryingToSleepEvent = new TryingToSleepEvent(ent);
+        RaiseLocalEvent(ent, ref tryingToSleepEvent);
+        if (tryingToSleepEvent.Cancelled)
+            return false;
+
+        EnsureComp<SleepingComponent>(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to wake up <paramref name="ent"/>, with a cooldown between attempts to prevent spam.
+    /// </summary>
+    public bool TryWakeWithCooldown(Entity<SleepingComponent?> ent, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        var curTime = _gameTiming.CurTime;
+
+        if (curTime < ent.Comp.CooldownEnd)
+            return false;
+
+        ent.Comp.CooldownEnd = curTime + ent.Comp.Cooldown;
+        Dirty(ent, ent.Comp);
+        return TryWaking(ent, user: user);
+    }
+
+    /// <summary>
+    /// Try to wake up <paramref name="ent"/>.
+    /// </summary>
+    public bool TryWaking(Entity<SleepingComponent?> ent, bool force = false, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        if (!force && HasComp<ForcedSleepingComponent>(ent))
+        {
+            if (user != null)
+            {
+                _audio.PlayPredicted(ent.Comp.WakeAttemptSound, ent, user);
+                _popupSystem.PopupClient(Loc.GetString("wake-other-failure", ("target", Identity.Entity(ent, EntityManager))), ent, user, PopupType.SmallCaution);
+            }
+            return false;
+        }
+
+        if (user != null)
+        {
+            _audio.PlayPredicted(ent.Comp.WakeAttemptSound, ent, user);
+            _popupSystem.PopupClient(Loc.GetString("wake-other-success", ("target", Identity.Entity(ent, EntityManager))), ent, user);
+        }
+
+        Wake((ent, ent.Comp));
+        return true;
+    }
+}
+
+
+public sealed partial class SleepActionEvent : InstantActionEvent;
+
+public sealed partial class WakeActionEvent : InstantActionEvent;
+
+/// <summary>
+/// Raised on an entity when they fall asleep or wake up.
+/// </summary>
+[ByRefEvent]
+public record struct SleepStateChangedEvent(bool FellAsleep);
diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Shared/Bed/Sleep/SnoringComponent.cs
similarity index 54%
rename from Content.Server/Bed/Components/SnoringComponent.cs
rename to Content.Shared/Bed/Sleep/SnoringComponent.cs
index 09f80327ba73..2fe92951f073 100644
--- a/Content.Server/Bed/Components/SnoringComponent.cs
+++ b/Content.Shared/Bed/Sleep/SnoringComponent.cs
@@ -1,9 +1,11 @@
-namespace Content.Server.Bed.Sleep;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Bed.Sleep;
 
 /// <summary>
 /// This is used for the snoring trait.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class SnoringComponent : Component
 {
 

From 80590280158efd3094195c66a66ca52cb223ac65 Mon Sep 17 00:00:00 2001
From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Fri, 14 Jun 2024 04:40:23 +0200
Subject: [PATCH 459/568] makes PKA able to mine rocks in one hit (#27476)

gives it gatheringprojectile
---
 .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 825d3cc4a70c..560111600909 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -400,6 +400,7 @@
   # Short lifespan
   - type: TimedDespawn
     lifetime: 0.4
+  - type: GatheringProjectile
 
 - type: entity
   id: BulletKineticShuttle

From bcf85944318b8afd5d9b82176f3316e31cb959b2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 02:41:29 +0000
Subject: [PATCH 460/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 96a868d131f4..92cab63ea218 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: IProduceWidgets
-  changes:
-  - message: More varieties of astro-grass are now available.
-    type: Add
-  - message: Astro-grass must now be cut instead of pried.
-    type: Tweak
-  id: 6226
-  time: '2024-03-25T01:14:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26381
 - author: Tayrtahn
   changes:
   - message: Parrots now sound more like parrots when they talk. RAWWK!
@@ -3847,3 +3838,10 @@
   id: 6725
   time: '2024-06-14T02:04:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28768
+- author: Boaz1111
+  changes:
+  - message: The PKA can now mine rocks in one hit again.
+    type: Tweak
+  id: 6726
+  time: '2024-06-14T02:40:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27476

From c52073f542a07f2e1b8380556a14995380336b49 Mon Sep 17 00:00:00 2001
From: Tabitha <64847293+KyuPolaris@users.noreply.github.com>
Date: Fri, 14 Jun 2024 12:43:02 +1000
Subject: [PATCH 461/568] Add chicken speech sound (#28948)

---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 3 +++
 Resources/Prototypes/Voice/speech_sounds.yml        | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 971d05823a52..f216e05cf9aa 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -181,6 +181,9 @@
         - MobMask
         layer:
         - MobLayer
+  - type: Speech
+    speechVerb: SmallMob
+    speechSounds: Cluck
   - type: Tag
     tags:
     - DoorBumpOpener
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index a490c734d3de..bc3cffb3596e 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -150,3 +150,12 @@
     path: /Audio/Animals/dog_bark3.ogg
   exclaimSound:
     path: /Audio/Animals/dog_bark2.ogg
+
+- type: speechSounds
+  id: Cluck
+  saySound:
+    path: /Audio/Animals/chicken_cluck_happy.ogg
+  askSound:
+    path: /Audio/Animals/chicken_cluck_happy.ogg
+  exclaimSound:
+    path: /Audio/Animals/chicken_cluck_happy.ogg

From 39d7afec2b52870e748cdd76f6de429f3ed71319 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 02:44:08 +0000
Subject: [PATCH 462/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 92cab63ea218..112dbfb313ee 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Parrots now sound more like parrots when they talk. RAWWK!
-    type: Add
-  id: 6227
-  time: '2024-03-25T01:26:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26340
 - author: DenisShvalov
   changes:
   - message: Added Cleaner Grenades that will help janitors in their work
@@ -3845,3 +3838,10 @@
   id: 6726
   time: '2024-06-14T02:40:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27476
+- author: KyuPolaris
+  changes:
+  - message: Chickens now make a clucking sound when they speak.
+    type: Add
+  id: 6727
+  time: '2024-06-14T02:43:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28948

From df2c3ec844da27056e27d0de44aade706b76e204 Mon Sep 17 00:00:00 2001
From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Date: Fri, 14 Jun 2024 01:26:39 -0400
Subject: [PATCH 463/568] Evac shuttle for Oasis (#27998)

* Add robo control comp, also de-reinforce a lot of walls.

* Add Accordia Evac shuttle for Oasis.

* Revert "Add robo control comp, also de-reinforce a lot of walls."

This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.
---
 .../Maps/Shuttles/emergency_accordia.yml      | 6531 +++++++++++++++++
 Resources/Prototypes/Maps/oasis.yml           |    2 +-
 2 files changed, 6532 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Maps/Shuttles/emergency_accordia.yml

diff --git a/Resources/Maps/Shuttles/emergency_accordia.yml b/Resources/Maps/Shuttles/emergency_accordia.yml
new file mode 100644
index 000000000000..8b5dac4d9277
--- /dev/null
+++ b/Resources/Maps/Shuttles/emergency_accordia.yml
@@ -0,0 +1,6531 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  32: FloorDark
+  60: FloorHullReinforced
+  96: FloorSteel
+  112: FloorTechMaint2
+  113: FloorTechMaint3
+  115: FloorWhite
+  125: FloorWood
+  127: FloorWoodTile
+  129: Plating
+  135: TrainLattice
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: NT Evac Accordia
+    - type: Transform
+      pos: -0.5104167,-0.5
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: PAAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACIAAAAAACIAAAAAABgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: PAAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAABfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACgQAAAAAAIAAAAAABIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABcwAAAAACcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAgQAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAABfwAAAAABfQAAAAADfQAAAAABfQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAcQAAAAABcQAAAAACgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABcAAAAAAAcAAAAAAAcQAAAAACgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAACgQAAAAAAcQAAAAABcQAAAAADgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAADfwAAAAADfQAAAAADfQAAAAABfQAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAAD
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACIAAAAAAB
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAgQAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAIAAAAAAB
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: IAAAAAAAIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteCornerNe
+          decals:
+            40: 5,12
+            41: 4,13
+            43: 3,15
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerNe
+          decals:
+            116: 5,0
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteCornerNe
+          decals:
+            119: 5,-6
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerNw
+          decals:
+            115: 3,0
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteCornerNw
+          decals:
+            120: 3,-6
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerSe
+          decals:
+            117: 5,-4
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteCornerSe
+          decals:
+            118: 5,-10
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteCornerSe
+          decals:
+            206: -3,-25
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteCornerSw
+          decals:
+            46: -2,14
+            47: -1,13
+            48: 0,12
+            89: 3,9
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerSw
+          decals:
+            114: 3,-4
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteCornerSw
+          decals:
+            132: 3,-10
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteEndS
+          decals:
+            82: 1,9
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteInnerNe
+          decals:
+            70: 2,15
+            72: 4,12
+            97: 3,13
+            148: 1,7
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteInnerNe
+          decals:
+            137: 1,-4
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteInnerNe
+          decals:
+            152: -3,7
+            177: 1,-19
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteInnerNe
+          decals:
+            145: 1,-9
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteInnerNe
+          decals:
+            183: 1,-22
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteInnerNw
+          decals:
+            57: -2,15
+            149: 3,7
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteInnerNw
+          decals:
+            151: -1,7
+            243: -5,-3
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteInnerNw
+          decals:
+            184: -1,-23
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteInnerSe
+          decals:
+            104: 1,11
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteInnerSe
+          decals:
+            138: 1,-1
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteInnerSe
+          decals:
+            175: 1,-17
+            176: 1,-23
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteInnerSe
+          decals:
+            146: 1,-6
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteInnerSe
+          decals:
+            181: 1,-20
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteInnerSw
+          decals:
+            58: -2,15
+            79: 0,13
+            92: -1,14
+            102: 1,12
+            103: 3,11
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteInnerSw
+          decals:
+            242: -5,-7
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteInnerSw
+          decals:
+            182: -1,-20
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteLineE
+          decals:
+            36: 5,10
+            38: 5,11
+            53: 2,16
+            54: 3,14
+            83: 1,10
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineE
+          decals:
+            110: 5,-3
+            111: 5,-2
+            112: 5,-1
+            135: 1,-3
+            136: 1,-2
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteLineE
+          decals:
+            173: 1,-24
+            174: 1,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineE
+          decals:
+            127: 5,-9
+            128: 5,-8
+            129: 5,-7
+            133: 1,-8
+            134: 1,-7
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineE
+          decals:
+            180: 1,-21
+            190: -3,-17
+            191: -3,-18
+            192: -3,-19
+            193: -3,-20
+            197: -3,-23
+            205: -3,-24
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteLineN
+          decals:
+            147: 2,7
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineN
+          decals:
+            113: 4,0
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteLineN
+          decals:
+            153: -2,7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineN
+          decals:
+            131: 4,-6
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteLineS
+          decals:
+            35: 4,9
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineS
+          decals:
+            106: 4,-4
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineS
+          decals:
+            130: 4,-10
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineS
+          decals:
+            207: -4,-25
+        - node:
+            color: '#334E6DC8'
+            id: BrickTileWhiteLineW
+          decals:
+            50: 1,10
+            52: -2,16
+            86: 3,10
+            100: 1,11
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineW
+          decals:
+            109: 3,-1
+            141: 3,-3
+            142: 3,-2
+        - node:
+            color: '#D4D4D428'
+            id: BrickTileWhiteLineW
+          decals:
+            164: -1,-1
+            165: -1,-2
+            166: -1,-3
+            167: -1,-4
+            168: -1,-5
+            169: -1,-6
+            170: -1,-7
+            171: -1,-8
+            172: -1,-9
+        - node:
+            color: '#D4D4D496'
+            id: BrickTileWhiteLineW
+          decals:
+            236: -5,-8
+            237: -5,-10
+            238: -5,-2
+            239: -5,-1
+            240: -5,0
+            241: -5,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileWhiteLineW
+          decals:
+            124: 3,-7
+            125: 3,-8
+            126: 3,-9
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineW
+          decals:
+            178: -1,-22
+            179: -1,-21
+            186: -5,-17
+            187: -5,-18
+        - node:
+            color: '#334E6DC8'
+            id: FullTileOverlayGreyscale
+          decals:
+            55: -3,15
+            62: 2,17
+            63: 1,17
+            64: 0,17
+            65: -1,17
+            66: -2,17
+            74: 2,10
+            245: 2,8
+        - node:
+            color: '#52B4E996'
+            id: FullTileOverlayGreyscale
+          decals:
+            143: 2,-3
+            144: 2,-2
+        - node:
+            color: '#DE3A3A96'
+            id: FullTileOverlayGreyscale
+          decals:
+            121: 4,-5
+            122: 2,-7
+            123: 2,-8
+        - node:
+            color: '#EFB34196'
+            id: FullTileOverlayGreyscale
+          decals:
+            212: -5,-25
+            213: -5,-24
+            217: -2,-22
+            218: -2,-21
+        - node:
+            color: '#EFB34196'
+            id: HalfTileOverlayGreyscale
+          decals:
+            188: -5,-17
+            189: -4,-17
+            194: -3,-17
+        - node:
+            color: '#334E6DC8'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            105: 2,11
+        - node:
+            color: '#EFB34196'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            214: -4,-25
+            215: -4,-24
+        - node:
+            color: '#EFB34196'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            219: -3,-22
+            220: -3,-21
+        - node:
+            color: '#EFB34196'
+            id: MiniTileWhiteInnerSw
+          decals:
+            216: -4,-23
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            221: 5,-24
+            222: 5,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            223: 3,-16
+            224: 3,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            227: 5,-25
+            228: 5,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            225: 3,-25
+            226: 3,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            229: 5,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            233: 4,-16
+            234: 4,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            231: 4,-25
+            232: 4,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            230: 3,-17
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 13113
+            1: 17408
+          0,-1:
+            0: 49147
+          -1,0:
+            0: 34947
+            1: 21504
+          0,1:
+            0: 65299
+            1: 4
+          -1,1:
+            0: 60936
+            1: 5
+          0,2:
+            0: 61156
+          -1,2:
+            0: 32756
+          0,3:
+            0: 65535
+          -1,3:
+            0: 60563
+          0,4:
+            0: 119
+          1,0:
+            0: 3
+            1: 30272
+          1,2:
+            0: 13104
+            1: 4
+          1,3:
+            0: 19
+            1: 1024
+          1,-1:
+            0: 13107
+          1,1:
+            1: 8739
+          0,-4:
+            0: 13113
+            1: 17408
+          0,-5:
+            0: 48955
+          -1,-4:
+            0: 34947
+            1: 17408
+          0,-3:
+            0: 47411
+            1: 4
+          -1,-3:
+            0: 62344
+            1: 4
+          0,-2:
+            0: 15359
+          -1,-2:
+            0: 65535
+          -1,-1:
+            0: 65535
+          1,-4:
+            0: 3
+            1: 26176
+          1,-3:
+            0: 13056
+            1: 70
+          1,-2:
+            0: 4915
+          1,-5:
+            0: 13057
+            1: 4
+          0,-7:
+            1: 1904
+            0: 36864
+          -1,-7:
+            1: 3280
+            0: 12288
+          0,-6:
+            0: 64319
+          -1,-6:
+            0: 65467
+          -1,-5:
+            0: 48059
+          1,-7:
+            1: 112
+            0: 12288
+          1,-6:
+            0: 4355
+            1: 17408
+          -2,0:
+            0: 12
+            1: 52288
+          -2,2:
+            1: 4
+            0: 34944
+          -2,3:
+            0: 8
+            1: 1024
+          -2,-1:
+            0: 35976
+          -2,1:
+            1: 34952
+          -1,4:
+            0: 204
+          -2,-4:
+            1: 52288
+            0: 8
+          -2,-3:
+            1: 76
+            0: 35840
+          -2,-2:
+            0: 34956
+          -2,-5:
+            0: 34944
+            1: 4
+          -2,-7:
+            1: 192
+            0: 32768
+          -2,-6:
+            0: 8
+            1: 17408
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: Airlock
+  entities:
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+- proto: AirlockCommandGlassLocked
+  entities:
+  - uid: 198
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,8.5
+      parent: 1
+- proto: AirlockEngineeringLocked
+  entities:
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -1.5,-21.5
+      parent: 1
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+- proto: AirlockExternalGlass
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-24.5
+      parent: 1
+- proto: AirlockGlass
+  entities:
+  - uid: 250
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,8.5
+      parent: 1
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-1.5
+      parent: 1
+- proto: AirlockHatch
+  entities:
+  - uid: 223
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-15.5
+      parent: 1
+- proto: AirlockMedicalGlassLocked
+  entities:
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+- proto: AirlockSecurityGlassLocked
+  entities:
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+- proto: AltarNanotrasen
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,11.5
+      parent: 1
+- proto: APCHighCapacity
+  entities:
+  - uid: 615
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,11.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-24.5
+      parent: 1
+- proto: BaseComputer
+  entities:
+  - uid: 244
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,16.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+- proto: BedsheetMedical
+  entities:
+  - uid: 310
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-0.5
+      parent: 1
+- proto: BedsheetSpawner
+  entities:
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+- proto: BorgCharger
+  entities:
+  - uid: 814
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-17.5
+      parent: 1
+- proto: BoxInflatable
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      parent: 359
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 370
+    components:
+    - type: Transform
+      parent: 369
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: CableApcExtension
+  entities:
+  - uid: 534
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -3.5,-24.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 0.5,-21.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -3.5,-23.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+  - uid: 611
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 662
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 664
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 4.5,-23.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 685
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 687
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 692
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 698
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 703
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+  - uid: 707
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 712
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 719
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 723
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 724
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 725
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 726
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 727
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 728
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 729
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 730
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 733
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 735
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 737
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 1
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 741
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 748
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 749
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 750
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 752
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 753
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 754
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 755
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 756
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 762
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -0.5,15.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      pos: -0.5,16.5
+      parent: 1
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 0.5,16.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      pos: 1.5,16.5
+      parent: 1
+  - uid: 773
+    components:
+    - type: Transform
+      pos: 2.5,16.5
+      parent: 1
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 1
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 776
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 1
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 781
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 4.5,-21.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 4.5,-19.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 612
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 626
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 628
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 635
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 647
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 667
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+- proto: CarpetBlack
+  entities:
+  - uid: 868
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,9.5
+      parent: 1
+  - uid: 869
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,12.5
+      parent: 1
+  - uid: 870
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,10.5
+      parent: 1
+  - uid: 871
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 872
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 873
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,9.5
+      parent: 1
+  - uid: 874
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 875
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 876
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 1
+  - uid: 877
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,11.5
+      parent: 1
+  - uid: 879
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 880
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 881
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 882
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 883
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 885
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,10.5
+      parent: 1
+- proto: CarpetCyan
+  entities:
+  - uid: 864
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 865
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 866
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 867
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,14.5
+      parent: 1
+- proto: CarpetGreen
+  entities:
+  - uid: 916
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 917
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 918
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 922
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 923
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 927
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-5.5
+      parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.551079,-9.396126
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 247
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,15.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,16.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-5.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-22.5
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-24.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-17.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 820
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 829
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 848
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 859
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-22.5
+      parent: 1
+- proto: ChurchBell
+  entities:
+  - uid: 254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,13.5
+      parent: 1
+- proto: ChurchOrganInstrument
+  entities:
+  - uid: 258
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,12.5
+      parent: 1
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      pos: 1.3731825,9.5
+      parent: 1
+- proto: ClosetEmergencyN2FilledRandom
+  entities:
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+- proto: ClosetFireFilled
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 360
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 363
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 370
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 3.6023493,9.5
+      parent: 1
+- proto: ComfyChair
+  entities:
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,11.5
+      parent: 1
+  - uid: 842
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 843
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 844
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-17.5
+      parent: 1
+- proto: ComputerComms
+  entities:
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -1.5,16.5
+      parent: 1
+- proto: ComputerEmergencyShuttle
+  entities:
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 0.5,17.5
+      parent: 1
+- proto: ComputerId
+  entities:
+  - uid: 296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,15.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 1.5,17.5
+      parent: 1
+- proto: CrateEmergencyInflatablewall
+  entities:
+  - uid: 592
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+- proto: CrowbarRed
+  entities:
+  - uid: 943
+    components:
+    - type: Transform
+      pos: -2.4281309,-17.42973
+      parent: 1
+  - uid: 944
+    components:
+    - type: Transform
+      pos: -2.6107843,-0.41439295
+      parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-4.5
+      parent: 1
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 886
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 887
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-9.5
+      parent: 1
+- proto: FloorDrain
+  entities:
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FolderSpawner
+  entities:
+  - uid: 826
+    components:
+    - type: Transform
+      pos: -0.46709335,14.534386
+      parent: 1
+  - uid: 835
+    components:
+    - type: Transform
+      pos: -0.6129268,14.659386
+      parent: 1
+- proto: GasMinerNitrogen
+  entities:
+  - uid: 268
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+- proto: GasMinerOxygen
+  entities:
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+- proto: GasPassiveVent
+  entities:
+  - uid: 413
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-25.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 449
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 472
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 505
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 548
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 557
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 558
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 430
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 446
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 503
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 546
+    components:
+    - type: Transform
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 581
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 422
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 423
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 424
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 425
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 426
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 427
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 433
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 435
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 437
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 438
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 439
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 440
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 443
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 444
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 445
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 453
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 455
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 456
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 457
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 458
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 464
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 466
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 467
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 468
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 469
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 470
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 471
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 474
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 484
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 485
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 491
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 492
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 493
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 496
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 497
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 498
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 500
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 501
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 508
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 509
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 510
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 511
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 515
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 516
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 523
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 524
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 525
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 526
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 528
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 529
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 530
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 531
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 532
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 539
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 540
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 541
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 542
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 547
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 549
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 551
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 553
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 554
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 555
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 556
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 561
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 562
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 564
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 565
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 567
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 568
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 569
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 576
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 577
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 578
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 580
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 582
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 583
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 584
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 586
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 587
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 588
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 589
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 590
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 591
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 415
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 451
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 473
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 482
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 502
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 504
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 559
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPressurePump
+  entities:
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasVentPump
+  entities:
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 460
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 462
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 463
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 476
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 483
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 520
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 521
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 533
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 486
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 488
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 489
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 490
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 536
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 537
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 572
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 573
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 574
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 575
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 661
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 4.5,-21.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 4.5,-19.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 595
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-23.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-24.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-24.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,17.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,18.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,18.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,18.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,18.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,18.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,18.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,18.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,17.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,11.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,12.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,11.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,12.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,15.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,15.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,8.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,8.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-24.5
+      parent: 1
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+- proto: Handcuffs
+  entities:
+  - uid: 338
+    components:
+    - type: Transform
+      pos: -1.3004267,14.607303
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.8206716,-7.4019303
+      parent: 1
+- proto: InflatableWallStack
+  entities:
+  - uid: 603
+    components:
+    - type: Transform
+      pos: -2.386464,-16.39848
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: -2.5218809,-16.700562
+      parent: 1
+- proto: LampGold
+  entities:
+  - uid: 255
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.4493566,11.8694725
+      parent: 1
+  - uid: 862
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.584395,-15.1845875
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.553145,-24.282356
+      parent: 1
+- proto: LockerMedicineFilled
+  entities:
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+- proto: MedicalBed
+  entities:
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+- proto: MedkitBruteFilled
+  entities:
+  - uid: 809
+    components:
+    - type: Transform
+      pos: 5.390535,0.48565245
+      parent: 1
+- proto: MedkitBurnFilled
+  entities:
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 3.7342849,0.48565245
+      parent: 1
+- proto: MedkitFilled
+  entities:
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 5.723868,0.67315245
+      parent: 1
+  - uid: 857
+    components:
+    - type: Transform
+      pos: -1.0117843,17.526836
+      parent: 1
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 3.3176181,0.6835692
+      parent: 1
+- proto: Pen
+  entities:
+  - uid: 825
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.13376004,14.659386
+      parent: 1
+- proto: PhoneInstrument
+  entities:
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 3.96624,12.203929
+      parent: 1
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 410
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 411
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 414
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-16.5
+      parent: 1
+- proto: PlasmaWindoorSecureCommandLocked
+  entities:
+  - uid: 408
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-23.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-24.5
+      parent: 1
+- proto: PosterContrabandMissingGloves
+  entities:
+  - uid: 913
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-22.5
+      parent: 1
+- proto: PosterContrabandMissingSpacepen
+  entities:
+  - uid: 914
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-19.5
+      parent: 1
+- proto: PosterLegitBlessThisSpess
+  entities:
+  - uid: 908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,13.5
+      parent: 1
+- proto: PosterLegitDoNotQuestion
+  entities:
+  - uid: 909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-9.5
+      parent: 1
+- proto: PosterLegitJustAWeekAway
+  entities:
+  - uid: 910
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
+      parent: 1
+- proto: PosterLegitNanotrasenLogo
+  entities:
+  - uid: 889
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,16.5
+      parent: 1
+  - uid: 890
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,16.5
+      parent: 1
+  - uid: 891
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 892
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-26.5
+      parent: 1
+- proto: PosterLegitSafetyMothPiping
+  entities:
+  - uid: 911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-15.5
+      parent: 1
+- proto: PosterLegitVacation
+  entities:
+  - uid: 912
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-22.5
+      parent: 1
+- proto: PosterLegitWorkForAFuture
+  entities:
+  - uid: 915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-16.5
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 850
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 851
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 852
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 1
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 854
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 855
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 323
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-8.5
+      parent: 1
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 2.5,17.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 785
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 787
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 788
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-7.5
+      parent: 1
+  - uid: 790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 791
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 792
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 799
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1
+  - uid: 800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,16.5
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,9.5
+      parent: 1
+  - uid: 830
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 860
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 861
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-9.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 803
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-20.5
+      parent: 1
+- proto: Rack
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,7.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,7.5
+      parent: 1
+- proto: Railing
+  entities:
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 1
+  - uid: 801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,9.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,9.5
+      parent: 1
+  - uid: 919
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 920
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 921
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 924
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 933
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 934
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 938
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
+  - uid: 350
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,10.5
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,10.5
+      parent: 1
+  - uid: 925
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 928
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-13.5
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 935
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 936
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 1
+- proto: RandomDrinkGlass
+  entities:
+  - uid: 939
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 940
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 1
+- proto: RandomFoodSingle
+  entities:
+  - uid: 941
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+- proto: RandomPosterLegit
+  entities:
+  - uid: 893
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 894
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-23.5
+      parent: 1
+  - uid: 895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 896
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 1
+  - uid: 897
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 898
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-10.5
+      parent: 1
+- proto: ReinforcedWindow
+  entities:
+  - uid: 197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,8.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,8.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 402
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+- proto: ShotGunCabinetFilled
+  entities:
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,8.5
+      parent: 1
+- proto: ShuttleWindow
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-24.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-23.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-24.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,15.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,15.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,12.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,18.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,17.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,18.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,18.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,17.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,18.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,18.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,18.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,11.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,18.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,12.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,11.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-24.5
+      parent: 1
+- proto: SignBridge
+  entities:
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+- proto: SignRedOne
+  entities:
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 901
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+- proto: SignRedThree
+  entities:
+  - uid: 906
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 907
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-14.5
+      parent: 1
+- proto: SignRedTwo
+  entities:
+  - uid: 902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 904
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 905
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+- proto: Sink
+  entities:
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+- proto: StairStageDark
+  entities:
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 930
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 931
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 932
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 1
+- proto: StasisBed
+  entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+- proto: SubstationBasic
+  entities:
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+- proto: Table
+  entities:
+  - uid: 248
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,17.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,17.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,17.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-7.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-8.5
+      parent: 1
+- proto: TableCounterMetal
+  entities:
+  - uid: 593
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 1
+- proto: TableFancyBlue
+  entities:
+  - uid: 366
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 839
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+- proto: TableFancyGreen
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 836
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 837
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,14.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 260
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 351
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 856
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 926
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,8.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,8.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,7.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,6.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-21.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-20.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-21.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-26.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: -5.5,14.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 6.5,14.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-26.5
+      parent: 1
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+- proto: VendingMachineWallMedical
+  entities:
+  - uid: 888
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-4.5
+      parent: 1
+- proto: WallShuttle
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-10.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-21.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-22.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-25.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-8.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,9.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,13.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,16.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,16.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,14.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,16.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,16.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,14.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,14.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,13.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,13.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,14.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,13.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,9.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,1.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,8.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-18.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-22.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,1.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,5.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-25.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-25.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-18.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-24.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-25.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-26.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-26.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,9.5
+      parent: 1
+- proto: WallShuttleInterior
+  entities:
+  - uid: 145
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-21.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-19.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,12.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-18.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-18.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -1.5,-22.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -1.5,-23.5
+      parent: 1
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 322
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-7.5
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,14.5
+      parent: 1
+- proto: WindoorSecure
+  entities:
+  - uid: 205
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,3.5
+      parent: 1
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 207
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-13.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-11.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,4.5
+      parent: 1
+- proto: WoodenBench
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,9.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 942
+    components:
+    - type: Transform
+      pos: -2.5010476,-17.356812
+      parent: 1
+...
diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
index a4cc6eb43d62..dd6990ac8c65 100644
--- a/Resources/Prototypes/Maps/oasis.yml
+++ b/Resources/Prototypes/Maps/oasis.yml
@@ -13,7 +13,7 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'B'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
+          emergencyShuttlePath: /Maps/Shuttles/emergency_accordia.yml
         - type: StationJobs
           availableJobs:
             #service

From 4c182298cc7bbc37ac818fe7c0f7e1e25f6f679c Mon Sep 17 00:00:00 2001
From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Date: Fri, 14 Jun 2024 08:19:47 +0200
Subject: [PATCH 464/568] uncuffCooldown *= 5 (#28095)

---
 Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 5f970da1840d..f7038861279c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -27,7 +27,7 @@
     guides:
     - Security
   - type: UseDelay
-    delay: 6
+    delay: 30
 
 - type: entity
   name: makeshift handcuffs

From e7a3fd5285ba5d61a7f16f487ec630220fd2d15d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 06:20:53 +0000
Subject: [PATCH 465/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 112dbfb313ee..083f85753780 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: DenisShvalov
-  changes:
-  - message: Added Cleaner Grenades that will help janitors in their work
-    type: Add
-  id: 6228
-  time: '2024-03-25T06:46:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25444
 - author: Weax
   changes:
   - message: Harmonicas can now be equipped (and played) in the neck slot.
@@ -3845,3 +3838,10 @@
   id: 6727
   time: '2024-06-14T02:43:02.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28948
+- author: Killerqu00
+  changes:
+  - message: Time between uncuff attempts is now 30 seconds instead of 6.
+    type: Tweak
+  id: 6728
+  time: '2024-06-14T06:19:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28095

From adad6b2b0434416327337b57816dc412b97d4963 Mon Sep 17 00:00:00 2001
From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:24:18 -0700
Subject: [PATCH 466/568] cargo can now order fax machines (#28968)

* cargo can now order fax machines

* removed fax manual
---
 .../Prototypes/Catalog/Cargo/cargo_service.yml    |  10 ++++++++++
 .../Prototypes/Catalog/Fills/Crates/service.yml   |  11 +++++++++++
 .../Entities/Objects/Devices/flatpack.yml         |  12 ++++++++++++
 .../Objects/Devices/flatpack.rsi/fax-machine.png  | Bin 0 -> 429 bytes
 .../Objects/Devices/flatpack.rsi/meta.json        |   5 ++++-
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index d2ca08e1166d..0f930ddfd6a2 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -68,6 +68,16 @@
   category: cargoproduct-category-name-service
   group: market
 
+- type: cargoProduct
+  id: ServiceFaxMachine
+  icon:
+    sprite: Structures/Machines/fax_machine.rsi
+    state: icon
+  product: CrateServiceFaxMachine
+  cost: 2000
+  category: cargoproduct-category-name-service
+  group: market
+
 - type: cargoProduct
   id: ServicePersonnel
   icon:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 5b16b91f8b48..1876de6a53ba 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -129,6 +129,17 @@
     - id: BoxFolderYellow
     - id: NewtonCradle
 
+- type: entity
+  id: CrateServiceFaxMachine
+  parent: CrateGenericSteel
+  name: fax machine crate
+  description: A fax machine and a screwdriver to set the name with.
+  components:
+  - type: StorageFill
+    contents:
+    - id: Screwdriver
+    - id: FaxMachineFlatpack
+
 - type: entity
   id: CrateServicePersonnel
   parent: CrateCommandSecure
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index b9c2b752dba4..5fb81aa6d481 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -204,3 +204,15 @@
   components:
   - type: Flatpack
     entity: SpaceHeaterAnchored
+
+- type: entity
+  parent: BaseFlatpack
+  id: FaxMachineFlatpack
+  name: fax machine flatpack
+  description: A flatpack used for constructing a fax machine.
+  components:
+  - type: Sprite
+    layers:
+    - state: fax-machine
+  - type: Flatpack
+    entity: FaxMachineBase
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png
new file mode 100644
index 0000000000000000000000000000000000000000..428918e73103bb12c6fd84ed3cbd52c18847456a
GIT binary patch
literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$XGugsR9J=Wm9b01Kop06ic8a*n@L*elt5{yrE7aAs2QBZwQK&Ztm1S-M8rYd
zLMtsoG8LR!(<RF#9qVEOwKlyZqRV|#^6p*U_qcEmkVqtwf960W$>_A!MGH(`-!f|)
zi4<4WTJFL@u!P9IOaY_QTK9S<P^tvJ=OYM~J9AaF22IxxM;xv@M%!rPW3ebFkaXaC
zJ_u1jNF(!OzUQM}KNjj-NB{s_cZ_DUfxBCl#)iWoDwPUWs}*e9PUF`%S8&~NE`dYg
z%r7j<%6!jDE&<E3Kq=jbQA$fm>^*{?Fio>?!BPVA`5cbpY{kPc{2PIUZnv90k4B@y
z#etmv0Ap;c+b|5l7~8Sq7X${h56<HaiSJSgoW~f@el7u_BhYjW7v>oVQMT5eUmnxq
znyziEW!;>@0&&ElR0#lJHhbThms~z^!~p=)$#m}^0tBYv`Q>S$N%(O8Bs6Iy5{cv!
X-JEd&LsJ*g00000NkvXXu0mjfyehg_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
index 8f46a0ca53be..bb5b49e18505 100644
--- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef",
     "size": {
         "x": 32,
         "y": 32
@@ -42,6 +42,9 @@
         },
 		{
             "name": "emitter"
+        },
+        {
+            "name": "fax-machine"
         }
     ]
 }

From 0d869a317f311a600b9801f35c794a70f1231e85 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 06:25:24 +0000
Subject: [PATCH 467/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 083f85753780..d2c819747f18 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Weax
-  changes:
-  - message: Harmonicas can now be equipped (and played) in the neck slot.
-    type: Tweak
-  id: 6229
-  time: '2024-03-25T07:05:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26261
 - author: nikthechampiongr
   changes:
   - message: Mailing units no longer spontaneously turn into disposal units when flushed.
@@ -3845,3 +3838,11 @@
   id: 6728
   time: '2024-06-14T06:19:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28095
+- author: Moomoobeef
+  changes:
+  - message: Fax machines can now be purchased at cargo, for when you need more paper
+      pushing on your station!
+    type: Add
+  id: 6729
+  time: '2024-06-14T06:24:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28968

From e70131e5b4cf0f36352d5f352d75df49181a4718 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:55:30 +1000
Subject: [PATCH 468/568] Lighten throwing knive's border (#28977)

add
---
 .../Weapons/Melee/throwing_knife.rsi/icon.png | Bin 1593 -> 1622 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png
index 2c61755b52c35b9138c5aa7f93ec6e71bffa7871..5817fac2becace1878ee853b6264dd66a98f17dd 100644
GIT binary patch
delta 651
zcmV;60(AYk4Au;=*aLrQNkl<ZSPAWw%}*0S7{;I77)e+ZP_PHTl9nxgokWfTdg0JR
zx2-1n2UwK@79=t8e^4*bgWmOI;!UG5(SGPbjW=kr9?(Fv7zq)Y^we?RX{XtS4!euH
zUhE{@ne5EY?|Gm1ohi_1|GNXqzc3&@HOmC&VfKCtbB~w^q8ESQyLV<`ep$vsc3~SP
zFaZQlB@CPxj$k@-8y7E3KvmUk0s?uFo|<7VUcO<=Ussrsyu#+QkC>6V+DwBT>bnCJ
z`K6?RNccEz&CFq9d<@lU)y`}g`zoMrdmK?cj7$SwtJP2_zQ?ntPg;sksPIhy*-nuU
zN9#GK$f*^I?<{}#<F;^`_eH?9n;CXFm4H4J<^?C<Z*zHR<OHYo*8(VVs`jWJY37_U
zhFrej2=^>t-~K*c$(z47xTSU56Wn$xxbd;`JgQv2=n77YJs(V6*Fi$)SS5`(ulC8w
zSQB2iU7mBU(Dv{ofFd_d6C~pGtLG?{mJo}@as5V`Z|Q#~=Qj54hlh_GV}_An+zIQV
zx%XgRdeJyhq{l<{;TctB1Kr&)`wn3A+z38={A8u%AWDm$J?}*fPp9CtqHy>?e?Qpz
zFAfidLMWHZGQE!PT?;q~ut813TBX7_{b}{9l?p}8NCfq(E8jf3;7Y(LYx6@rJ)p>`
zt!-^#5#WEY2DI%T4PWf=*ikVRTi1{8ING%r6!D-Xg5XOHxWnGArrSC|;D)W(+*pU!
z+Y3ceQ1%%vRd{w}l#vKpK;t1z<3H&KeoqLv*w-#dyz{G<-h@Jg=yy}$ZbV9pP=Lib
l4@!U=k)1Ui2Lg5A4=97+Rjf<`6951J07*qoM6LruV1hLLJPH5+

delta 621
zcmV-z0+RjK47m)j*aLq|Nkl<ZSPAV_OHWfl6#i~&gm8I3?7~+RE-kc01C*Uq-LU9_
zsvG$O$O<*`Gk6G80`f-`Gy%d&O>{+Tx&gwC79$}-lkN`pjGa={YdUb-4ZX?q%-o)t
z?=ffQ0_EqtJD`=q0HZxfjN^8@k%)gO38v7+z`l;#w7IoI%kO{JsomQph~$gDkUwy;
z&%o0&Gw^v^G5YKU?%%r$qQCH+ggjo$>$^p7mR5xF=)=bpn_DEg4aZr(d#*oUoORsk
z@21(<ER41rc=~({;c!1PnG7_o1Y6I0{C0UYr+jL9jwYsJw(8F+_QZUDpof;;t<l!D
zNrRT{49?AK)xv*?#9|DBT_LN=*M#ztgR^qBos~x)4GGngFJBc$c};CSag#0vg1tH0
zCAg~X%BR3E3@`~k=i?LOXuWwI0|OC+`|k)|^YgFqRpGW%B5?3)UrQ#FU=pUei9{lf
zNMsOCMur9W!os2wxO7rEUcPdTqR|IpJNTmEqjuVASH6E80xlOdS5+Zd--y0YZ|1|t
zPn9*bO-O8fR$hyhD}4+6nkK-T8yY}+Kf&N0j|Zt#O4&s@p<n_X0JZ2kcGGDw_lFhD
zbedHYli+CXY%9A^5P?o>@k`a!VCDSm9v)%?5MWu*+|d*X3P1m4%*9sm{Tr@UTm&m_
zu}Cm@JPT#6fMc8bPX`z{Yby@+_n_C+iLY78VQ^bk-8~^<5}d&OHeDCZc7oG?NN~As
zJ|X$esc3r>N)j@jrosy$X<LL6Sf2A@5h#RYIj8JEQ5`q}rC9?$B2#SJ00000NkvXX
Hu0mjf9NsC=


From 3b3163c4f46d25790a207d2d8772b48b10841fd5 Mon Sep 17 00:00:00 2001
From: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Date: Fri, 14 Jun 2024 12:15:42 +0100
Subject: [PATCH 469/568] SS-28662 Add cvars to support forcing people to
 departures and making those at departures invincible (#28765)

* SS-28662 Add cvar to force spawn everyone at departures

This cvar means everyone must spawn at departures. This
could be handy for an admin event? But mostly it's so the
tutorial departures terminal can be seen by all newbies on
gateway servers.

* Small fix to ArrivalsSystem flow

* Remove incorrect todo

* Add godmode arrivals cvar
---
 .../Shuttles/Systems/ArrivalsSystem.cs        | 73 ++++++++++++-------
 .../Station/Systems/StationSpawningSystem.cs  | 12 ++-
 Content.Shared/CCVar/CCVars.cs                | 12 +++
 3 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index eb1f9796b27a..47ccc3c3c41d 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -15,6 +15,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.Damage.Components;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
@@ -63,6 +64,16 @@ public sealed class ArrivalsSystem : EntitySystem
     /// </summary>
     public bool Enabled { get; private set; }
 
+    /// <summary>
+    /// Flags if all players must arrive via the Arrivals system, or if they can spawn in other ways.
+    /// </summary>
+    public bool Forced { get; private set; }
+
+    /// <summary>
+    /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal.
+    /// </summary>
+    public bool ArrivalsGodmode { get; private set; }
+
     /// <summary>
     ///     The first arrival is a little early, to save everyone 10s
     /// </summary>
@@ -94,7 +105,12 @@ public override void Initialize()
 
         // Don't invoke immediately as it will get set in the natural course of things.
         Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles);
-        Subs.CVar(_cfgManager, CCVars.ArrivalsShuttles, SetArrivals);
+        Forced = _cfgManager.GetCVar(CCVars.ForceArrivals);
+        ArrivalsGodmode = _cfgManager.GetCVar(CCVars.GodmodeArrivals);
+
+        _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
+        _cfgManager.OnValueChanged(CCVars.ForceArrivals, b => Forced = b);
+        _cfgManager.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b);
 
         // Command so admins can set these for funsies
         _console.RegisterCommand("arrivals", ArrivalsCommand, ArrivalsCompletion);
@@ -250,6 +266,9 @@ private void OnArrivalsFTL(EntityUid shuttleUid, ArrivalsShuttleComponent compon
             // The player has successfully left arrivals and is also not on the shuttle. Remove their warp coupon.
             RemCompDeferred<PendingClockInComponent>(pUid);
             RemCompDeferred<AutoOrientComponent>(pUid);
+
+            if (ArrivalsGodmode)
+                RemCompDeferred<GodmodeComponent>(pUid);
         }
     }
 
@@ -309,7 +328,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
             return;
 
         // Only works on latejoin even if enabled.
-        if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound)
+        if (!Enabled || !Forced && _ticker.RunLevel != GameRunLevel.InRound)
             return;
 
         if (!HasComp<StationArrivalsComponent>(ev.Station))
@@ -317,33 +336,37 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
 
         TryGetArrivals(out var arrivals);
 
-        if (TryComp(arrivals, out TransformComponent? arrivalsXform))
-        {
-            var mapId = arrivalsXform.MapID;
+        if (!TryComp(arrivals, out TransformComponent? arrivalsXform))
+            return;
 
-            var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
-            var possiblePositions = new List<EntityCoordinates>();
-            while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
-            {
-                if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId)
-                    continue;
+        var mapId = arrivalsXform.MapID;
 
-                possiblePositions.Add(xform.Coordinates);
-            }
+        var points = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
+        var possiblePositions = new List<EntityCoordinates>();
+        while (points.MoveNext(out var uid, out var spawnPoint, out var xform))
+        {
+            if (spawnPoint.SpawnType != SpawnPointType.LateJoin || xform.MapID != mapId)
+                continue;
 
-            if (possiblePositions.Count > 0)
-            {
-                var spawnLoc = _random.Pick(possiblePositions);
-                ev.SpawnResult = _stationSpawning.SpawnPlayerMob(
-                    spawnLoc,
-                    ev.Job,
-                    ev.HumanoidCharacterProfile,
-                    ev.Station);
-
-                EnsureComp<PendingClockInComponent>(ev.SpawnResult.Value);
-                EnsureComp<AutoOrientComponent>(ev.SpawnResult.Value);
-            }
+            possiblePositions.Add(xform.Coordinates);
         }
+
+        if (possiblePositions.Count <= 0)
+            return;
+
+        var spawnLoc = _random.Pick(possiblePositions);
+        ev.SpawnResult = _stationSpawning.SpawnPlayerMob(
+            spawnLoc,
+            ev.Job,
+            ev.HumanoidCharacterProfile,
+            ev.Station);
+
+        EnsureComp<PendingClockInComponent>(ev.SpawnResult.Value);
+        EnsureComp<AutoOrientComponent>(ev.SpawnResult.Value);
+
+        // If you're forced to spawn, you're invincible until you leave wherever you were forced to spawn.
+        if (ArrivalsGodmode)
+            EnsureComp<GodmodeComponent>(ev.SpawnResult.Value);
     }
 
     private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, TransformComponent? transform = null)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index b91082ff2616..d30c9fc111d4 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -65,7 +65,15 @@ public override void Initialize()
         _spawnerCallbacks = new Dictionary<SpawnPriorityPreference, Action<PlayerSpawningEvent>>()
         {
             { SpawnPriorityPreference.Arrivals, _arrivalsSystem.HandlePlayerSpawning },
-            { SpawnPriorityPreference.Cryosleep, _containerSpawnPointSystem.HandlePlayerSpawning }
+            {
+                SpawnPriorityPreference.Cryosleep, ev =>
+                {
+                    if (_arrivalsSystem.Forced)
+                        _arrivalsSystem.HandlePlayerSpawning(ev);
+                    else
+                        _containerSpawnPointSystem.HandlePlayerSpawning(ev);
+                }
+            }
         };
     }
 
@@ -308,4 +316,4 @@ public PlayerSpawningEvent(JobComponent? job, HumanoidCharacterProfile? humanoid
         HumanoidCharacterProfile = humanoidCharacterProfile;
         Station = station;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index f3025f326aa8..e3f0f6543873 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1425,6 +1425,18 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> ArrivalsReturns =
             CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Should all players be forced to spawn at departures, even on roundstart, even if their loadout says they spawn in cryo?
+        /// </summary>
+        public static readonly CVarDef<bool> ForceArrivals =
+            CVarDef.Create("shuttle.force_arrivals", false, CVar.SERVERONLY);
+
+        /// <summary>
+        /// Should all players who spawn at arrivals have godmode until they leave the map?
+        /// </summary>
+        public static readonly CVarDef<bool> GodmodeArrivals =
+            CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY);
+
         /// <summary>
         /// Whether to automatically spawn escape shuttles.
         /// </summary>

From 24e7653c984da133283457da2089e629161a7ff2 Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 14 Jun 2024 08:45:01 -0500
Subject: [PATCH 470/568] Resprite rodent inhands + add hamlet inhands (#28955)

* Resprite rodent inhands + add hamlet inhands

* Small ham adjustment
---
 .../Animals/hamster.rsi/0-inhand-left.png     | Bin 15202 -> 0 bytes
 .../Animals/hamster.rsi/0-inhand-right.png    | Bin 15185 -> 0 bytes
 .../Mobs/Animals/hamster.rsi/icon-0.png       | Bin 18686 -> 751 bytes
 .../Mobs/Animals/hamster.rsi/inhand-left.png  | Bin 0 -> 903 bytes
 .../Mobs/Animals/hamster.rsi/inhand-right.png | Bin 0 -> 906 bytes
 .../Mobs/Animals/hamster.rsi/meta.json        |   6 +++---
 .../Mobs/Animals/mouse.rsi/0-inhand-left.png  | Bin 482 -> 807 bytes
 .../Mobs/Animals/mouse.rsi/0-inhand-right.png | Bin 492 -> 792 bytes
 .../Mobs/Animals/mouse.rsi/1-inhand-left.png  | Bin 508 -> 805 bytes
 .../Mobs/Animals/mouse.rsi/1-inhand-right.png | Bin 510 -> 811 bytes
 .../Mobs/Animals/mouse.rsi/2-inhand-left.png  | Bin 491 -> 805 bytes
 .../Mobs/Animals/mouse.rsi/2-inhand-right.png | Bin 499 -> 801 bytes
 .../Textures/Mobs/Animals/mouse.rsi/meta.json |   2 +-
 .../Mobs/Pets/hamlet.rsi/inhand-left.png      | Bin 0 -> 897 bytes
 .../Mobs/Pets/hamlet.rsi/inhand-right.png     | Bin 0 -> 898 bytes
 .../Textures/Mobs/Pets/hamlet.rsi/meta.json   |  10 +++++++++-
 16 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png
 delete mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png
 create mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png b/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-left.png
deleted file mode 100644
index c8a6e78f16aff80ab8f662c08b691bea1475969a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15202
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
F-9PT<q*DL@

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png b/Resources/Textures/Mobs/Animals/hamster.rsi/0-inhand-right.png
deleted file mode 100644
index 18e5157f8486f443a86ab2c0acdb9ce86c3ca5aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15185
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

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/icon-0.png
index de09d6311da69d5aecdb2ba7213ba49a66a7effe..5c5c8a891b3c8bc945caefbeb740a3600ab24de9 100644
GIT binary patch
delta 714
zcmV;*0yX{qkpb@okRyKqZfQe9P-$ah001bFb&<VGLQxpTe`;lv;ZRUSgo8yxLKH+}
z802CNYLL~U*RQ~j%e_iSYtYglG(;_Z4gCkT2CW4_Py`W;&3!E)xA$bAgr3W}?~mu4
z=jFZ61$!{7<;=EO$mNShDB$-jM^`+~S2}2?pJD7V&D0md^AUequCIG+s^0ljuh#dP
zuI@zA)WFs$Jgw<QQCOxSxKY#<?+Ev4nOH*jNO;_k0fn!X9<T9>;&hEa6dRGy9N1M)
zPr8BQ4XkC1obZ^iH<vAGfAgp>aV7IhVX1?%hcF2dz>kMGCDzGO#3wZ`nKk!K{Q4Ft
zh)0vRP8mZSX)=G}9T&AEU6WE%q9^6aQdYVD&(lmzP1d@*{LubvS??p@+=Xhzvc8Wk
zt9k;CC%DYl{RPQs=2P@aUGpA-dkfC5>RNmcF1BIdQI8q1U&$fco=U;n8T3S<_ZGTV
zYgzrBbNT?0P5DJPuzvufa^Jo71K_G>`;hGe`2YX_32>1n5`O_FNkl<ZSVv=E7zLvt
zFd71*AuyCepw5xyKL}%UGd?-0_z`5m|C|5+-`{c{!x11kkT^&lmjiJ*f`wSu-F?r%
z@Zk0XhMF2x1{Z}t4ABONkWl3R0~T*-xy=AlM>7Dj6y(Eyx0e2&AHV>|AU;SO*-=z?
z1js^|<v_#1j(>n*7#}1LQb&sAOvEa_|B;2EVdg@xa-hXvdjC2J6h25Eq>dCov;#o#
z{PM*!xY_%UoMvzgdcgpqVE`l#Qb!74BvvsfenE-Pqo|ufTtW&%8_4n<eWeV09<VSh
zz3_)<bBR_6vJvD6WkCi8``8=|2OL~H1)Kv&v7A`XgFn^%|Nox>l+X8e>;+*69|?oR
wLGnOMlDVUbM?+vV1V%$(Gz3ONV8BBF0G4m8FQ?~THvj+t07*qoM6N<$f~p8i8UO$Q

literal 18686
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
G-TXhb9IChg

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ea3a332cc79753527407a5680360a62f7471f37
GIT binary patch
literal 903
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d#Mb`Ho)PG(@xm{>Y-xA)-y
zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW}
z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{
z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef
zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2
z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+
zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ
z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcB<w@P?
zJL)D^GL*!Q2Z#ZKpR>RtvY3H^TL^?1FWs&C1B{G=o-U3d6>)EG?e_x4!|{*7ott-b
zWPfC>Vg1NDC&p#fTp5>=qTts{{FL~1Z4o*7NTF%n*7XlodCxz%^Juoehu%iF6Z02q
z)G#aFne^w}+2!V!ZIxs=6dD+qkcj}d2ML-5Rm<j|{k7KTo4>tqglI-A@6vto#m(Ct
zUKuOjw2(dZ@Y)v78maF)>{rcfiE2MGx#a!&h3i`MwHM{=-FoyuY1onZR(i9ie!Vlr
zb%x)E7rV3{PoMtpZcWM6jsN0I>l4FV!b2bH^sKYmW^-oR<bTHI+hgswf4$n)a{lV{
z)z8ezx7FtTesoFYx{%?iBK>n;Z|(kfWuxmvmGn7pUq?Kd)QIX_G}i;US6S6&tFBV7
zn=fFV)Uo+y*BZOfxfAj-qH=ou&$-1LS(Yk?WoN9t&vIT>WdEMmbHDhMb*Oh|<z4ES
zXyUK(UF4`i=7bYL7u7gtR-a%E`?1Wze3hY{+54m4Ei<b9dM0aMTjQt{>pOjU-}Kqf
zm;HSC{?E$I&%?ua^{s2LzwJKdwZ3M-<p+fyUJ7r{I;CO2n&-;E$RgkXB7SUVlDF{L
V$=+4(%nOWR22WQ%mvv4FO#oSVpojnf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/hamster.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..9494fc10a0ed95e36084cf1489436a92c29c32b6
GIT binary patch
literal 906
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d#Mb`Ho)PG(@xm{>Y-xA)-y
zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW}
z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{
z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef
zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2
z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+
zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ
z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcB<w@P?
zJL)D^GL*!Q2Z#ZKpR>RtvY3H^TL^?1FWs&C1B{F#o-U3d6>)EG83N-$;K0Z3Batyj
zw*Fv^xf9bBf8eC+l3OPokDT>gJ=v<$;zf|=Ek}0265ZH4F)^ht(+lzppUL@FXqf0v
zx*qn&o<sHR(|4avm!1+%RBT{i;!r>$8gw^=^C{bI+V}f(R$|y^cJWxvw`_sWm8V<^
z@xRu;d((c)nWZ;9>bA>YOWZ9ka>>O$^UKeBS3G|h3bu-9Dx7>(BN40XUG-w8_pMGx
z$5|W7Zcg~|Y-z21w%ym5{pFr^XJ+io6r6kMl;`D|S36Iik`bP|XJ7V`o!7#&F4gE}
z?1`}|>A7gP`gU|?$=^43R-SJZUT`xnZ}+9TI!}IE`QumLYisE1y>R9|w$=ZA+1g)y
z-=#zx7#LXua1uYtneLnW|6q|w(_Q}iLffM4C-(IB-#=bi8@tYQ%e51NZ`dZC<=8mw
zrp-mGtV+ih&rL7*`KzS|JbV37W&XV-c@sUa9c!MkmvvX>p*1s)&si#a`0<`h-s9e%
zT2k{SY?%C#<wkY>n~U+Q<~=(#b@|C9edndl{e4k?k?);N>7Jft#m+2Bh@kzT-KcLc
XX;E~+8{;>?NM`VK^>bP0l+XkK57DMt

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
index 85616627ceca..4a59c01d0963 100644
--- a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord)",
+  "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord), inhands resprited by Vermidia.",
   "size": {
     "x": 32,
     "y": 32
@@ -59,11 +59,11 @@
       "name": "splat-0"
     },
     {
-      "name": "0-inhand-left",
+      "name": "inhand-left",
       "directions": 4
     },
     {
-      "name": "0-inhand-right",
+      "name": "inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png b/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-left.png
index 4e5244ab3a66091c99b8e85fd8f25807670d93a0..63b009dffdd33dc751169ec6169978d8cfdef085 100644
GIT binary patch
delta 784
zcmaFFyqs-<N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8}
zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRT<FmRsmCuWw
z^Hdy;R8BYdanySsF)<(@IwI!MtoY1HymNVu^WL7*d+x}J-TUg_eOysxzNqTz{_pRz
zyj60UZFCO_w`E!$GU9z$dOT#0?w#b6N1P9pA2z5mbH!`NuK&>esHD|iBzofslZsG(
z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va
zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42
zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(<
zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7<o?pT{l(!QEd93=g&7?U|?Y2Ebxddu4iE2
z76M_$OLy!3FfcGCdb&7<RK&f#W$1m_LE_lQaO=`ygG>Dj<duH%+?1JPy<2qF%5`~@
zPVz4hFe)iOrF8Tx&(fL3tb!%QoJaOGHn7Q_ik;;2pZ#fu;`!q5-Y<#-6BQa5m^e@g
zcC~_(;{D~DS7+51RVn2^F1GxAYDvZaDX(v{ua-5tzB=-_8FT69*~imA+N_`Vb@xk-
z!yCLVZ@F~SWcBpdi#1k>ui4z|be5}W!MQCHub-2+$)|g|$S`hw%Fj<)k<;$ZcqZ<;
zu|UTCk;OgB^QEyTKi?_gJRG;ay#9vhg+6qr)T2ACp7Vt@Q|+l4-y&=69nAlI+%j!l
z-=^CeZY{30KfdnnHHJwlf`4PqJpWqtZu#`NcAUO-m#-`2^gl_xAe?&tyY=0Q-<mhR
z{r$D_rM$?(^Zy(E@8Xk7kk4bvc3@y+5dab2q8><Ft|*c_^ZevpP$V#Ty85}Sb4q9e
E0DDwuPXGV_

delta 456
zcmV;(0XP1q2I2#dB!8(%L_t(|obA~$OT$1M1@L#`;?{#=N+39@Q#XeWq0<d^mK&TM
z96S02T)PMk&i3dBs6(bMf@>&Z`~t;_P=|u!IayQ`ZPV~K_WhPjcX@dnH{=fx5fKp)
z5fRa<QF%8Q3<gVx@lmJK@nIOkTB~}!o*#`yXt&#6W^Fc`xqsfZo@@0t(yI$!t5)#1
zv4hQ*3=dDwsP7;By6i9v5k(P(!=aC&sECL&Yej5Yt5$H=y+$0zxa(e{R;|pn-dd|#
ztrp@q#&kM`wKn%j{Z1h#AlN%l*or*>?4Fz;2!gpkAj>kOX^MKijwDIEF{Y3b3ONA)
z;GDzF*(scJ3xBUS#;CXFlH<+%$xCn^c`w1jPC!|(0O<hISb%f@X)HiGfHW2$9YEU3
z7eGWrL_|bHM60K;ncK2_9=)Yk7ykXI{ing{PouL^{Sney`$=+(@p$aD)?RDvjWH@o
z62Iu4r77V4@_aUK2Y`ORk1We_kIqX|!1m#>noK6jIYEaY2vnodSjy<Uba%kK{?#2&
y1QsA2KpG2>4j_#MNC%L{0;B^-V*%0uq`d+?%XUJn*L<n~0000<MNUMnLSTY&gVc%u

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-right.png b/Resources/Textures/Mobs/Animals/mouse.rsi/0-inhand-right.png
index 54edb0052838bd9a029d20be315106a111120d13..22f53f89a12125c16031e077bfaba42533341a93 100644
GIT binary patch
delta 768
zcmaFEJcDh5N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8}
zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRT<FmRsmCuWw
z^Hdy;R8BYdanySsF)<(@IwI!MtoY1HymNVu^WL7*d+x}J-TUg_eOysxzNqTz{_pRz
zyj60UZFCO_w`E!$GU9z$dOT#0?w#b6N1P9pA2z5mbH!`NuK&>esHD|iBzofslZsG(
z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va
zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42
zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(<
zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7<o?pT{l(!QEd93=g&7?U|?Y2Ebxddu4iE2
z76M_$OLy!3FfcF%dAc};RK&f#wb$!#fXIQ5i$#{qcGj+CncaTk-L$pN&(GyKZB8lI
zo>{}dTgkLAc$%F<+a;T(6$#rfX;v{w&Po#ca4+cOf4%A6dFPI=zw74`!J*K=z=T3L
z9B0vc^()rK=kvt}^-=eJZ!g+>`pMg3?eG2Px4!>lzW?;Drma8Ep7x5lu3Kh1|2NlR
z1OLk=*YA3)EtC;wEHxLpP$aPS>i55ko|&zz@}0g&W76)2Q}@)pnZ0h_(a#DTM+#*w
z?w#yi|JTpV?=p(LXwCp~BSb1Myl2;Gv**fHj(_`|@haCU<>%|4M&0UL_@8TOrOEu4
zSEU@5uZx@}`$Ycy^P@jA%{Kn>*LXbrr;oD9F>UvA^PbC^{3_0?x&EXzt8Vhf`rfH3
qod(7BoTi=v4h)PeV8T!918-?+5{u&h?+bvT&fw|l=d#Wzp$Pzyv|io-

delta 466
zcmbQi_J(<aO8sU}7srr_Id5;-dmna?VEgd=$kDazN2fRxge=eFlXY4y{YJ;!!rG$j
zjd;OZB@2t!7x^#n&D<pt<1F}CTqCT-N<`+o<1UX^^RIol_3fu_>x33{|32wYVhT!N
zu*i4uufP9-%vW50T`!apSo!nz+im=Z1+GP1eOdA+!^CNG{mqcd>-o=ReX6hT3(|X7
z`J7>QzT~{PxIkOG(|Zrri?k^&(l}IL@g-2Cw(?!ry@OsmTiS0kKC(D=_$|ZKqLm$U
zS~p%><+ixdqR()yU*g)izdsd)I~0^G+8|!dV3D&`faTz+J%4BFoSv{ubJbO?Nh%+Y
z&A5|(B9@Wi!JNZ)pR&%WFFv|dXF@UGF$vS(bIb2V<u&a$EN9K(5>t?Mkm8=er_jsl
z!9L*_(-LNn+dr5(ARyy&jrEs5Szo?XzL@cC-QVYiyS}`5W6fPJILmg=wOiS1|5n(1
zoBTvBD*OL*#_nwejK?IVs&t;;#B(=K{J?PySq8cMbz#d|mhR&`cg*|z)+k?A#|3kW
zXZWaP{r^&v`p<vE6}b<>*}K`-aAR>rGUFx2C3~6oq*NX14Cypy00K`}KbLh*2~7a8
C$lL<}

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png b/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-left.png
index 634ba7254cb1e0bfb1541839d5dc1c8794b78284..55d5e5f39cdbd5baee38aa1fa5e109cc8c979c88 100644
GIT binary patch
delta 782
zcmeyvyp(N%N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8}
zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRT<FmRsmCuWw
z^Hdy;R8BYdanySsF)<(@IwI!MtoY1HymNVu^WL7*d+x}J-TUg_eOysxzNqTz{_pRz
zyj60UZFCO_w`E!$GU9z$dOT#0?w#b6N1P9pA2z5mbH!`NuK&>esHD|iBzofslZsG(
z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va
zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42
zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(<
zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7<o?pT{l(!QEd93=g&7?U|?Y2Ebxddu4iE2
z76M_$OLy!3FfcI2d%8G=RK&f#W$W#fD01Lqvh#&&0!0UxZV!~XBlYf*c?Vnjv}wmO
zieCu3%x-R;Z1JM}f~w4%rZxv2tqe{VroU|A=Uds0n0DSNUVrNE{HF!?&sm=DPp@9b
z(a6BWq0oRrr1&V*r|-NM^;PQw-?!9HAC-Py-qcf{R`mUb+1o_R_1A7~)LGFjU&<C_
z_3hA_>xGL;tHr*^>oJ`z%>Mg*ucpJ&sPnQvs}tqVR>_vXINYRu_j&onIW9ApUNrb0
z?%Y%RuI;AMti9Ja^qdaN`n6B~>DRM0-~VlzapKzjGgpm7p^m9Xa}u0;TY15MjwP14
zcj}%kKYaOKz!w{PUY56u|JJ!*x%Z6W-T#JTzN&#N;rG85bHv|Ij(pwu>FZC=Mcn^)
zZx;JIEpO+)Y*&xu-|JsZtZWE%uyJQ#WD#%x5=Qz4?85DSrz?~n=L4gF!IRz9&t;uc
GLK6VD#cAFE

delta 482
zcmZ3=_J?_bO8sF^7srr_Id5<6_hw3zVf*mB*F%cu;Nf#pzZ@^5I680P@Z(#1F{#*j
zfr+_^b-R;u@jq6@7mK_FI2v0*LPDHX!$eF>_VNB*uxQttcTaCW{2ZBA^?qJ;MP>VM
zIR_UAnCrH4ujAIJuL{T9pT<PFA9g$v6uC7#;$rxAevkUJPw{EKDnje#U45JN)%?{_
z-rQ)#Eq&#JlCzyYKa-ohxqH8!wG`hXeTJC)wXgOuG!$HL@nLY7-Z}eL7{~9{T%Vp>
zH}rE3Z*$6B+rM;ER>cLkBby2;el|pCy{=kbcie;V@8!=~D)+b<Bs#w@s;}DjR@`ED
z#-b4GLq8k@fR3rIm;2N@k%?i!rHqFUmatECdwu@(<e7V__EyQfKfB+C<@UpG0w&v-
z|1`0BuunL~w1n9sneh_il8p>687^7vV^D&CS2oAe^5TBlRIL^_|MEMq+H(3e`?Gv=
z-O}Cu@f*0lUGsAHC(U#6;a@&1;AQYg`*dn$%lseDCf|7YY!_SfyyI^f0#?aBe6#4~
z4(2&OmNk5ARb84sEp+L{Ll<JgDow4v-<7<ex7_%Ex%B}NF$Gx%Deeh;3caZAv1Od`
Wy0lVRz+Qj>2s~Z=T-G@yGywoSVc`A%

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png b/Resources/Textures/Mobs/Animals/mouse.rsi/1-inhand-right.png
index 2af0144edb4326ba5a4131b3a63ac0879899edc0..44386b1d5fb515ebf1a39a4d587bbfa97fd33963 100644
GIT binary patch
delta 788
zcmeyzyqax-N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8}
zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRT<FmRsmCuWw
z^Hdy;R8BYdanySsF)<(@IwI!MtoY1HymNVu^WL7*d+x}J-TUg_eOysxzNqTz{_pRz
zyj60UZFCO_w`E!$GU9z$dOT#0?w#b6N1P9pA2z5mbH!`NuK&>esHD|iBzofslZsG(
z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va
zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42
zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(<
zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7<o?pT{l(!QEd93=g&7?U|?Y2Ebxddu4iE2
z76M_$OLy!3FfcHtdb&7<RK&f#wbzT;QQ*MG&ejR%oSqyw);}dFF@54ObAfIVGqY(2
z^<3vE+=z^b=xp8BeEo?|5Ni;Jqa*8V2acwF2UUwVOklZlJL&zGN&ig_%T*iiwqG|}
zSW&=%fsqA;XjB!h*SPtv`l>~5^H)>Jz28$77bzTGFTZogp6&aBP4<i4Zv6U5pI`Ro
zea=a1UjLUX|9bex%2Ju^GRxJX3$E?Z%MCy6DSLKTndYzQ)!WRNE8pzvOq;%eDWkEh
zUS+-fYEM0<J8kDr8v5!Tnz?u0#>!34zr3u@^)f_uL_LP17+J((9RACn_}mrw#d|KF
ze|*66cb8wk-=P2b{3fQ0cDK%#TQI-4^0nAt&ddCNvO6r-r~Xo%@oU-q{FW<KX-{g(
zwpbTmJZbeccE0qp-@n)V&0ed~)iSeM?}~{d-1{d&6L_Lp0zy=IPV&A6#sq_>tDnm{
Hr-UW|+X7^7

delta 484
zcmV<A0UQ3S2L1z(B!9(8L_t(|obB4bO9EjW2Jq*NNE{T&!>$_oLC|DDgR}%r4z1B*
zb3>psH#9qoLW6Vu1tD~cLIgn&L`X#iEtOnFfkWfl5JJRVT6TQ3dp?VBydICw9q;gd
z1&D}<h=_=Y$Zu4wR_p2p$z<|Rg8Y_KeyfntqtOuJ>6|(%Z-42B=O$9wqH_BFpwq?E
zN=chW1org_VlxY9JiTImdEM~_y=XKVLO1|C?rrOE06;Y4x^}?nqG?2MUOvR!w2AZb
zAxtCUQB-fl(>XOcZX#wFxV&#7p3b>GJjVh?602%zDF^_VS_)z$vD!CJzvcF>f&Jqv
z%#MX%6*AgwoquBi08p*lxVRZYwQhTp&|}rQja0U%TAyy~{^ch46RvN7U$6k_0Mb~1
zbO32AKstal79br!n(qrBA|fIpA|fLHX*=}%ZuDdoGWzq}?X*(TU&rXuqqBA#{~yqa
z){j?5c@2C_V_y#5poa5WFK+hDH2K#@VySFVS%r*lja{LEk5M`RT<-3;j-z``S7(Bs
z$IlZhIaRIO(2JXDc5S0?-hi(5fKK%K9^m^^VHO}AKpG2>4j_#MNC%L{0;B^-V*%0u
aq`d=JlzS#A%(b-u0000<MNUMnLSTaF_Ttk3

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-left.png b/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-left.png
index d7dd6672041e6ec4d060594161eacaa84c227b8c..68da6f38d7bcda1cac24c5b52dc815654b1fc3ee 100644
GIT binary patch
delta 782
zcmaFOyp(N%N_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8}
zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRT<FmRsmCuWw
z^Hdy;R8BYdanySsF)<(@IwI!MtoY1HymNVu^WL7*d+x}J-TUg_eOysxzNqTz{_pRz
zyj60UZFCO_w`E!$GU9z$dOT#0?w#b6N1P9pA2z5mbH!`NuK&>esHD|iBzofslZsG(
z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va
zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42
zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(<
zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7<o?pT{l(!QEd93=g&7?U|?Y2Ebxddu4iE2
z76M_$OLy!3FfcI2d%8G=RK&f#wcqQogUo@C@!ic6mNqr(D?GXrxJmSRPOFu5N)cx*
zhdDc^U4xxVVd)9x4v|fzg$6F|4bgkzA2@85-MQsxP5#e`1wa4(OxYuxsMx^3#G!yf
zFbhlkobx@eGIV~ujDO13f74EHcCP&YW6JE??(0o!zOCNLSEF|2;r)4WPcqDmKSrJt
z7oU6icwr2?qe5t?=d5M-43E#X{xdaU-yZqgWtX4zy4Aj$72ke-laI-_jeD3fnq31=
zyu7}w(=Ke@b6+Xx*rK+?7n^GBzt2*9_4iHBIspd;Miv-Rk6^-B65AT?3Eo)dusd#&
zir>?{^ZBN)4mb48VRd|+vG-chs<*NS?(tXbm}hPJ=*#UhX|wNN+kAg|s;0GVVBew@
z*ALzfSaxrI__lw3f-(Qo<bSjCUtrg=6ogvYSg-nlnK>osvy_PFZ(tNKc(S|txvX<a
GXaWGG0ARrY

delta 465
zcmV;?0WSWf2I~WmB!99=L_t(|obB2_OT$1I2Jq)Zf)IxW4(u1O9UThJogAdAlicXw
z)_#CY`2Zaq9D_pl;vf!P96AaW5xRA8=n>uA&cQ#ZsIex;Yv}V^GF|fI;kY4h03sqH
zA|fIpS~jZa4Mw9;2{AtE_xnz34P%T-)6~u9bM$(>FSEAW?SDegS}nBt8&_w?uC8l1
zzkS3`a}9U%du;6<{JLzdHG&|(U@&k&5I}3~BPIY~#m7zSx`vz6OGHtGo6}3wb#0;b
z#uycbA;K`kWHNy<rtnVvj+X*9w)fPm)dB#_S}kmB?=AcSS(afu9;4A{AdX{KddL@E
z3IG6WEjAx!uz%M6d3};3>h)T3yf^>y5L`sjL(tm}s0tP!9Y7ijkPaY?1xN>w#sZ`R
zNL%^>h=_=Yh=_=2`FNYTmF4s3?dt5<y&tv5aqNDY9p;VBy!;>F%Wyb!>lfEZZR(;Z
z0stgQqVh`kNo78X-JTpd;Cb8*0MqFdS(fGQfIO8cph~%as5+gFvev>Fqq^O0DWmhs
zodJu=I|C}S1AJit(gCEg0O<hISb%f@X)HiGfHW2$9YER>xA1wqlzq@X00000NkvXX
Hu0mjf0m|Bb

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png b/Resources/Textures/Mobs/Animals/mouse.rsi/2-inhand-right.png
index 23b4e08a3ec4f7a33c7f6f4ef5f31d1e04abf693..0cdf92945956755f84208b5caaccdc83072ab636 100644
GIT binary patch
delta 778
zcmey&ypU~zN_|eIvvWXZaxw#h#>CQzmfp;PBCY#X@^*+tbwv0Gx+*qlbS!l-@ZI8}
zw8M1fNi~(i88a0QhHcm=pyMLF{ZRdawF#>gIJy*)GT&bFka+Li!eaRT<FmRsmCuWw
z^Hdy;R8BYdanySsF)<(@IwI!MtoY1HymNVu^WL7*d+x}J-TUg_eOysxzNqTz{_pRz
zyj60UZFCO_w`E!$GU9z$dOT#0?w#b6N1P9pA2z5mbH!`NuK&>esHD|iBzofslZsG(
z-PprbywZ}|>NYBG&Zlx8dvEi~`_|;2KUZ9_v;2F*g+tKAdHDgYNEx>!&r~=6uU(va
zUncvJ;giguBSP-8dMcO~)r&334$AWSvgD19>(t-(ZQfq_5wWzoT0m-k?DtxRS>+42
zJl=Kx__}B-#{0rC&sP64J(>9__{-c?&+J>)`C9B>mGw(5CdcvpV#)1~QctQMpY3(<
zwq%Kp(|6r1df}UX)t-OJe8lXD_}v5l7<o?pT{l(!QEd93=g&7?U|?Y2Ebxddu4iE2
z76M_$OLy!3FfcGid%8G=RK&f#wbAQvfXK0r!G!{wG%S8F1zD9($vJ8neej&D(ash-
z7jt&bT87$=N3SNZ3kYs1Ei_mn%aoVtr;uQEr(_2w@4xp&9v<g*-d}$=&n1FGp@D%3
zg*ad@EHUGgoo-tF&$C~buGwGrw5~$&zI}9M%sz?xFK6H1nR!_1-{-Hf>(nMM+IRBB
z!*@?U|J*m<x=%TBnx{ltul==|nioqx+T7?l{!}^Y>#r-UCN(0ii@wfCWx2rSIqAgP
zyx?ngYb^Rs=Vq10Zs(8Qw)?nJN#1tly8;djj4a4RJsRI(zx<1!g}s%%%MaHxvpEKE
z&sk^x<U?Gvf|dL8n{n>UFIHyHTDJA))$Poye{Q*2?{szltaRyx8{<o#ys3=S%_zM4
xW8GPHzUQ~!<i0sNvpW3>j}zR27d{F66Vie{KmB081Q`4bp00i_>zJJqngIXGU~>Qf

delta 473
zcmV;~0Ve*T2J-`uB!9X|L_t(|obB2_OT$1I2Jq)Zf{>+!gLZMW9UThJog5@<C%MtV
zt^EKu<pXqd=vWlG2M4Dv4jmkXiU{4hIP{2aPM$+4h$Q~2<!#OLTMFSCo<0dT+*^Q%
zh=_=Yh=__t4Tr;}ZqRHt|0Kw7W##X7yIyMzV~pze`+hc?p?}lqsI2dAXI;F#?D?uL
z;p*W9hxHvi&YrM;bdq_4b)>aM5Cj+u20jP^XsvVCZe?Ap>JsiRu2C+Raer}*sxGZ6
z>q;17R2YT`!w}=~7{-{~hnHDE<)EdejRpW<+GwD1(At=%zmTRWMxzmGwHmCoK5t!S
z0RZ5f!`|~0&VRYpBwR7)9O5`ui_g4u|8f)jiQG4!C|H1W0BI~hI)F45ARRy&3y=;V
zt?&g95fKp)5fM@Gd^z;|Z1iNU_3!6yx0gNtaf~iKI{QlI{{y~b@#B*u@xXi<yL)qo
z<Tde86m85j`PWBcaU3gatxwYwlgR|Ye3T9V59epO<5K8#v(%a3V*K20x0NwQIp+{X
zk*Xh`Zp<67)E@91>%IpR{#2L+NC%L{0;B^-V*%0uq_F_$0Mb~1bO32@|J;Cv9p!-j
P00000NkvXXu0mjfR=?p6

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
index 8fcbe50997a3..87c0bd4d3477 100644
--- a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298, modified by Vermidia.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea3393a679986d564e1902dab4e6c73f06615a7f
GIT binary patch
literal 897
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d#Mb`Ho)PG(@xm{>Y-xA)-y
zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW}
z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{
z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef
zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2
z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+
zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ
z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcB<w@P?
zJL)D^GL*!Q2Z#ZKpR>RtvY3H^TL^?1FWs&C1B{H_o-U3d6>)EGZS(@g!$)CGi>~e+
zUHT6mJqx-!C#FPD^IGT;^@0~Fey(%07s<W~V2Sk>Hy00&HTuEgC#e%x?Ua8Z$RO9R
z>5#p^A>NbadG$L>cDlDPGqMOcFd!4l1T9v!_?>_MzHhg=Z`sB7XCg#beE%i&RPjzh
zj?jBU_ldrT);c}1D7)Ru{Qc)GuXR@2PTY&-y!&+8lI4B6MYU}wxh`;?+gG||?@qnF
z=aP!9ZoGHi`sUNhi7#xYyo%J``Rc|ejx~qAoQ}C4x3sX@IyBSvd-3z^ytgk5&gRaG
zpYdeYItJd|ne`s;KWf^R<`nW2H=Vk*Dv2#@r&zJJ>EhcqdRyg=qPZBIdqN@LnO)t?
ztww)J1m{kuF5IO%uR8nB^d?W<wO^kLY|(d^t+H$RT_*vP>*k3+o^ke@YPNYcAK9V5
z)K_Rz!TijtK7TGK0Ht2+{#`!lo1)Iyudcg8Hl;nwOOOc9*f4djPr~AB8Y=OdYkMzR
z?P6m4>)CqsELZfY;)~8-9((iuul8E$D+mwN#{YUBSh*aRY<ZMoG!q!N44$rjF6*2U
FngC?BmYV<o

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ca84a7e5bd76a4cbc19727a2724ce698e9ac12d
GIT binary patch
literal 898
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d#Mb`Ho)PG(@xm{>Y-xA)-y
zkz@61{c9d9Xzp-skCM^qXtMHRjlHsPZNk;1otfGyhANs$>zcZoA1LhlA@zs9L^MW}
z#Zk~jW^S#n(#II(5SRB)pZ)n!wEyr)@s7UPyPk&fH>dv2tI`pjeeUd$S8^+-@;0k{
z+V$Kg#clJS-S^gYuBf`Yxax2H`}0>V@++)dUbV899RJ#yDs^mnjr+%41+(K$o#%ef
zsU9mC@FV7B)CvBsZpHl?Wt(3LcC4DW@e%*Ex(#tfx)1Xn?ns^X^?l`)=_ZojLfo?2
z=lI!N>Y1q2<~Ebnr>1Jjtw}fU@4KgeU#0ue#iuVf^l0}fseV**)%6Z{&T=eq-ga`+
zslVm(;uh}Le{*k2)2!bL74MpM`Tn@U(e(YV!VimvRn`_;wg0)E%zP30rMFA$e(SVQ
z3%k`Bx5VbGas0h@a{1@@ps8~*7Bcv|UzpQ;%{yZT@8(~1=O6N>gg+6FJ@AcB<w@P?
zJL)D^GL*!Q2Z#ZKpR>RtvY3H^TL^?1FWs&C1B{G4o-U3d6>)EG8G17tiX8YD!Y6ao
zHRh=PgGbMT?#_uR5!AdEdc^<10~J5lIogZNuPo%)HBB#1Z{4nv55g9u8zkPhdTa2h
z?KR6iTCX6pQ%!&U{+Qi&g1g!nm^c&~kcq!c>Q7y~zu*0RI?H(96aU+`Gm{ic?7r#F
zKJon9fjYTc0Vhj#$L@`_z7U_ka_6av6%7-`-mg>nmF2xt@9~7Sb+t??58hM<o0?q@
z-Muqoozb-4iU*HdrdP(TJm<bh>p4)1#geHtlU+VNdw0wC_U)A`zASwn`@Gxw)p^zP
zuP!d+j^4k6=hWrj@&&hlguGpzem&KuSNHttkhtinhc$h(=Usdo_4V<K>J5zO&PMUY
zf&Ib~FRLs1?^%53vhwis*q>GDn^%2dSJUJ(al-B|{11pJ-(c#x7OCxZw&BRsLp>3u
zocFFj{&r-EQ%dH!DW_*_t6%Ta+n~E3fSaF{|N3T~ZtYgdjkg?H`986vm^$V8e$%=&
z_m|sNvw$^@`zG8~e<pYE=ac=_=KDY2==}78UHym)i+}?IBZT1MtYNO-wPcI6^#4o1
P$Yt<!^>bP0l+XkK$~T|%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json
index 7fa6edb9ece6..3eb8229d247c 100644
--- a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord)",
+  "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord), inhands made by Vermidia",
   "size": {
     "x": 32,
     "y": 32
@@ -54,6 +54,14 @@
     },
     {
       "name": "splat-0"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
     }
   ]
 }

From 6d71ec1b140e48effbc4b6964b809e5244da0f8f Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:24:40 +0200
Subject: [PATCH 471/568] Non-uplink PDAs no longer can have TC inserted into
 them (#28985)

* PDAs no longer can have TC inserted into them

* far better way of doing this

---------

Co-authored-by: John Doe <johndoe@gmail.com>
---
 Content.Server/PDA/Ringer/RingerSystem.cs   | 10 ++++++++--
 Content.Server/Store/Systems/StoreSystem.cs |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index e15dcfaa2bc7..0cc4ea86c221 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -43,13 +43,19 @@ public override void Initialize()
             SubscribeLocalEvent<RingerComponent, RingerPlayRingtoneMessage>(RingerPlayRingtone);
             SubscribeLocalEvent<RingerComponent, RingerRequestUpdateInterfaceMessage>(UpdateRingerUserInterfaceDriver);
 
-            SubscribeLocalEvent<RingerUplinkComponent, CurrencyInsertAttemptEvent>(OnCurrencyInsert);
+            SubscribeLocalEvent<RingerComponent, CurrencyInsertAttemptEvent>(OnCurrencyInsert);
         }
 
         //Event Functions
 
-        private void OnCurrencyInsert(EntityUid uid, RingerUplinkComponent uplink, CurrencyInsertAttemptEvent args)
+        private void OnCurrencyInsert(EntityUid uid, RingerComponent ringer, CurrencyInsertAttemptEvent args)
         {
+            if (!TryComp<RingerUplinkComponent>(uid, out var uplink))
+            {
+                args.Cancel();
+                return;
+            }
+
             // if the store can be locked, it must be unlocked first before inserting currency. Stops traitor checking.
             if (!uplink.Unlocked)
                 args.Cancel();
diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs
index 0fd92cfb9651..c13a9583beb0 100644
--- a/Content.Server/Store/Systems/StoreSystem.cs
+++ b/Content.Server/Store/Systems/StoreSystem.cs
@@ -5,11 +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 Robust.Shared.Utility;
+using System.Linq;
 
 namespace Content.Server.Store.Systems;
 

From 795196c9647c2f40df8ec8c9380a049efe600ed9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 15:25:46 +0000
Subject: [PATCH 472/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d2c819747f18..ede76750a44c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: Mailing units no longer spontaneously turn into disposal units when flushed.
-    type: Fix
-  id: 6230
-  time: '2024-03-25T13:20:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26383
 - author: Simyon
   changes:
   - message: All implants are now unable to be implanted more than once.
@@ -3846,3 +3839,10 @@
   id: 6729
   time: '2024-06-14T06:24:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28968
+- author: Zonespace27
+  changes:
+  - message: Non-uplink PDAs can no longer have telecrystals inserted into them.
+    type: Fix
+  id: 6730
+  time: '2024-06-14T15:24:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28985

From 05cc7541ddf547f5ede3af5d17cc3ba486f4ba60 Mon Sep 17 00:00:00 2001
From: dffdff2423 <dffdff2423@gmail.com>
Date: Fri, 14 Jun 2024 11:53:48 -0500
Subject: [PATCH 473/568] Rename generic drugs (#28989)

* Rename generic drugs

Space Drugs and Stimulents cause quite a bit of confusion.

* Ensure everything is updated to the new names.
---
 Resources/Locale/en-US/reagents/meta/narcotics.ftl        | 6 +++---
 Resources/Locale/en-US/store/uplink-catalog.ftl           | 6 +++---
 .../Entities/Objects/Specific/Medical/healing.yml         | 4 ++--
 .../Entities/Objects/Specific/Medical/hypospray.yml       | 8 ++++----
 .../ServerRules/SpaceLaw/SLControlledSubstances.xml       | 4 ++--
 .../Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml        | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Resources/Locale/en-US/reagents/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/meta/narcotics.ftl
index d6da25950134..b48eb03b7dfd 100644
--- a/Resources/Locale/en-US/reagents/meta/narcotics.ftl
+++ b/Resources/Locale/en-US/reagents/meta/narcotics.ftl
@@ -4,11 +4,11 @@ reagent-desc-desoxyephedrine = A more effective ephedrine, with more active down
 reagent-name-ephedrine = ephedrine
 reagent-desc-ephedrine = A caffeinated adrenaline stimulator chemical that makes you faster and harder to knock down. Also helps combat narcolepsy at dosages over thirty, at the cost of severe nerval stress.
 
-reagent-name-stimulants = stimulants
+reagent-name-stimulants = hyperzine
 reagent-desc-stimulants = A chemical cocktail developed by Donk Co. that allows agents to recover from stuns faster, move more quickly, and grants a small heal while close to critical condition. Due to the complex nature of the chemical, it is much harder for the body to purge naturally.
 
 reagent-name-experimental-stimulants = experimental stimulants
-reagent-desc-experimental-stimulants = A prototype version of the stimulant chemical mixture. Usage grants virtual immunity to stun weaponry, rapid tissue regeneration, extreme running speed by reducing lactic acid buildup, and a general feeling of euphoria. Side effects may include extreme levels of anticoagulation, tunnel vision, extreme toxin buildup in the bloodstream, and rapid liver death. Do not give to animals.
+reagent-desc-experimental-stimulants = A prototype version of hyperzine. Usage grants virtual immunity to stun weaponry, rapid tissue regeneration, extreme running speed by reducing lactic acid buildup, and a general feeling of euphoria. Side effects may include extreme levels of anticoagulation, tunnel vision, extreme toxin buildup in the bloodstream, and rapid liver death. Do not give to animals.
 
 reagent-name-thc = THC
 reagent-desc-thc = The main psychoactive compound in cannabis.
@@ -22,7 +22,7 @@ reagent-desc-nicotine = Dangerous and highly addictive, but that's what the prop
 reagent-name-impedrezene = impedrezene
 reagent-desc-impedrezene = A narcotic that impedes one's ability by slowing down the higher brain cell functions.
 
-reagent-name-space-drugs = space drugs
+reagent-name-space-drugs = space mirage
 reagent-desc-space-drugs = An illegal compound which induces a number of effects such as loss of balance and visual artefacts.
 
 reagent-name-nocturine = nocturine
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index f4a32004c67b..78c094926f1d 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -355,11 +355,11 @@ uplink-combat-medipen-desc = A single-use medipen containing chemicals that rege
 uplink-nocturine-chemistry-bottle-name = Nocturine Bottle
 uplink-nocturine-chemistry-bottle-desc = A chemical that makes it very hard for your target to stand up.
 
-uplink-stimpack-name = Stimpack
+uplink-stimpack-name = Hyperzine Injector
 uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 30 seconds.
 
-uplink-stimkit-name = Stimkit
-uplink-stimkit-desc = A medkit containing 6 stimulant microinjectors, which each inject you with enough stimulants to last for 15 seconds.
+uplink-stimkit-name = Hyperzine Injector Kit
+uplink-stimkit-desc = A medkit containing 6 hyperzine microinjectors, which each inject you with enough hyperzine to last for 15 seconds.
 
 uplink-syndicate-segway-crate-name = Syndicate Segway
 uplink-syndicate-segway-crate-desc = Be an enemy of the corporation, in style!
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 71e0cf645038..13ebe4b8f476 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -571,7 +571,7 @@
       amount: 5
 
 - type: entity
-  name: space drugs
+  name: space mirage
   parent: Pill
   id: PillSpaceDrugs
   components:
@@ -958,7 +958,7 @@
           Quantity: 15
 
 - type: entity
-  name: stimulants syringe
+  name: hyperzine syringe
   parent: PrefilledSyringe
   id: SyringeStimulants
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index d6f3ee75fa6b..ddaf20351cdd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -318,10 +318,10 @@
     tags: []
 
 - type: entity
-  name: stimulant injector
+  name: hyperzine injector
   parent: ChemicalMedipen
   id: Stimpack
-  description: Contains enough stimulants for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
+  description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -350,10 +350,10 @@
     tags: []
 
 - type: entity
-  name: stimulant microinjector
+  name: hyperzine microinjector
   parent: ChemicalMedipen
   id: StimpackMini
-  description: A microinjector of stimulants that give you about fifteen seconds of the chemical's effects.
+  description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml
index 14f0f46de1b7..40b9ee946f5e 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml
@@ -1,4 +1,4 @@
-<Document>
+<Document>
   # Space Law: Controlled Substances
   - \[Chemists/Science\] Explosive and pyrotechnic compounds excluding welding fuel contained in welders or welding fuel storage vessels
   - \[Science\] Toxins
@@ -9,6 +9,6 @@
   - \[None\] Nocturine
   - \[None\] Norepinephirc acid
   - \[None\] Romerol
-  - \[None\] Space drugs
+  - \[None\] Space Mirage
   - \[None\] Stimulants, excluding Desoxyephedrine and Ephedrine
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
index 04e7139a48b7..4ece9150e05f 100644
--- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
+++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml
@@ -1,4 +1,4 @@
-<Document>
+<Document>
   # Space Law: Crime Listing
   Crime codes are organized by a Category Code (_-xx) which is a collection of non-stackable crimes on a row, prefixed
   by the Severity Number (X-__).
@@ -321,7 +321,7 @@
     <ColorBox>
       <Box HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="2">
         Combat enhancing drugs are those that benefit stun times, or movement speed, and are restricted. Poisons are
-        restricted. Substances such as Ephedrine, Desoxyephedrine, and stimulants are restricted. The captain or highest
+        restricted. Substances such as Ephedrine, Desoxyephedrine, and Hyperzine are restricted. The captain or highest
         standing command staff may publicly restrict other harmful substances.
       </Box>
     </ColorBox>

From 9efa5de340f0a9b518840e4b9ecf99fc628bb0b3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 16:54:55 +0000
Subject: [PATCH 474/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ede76750a44c..b0f8885e1f78 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Simyon
-  changes:
-  - message: All implants are now unable to be implanted more than once.
-    type: Tweak
-  id: 6231
-  time: '2024-03-26T00:16:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26250
 - author: EmoGarbage404
   changes:
   - message: Ninjas no longer wipe all technologies when using their gloves on a research
@@ -3846,3 +3839,12 @@
   id: 6730
   time: '2024-06-14T15:24:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28985
+- author: Aquif
+  changes:
+  - message: '"Space Drugs" have been renamed to "Space Mirage"'
+    type: Tweak
+  - message: '"Stimulants" have been renamed to "Hyperzine"'
+    type: Tweak
+  id: 6731
+  time: '2024-06-14T16:53:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28989

From ba6853d386e392560c528c6fba93bda97a32cd02 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 14 Jun 2024 19:22:01 +0200
Subject: [PATCH 475/568] It is pride month, nukies. You know what that means.
 (#28992)

* Make the nuke gay

* I forgot to commit the gay

* Add pride month

* Use holiday visualizer for nuke

* Fix pride month

* Trans too
---
 .../Locale/en-US/holiday/greet/holiday-greet.ftl |   1 +
 .../Entities/Structures/Machines/nuke.yml        |  14 ++++++++++++++
 Resources/Prototypes/holidays.yml                |   7 +++++++
 .../Textures/Objects/Devices/nuke.rsi/meta.json  |   5 ++++-
 .../Objects/Devices/nuke.rsi/nuclearbomb_gay.png | Bin 0 -> 1396 bytes
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png

diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
index fde896df39bb..2080f42c6348 100644
--- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
+++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
@@ -69,6 +69,7 @@ holiday-name-festive-season = Festive Season
 holiday-name-boxing-day = Boxing Day
 holiday-name-friday-thirteenth = Friday the 13th
 holiday-name-national-coming-out-day = National Coming Out Day
+holiday-name-pride-month = Pride Month
 
 ## Custom congrats
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index bc4581d7b653..1cf9ceaeab34 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -16,6 +16,9 @@
       map: ["enum.NukeVisualLayers.Unlit"]
       shader: unshaded
       visible: false
+    - state: nuclearbomb_gay
+      map: ["pride"]
+      visible: false
     - state: nukefestive
       map: ["christmas"]
       visible: false
@@ -24,11 +27,15 @@
     holidays:
       festive:
       - FestiveSeason
+      pride:
+      - PrideMonth
   - type: GenericVisualizer
     visuals:
       enum.HolidayVisuals.Holiday:
         christmas:
           festive: { visible: true }
+        pride:
+          pride: { visible: true }
       enum.NukeVisuals.Deployed:
         enum.NukeVisualLayers.Base:
           False: { state: nuclearbomb_base }
@@ -129,16 +136,23 @@
     - state: nukefestive
       map: ["christmas"]
       visible: false
+    - state: nuclearbomb_gay
+      map: [ "pride" ]
+      visible: false
   - type: Appearance
   - type: HolidayVisuals
     holidays:
       festive:
       - FestiveSeason
+      pride:
+      - PrideMonth
   - type: GenericVisualizer
     visuals:
       enum.HolidayVisuals.Holiday:
         christmas:
           festive: { visible: true }
+        pride:
+          pride: { visible: true }
   - type: Physics
     bodyType: Dynamic
   - type: Fixtures
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
index 235584dd6363..173999d156b0 100644
--- a/Resources/Prototypes/holidays.yml
+++ b/Resources/Prototypes/holidays.yml
@@ -437,3 +437,10 @@
   name: holiday-name-friday-thirteenth
   shouldCelebrate:
     !type:FridayThirteenth { }
+
+- type: holiday
+  id: PrideMonth
+  name: holiday-name-pride-month
+  beginDay: 1
+  endDay: 31
+  beginMonth: June
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
index 4bc62a96b2db..5ba8a2d753cb 100644
--- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github)",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,9 @@
     {
       "name": "nuclearbomb_deployed_unlit"
     },
+    {
+      "name": "nuclearbomb_gay"
+    },
     {
       "name": "nukefestive",
       "delays": [
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc17bc3a264a251d35ccabaa02477d51c6f6765
GIT binary patch
literal 1396
zcmV-)1&jKLP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)E=fc|R9J=WmTOE?XBfwSMPNGRIw};A>P7=iqg!J%ZlD;KnW$lq>Ac5eq%kpB
zh8gjeDT>P`nqAcBn3rJY4Hr;w%^-7`Q<RJt6=KB-xBvqw9i<doF9G7&hr>DTp%gFs
z;1~Z%)AzjZbNN62=gD~wyuvHIWT*liXh;x-?%8M$X#b)J4wQT~pVCV=0Ou$kF-YR%
z7y%$O#G#DiL-%sS@WuKOkdjL{M=_Z!_al)wIYv->9@8~$H0tqT0PNl)66ov@Z5~xX
z%sAOa7><a7z;KoOC6AmT04$BLQJWG+)Q|#_lEohYE#Cc^V<wWC-iEsYq0XoEG6AXQ
z$Jp<6VvfAFMaBd10-D7DT)4M`C{2WXzB%ufH}NpIaIc3{U=vV)mxMxrOqO$l8UWg8
zriP1N5}L)F-Zq8SRvQ3XZ3#zyS`UErW{-dJqu%BI;}bc%sg2-V@%fVYC)9yz*dg>q
z4HvP^C}h{7E|wjh55W6>h-dS56|ryMR%XnK2kwnny);#qfxnMd!6&l;2=X<wV^cWF
z)j!Y%46dIVg}e9Bh(*ku5G5xsI$DML?U@*E^zjY|BPtM!2AiP*#<sHYjGEJ*SBfo|
z2U@L0Zo%GfLh#s(vR~7oT8xR}`lEtzY+cdD*<5Ap6UGpX1b7cfuww(qDR>eMVS1K*
zH^8*!&lqipmu(6*hfq}5N%q<}0E!Ab$;vQLTTw4p@9=nJ`<(G^78pb1XGIH!qAWIn
zlHlXCJpK~gR&ZNoIROqG7|W{cCQ8e?akls2Z11DAteaKYP3YDbad^c3OK9|oU9-Co
zBn3>ST;bOvKl>4g&nzHsHdw#fP09VeOb@-!B8Nc!)(wNzel6RUo1F^ZqQXw}g9==4
z_A1bSrIwmot=L_neUQnNE9i8FVHFS#CE!|>fc}dOd>o#`frv=*f85FXEk96R*+N!E
zG$)F5oG8-CJ{9K;RGc@Ey*7^P%}NCTe%rYPyUWS;om;2_Rgm4@fmW+wp=qfffr(5W
zd;y6#)%65`)YJu3S63)(OUt?yt#G#Y0VrDLOF}}B*<7qTdGZ)Koq;z@u?oXBn$fsA
z=&b^5rL0hkBU4>nL2Bv(*5y3}l=4gKQ@g|=9I61oU%;eTJuo-}W^=I$5Yo~<02ACi
za#c27Xj%$Sz&@*kJG@1@j{>iU!@9hO?AZ}bRz|c}slns`ouLtcM@|foF+K*%;Chr~
z=x%gv9~d)$(KwTkNue~|sORvRjil%zNzp~}rZ${e?~1)n(M2+E?sQ7Z&hzj=9}Z6|
znhD4F{^0L4wAAxjuNd=}h6$`t2T}S@7*4mF+z*q8=?TKsAI$wxW4QCck*|0UTr*z=
zVCBly^4_)`d;KKL&&#2_vV}~S=w4Y3HP!Q(Gdq`yRkzTnU`=uo?@bf!rzQf^l4z`P
z;pz{jEz~;~G6Csp$80V}YDalxJ^6V#062SkiH?e(>dG}hoCD&bNOr>A#!eN$-NtVL
zxC_kbaru2wNy(=OU076VV1!SyjEv<%TG|IRHPw^;@3}x`0pY0kD4w0}0W2ytq3Khw
zSS%zvq1<i_d>f9sTE`VB*lkZBv*(7zV!>*)s?h5N>`%E1=HC8OUWZ2q)6)8w=&+~W
z;3N82tyWoey<R`^ZFtEe4ogO&Ti%nTd>V%OxcY-3)O+qrBp~#9y&(M`Ja|x8vSf)M
z?LCXHuTNI2{+WIK2uSPa4KUQ_x%^)w;me5mzwsY9q7jp%If9-50000<MNUMnLSTXp
C_MP<r

literal 0
HcmV?d00001


From 2711ef7f48bb3ecc4232136658b2508062e3beb5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 17:23:07 +0000
Subject: [PATCH 476/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b0f8885e1f78..1f4117595c50 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Ninjas no longer wipe all technologies when using their gloves on a research
-      server.
-    type: Tweak
-  id: 6232
-  time: '2024-03-26T00:52:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26421
 - author: Dutch-VanDerLinde
   changes:
   - message: The chest rig is now available for purchase in the syndicate uplink.
@@ -3848,3 +3840,12 @@
   id: 6731
   time: '2024-06-14T16:53:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28989
+- author: PJB3005
+  changes:
+  - message: Added pride month.
+    type: Add
+  - message: Made the nuke gay.
+    type: Add
+  id: 6732
+  time: '2024-06-14T17:22:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28992

From 9ebfb1d64fd5e2d8594897e557bf6c4ff7f33c4e Mon Sep 17 00:00:00 2001
From: Thomas <87614336+Aeshus@users.noreply.github.com>
Date: Fri, 14 Jun 2024 15:32:39 -0500
Subject: [PATCH 477/568] Fix Loadout Requirements Only Displaying One
 Requirement (#28994)

Collect all group effects failed instead of only first one failed
---
 .../Loadouts/Effects/GroupLoadoutEffect.cs            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
index 1be75f7dbc81..258d9a4dbb23 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
@@ -17,13 +17,16 @@ public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout load
     {
         var effectsProto = collection.Resolve<IPrototypeManager>().Index(Proto);
 
+        var reasons = new List<string>();
         foreach (var effect in effectsProto.Effects)
         {
-            if (!effect.Validate(profile, loadout, session, collection, out reason))
-                return false;
+            if (effect.Validate(profile, loadout, session, collection, out reason))
+                continue;
+
+            reasons.Add(reason.ToMarkup());
         }
 
-        reason = null;
-        return true;
+        reason = reasons.Count == 0 ? null : FormattedMessage.FromMarkup(string.Join('\n', reasons));
+        return reason == null;
     }
 }

From e8dd5d4312ef7e1376aafb4e3ef63b549dc71dcc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 20:33:46 +0000
Subject: [PATCH 478/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1f4117595c50..370d62967080 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Dutch-VanDerLinde
-  changes:
-  - message: The chest rig is now available for purchase in the syndicate uplink.
-    type: Add
-  id: 6233
-  time: '2024-03-26T04:05:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26427
 - author: ElectroJr
   changes:
   - message: Fixed an atmos bug, which was (probably) causing atmospherics on the
@@ -3849,3 +3842,10 @@
   id: 6732
   time: '2024-06-14T17:22:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28992
+- author: Aeshus
+  changes:
+  - message: Loadouts now display all requirements.
+    type: Fix
+  id: 6733
+  time: '2024-06-14T20:32:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28994

From a4ade6964055f7949c09f692edd886d9ba164c6c Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 14 Jun 2024 16:42:58 -0500
Subject: [PATCH 479/568] Move secure crate labels to the left (#28952)

Move secure label to the left
---
 .../Entities/Structures/Storage/Crates/base_structurecrates.yml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 01c226cb0fd0..2666e8261d09 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -124,6 +124,7 @@
       shader: unshaded
     - state: paper
       sprite: Structures/Storage/Crates/labels.rsi
+      offset: "-0.5,0"
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: Damageable
     damageContainer: StructuralInorganic

From 68807cb25e167425091035eb0d2be5f3c935758e 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 480/568] Changes all the uplink ally icons to be a combination
 of the mob + radio (#28954)

* New Icons!

* Better meta info
---
 Resources/Prototypes/Catalog/uplink_catalog.yml |  12 ++++++------
 .../Objects/Devices/communication.rsi/meta.json |  16 ++++++++++++++--
 .../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, 20 insertions(+), 8 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 efec2417d0b5..d39f9003575e 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -904,7 +904,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicate
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
     Telecrystal: 16
   categories:
@@ -920,7 +920,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
     Telecrystal: 16
   categories:
@@ -936,7 +936,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:
@@ -952,7 +952,7 @@
   name: uplink-reinforcement-radio-ancestor-name
   description: uplink-reinforcement-radio-ancestor-desc
   productEntity: ReinforcementRadioSyndicateAncestor
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
   cost:
     Telecrystal: 6
   categories:
@@ -968,7 +968,7 @@
   name: uplink-reinforcement-radio-ancestor-name
   description: uplink-reinforcement-radio-ancestor-desc
   productEntity: ReinforcementRadioSyndicateAncestorNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
   cost:
     Telecrystal: 6
   categories:
@@ -998,7 +998,7 @@
   id: UplinkMobCatMicrobomb
   name: uplink-mobcat-microbomb-name
   description: uplink-mobcat-microbomb-desc
-  icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
+  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndicat }
   productEntity: ReinforcementRadioSyndicateSyndiCat
   cost:
     Telecrystal: 6
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index bfd0e069f3eb..328747df09aa 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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
@@ -69,7 +69,7 @@
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
     },
-	{
+    {
       "name": "old-radio"
     },
     {
@@ -79,6 +79,18 @@
     {
       "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 27ba3440841b683d1380e5b8ff1a7e821a4f1add Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 14 Jun 2024 21:45:29 +0000
Subject: [PATCH 481/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 370d62967080..63e76d415d2d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ElectroJr
-  changes:
-  - message: Fixed an atmos bug, which was (probably) causing atmospherics on the
-      station to behave incorrectly.
-    type: Fix
-  id: 6234
-  time: '2024-03-26T04:44:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26441
 - author: nikthechampiongr
   changes:
   - message: Handcuffs will no longer try to uncuff themselves when they stop being
@@ -3849,3 +3841,10 @@
   id: 6733
   time: '2024-06-14T20:32:39.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28994
+- author: Vermidia
+  changes:
+  - message: allies callable by radio in the uplink now have unique icons
+    type: Tweak
+  id: 6734
+  time: '2024-06-14T21:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28954

From e803871172f3ad5aca65afb58e2ff373d516aab3 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sat, 15 Jun 2024 14:19:08 +1200
Subject: [PATCH 482/568] Adds witch robes (#28965)

* ze

* autodrobe entry

* autodrobe crate cost adjust
---
 .../Catalog/Cargo/cargo_vending.yml           |   2 +-
 .../VendingMachines/Inventories/theater.yml   |   2 ++
 .../Entities/Clothing/OuterClothing/suits.yml |  11 ++++++++
 .../witchrobe.rsi/equipped-OUTERCLOTHING.png  | Bin 0 -> 612 bytes
 .../Suits/witchrobe.rsi/icon.png              | Bin 0 -> 330 bytes
 .../Suits/witchrobe.rsi/inhand-left.png       | Bin 0 -> 725 bytes
 .../Suits/witchrobe.rsi/inhand-right.png      | Bin 0 -> 730 bytes
 .../Suits/witchrobe.rsi/meta.json             |  26 ++++++++++++++++++
 8 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index dd43ec409486..e202d2482b7e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1200
+  cost: 1300
   category: cargoproduct-category-name-service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 5e3c7d94010f..8ef72f557c4b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -29,6 +29,8 @@
     ClothingHeadHatShrineMaidenWig: 2
     ClothingOuterSuitShrineMaiden: 2
     Gohei: 2
+    ClothingOuterSuitWitchRobes: 2
+    ClothingHeadHatWitch1: 2
     ClothingHeadHatRedRacoon: 2
     ClothingOuterRedRacoon: 2
     ClothingHeadPaperSack: 2
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index 08bbd83c489b..ccf6f09b1940 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -190,6 +190,17 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/shrine-maiden.rsi
 
+- type: entity
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitWitchRobes
+  name: witch robes
+  description: Magic is all about the spell power, ZE!
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterSuitMonkey
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..b797c8dce44d41c7f83ad86b3593e43a8f83ec88
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq004jh001Be0{{R3?fifj00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj55>QN3MGg)Q=ib-MxTqKy7#kZK00021PX_D&000Jb
zQchF<|NsC00JFcOzW@LL32;bRa{vGi!vFvd!vV){sAK>D0m(^3K~z{r?N#lPgdhy#
z%lCifOWJ~ht=!Gc+};l}yGltdA%Ldi!*~U}0$u^HfPW<*rA(wq)Q&%nl1s5>fPxfj
zDlWxJN(J?Kvz{3{o(e^yMGi#%Jb^PP<e-m5yb*RhYSmKflLC%kk#tos+L&CbD4uY|
zG_Ci<jt3~OG-OzO1E|I|hy^s_K|rky|4;yC$P%#tR;LXX6TQvVg@wp~LujufD9`fh
zvZvrz0y3THGemn`N8?q1!xJK)w#nfMso?2A0A`2*%mD`0-=X{v;5)#6q{IU7v=p+K
znA)t5oT$JMVDXAXTXqiM<~l$O2P|H(6~N2R0l7=0nA&|0SiEA(^YRS`VgVf%uP`>|
zQJo&e0%#y|0s+__2KSV2`K>@V;RgbE$`ru}@_rz1@eSmd;0rj%_Z8?F$q(C*N3gMs
z#W%1rpTCwrOYsyN+-)QRG8F^@Ql+{F3#2rQT%R9JZV)`oAGXnb1UZ8oAya^-053VS
zAlM^X8!zK3XF)M4@iPmSaKE?Us|vvI-ViW=$CQX1Qj$W?gtG;Cx<#=T)-_?rcb0H1
y@DnDjT%&LWfoEPg{aeohH^DXQFY#dk$MFTU2}JDU2kWf>0000<MNUMnLSTZ*vi!OL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..acdc1b394b240a78f926d3232b887816aeb40a23
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?ST`S|#r-@ATh#|jAv32A9*pzvycwl_eEtt7}V_&*3RY~H_QKTw3T
zz$3Dlfr0NZ2s0kfUy%Y7T<_`P7-Hf7cH(QkqY50&f?xl}|J-teQ_p+aU;DFqN%o9a
zpLPE`a7q2Zn!qw0t;X4wHUCVURUbrfG40#xl*7=y_OMCKM7Pc52?6IBR!5ir@KfmI
z&RBD=TE60@=jEES3=WbK8FtkTW&B;v>I-;4gq%n_--Ahy0yuYEURpFEzTpeMQsa(O
zs`{1RFYIuxs5quk`%ZAZ<+;wXl@m3L^`E*rER~X+w&ELa#U*Zo=ls6{1(t^{e!~rP
OI)kUHpUXO@geCyvk9&~-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a93d4a5af0340300aefd324a724d1df5fbecea1e
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004lX+uL$Nkc;*
zP;zf(X>4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+<IJGrc#m
zu~fFo!pFwf!p54dg{@M`N6F64ir7fc|GrT(sZnm-?yqz2Io*3M1P`*N<yQ58Wfz>-
zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+
z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp<vsaxCF~;r5heOMWm>
z<doty#a4F3{JE!kVf~^#Gp%%)ZHzO)6j3w`R#+xWfo@rCQCwoOAF1GP_5D$C8RA;T
z6vr4jEOg(G`h(xyy6L{&Vp4qss-HaXtpjSd;A_+KJ`X+b>j*-RaABAHxdRw{7k#s&
zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp
zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk
z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002UNkl<ZSV!%a
z-4cW#2uAtQ_kZODmu<9gN8*-qg_NhSoJpZ4DM1O85|ltG!A1Z`cxv|UBT&djgT2z}
zA^|c2p^XJc`NJ15^DK}~<F+U-+*~7p)k;`Eiq&6+!0HvRi$kzHZgi|(@dV6-#Pb#T
zD71;-HD$#>*3CvrllgQmc=A+UoC*F=f)XetD1lOfR|45-ty1Cw{l8DM;sWHB69A_Z
zEVJGuXgPsw{JB>kV##n37U=nDUWRxAIq=P=m$=|YQqcPc_lHfk>b3l(00000NkvXX
Hu0mjfUGYjr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ee8f62362720f49506bdce053ff5ddc7e26e144
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004lX+uL$Nkc;*
zP;zf(X>4Tx04UFukxeK>Q5?m8Geabz%tEqw3#=$1DI128qNXuw1`F@KF+<IJGrc#m
zu~fFo!pFwf!p54dg{@M`N6F64ir7fc|GrT(sZnm-?yqz2Io*3M1P`*N<yQ58Wfz>-
zctlGiXSJGVLR8a4D?_^J=0~E@Nh*$yTLNmm=~h|%Z#1M9T@wPD@UWS83c?G*1FMC+
z;vM0zxumCrPldZ2xuEd9(v2d&D9-pCRGDEX9vc-73u~D&Hp<vsaxCF~;r5heOMWm>
z<doty#a4F3{JE!kVf~^#Gp%%)ZHzO)6j3w`R#+xWfo@rCQCwoOAF1GP_5D$C8RA;T
z6vr4jEOg(G`h(xyy6L{&Vp4qss-HaXtpjSd;A_+KJ`X+b>j*-RaABAHxdRw{7k#s&
zweLgYI-FgWG-DgiH=yMquRFRgg=7ZPX?Q)6Z%RV*HPp=&d;8hv_zvRI)#MfI?m=fp
zvga$jySBWyKhOC65%~suiE^us=7`$>000tDOjJb<4i3z?sOR3-8yg!K7#IKm0GAGk
z5dZ)H26R$RQ~&?}|Nj89zofqa000SaNLh0L01FcU01FcV0GgZ_0002ZNkl<ZSV!%a
z$qvLI2tZl%|9^P^mtZqVp<a0hOB;PqJs|W;N>Bo&1SL>PumymG-&|uAfkGBXaQW<k
z1jq=4_URp;ZwZ(=ERgAq+nl}%(F#WR&OZSuBaC2z8QO>@h;G4=ZwQzPiNpUOJ4UO7
zG0LHU9F4^RnyjZoki_TvB=D4=1WE}?pp@VgWcu^Q38dLUzMw<UINseBX9e-@w($b#
zk#`kH&%3KYI&}URoS;e5z7gml$VF+sg>ehy>Xx{qEYcaDTnc*s0p7?>wmd(FW&i*H
M07*qoM6N<$f-oIP5dZ)H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json
new file mode 100644
index 000000000000..76513321794f
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From 8eb85a08b60e6e0c24d8050265119ca2b3752257 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 02:20:14 +0000
Subject: [PATCH 483/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 63e76d415d2d..91fcf9f40f7f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: nikthechampiongr
-  changes:
-  - message: Handcuffs will no longer try to uncuff themselves when they stop being
-      dragged.
-    type: Fix
-  id: 6235
-  time: '2024-03-26T19:15:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26434
 - author: Nairodian
   changes:
   - message: Added disablers to every security officer locker.
@@ -3848,3 +3840,10 @@
   id: 6734
   time: '2024-06-14T21:44:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28954
+- author: K-Dynamic
+  changes:
+  - message: Added witch robes and witch hat to the AutoDrobe.
+    type: Add
+  id: 6735
+  time: '2024-06-15T02:19:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28965

From 9e4d19118900d31270f2c725da684a95137fb9cb Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 15 Jun 2024 02:42:40 +0000
Subject: [PATCH 484/568] make RefillableSolution optional for SolutionTransfer
 (#28830)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../Chemistry/EntitySystems/SolutionTransferSystem.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
index b12778262c8a..93e9765b1640 100644
--- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -193,7 +193,7 @@ public FixedPoint2 Transfer(EntityUid user,
         var actualAmount = FixedPoint2.Min(amount, FixedPoint2.Min(sourceSolution.Volume, targetSolution.AvailableVolume));
 
         var solution = _solution.SplitSolution(source, actualAmount);
-        _solution.Refill(targetEntity, target, solution);
+        _solution.AddSolution(target, solution);
 
         _adminLogger.Add(LogType.Action, LogImpact.Medium,
             $"{ToPrettyString(user):player} transferred {SharedSolutionContainerSystem.ToPrettyString(solution)} to {ToPrettyString(targetEntity):target}, which now contains {SharedSolutionContainerSystem.ToPrettyString(targetSolution)}");

From 3cd740c32bb1db33f21de5ee34cb54ef7cdd6821 Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Sat, 15 Jun 2024 04:43:36 +0200
Subject: [PATCH 485/568] Replaces reagent-effect-guidebook-missing with more
 descriptive guidebook entries (#28817)

removes `reagent-effect-guidebook-missing`

Co-authored-by: John Doe <johndoe@gmail.com>
---
 .../Chemistry/ReactionEffects/AreaReactionEffect.cs  |  4 +++-
 .../ReagentEffects/AddToSolutionReaction.cs          |  2 +-
 Content.Shared/Chemistry/Reagent/ReagentEffect.cs    |  4 ++--
 .../Locale/en-US/guidebook/chemistry/effects.ftl     | 12 +++++++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
index ebbf4e0341b2..56509a0953eb 100644
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
@@ -46,7 +46,9 @@ public sealed partial class AreaReactionEffect : ReagentEffect
         public override bool ShouldLog => true;
 
         protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-            => Loc.GetString("reagent-effect-guidebook-missing");
+            => Loc.GetString("reagent-effect-guidebook-area-reaction",
+                    ("duration", _duration)
+                );
 
         public override LogImpact LogImpact => LogImpact.High;
 
diff --git a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
index 6a43739b0ee2..2447814f948f 100644
--- a/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
+++ b/Content.Server/Chemistry/ReagentEffects/AddToSolutionReaction.cs
@@ -26,6 +26,6 @@ public override void Effect(ReagentEffectArgs args)
         }
 
         protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
-            Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+            Loc.GetString("reagent-effect-guidebook-add-to-solution-reaction", ("chance", Probability));
     }
 }
diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
index 5bcb21fedb30..6d0e85df3799 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Text.Json.Serialization;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
@@ -28,7 +28,7 @@ public abstract partial class ReagentEffect
 
         public virtual string ReagentEffectFormat => "guidebook-reagent-effect-description";
 
-        protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys); // => Loc.GetString("reagent-effect-guidebook-missing", ("chance", Probability));
+        protected abstract string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys);
 
         /// <summary>
         ///     What's the chance, from 0 to 1, that this effect will occur?
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index ba005e6bf983..c60e690d2673 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -1,4 +1,4 @@
--create-3rd-person =
+-create-3rd-person =
     { $chance ->
         [1] Creates
         *[other] create
@@ -345,11 +345,17 @@ reagent-effect-guidebook-reduce-rotting =
         *[other] regenerate
     } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting
 
-reagent-effect-guidebook-missing =
+reagent-effect-guidebook-area-reaction =
     { $chance ->
         [1] Causes
         *[other] cause
-    } an unknown effect as nobody has written this effect yet
+    } a smoke or foam reaction for {NATURALFIXED($duration, 3)} {MANY("second", $duration)}
+
+reagent-effect-guidebook-add-to-solution-reaction =
+    { $chance ->
+        [1] Causes
+        *[other] cause
+    } chemicals applied to an object to be added to its internal solution container
 
 reagent-effect-guidebook-plant-attribute =
     { $chance ->

From 835d1dd15383b62802eb6d89f9b6f12fa8ce9a63 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Fri, 14 Jun 2024 19:58:30 -0700
Subject: [PATCH 486/568] Prevent borgs from getting duplicate modules (#28943)

* Prevent borgs from getting duplicate modules

* outta the loop

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 .../Silicons/Borgs/BorgSystem.Modules.cs      | 19 +++++++++++++++++++
 Resources/Locale/en-US/borg/borg.ftl          |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index 5c600be3f640..f372f7df1a50 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -274,6 +274,25 @@ public bool CanInsertModule(EntityUid uid, EntityUid module, BorgChassisComponen
             return false;
         }
 
+        if (TryComp<ItemBorgModuleComponent>(module, out var itemModuleComp))
+        {
+            foreach (var containedModuleUid in component.ModuleContainer.ContainedEntities)
+            {
+                if (!TryComp<ItemBorgModuleComponent>(containedModuleUid, out var containedItemModuleComp))
+                    continue;
+
+                for (int i = 0; i < itemModuleComp.Items.Count; i++)
+                {
+                    if (itemModuleComp.Items[i] != containedItemModuleComp.Items[i])
+                        continue;
+                }
+
+                if (user != null)
+                    Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value);
+                return false;
+            }
+        }
+
         return true;
     }
 
diff --git a/Resources/Locale/en-US/borg/borg.ftl b/Resources/Locale/en-US/borg/borg.ftl
index c9005eb79617..72667f318e35 100644
--- a/Resources/Locale/en-US/borg/borg.ftl
+++ b/Resources/Locale/en-US/borg/borg.ftl
@@ -1,4 +1,4 @@
-borg-player-not-allowed = The brain doesn't fit!
+borg-player-not-allowed = The brain doesn't fit!
 borg-player-not-allowed-eject = The brain was expelled from the chassis!
 
 borg-panel-not-open = The cyborg's panel isn't open...
@@ -7,6 +7,7 @@ borg-mind-added = {CAPITALIZE($name)} powered on!
 borg-mind-removed = {CAPITALIZE($name)} shut off!
 
 borg-module-too-many = There's not enough room for another module...
+borg-module-duplicate = This module is already installed in this cyborg.
 borg-module-whitelist-deny = This module doesn't fit in this type of cyborg...
 
 borg-construction-guide-string = The cyborg limbs and torso must be attached to the endoskeleton.

From 7d0798cea5cfb19665076cb745e2882fcd102c7f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 02:59:36 +0000
Subject: [PATCH 487/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 91fcf9f40f7f..29002d350930 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: Nairodian
-  changes:
-  - message: Added disablers to every security officer locker.
-    type: Add
-  - message: Any way to obtain rubber bullets has been removed.
-    type: Remove
-  id: 6236
-  time: '2024-03-27T15:11:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26470
 - author: Ghagliiarghii
   changes:
   - message: Removed Donk Pocket Bounty from Cargo
@@ -3847,3 +3838,10 @@
   id: 6735
   time: '2024-06-15T02:19:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28965
+- author: Plykiya
+  changes:
+  - message: You can no longer insert duplicates of the same module into a cyborg.
+    type: Tweak
+  id: 6736
+  time: '2024-06-15T02:58:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28943

From 41a081d5efa0050b44f3200cdaecde16eab2bc78 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 488/568] 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 |  16 +++++++-
 .../Kitchen/Components/MicrowaveComponent.cs  |   6 +++
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  |  26 ++++++++++++-
 Resources/Maps/Nonstations/nukieplanet.yml    |   2 +-
 Resources/Maps/Shuttles/infiltrator.yml       |   2 +-
 .../Structures/Machines/microwave.yml         |  18 +++++++++
 .../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
 15 files changed, 99 insertions(+), 6 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 47388d1a6fd2..b49bc55d1be6 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,12 +29,13 @@ public override void Initialize()
 
     private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowavedEvent args)
     {
-        if (!component.CanMicrowave)
-            return;
+        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)
             {
@@ -49,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)
             {
@@ -73,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 815ba8f52132..1d26f68cae89 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -101,6 +101,12 @@ public sealed partial class MicrowaveComponent : Component
         /// Chance of lightning occurring when we microwave a metallic object
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         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 c69ed49d50a6..eefa539149b0 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;
@@ -36,6 +38,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Content.Shared.Stacks;
+using Content.Server.Construction.Components;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
@@ -61,6 +64,7 @@ public sealed class MicrowaveSystem : EntitySystem
         [Dependency] private readonly SharedItemSystem _item = default!;
         [Dependency] private readonly SharedStackSystem _stack = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
+        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
         [ValidatePrototypeId<EntityPrototype>]
         private const string MalfunctionSpark = "Spark";
@@ -408,6 +412,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>
@@ -425,7 +446,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.
             }
 
@@ -532,7 +553,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 4d1172198cab..35e00358ec56 100644
--- a/Resources/Maps/Nonstations/nukieplanet.yml
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -10994,7 +10994,7 @@ entities:
     - type: Transform
       pos: 18.918644,6.663283
       parent: 104
-- proto: KitchenMicrowave
+- proto: SyndicateMicrowave
   entities:
   - uid: 10
     components:
diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml
index 55955bfeeac8..fb2045d70185 100644
--- a/Resources/Maps/Shuttles/infiltrator.yml
+++ b/Resources/Maps/Shuttles/infiltrator.yml
@@ -3607,7 +3607,7 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 1
-- proto: KitchenMicrowave
+- proto: SyndicateMicrowave
   entities:
   - uid: 497
     components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 994269f71b4d..3b6fbf7f5f77 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -105,3 +105,21 @@
   - type: GuideHelp
     guides:
     - Chef
+
+- 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
+
+
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 000000000000..932ea0c4829a
--- /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 6132b5e07a4185ce9e2a643906466beac5f0d05e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 03:01:06 +0000
Subject: [PATCH 489/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 29002d350930..0b0cbc7d550b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: Ghagliiarghii
-  changes:
-  - message: Removed Donk Pocket Bounty from Cargo
-    type: Remove
-  - message: Removed Box of Hugs Bounty from Cargo
-    type: Remove
-  id: 6237
-  time: '2024-03-27T21:50:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26481
 - author: Vermidia
   changes:
   - message: Artifact node IDs are now only 3-digits long
@@ -3845,3 +3836,14 @@
   id: 6736
   time: '2024-06-15T02:58:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28943
+- author: Vermidia
+  changes:
+  - message: Nukie planet now has an improved Donk co. microwave, which cooks twice
+      as fast but is more likely to explode. It can't handle id cards without exploding.
+    type: Add
+  - message: Made microwave explosions destroy the machine board and spit out the
+      machine parts.
+    type: Tweak
+  id: 6737
+  time: '2024-06-15T03:00:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28951

From 48f90322f274cb5524c816a2f88ede8bc779cd64 Mon Sep 17 00:00:00 2001
From: Robert V <keywogger@gmail.com>
Date: Fri, 14 Jun 2024 20:13:52 -0700
Subject: [PATCH 490/568] Allow vending machines to be repaired (#28920)

Vending machines can be repaired
---
 .../VendingMachines/VendingMachineSystem.cs           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 63ec8f2c24bb..2866b14a8351 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -50,7 +50,7 @@ public override void Initialize()
             SubscribeLocalEvent<VendingMachineComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
             SubscribeLocalEvent<VendingMachineComponent, GotEmaggedEvent>(OnEmagged);
-            SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamage);
+            SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamageChanged);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
             SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse);
 
@@ -149,8 +149,15 @@ private void OnEmagged(EntityUid uid, VendingMachineComponent component, ref Got
             args.Handled = component.EmaggedInventory.Count > 0;
         }
 
-        private void OnDamage(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args)
+        private void OnDamageChanged(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args)
         {
+            if (!args.DamageIncreased && component.Broken)
+            {
+                component.Broken = false;
+                TryUpdateVisualState(uid, component);
+                return;
+            }
+
             if (component.Broken || component.DispenseOnHitCoolingDown ||
                 component.DispenseOnHitChance == null || args.DamageDelta == null)
                 return;

From 97695cfa62fe3291fe7abfe8d35668987f2fd79b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 03:14:58 +0000
Subject: [PATCH 491/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0b0cbc7d550b..2ac82f740c71 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Vermidia
-  changes:
-  - message: Artifact node IDs are now only 3-digits long
-    type: Tweak
-  id: 6238
-  time: '2024-03-27T23:26:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26482
 - author: Jake Huxell
   changes:
   - message: Fixed late join menu scrolling to the top whenever a new player joins
@@ -3847,3 +3840,11 @@
   id: 6737
   time: '2024-06-15T03:00:00.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28951
+- author: robertGN
+  changes:
+  - message: Using a welder on vending machines now correctly repairs the vending
+      machine.
+    type: Fix
+  id: 6738
+  time: '2024-06-15T03:13:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28920

From 298de1ba39279a3e10ce978802a356987589a07a Mon Sep 17 00:00:00 2001
From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Date: Sat, 15 Jun 2024 03:23:42 +0000
Subject: [PATCH 492/568] fix(uplink): Remove useless gps from death rattle box
 (#28999)

---
 Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 2bfca8362a36..b350b0b1cfb3 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -54,7 +54,7 @@
   name: deathrattle implant box
   parent: BoxCardboard
   id: BoxDeathRattleImplants
-  description: Six deathrattle implants and handheld GPS devices for the whole squad.
+  description: Six deathrattle implants for the whole squad.
   components:
   - type: Sprite
     layers:
@@ -67,5 +67,3 @@
     contents:
       - id: DeathRattleImplanter
         amount: 6
-      - id: HandheldGPSBasic
-        amount: 6

From 1d5840c279a48486c8a4668b10c5af3f40f5fa63 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 03:24:48 +0000
Subject: [PATCH 493/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2ac82f740c71..51fcaa28a05f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Jake Huxell
-  changes:
-  - message: Fixed late join menu scrolling to the top whenever a new player joins
-      the round.
-    type: Fix
-  id: 6239
-  time: '2024-03-28T01:43:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26483
 - author: blueDev2
   changes:
   - message: Generalized bounties to allow selling them off-station
@@ -3848,3 +3840,11 @@
   id: 6738
   time: '2024-06-15T03:13:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28920
+- author: Brandon-Huu
+  changes:
+  - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant
+      box.
+    type: Remove
+  id: 6739
+  time: '2024-06-15T03:23:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28999

From f136657b388b6d90b63fa338cc7295b1fd39d00c Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Fri, 14 Jun 2024 23:38:43 -0400
Subject: [PATCH 494/568] Revamped Meteor Swarm (#28974)

* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.
---
 .../Destructible/DestructibleSystem.cs        |  11 +
 Content.Server/Mining/MeteorComponent.cs      |  25 ++
 Content.Server/Mining/MeteorSystem.cs         |  65 +++++
 .../Components/MeteorSchedulerComponent.cs    |  35 +++
 .../Components/MeteorSwarmComponent.cs        |  58 ++++
 .../Components/MeteorSwarmRuleComponent.cs    |  40 ---
 .../StationEvents/Events/MeteorSwarmRule.cs   |  85 ------
 .../StationEvents/Events/MeteorSwarmSystem.cs |  82 ++++++
 .../StationEvents/MeteorSchedulerSystem.cs    |  39 +++
 .../Mobs/Systems/MobThresholdSystem.cs        |   2 +-
 .../station-events/events/meteor-swarm.ftl    |   5 +-
 .../Weapons/Guns/Launchers/launchers.yml      |   2 +-
 .../Weapons/Guns/Projectiles/meteors.yml      | 204 +++++++++++--
 Resources/Prototypes/GameRules/events.yml     |  17 --
 .../Prototypes/GameRules/meteorswarms.yml     | 104 +++++++
 Resources/Prototypes/game_presets.yml         |   6 +
 .../Textures/Objects/Misc/meteor.rsi/big.png  | Bin 0 -> 4562 bytes
 .../Objects/Misc/meteor.rsi/big_cluster.png   | Bin 0 -> 4473 bytes
 .../Misc/meteor.rsi/big_cluster_pixel.png     | Bin 0 -> 4473 bytes
 .../Objects/Misc/meteor.rsi/big_pixel.png     | Bin 0 -> 4562 bytes
 .../Objects/Misc/meteor.rsi/firework.png      | Bin 0 -> 367 bytes
 .../Misc/meteor.rsi/firework_pixel.png        | Bin 0 -> 430 bytes
 .../Objects/Misc/meteor.rsi/human.png         | Bin 0 -> 5045 bytes
 .../Objects/Misc/meteor.rsi/human_pixel.png   | Bin 0 -> 1844 bytes
 .../Objects/Misc/meteor.rsi/medium.png        | Bin 0 -> 2921 bytes
 .../Misc/meteor.rsi/medium_piercing.png       | Bin 0 -> 3594 bytes
 .../Misc/meteor.rsi/medium_piercing_pixel.png | Bin 0 -> 3594 bytes
 .../Objects/Misc/meteor.rsi/medium_pixel.png  | Bin 0 -> 2921 bytes
 .../Misc/meteor.rsi/medium_radioactive.png    | Bin 0 -> 2088 bytes
 .../meteor.rsi/medium_radioactive_pixel.png   | Bin 0 -> 2088 bytes
 .../Objects/Misc/meteor.rsi/meta.json         | 271 ++++++++++++++++++
 .../Objects/Misc/meteor.rsi/small.png         | Bin 0 -> 2458 bytes
 .../Objects/Misc/meteor.rsi/small_flash.png   | Bin 0 -> 2484 bytes
 .../Misc/meteor.rsi/small_flash_pixel.png     | Bin 0 -> 2484 bytes
 .../Objects/Misc/meteor.rsi/small_pixel.png   | Bin 0 -> 2458 bytes
 .../Objects/Misc/meteor.rsi/space_dust.png    | Bin 0 -> 328 bytes
 36 files changed, 887 insertions(+), 164 deletions(-)
 create mode 100644 Content.Server/Mining/MeteorComponent.cs
 create mode 100644 Content.Server/Mining/MeteorSystem.cs
 create mode 100644 Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs
 create mode 100644 Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
 delete mode 100644 Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs
 delete mode 100644 Content.Server/StationEvents/Events/MeteorSwarmRule.cs
 create mode 100644 Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
 create mode 100644 Content.Server/StationEvents/MeteorSchedulerSystem.cs
 create mode 100644 Resources/Prototypes/GameRules/meteorswarms.yml
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big_cluster.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big_cluster_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/big_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/firework.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/firework_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/human.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/human_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small_flash.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small_flash_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/small_pixel.png
 create mode 100644 Resources/Textures/Objects/Misc/meteor.rsi/space_dust.png

diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index 16c54fd3b02a..e0183a037dd7 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
@@ -90,6 +91,16 @@ public void Execute(EntityUid uid, DestructibleComponent component, DamageChange
             }
         }
 
+        public bool TryGetDestroyedAt(Entity<DestructibleComponent?> ent, [NotNullWhen(true)] out FixedPoint2? destroyedAt)
+        {
+            destroyedAt = null;
+            if (!Resolve(ent, ref ent.Comp, false))
+                return false;
+
+            destroyedAt = DestroyedAt(ent, ent.Comp);
+            return true;
+        }
+
         // FFS this shouldn't be this hard. Maybe this should just be a field of the destructible component. Its not
         // like there is currently any entity that is NOT just destroyed upon reaching a total-damage value.
         /// <summary>
diff --git a/Content.Server/Mining/MeteorComponent.cs b/Content.Server/Mining/MeteorComponent.cs
new file mode 100644
index 000000000000..059c450a8a01
--- /dev/null
+++ b/Content.Server/Mining/MeteorComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Damage;
+
+namespace Content.Server.Mining;
+
+/// <summary>
+/// This is used for meteors which hit objects, dealing damage to destroy/kill the object and dealing equal damage back to itself.
+/// </summary>
+[RegisterComponent, Access(typeof(MeteorSystem))]
+public sealed partial class MeteorComponent : Component
+{
+    /// <summary>
+    /// Damage specifier that is multiplied against the calculated damage amount to determine what damage is applied to the colliding entity.
+    /// </summary>
+    /// <remarks>
+    /// The values of this should add up to 1 or else the damage will be scaled.
+    /// </remarks>
+    [DataField]
+    public DamageSpecifier DamageTypes = new();
+
+    /// <summary>
+    /// A list of entities that this meteor has collided with. used to ensure no double collisions occur.
+    /// </summary>
+    [DataField]
+    public HashSet<EntityUid> HitList = new();
+}
diff --git a/Content.Server/Mining/MeteorSystem.cs b/Content.Server/Mining/MeteorSystem.cs
new file mode 100644
index 000000000000..fc00147f70f0
--- /dev/null
+++ b/Content.Server/Mining/MeteorSystem.cs
@@ -0,0 +1,65 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Destructible;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Player;
+
+namespace Content.Server.Mining;
+
+public sealed class MeteorSystem : EntitySystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly DestructibleSystem _destructible = default!;
+    [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<MeteorComponent, StartCollideEvent>(OnCollide);
+    }
+
+    private void OnCollide(EntityUid uid, MeteorComponent component, ref StartCollideEvent args)
+    {
+        if (TerminatingOrDeleted(args.OtherEntity) || TerminatingOrDeleted(uid))
+            return;
+
+        if (component.HitList.Contains(args.OtherEntity))
+            return;
+
+        FixedPoint2 threshold;
+        if (_mobThreshold.TryGetDeadThreshold(args.OtherEntity, out var mobThreshold))
+        {
+            threshold = mobThreshold.Value;
+            if (HasComp<ActorComponent>(args.OtherEntity))
+                _adminLog.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(args.OtherEntity):player} was struck by meteor {ToPrettyString(uid):ent} and killed instantly.");
+        }
+        else if (_destructible.TryGetDestroyedAt(args.OtherEntity, out var destroyThreshold))
+        {
+            threshold = destroyThreshold.Value;
+        }
+        else
+        {
+            threshold = FixedPoint2.MaxValue;
+        }
+        var otherEntDamage = CompOrNull<DamageableComponent>(args.OtherEntity)?.TotalDamage ?? FixedPoint2.Zero;
+        // account for the damage that the other entity has already taken: don't overkill
+        threshold -= otherEntDamage;
+
+        // The max amount of damage our meteor can take before breaking.
+        var maxMeteorDamage = _destructible.DestroyedAt(uid) - CompOrNull<DamageableComponent>(uid)?.TotalDamage ?? FixedPoint2.Zero;
+
+        // Cap damage so we don't overkill the meteor
+        var trueDamage = FixedPoint2.Min(maxMeteorDamage, threshold);
+
+        var damage = component.DamageTypes * trueDamage;
+        _damageable.TryChangeDamage(args.OtherEntity, damage, true, origin: uid);
+        _damageable.TryChangeDamage(uid, damage);
+
+        if (!TerminatingOrDeleted(args.OtherEntity))
+            component.HitList.Add(args.OtherEntity);
+    }
+}
diff --git a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs
new file mode 100644
index 000000000000..e71a284a893b
--- /dev/null
+++ b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationEvents.Components;
+
+/// <summary>
+/// This is used for running meteor swarm events at regular intervals.
+/// </summary>
+[RegisterComponent, Access(typeof(MeteorSchedulerSystem)), AutoGenerateComponentPause]
+public sealed partial class MeteorSchedulerComponent : Component
+{
+    /// <summary>
+    /// The weights for which swarms will be selected.
+    /// </summary>
+    [DataField]
+    public ProtoId<WeightedRandomEntityPrototype> Config = "DefaultConfig";
+
+    /// <summary>
+    /// The time at which the next swarm occurs.
+    /// </summary>
+    [DataField, AutoPausedField]
+    public TimeSpan NextSwarmTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// The minimum time between swarms
+    /// </summary>
+    [DataField]
+    public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f);
+
+    /// <summary>
+    /// The maximum time between swarms
+    /// </summary>
+    [DataField]
+    public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f);
+}
diff --git a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
new file mode 100644
index 000000000000..1cde2ac8fad4
--- /dev/null
+++ b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
@@ -0,0 +1,58 @@
+using Content.Server.StationEvents.Events;
+using Content.Shared.Destructible.Thresholds;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationEvents.Components;
+
+[RegisterComponent, Access(typeof(MeteorSwarmSystem)), AutoGenerateComponentPause]
+public sealed partial class MeteorSwarmComponent : Component
+{
+    [DataField, AutoPausedField]
+    public TimeSpan NextWaveTime;
+
+    /// <summary>
+    /// We'll send a specific amount of waves of meteors towards the station per ending rather than using a timer.
+    /// </summary>
+    [DataField]
+    public int WaveCounter;
+
+    [DataField]
+    public float MeteorVelocity = 10f;
+
+    /// <summary>
+    /// If true, meteors will be thrown from all angles instead of from a singular source
+    /// </summary>
+    [DataField]
+    public bool NonDirectional;
+
+    /// <summary>
+    /// The announcement played when a meteor swarm begins.
+    /// </summary>
+    [DataField]
+    public LocId? Announcement = "station-event-meteor-swarm-start-announcement";
+
+    [DataField]
+    public SoundSpecifier? AnnouncementSound = new SoundPathSpecifier("/Audio/Announcements/meteors.ogg")
+    {
+        Params = new()
+        {
+            Volume = -4
+        }
+    };
+
+    /// <summary>
+    /// Each meteor entity prototype and their corresponding weight in being picked.
+    /// </summary>
+    [DataField]
+    public Dictionary<EntProtoId, float> Meteors = new();
+
+    [DataField]
+    public MinMax Waves = new(3, 3);
+
+    [DataField]
+    public MinMax MeteorsPerWave = new(3, 4);
+
+    [DataField]
+    public MinMax WaveCooldown = new (10, 60);
+}
diff --git a/Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs
deleted file mode 100644
index 3927f9431953..000000000000
--- a/Content.Server/StationEvents/Components/MeteorSwarmRuleComponent.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Server.StationEvents.Events;
-
-namespace Content.Server.StationEvents.Components;
-
-[RegisterComponent, Access(typeof(MeteorSwarmRule))]
-public sealed partial class MeteorSwarmRuleComponent : Component
-{
-    [DataField("cooldown")]
-    public float Cooldown;
-
-    /// <summary>
-    /// We'll send a specific amount of waves of meteors towards the station per ending rather than using a timer.
-    /// </summary>
-    [DataField("waveCounter")]
-    public int WaveCounter;
-
-    [DataField("minimumWaves")]
-    public int MinimumWaves = 3;
-
-    [DataField("maximumWaves")]
-    public int MaximumWaves = 8;
-
-    [DataField("minimumCooldown")]
-    public float MinimumCooldown = 10f;
-
-    [DataField("maximumCooldown")]
-    public float MaximumCooldown = 60f;
-
-    [DataField("meteorsPerWave")]
-    public int MeteorsPerWave = 5;
-
-    [DataField("meteorVelocity")]
-    public float MeteorVelocity = 10f;
-
-    [DataField("maxAngularVelocity")]
-    public float MaxAngularVelocity = 0.25f;
-
-    [DataField("minAngularVelocity")]
-    public float MinAngularVelocity = -0.25f;
-}
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
deleted file mode 100644
index b97cde86a02e..000000000000
--- a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System.Numerics;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Server.StationEvents.Components;
-using Content.Shared.GameTicking.Components;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Spawners;
-
-namespace Content.Server.StationEvents.Events
-{
-    public sealed class MeteorSwarmRule : StationEventSystem<MeteorSwarmRuleComponent>
-    {
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-
-        protected override void Started(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
-        {
-            base.Started(uid, component, gameRule, args);
-
-            component.WaveCounter = RobustRandom.Next(component.MinimumWaves, component.MaximumWaves);
-        }
-
-        protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, float frameTime)
-        {
-            if (component.WaveCounter <= 0)
-            {
-                ForceEndSelf(uid, gameRule);
-                return;
-            }
-
-            component.Cooldown -= frameTime;
-
-            if (component.Cooldown > 0f)
-                return;
-
-            component.WaveCounter--;
-
-            component.Cooldown += (component.MaximumCooldown - component.MinimumCooldown) * RobustRandom.NextFloat() + component.MinimumCooldown;
-
-            Box2? playableArea = null;
-            var mapId = GameTicker.DefaultMap;
-
-            var query = AllEntityQuery<MapGridComponent, TransformComponent>();
-            while (query.MoveNext(out var gridId, out _, out var xform))
-            {
-                if (xform.MapID != mapId)
-                    continue;
-
-                var aabb = _physics.GetWorldAABB(gridId);
-                playableArea = playableArea?.Union(aabb) ?? aabb;
-            }
-
-            if (playableArea == null)
-            {
-                ForceEndSelf(uid, gameRule);
-                return;
-            }
-
-            var minimumDistance = (playableArea.Value.TopRight - playableArea.Value.Center).Length() + 50f;
-            var maximumDistance = minimumDistance + 100f;
-
-            var center = playableArea.Value.Center;
-
-            for (var i = 0; i < component.MeteorsPerWave; i++)
-            {
-                var angle = new Angle(RobustRandom.NextFloat() * MathF.Tau);
-                var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0));
-                var spawnPosition = new MapCoordinates(center + offset, mapId);
-                var meteor = Spawn("MeteorLarge", spawnPosition);
-                var physics = EntityManager.GetComponent<PhysicsComponent>(meteor);
-                _physics.SetBodyStatus(meteor, physics, BodyStatus.InAir);
-                _physics.SetLinearDamping(meteor, physics, 0f);
-                _physics.SetAngularDamping(meteor, physics, 0f);
-                _physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics);
-                _physics.ApplyAngularImpulse(
-                    meteor,
-                    physics.Mass * ((component.MaxAngularVelocity - component.MinAngularVelocity) * RobustRandom.NextFloat() + component.MinAngularVelocity),
-                    body: physics);
-
-                EnsureComp<TimedDespawnComponent>(meteor).Lifetime = 120f;
-            }
-        }
-    }
-}
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
new file mode 100644
index 000000000000..e085a2e159e1
--- /dev/null
+++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
@@ -0,0 +1,82 @@
+using System.Numerics;
+using Content.Server.Chat.Systems;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
+using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Random.Helpers;
+using Robust.Server.Audio;
+using Robust.Shared.Map;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+
+namespace Content.Server.StationEvents.Events;
+
+public sealed class MeteorSwarmSystem : GameRuleSystem<MeteorSwarmComponent>
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    protected override void Added(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+        base.Added(uid, component, gameRule, args);
+
+        component.WaveCounter = component.Waves.Next(RobustRandom);
+
+        if (component.Announcement is { } locId)
+            _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Yellow);
+        _audio.PlayGlobal(component.AnnouncementSound, Filter.Broadcast(), true);
+    }
+
+    protected override void ActiveTick(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, float frameTime)
+    {
+        if (Timing.CurTime < component.NextWaveTime)
+            return;
+
+        component.NextWaveTime += TimeSpan.FromSeconds(component.WaveCooldown.Next(RobustRandom));
+
+
+        if (_station.GetStations().Count == 0)
+            return;
+
+        var station = RobustRandom.Pick(_station.GetStations());
+        if (_station.GetLargestGrid(Comp<StationDataComponent>(station)) is not { } grid)
+            return;
+
+        var mapId = Transform(grid).MapID;
+        var playableArea = _physics.GetWorldAABB(grid);
+
+        var minimumDistance = (playableArea.TopRight - playableArea.Center).Length() + 50f;
+        var maximumDistance = minimumDistance + 100f;
+
+        var center = playableArea.Center;
+
+        var meteorsToSpawn = component.MeteorsPerWave.Next(RobustRandom);
+        for (var i = 0; i < meteorsToSpawn; i++)
+        {
+            var spawnProto = RobustRandom.Pick(component.Meteors);
+
+            var angle = component.NonDirectional
+                ? RobustRandom.NextAngle()
+                : new Random(uid.Id).NextAngle();
+
+            var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0));
+            var subOffset = RobustRandom.NextAngle().RotateVec(new Vector2( (playableArea.TopRight - playableArea.Center).Length() / 2 * RobustRandom.NextFloat(), 0));
+            var spawnPosition = new MapCoordinates(center + offset + subOffset, mapId);
+            var meteor = Spawn(spawnProto, spawnPosition);
+            var physics = Comp<PhysicsComponent>(meteor);
+            _physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics);
+        }
+
+        component.WaveCounter--;
+        if (component.WaveCounter <= 0)
+        {
+            ForceEndSelf(uid, gameRule);
+        }
+    }
+}
diff --git a/Content.Server/StationEvents/MeteorSchedulerSystem.cs b/Content.Server/StationEvents/MeteorSchedulerSystem.cs
new file mode 100644
index 000000000000..3ad88a7d8911
--- /dev/null
+++ b/Content.Server/StationEvents/MeteorSchedulerSystem.cs
@@ -0,0 +1,39 @@
+using Content.Server.GameTicking.Rules;
+using Content.Server.StationEvents.Components;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.StationEvents;
+
+/// <summary>
+/// This handles scheduling and launching meteors at a station at regular intervals.
+/// TODO: there is 100% a world in which this is genericized and can be used for lots of basic event scheduling
+/// </summary>
+public sealed class MeteorSchedulerSystem : GameRuleSystem<MeteorSchedulerComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    protected override void Started(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+        base.Started(uid, component, gameRule, args);
+
+        component.NextSwarmTime = Timing.CurTime + RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay);
+    }
+
+    protected override void ActiveTick(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, float frameTime)
+    {
+        base.ActiveTick(uid, component, gameRule, frameTime);
+
+        if (Timing.CurTime < component.NextSwarmTime)
+            return;
+        RunSwarm((uid, component));
+        component.NextSwarmTime += RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay);
+    }
+
+    private void RunSwarm(Entity<MeteorSchedulerComponent> ent)
+    {
+        var swarmWeights = _prototypeManager.Index(ent.Comp.Config);
+        GameTicker.StartGameRule(swarmWeights.Pick(RobustRandom));
+    }
+}
diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index b11de9eac56d..eeaecc24d800 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -212,7 +212,7 @@ public bool TryGetDeadThreshold(EntityUid target, [NotNullWhen(true)] out FixedP
         MobThresholdsComponent? thresholdComponent = null)
     {
         threshold = null;
-        if (!Resolve(target, ref thresholdComponent))
+        if (!Resolve(target, ref thresholdComponent, false))
             return false;
 
         return TryGetThresholdForState(target, MobState.Dead, out threshold, thresholdComponent);
diff --git a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
index 6a96c5604812..0090c170caa2 100644
--- a/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
+++ b/Resources/Locale/en-US/station-events/events/meteor-swarm.ftl
@@ -1,2 +1,5 @@
-station-event-meteor-swarm-start-announcement = Meteors are on a collision course with the station. Brace for impact.
+station-event-meteor-swarm-start-announcement = Meteors have been detected on collision course with the station.
 station-event-meteor-swarm-end-announcement = The meteor swarm has passed. Please return to your stations.
+
+station-event-space-dust-start-announcement = The station is passing through a debris cloud, expect minor damage to external fittings and fixtures.
+station-event-meteor-urist-start-announcement = The station is colliding with an unidentified swarm of debris. Please stay calm and do not listen to them.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 728783fb3eaf..0d10411cfbbf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -361,7 +361,7 @@
     whitelist:
       tags:
         - CartridgeRocket
-    proto: MeteorLarge
+    proto: MeteorMedium
 
 - type: entity
   name: immovable rod launcher
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
index 6bdac1e85f0e..3468cade76b5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
@@ -1,40 +1,206 @@
 - type: entity
-  id: MeteorLarge
+  id: BaseMeteor
   name: meteor
-  noSpawn: true
+  description: You prefer them when they're burning up in the atmosphere.
+  abstract: true
   components:
   - type: Sprite
     noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/meteor.rsi
-    scale: 4,4
-    layers:
-    - state: large
-      shader: unshaded
-  - type: ExplodeOnTrigger
-  - type: DeleteOnTrigger
-  - type: TriggerOnCollide
-    fixtureID: projectile
+    sprite: Objects/Misc/meteor.rsi
   - type: Projectile
     damage: {}
     deleteOnCollide: false
-  - type: Explosive
-    explosionType: Default
-    totalIntensity: 600.0
-    intensitySlope: 30
-    maxIntensity: 45
+  - type: Meteor
+    damageTypes:
+      types:
+        Blunt: 1
+  - type: TimedDespawn
+    lifetime: 120
+  - type: Clickable
   - type: Physics
     bodyType: Dynamic
+    bodyStatus: InAir
+    angularDamping: 0
+    linearDamping: 0
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.4
+        density: 100
+        hard: false
+        layer:
+        - LargeMobLayer
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Explosive
+    explosionType: Default
+    intensitySlope: 4
+    maxIntensity: 100
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorSpaceDust
+  name: space dust
+  description: Makes a station sneeze.
+  components:
+  - type: Sprite
+    state: space_dust
   - type: Fixtures
     fixtures:
       projectile:
         shape:
           !type:PhysShapeCircle
-          radius: 0.8
+          radius: 0.45
         density: 100
-        hard: true
-        # Didn't use MapGridComponent for now as the bounds are stuffed.
+        hard: false
         layer:
         - LargeMobLayer
         mask:
         - Impassable
         - BulletImpassable
+  - type: Explosive
+    totalIntensity: 25
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorSmall
+  suffix: Small
+  components:
+  - type: Sprite
+    state: small
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.25
+        density: 100
+        hard: false
+        layer:
+        - LargeMobLayer
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Explosive
+    totalIntensity: 100
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1250
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorMedium
+  suffix: Medium
+  components:
+  - type: Sprite
+    state: medium
+  - type: Fixtures
+    fixtures:
+      projectile:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.3
+        density: 100
+        hard: false
+        layer:
+        - LargeMobLayer
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: Explosive
+    totalIntensity: 200
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1750
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorLarge
+  suffix: Large
+  components:
+  - type: Sprite
+    state: big
+  - type: Explosive
+    totalIntensity: 300
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 2500
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:ExplodeBehavior
+
+- type: entity
+  parent: BaseMeteor
+  id: MeteorUrist
+  name: Urist McMeteor
+  description: As a successful member of society with a stable unflinching psyche and limitless drive, natural affinity for finance and domination, you have been selected, no, you have been effortlessly guided by divine (biological) trauma towards this moment. The gates of destiny fling open, and once again you're left standing on pulsating nothingness. A strobing headache of the soul.
+  suffix: Meteor
+  components:
+  - type: Sprite
+    state: human_pixel
+  - type: SolutionContainerManager
+    solutions:
+      blood:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Blood
+          Quantity: 1000
+  - type: Explosive
+    totalIntensity: 25
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 3000
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MaleScreams
+          params:
+            volume: 10
+      - !type:SpillBehavior
+        solution: blood
+      - !type:ExplodeBehavior
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 04918578fa3e..853853fb22b1 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -196,23 +196,6 @@
     duration: 240
   - type: KudzuGrowthRule
 
-- type: entity
-  id: MeteorSwarm
-  parent: BaseStationEventLongDelay
-  components:
-  - type: StationEvent
-    earliestStart: 30
-    weight: 7.5
-    minimumPlayers: 10 #Enough to hopefully have at least one engineering guy
-    startAnnouncement: station-event-meteor-swarm-start-announcement
-    endAnnouncement: station-event-meteor-swarm-end-announcement
-    startAudio:
-      path: /Audio/Announcements/meteors.ogg
-      params:
-        volume: -4
-    duration: null #ending is handled by MeteorSwarmRule
-  - type: MeteorSwarmRule
-
 - type: entity
   id: MouseMigration
   parent: BaseStationEventShortDelay
diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml
new file mode 100644
index 000000000000..70dd5265b044
--- /dev/null
+++ b/Resources/Prototypes/GameRules/meteorswarms.yml
@@ -0,0 +1,104 @@
+- type: entity
+  parent: BaseGameRule
+  id: GameRuleMeteorScheduler
+  components:
+  - type: GameRule
+    minPlayers: 25
+  - type: MeteorScheduler
+
+- type: weightedRandomEntity
+  id: DefaultConfig
+  weights:
+    GameRuleSpaceDustMinor: 44
+    GameRuleSpaceDustMajor: 22
+    GameRuleMeteorSwarmSmall: 18
+    GameRuleMeteorSwarmMedium: 10
+    GameRuleMeteorSwarmLarge: 5
+    GameRuleUristSwarm: 0.05
+
+- type: entity
+  parent: BaseGameRule
+  id: GameRuleMeteorSwarm
+  abstract: true
+  components:
+  - type: GameRule
+  - type: MeteorSwarm
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleSpaceDustMinor
+  components:
+  - type: MeteorSwarm
+    announcement: null
+    announcementSound: null
+    nonDirectional: true
+    meteors:
+      MeteorSpaceDust: 1
+    waves:
+      min: 2
+      max: 3
+    meteorsPerWave:
+      min: 3
+      max: 5
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleSpaceDustMajor
+  components:
+  - type: MeteorSwarm
+    announcement: station-event-space-dust-start-announcement
+    announcementSound: /Audio/Announcements/attention.ogg
+    nonDirectional: true
+    meteors:
+      MeteorSpaceDust: 1
+    waves:
+      min: 2
+      max: 3
+    meteorsPerWave:
+      min: 8
+      max: 12
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleMeteorSwarmSmall
+  components:
+  - type: MeteorSwarm
+    meteors:
+      MeteorSmall: 7
+      MeteorMedium: 3
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleMeteorSwarmMedium
+  components:
+  - type: MeteorSwarm
+    meteors:
+      MeteorSmall: 3
+      MeteorMedium: 6
+      MeteorLarge: 1
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleMeteorSwarmLarge
+  components:
+  - type: MeteorSwarm
+    meteors:
+      MeteorSmall: 2
+      MeteorMedium: 4
+      MeteorLarge: 4
+
+- type: entity
+  parent: GameRuleMeteorSwarm
+  id: GameRuleUristSwarm
+  components:
+  - type: MeteorSwarm
+    announcement: station-event-meteor-urist-start-announcement
+    announcementSound: /Audio/Announcements/attention.ogg
+    meteors:
+      MeteorUrist: 1
+    waves:
+      min: 3
+      max: 3
+    meteorsPerWave:
+      min: 10
+      max: 10
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 3bc6ae6208c0..8876468bbdb5 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -31,6 +31,7 @@
   description: extended-description
   rules:
   - BasicStationEventScheduler
+  - GameRuleMeteorScheduler
   - BasicRoundstartVariation
 
 - type: gamePreset
@@ -64,6 +65,7 @@
   description: secret-description
   rules:
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
 
 - type: gamePreset
   id: SecretGreenshift #For Admin Use: Runs Greenshift but shows "Secret" in lobby.
@@ -95,6 +97,7 @@
     - Traitor
     - SubGamemodesRule
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
     - BasicRoundstartVariation
 
 - type: gamePreset
@@ -121,6 +124,7 @@
     - Nukeops
     - SubGamemodesRule
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
     - BasicRoundstartVariation
 
 - type: gamePreset
@@ -136,6 +140,7 @@
     - Revolutionary
     - SubGamemodesRule
     - BasicStationEventScheduler
+    - GameRuleMeteorScheduler
     - BasicRoundstartVariation
 
 - type: gamePreset
@@ -152,4 +157,5 @@
   rules:
   - Zombie
   - BasicStationEventScheduler
+  - GameRuleMeteorScheduler
   - BasicRoundstartVariation
diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big.png b/Resources/Textures/Objects/Misc/meteor.rsi/big.png
new file mode 100644
index 0000000000000000000000000000000000000000..34062b9a4354a34427a60a87b5a2267a2a3a6608
GIT binary patch
literal 4562
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster.png b/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster.png
new file mode 100644
index 0000000000000000000000000000000000000000..292c93f6e62bbe0c0e1d8e192a48637b209feed7
GIT binary patch
literal 4473
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
LNkvXXu0mjfiaUtG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/big_cluster_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..292c93f6e62bbe0c0e1d8e192a48637b209feed7
GIT binary patch
literal 4473
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
LNkvXXu0mjfiaUtG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/big_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/big_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..34062b9a4354a34427a60a87b5a2267a2a3a6608
GIT binary patch
literal 4562
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/firework.png b/Resources/Textures/Objects/Misc/meteor.rsi/firework.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c661fc1d5b161430f403e3ffe991d3c777f3885
GIT binary patch
literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SAxT6*RCt{2m(dM_FbqUnsWUJF-;Bfu(=Y?$FaY0-z!J2FdX<S1
zNbE$Y688fwDEH#CBk_6|)HKaHP1Dn|h8h6obzS4u1fc?;c~w>XOAV0>AkCL$F+-So
zAcv9wJf+`csX{bB$lMAM1>iGh{<04=5T^h~<}|fHL`N`=<8}@803hah{=E~cQ-JR-
z<Zf0NNfR2&cd|v`EW8QkH1++?-h{4Da>mfM?RM?DPP0_{IUr4;zVCO>i=6}1Fbq3W
z+5K$PA^;pmn9C`U)xiBHinUk|xVb~J8X6@5(AXCNC8r@f0F6TtK&gH3KN0Xm3{3%q
z-4`FjqbVplh7`;%n*s>tp$JkZKn38Q`5IF-fb}E93{XNhzzuLYz#I84uX_M#-hluB
N002ovPDHLkV1iH?ksSa4

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/firework_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/firework_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b0847b76329ec0bc8d379d3cbb98e0c128ec08
GIT binary patch
literal 430
zcmV;f0a5;mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SU`a$lRCt{2mdg!-Kp2EEu?9-uOaT<bff^`+8aPl41#qSWnm}jc
zn4e`~A1rDjlNeSbJ0JgRxhG%N1#khZ0P;MaO@ADQ;r0;#D9f_N_i-Fg1KUkOnx?xq
z1MH|a0bo8&le(Hf`o2$M$Ql7aa4pSa)x-+mwehT*o+WD=5`yV~ilV^fU6e<n;WY;U
z!NP0XHmRygt!0P!!dL-V1G3^_-ZYJBS45>OOZ7W|0OJE;1)wo!gRBdh0|r8BP@p~#
zy8v3X&oJQALeiWt_%Jnx08B#$Kr}T)0wR!W6pR428>Jy6%{jPSQ{mhN*a#c)38i7z
zb&ECy5Icq)vIXLO9P6Q{A;Dyd7>T_ocmZ%qvJIiSt`k#KAeWKt9RY0ktn!&NfYMvi
z^}GmrBVr_wV;BJ@#5@>4K&T><EsJ&3N$3Is2o9g<XMqny$f+3ZtvK{Z{=L`o3*hen
Y9*n}~m89Kx`2YX_07*qoM6N<$f;ywAq5uE@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/human.png b/Resources/Textures/Objects/Misc/meteor.rsi/human.png
new file mode 100644
index 0000000000000000000000000000000000000000..d73b573fbe5e5a84d70e7f34e132a781526a5b1e
GIT binary patch
literal 5045
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
O4lp#htzW0>9Ql7C+KyEK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/human_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/human_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..8207cd57d27f8c61d53be8ec7254799b275f9544
GIT binary patch
literal 1844
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..27b6b98ae6d86fd677de3ab2def545626896231a
GIT binary patch
literal 2921
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
TBRhnY00000NkvXXu0mjf2S$Bf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b758c2c1dd2579d2de811d7adb9e6581ca7c9809
GIT binary patch
literal 3594
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
QVE_OC07*qoM6N<$f=Kz@$N&HU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_piercing_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..b758c2c1dd2579d2de811d7adb9e6581ca7c9809
GIT binary patch
literal 3594
zcmV+l4)yVgP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm000ie
z000ie0hKEb8vp<eyh%hsRCt{2o!PDv$r43<8JeL7Kp>#iLZbVn#UJqhPy7Mm1rP`^
zh@l&LV7~XR63f~IRd!82K0fl6tnyH<jEsnk%*x!6bz-r{R<Sq0ma#X$mNCfyH*enj
zZ~gApty}+D?9m&OTfpVZmzVFKJ$ts;V;Dvopw0XJ{wTD9tluW<Gs*x8clz|{=JP-Q
z{IfWF_Uz(^AAVT;_19m^-*?>*wLWc_TF1c#P#8lG%D;5!((*mub42h>VU<F<Fho&#
zeT*P*GG2f>5^|@ultBil%2ych#~*(zPMkQ=2$tv1)e5T8k>U00*NdNi`f2TdRn!n!
zRJ`?}uC{bP*Zyxz%kOP~R6d2DIdf+5@4x>pE?&I2c>MTrbI!YW?-s|8A76UPT%B??
zyh!D%pf>QoF|t&p1L_U#-MiN~oWJQ1Z{NNhWb9rBs0vW|98>wt1^+J;M#=w<Z3XG|
zRr!?j@#Dwly$+#VC@npAY?*-YYM8Cc2h`Ovb%-HGSZjdV;Q|T-coiOh;lhPR8H6El
z=gys`;`R+=V7b??UvECE)N9wSE&lxT&*gWgPMuoHq!DVr)YUS&kZ~VSCV2SpVRKaZ
z;KPRxi}&x}FC79S@ah}(dbI$QuXR!En>TM7rSrOb_ip3;-+%x8^8BG*S5cJ@Xx>y3
zC0xCFb@AlMlcjQz<JGHIja;8TeQM4}DFCG)&(J|Z)&b*kZH)T-`Sa!X$U*tY25c?B
zu(!?#D-EC`R6Yto04t61^@bmR{BaqE`2F|ae_sqm4LOvRO}`Dl{q|cU2S<#+`Hvnw
zTDFX_F!t+k)K4SiIVfMHd!C`Nj}g|kfE@AYRe(x^@4ox4@qU!Wdw{`Sym+zvf1jq9
z{Y-`pu1g5WW}op^CwTDSK~p{+f91-R#nY!xoABuQW5Iv9j^Pa$f)h9ZpnSuj!}3)|
z=sgPJf~f?7A}EN;V<3)nLI^Un4<Po|4ix1Zdx6)aEaR;qfRKO}(h_X}I>ng#66?i(
zb-tf}{<-yBTOsA6bd2CAiV$wc%(-cZP6K2(NTpE81ce|Z9k7)J7{CzH7psPn^*WTL
zL*#!9g8;)23UA-Oy%+=Jp&pc_kpV_v^p`SWAdEn0<~PnE3fNk0v2{4SvIRKiw*v%p
zepxU|rZAhQp~nggfr_lk#+&ghWy&G&`Sa(S@2isRd<_>vhr&98PUR@aGN`k|PX{2J
ziviGyvT+?gcj;oK0sPaizyA8w*f*g!Sn2Es>P^f#(9{h>{!fG2x#?Yk?;QTB1S*W@
zx5etdP=+*ubriOGTAksK-wlEMt`WM>yAQw!8H@FJ6rxvPAOuqRD73Eu@KC~DHA2q4
zP$9~)Jj%)D4*1O$gp6atk1}{e*=2<6_Z*%Y0yTo)clALl4Un<ln-MC9rS-<DeE&y*
zH*VZ$KKGpl&<MP*{Q;Fu@1s1*<~&9`e)hi@#Bzs(pOk@XR3lhN4W5P(C|-GUN@nmV
zC>20+#t2-DaPZYdz9?UhP<h-DkGUI8Z&8M<Jg^+UOGn7ge~!t(3`h2f2}U_OgZDso
zz{)@RKEOg9k9$Mn#SIZv`C}*KYA9L?8goC@82pxf4zK(7?=Pl+@-u`||IeR4H}7-k
ztMj3BLUe}QK11JD1JnsA=T@>q<hxXm%BRUXL1p|K>V>O};Jk}+ftN2|Hb>4)<&X9L
z3`34!D2tG4pQ6EY`oUH=B>Z)@04tsyp|HT}@hDy+O`VEv>y&|gk#eXQK-p83-&Q^^
zX9OIYgVamy>?co0+kCR}7Mh<kKDOONO;JQ!OR$+^Y`xFUa!jYYu6&Njz_nL7)z~sy
z4Uh$A9IM6<eph4O9EwOIR2j0|xs_jKSZoL@JK-$28l%sD=0cl8Y{J;vK<^u|!%)Fn
zJF4VW*i#d?jJ*N2jJ*N2jJ*N2jJ*N2j7i+k#8Dif90W#lL!EbV>iMX!q7NE_sfnQS
zCdX3$#-J}Tchk-=7h`%5HL)^<lceN%o2YoLY-O%hR7&}rGIcSh+sdAmnwTM{ZJDtz
z6Kp8jj1Srv6n>ZI&Y7>^b(np1Qczy13ow@5H!SyJ#%0J!<>z~TgG$JB@LWbnZ?i0?
zyz44emrSXUIb?BKnrU%4u)KF2#C7vb?ifW)><T+p+5!QEx)?FH5hy?Di7H<foGW9s
zMHn8(@Iot+tIBol@6?TJAn6Pmf1MFlu84KTS_rTRAp^ig5@{fFbjrCnpUO-Y9^eS|
zBYByIhcw7kiag5CK?iV&G|2+IPx{U}BlKDk^TNCkB8jRfhYBl1CQVFj1rl_Di!Uml
zmvnHKKxJzv*Ho6a(DQ-hEU&FBUECqC$_U>Wplx{N1u2MyX(}vJZF!+sr!{?NYAZ0z
zvE0|D{Ddt4XUJvCDIrK*xb_Px5MXr5M-G0=)GWSpz~X;>-zG<E3()&3F*cjD)V#`>
z=RZkLoB|iOt&o+@)+S31<ySeTFyk@|=UTTd90oSLsANb0<jmA1uqtn^GX&+rvlUNd
z<q*R2&0gs$a0pC&m5U<}$g*^T3TTut`KBThL@Lo(Mjl6VA^gs8C_O%h$2AnS8o)*G
zM5f{BbrhswvUw(lXDX5i#dYz#RD$H(1m|G{Ggzj;Rz<yPtWV?f9=&AP&6ZP*u#~l}
z&?I94iBM9lCF9}|2$fkP76#<SPeD~66>{X0oE%{4Qd6-nad}KXWcV@3A_o?{S1*)-
z3>t!?tU=FNmoV5Fg4&pGqBecbGgT;4gAjJA0qkRPAYeX18%+=+oIH8*tA1!q2*gvl
zMk?RBDN7n({nY81b!at!lsuCg7}0psW9K6r_nINnCfr!0=NRf7389SI@<bb9c1ro&
z_Za$UVHtLj&G3}YkOP=Oqab-WwGXf<;uTh~cFZKnc{7w17z5>y^~P<#-sq6f@@;)7
zE0{72HfG~oykKDe^2;xc;k|yAn=M5r%=?ip-cn}>(({uDRksFkRDd#!eRC*3A;&c1
zr}rRK)Z{oaQ{=2FD;PThtMbeBH!s>OQBlL8AsQX6qDyu%<D}zx3(m{CK${!_AsB^7
z3(vymM0SQ48D-PrY;{%nQ~MrJ6GV&()DK-?1g2vo>bBhjt>db8wg8R51vG-gIuxxk
z5CDakn>*J{n6P4izK8M%2X=@K2pq8hl|N+~Bx&h>&TM?%yDtX7AX)dM$B$0bZZkqo
zyE^@l3dy9jIzkzWq=^G#Yn$?O`vm{Hm;o93>bz8y%TePH8P+byq!EA<U%+tW9bd&9
z!%*OK1W@_h2jFq0BYB=O&rznco|z>I+J>5yvpVZ;DM^l{bEY*oM^EK5e`{!FWS_EY
z-dJwLA?8$m_JKqHH?*ultcYw4ZYdzL>1lvD7wS!v$ZUGU+#E5#;-DBFgJ~&U-jPi(
zZ#d@iNRHCeb9Ax^<sT$Q5wo^c+1e>@Tb?<vlhnkcv_I+28DN*ay$w5OfTM=J0k(|2
z0k(|20k(|20k(|20k(|20k(`oZ-5~?rSIZB!t4)lNX*5@&#m%75^vqfWD~gw2Z2#3
zN+7pw5iZzBDV!rQA~)@>yRyj5XMJLBTKqwwcZN(V+;squ8yew_7=Z8cK@M{$#dUz(
z6PowAQMel_?a~uGdTrc_GBf+bHChQ%$(BF?$BrFaD$J?ru}0{6NCR9Qw<<#h*%&&?
zuC#`gEubc7xCkOgC;6YLC|d+dnfgc*mjW~HvoH@)%Kbt)#|;8qlirn(v@$~`W3GEO
z1CDj$JeMWqkj}X*sVr`l2|<doSRXb^2j#n`sJzf!Fv3>`s418-!>A-pzHSLGPt)+^
zXN>^(&G%yzk^K&U000-r-D=?j<wmZ&H<O3gVILuV(*o+KgJ!O$!9<V&>~{5biuD0L
zX#`Md*?p0V@Uk&50Oi5R%MD|JMsSVV3`RTW!)An)>}V>1(lr8={rm5~n-?2aYm`Lx
z3mJ~4P!;pPJ}o1WTg$^ys^O2;Io1I-jg=WP4l&IHq2h)mU@}H-sBH-7N*^7Hqy`cO
zkwH?dovx!G<gjdxDBaF^F0Sg__{IRPxBA=|DS2jpSo!pHLsRZ*Zc^RUis$Ic4wv%N
z%W0vGh%7H1V5$>r5?>i0=^xNNB%R8JlL1}n;0cZ3jauy+1`GJ5wK?V&zR#2?yxrY(
z%_XZe`@@E{?C5-80!JCiZ7?|vLlG{Lu{;*WZL<$E?@KRNKH!e!iMa{Gb7Cz!S|eEL
zd|Hwr%DgP#_V%g#u_2)HfX<ye*ZMq}e4v~#pE!rXhY`Kl(MeQIo_<w6aF=z@&Er_e
zhO3@z>L~IVhU|Nq%6)n6nAbRr=*^C%l6K5CbCTf%-<g}+men#=0bLaJ`ZyKJMDff+
zwf*k37KaSI+0k~)z|L9EPUUBasL9P!6yOb+QxcYCmQIE}r%uFS^?opD>tc<-D<AOY
zP&F}E_z@^E?}#(hfv%2rC}01eF_@mtv9hD<p89n%ZmI{?OdS&>Y8q&^$}IQRuFZz7
zL)}$<6<O9P?YSPPkhuvp13jlbc0u`I@}m5z3ijRden?pwylt(*<E|(lY?KwTsb>k~
zdIe}(@Yx0BgF{bC=|Vo%WS2a?VkZqyA8X=wiyg#H8UXC7!Yg*x07nJ?1LlPk!k-E&
QVE_OC07*qoM6N<$f=Kz@$N&HU

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..27b6b98ae6d86fd677de3ab2def545626896231a
GIT binary patch
literal 2921
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
TBRhnY00000NkvXXu0mjf2S$Bf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4e0cf266cf98d4ffaa64c0f4c014c5049574d3d
GIT binary patch
literal 2088
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
S=!|9n0000<MNUMnLSTYEO1OOh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/medium_radioactive_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4e0cf266cf98d4ffaa64c0f4c014c5049574d3d
GIT binary patch
literal 2088
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
S=!|9n0000<MNUMnLSTYEO1OOh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/meta.json b/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
new file mode 100644
index 000000000000..1e857be2cbdc
--- /dev/null
+++ b/Resources/Textures/Objects/Misc/meteor.rsi/meta.json
@@ -0,0 +1,271 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "small",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "small_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "small_flash",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "small_flash_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "space_dust"
+    },
+    {
+      "name": "medium",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_piercing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_piercing_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_radioactive",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "medium_radioactive_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big_cluster",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "big_cluster_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "human",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "human_pixel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "firework_pixel"
+    },
+    {
+      "name": "firework"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small.png b/Resources/Textures/Objects/Misc/meteor.rsi/small.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c729ac87e9396c7156b483d25d26ecc9714c033
GIT binary patch
literal 2458
zcmai0cTf|E(oaGH2@pu3iH3s^s-OfxFmN<u2)!fvl<p}OI_L>#010qF04bvMej-i5
z1L+VTG-*Ky38DxZf+EI96Z9T8-+cePnK$o`-JRK;`R(p+cV{-)(cTg+DlZBE0N_?+
zqVs|E{zss~2l`#!O~V5N3nrfn0{|rY{}Eu$QHjF`K3glIx$CWh^}=DAlo8@gQ|ZIY
zc$-EFyu0VV!{y=Qjj<5&n6ColTNLA6bDXQWQPU^g`L8+F=PtTk^kKjgFY*pQ<eav2
z2?xoSqbKDGDTAwEJ(5}po&Zdnf?Y{{4r>kLj!Q6(dv%FhrYqQ425&5O)|L7>jH#M2
z;+fSBk{k|)&R=FQ`Se6d`Z}kDxwjXa#5(J!%Th%n4u@^7y;@pkq|>V%im76<$13J-
z-Qi7FhTltKXIyc56uf7X0gDr#oZwCrSDzevZgdSinTJ-h$8ph{?_TB`JPtAJ)*EzE
z7YDHgV(rC8&rrv!8#dl_JM?aSeLw0Sb`kX(lCo4-Sh%#mE1(~MF!{q-YP`+{uWktu
zNd+zWA9zs}PdTtc2-L$sS9!5B%HYC_P?b}E&pdW%$4$=RVLu(}Ut57!p@b)bbd1qf
zzJU4Qr+k?TGgdi8La_g3iB6xLbsrgMR;Ce)ij98{y?N{rheqB%=$x7P^D7_~l#~IE
z7t(#Ur(cbiD`Nuui2E<XxYUChtMyz_tbr<t-&T;BZ-+9Kc|jP|QbF@)a{tM#Mu#_D
zF?+e5YMV#|O;l*wHP0qm2I$9S28b_*D@ZCBvoJK|$12Kd^d}&8{rl!e`j5SBm-7H{
zZ~8B$RQaCa`#paylZy{+8U!uc7At)j6K?SAln-2J#T!TO=zQF3vZRbNru5>dyl7g7
zJuZ(rmZIWwr&?g2$`Ub*&n}4}i6~0fp`nJd)kUYmR5u@f+dfG0y36mu+mahq7TiCN
zw9kXR7v8HPp}}Byskz>#gAotoqwB*pu`idP&VY%h0c&*L$`$t3r}?IDzaJ5qwKBiC
zvH03o3gr>>rt60?j0T-X-3ZqxLQ}F-eF#vFeFq^<7-JZ$_;lmmSX8CEqQc#u`wyon
zqZgQ{hD@3qkaS0!62a+}tarni8OKlo*O}W*mnW*`c8o;MfhPfS5q-!5g3JocO^z)^
zD`${>pT}dc`O1;th5?D?ednV(oW?)E52{#+;zNwTa4V@@TA)?qVEA=HA9OInWJ7Rs
z_zmEG`mdo{g(3t{$1Og#(quZTTEyA{WqXaK{F>Y*py5_Xrb7zA50M47U6(?$z=d9f
z4I%8QpFK+O0dAF&OWEHiTmi9XbS#<!$Zu~!brr*873aeMUS!<&_<IFonO16qZW31+
zmg!Fzjb1@De@HeZ#ZCl>`PV+W0v}u0@<)~k>B%rbg$=xY7L|XkZoHNDqckS@VcaJq
z!st+1`Wp`Je9@Zcr6@nO<t_TDpLZcKHqZY57VXXa{@a=UU&v1e_&Ku%5f~8}UMriH
zuWHk)6@Yatr`LOEz&{j3s;3k`d8su;i%2TQ+4au{+L5$X?*?7HIbwg}J4-S$D*I%s
z-FfG{y_S=$YN>S|#{qx*5vD&RgQL!@waShb1;g;y?GIDNEu~8XT_6G}ry0TxvmaDF
zYL~KbiJdX4sIY8sQ~}tSQhGX3VqFtGh^c!OV&2c6+|@)YDrnQ%Dj#ja3=c6*Q=Z9D
z++nR}1KrhC?JDBsmPP|8nm+oOvd2C5?OMEqG@nJ7#FpH0kI==bJ7~Z+oxWiTYl-M=
z;rIsW2bIK0K)BAD5)x}}rY#o}o*iB;$gETp(~~BEq)0iAmm6+ll2yMRiFfRk0Z$$S
z>9>Tc<^v#(hQRnCRI;)EJ449uZFoOy;(}?Ui8-K5V8e#6%y%PqzrJ6IUI!+$MGp=n
zzam7X-TM_*qNHbWqv|w#S&mfnGV^NAdB@11W%l!H!@#L7^B%5kg33xJp}4#})hc&b
z!L6Am+>S@oxDFZe>p<faMS^`u-{0zODD2wHZW^&rGRcH(hUiC?MsRx6v%qe16sO-p
zL@BBNY6-05y2vU;p-OaeR!?V-tk7|_iqe*~n)d3D^*sY;VtKL1#5F@x_9Y-{T}&<J
z`;XPBay^5*Tscg0B})^k(_cX0)w*f)VcX7A!bNpbNo=%Dy!9zl3!c$9=6KLkG5*-y
zodhmeLlGjghe22Zdyumuq<$|(rMFbuw8#5>k0WQNcb#(U1;0+8C8y`rqzY$|C~9vh
zm1c%uk^apfo>$+pv8{E9fZ%h%=mKgPi&SHGjyR>v!5G#^tEAu<Pq909J8+<$-51iy
zVffrC#`Y}yFDvC9YO7uvM6{y({2cXd)bD?Gw&+wOShVk~dUA_jj!x}X9#-dF-FWUY
zx>$wJ2h0uO*9<O}JpDx{1;CA8sB~u(<D<Y@A$uEM#5dVNssDTZ`QTQo=9#Rx6r8t~
z!{x+4CTiC?uYx8MlI71lBkwoB-r1ebcpYjqOd8u+1R@%fp{e7SgIGr+UYuwl`dgt-
zwP~0vijiviJhf#%bBGDn9W*^hMXIweQ(9LgLm!lVG3u#vc!pCAHwT@WP|kcDvn*`z
zo<RY-M(JOZvQ|z35I(-5hZy4~&wVo^^IQG#Wgg_DOGYZ?8JS6{meMDQ90j&7!P)pP
zDSxDQ|GX0+tsJSwZ*&ClkKuM+$P4-mzrR|G;`uf#v}e0HZ9z-IjwD-%o<I!VhHQFZ
zbX7}n@3dXyVk(TYhdYE}p1f$QA#BguX@WIFDb_f}aPCQB6oy9zsUJ$VMrd0)V`(>B
zM`n)aiCQ_?$U)}6ehcB|_&mv&Mb_u;To^Xen3s6axoFl0Ncti_Yh$*x0r=QkhCP>N
zG5}k21y(m{Ma;~2Ao0j1M9(g(1WwuC7&;mO*=FbA9JV8!H198CPPoDao?3bJz_SF@
z#;Q<-sSHH_7|v5D>kj?s)E0XxgHm266^p>8OD88>*DuR(%hL>yg?L)u4fqG+#T+dc
zTw~GEPEDBpuqHoQbmL3CyltNrc<Z&~Q~bME^v)}Zqce{aMqJEqr&L>Xq~+$U9q@eB
zdn=%yud>j4tFKPUZCkw7AS+2nF&8KA`O*0E&S#nY)$k7Y?s7>vsJ?Z@Ro`_qPkRI7
xxMyFJ-xGRMm+Hfkd=5)d^)@Z}&wq#ii)C*glD%)XaPVvatj^dI>n*(F{teneebWE{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small_flash.png b/Resources/Textures/Objects/Misc/meteor.rsi/small_flash.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ff19cde080fb5bb5befe72894e69b6640edca1a
GIT binary patch
literal 2484
zcmZuzS5Om(7EMBALj)3vh#(MZ1XMtZiV~6#N?a)tWGPaflm(UuN(n6zA|(_df(Rl=
z08xsRr+`S0fC{1%1954gN{bZfg!0%Q=gqwLan7B&cjo@wbLQN5D+^O0s1y_c00`mD
zaMp*_^&dd^4|yV!bm6cF_?y`W006>m{{Wb-E-Zc6^TgvYHX+$RaxSKb8^YW7;-;I9
zOqjtV5`_ffX%GrL3c(i@-KGkr0tBku%@9}wLP0@k*bk^M4yW-@-<u5+*(EDq7HjH9
zCS{h>Y`+?4U#eNSp3V!ImJK*!e+}|635)g=2c0W`(@(@ux=w-JP2?HCVD7ix*Sr*2
zgPn>wzhfW;O%!U>u`aNf<J=e)l*&1I0<^5Z;GLG1)~I?<XQRQ+b@#sX`ML}Z7k%eL
zawZQv*C-QUxCKX+Xm{MFuB_BL)d#Oz<mh`0l?*PX3f^B?o#{@7gdFTQMjo&$T)ysz
z4yAa3xD4j{0(<0zW$tjoG4(au?ua+l*W4p0Y^R2h-W-GQVAtllWSWLcQ>}5L#9K~t
zB#&&2lV+(PbQ&ltT1n1x;taPC3#jOF?dK=w>tS-JElzHHbYuADhOFV;VZ3;`Q~kgh
zyUG?*=0tnq$mSAfk0(_DUx1WZ_Y9Odj_j;2H2(Q5`{PDuy86h66gkHSj2<NDsbQqE
zd4ynAO)iS;ux>OI@hD;IF=Zv=wEe_WgYfUSI89E~Bj9R?<kX&^)Q!5pjvN#@Z1BMM
zTP3p@i<Nc_RG?Hw@-~Rmp}ftd&3nK3G_x1BZEDH9;N~Z(;CvXJdUt<!ZnPnka4|ZF
zV%K$r@^h)J4c8C6ELh-3zr~GyC>p(+B4@bU^5Oma-Tjj5r8|QKh98n;R)?4oEGe8=
z@719z7++33sbVSI98bG~=_G~7(SJMK_%-Lk?RSk~>z!oY#^+{J8c3g`q726zJ$`o0
z`#zJeVQGJl*H03by*$f%ZUYfOc&NPtvR~RyE)KudUJl4#K0L<L-OS*>#3&+O6!8{4
zlgipV(+QjJj%zq?k>80|;W2_#=GY2aX)H=&VW4bvJLJ=&GfgRoc9Db~SAwQ<`PxxW
zh32#0mCzp=I$KWyKZ<Q~|0cvJ$Xp6rE8?Ic_Zzy|!SHf<9LQAuC$?G+B)TPwkRn7C
zWMP!x>w3rfD!#3qR|jT?o`a3yvnh1G6<=rhcflVg##`g?Dd^Jz0L$0JK4c+^HWN-n
z9=t_YIU)(oH?{r*N9^tN$4PQUJwp&7n~OOdl>Zpz5@|78nqO0gTpPCT!{OmZJJOJ)
z<OY{GW-;6(%KA)z4B6Ud;-!{|Arkl#^<&|*)sVjaE14h};JrIIJ%}WT${kMIxq)^Y
zdK)lP)p{qK4!>7713V_6$Cc#1^7yo)&pzhfRUBN!A<3BSwXW9l>-FRnqglG~wVA(*
zd=-3&fvuK2^RBNjzldkQ<zRa~@5@OCm7O&X46WmUTe&cP*vw;<A1PgXlx?syk%-p-
z>)=Yf)c<iLLK_Nv{Qu4RYh()+G|J??DbNCL2#dd&v@$R9&ogIY(@=rt5gEw?G=RF;
zc&rX7R!M$Jm-UkbyoG;yG2r=pH>EqRrou7Db}0)h>+%F}$xJn-uy_1>gLoI0gr~~r
zOeqdxPpPatTC^uA_w+Z8S!tA#y$e#+Cw(Vv5$!0Si%DO2lGM$5Jro_sKL!V!gG1>O
z1UiCv%Jt=Jif145(0rF2gb7aoQwW_FM%j#81b^aH8Ac+e{$PyB$JV_yQa8QvV`wI(
zJ~i5`@wApb)U}5=RI{#%t&D4sxl!xS9BS_jo=2#G;J98mpXsBI=w6RbMfY7B$k(Sa
zYmWsp?~diDWh12EX>%<MqK+D9_MRETpj4zC=#P5^;FL;}d)I;1OuU#{p^oTn_2a&d
z=fvkDAY_)`6FuS`cDYk&lc{0w(x?-DKpDm=ttunB8vg;I^fF>wM7EOqZaRrN<kIl@
zvhzj+uNdFO>kr4HXg9C99qlrVNWP7RUayKNOLCuhky9yToOd6rd0b$1<EmXB>;WT;
zj{=9<UkDOtvF&`O*R&HgZy)4OXVd`gDK<&H#-Ji?dA33el<+u0siVMzlB~I`d89D<
z^Fb;$mhr<VPS|{b)Oi;T@~~RNxJf+R=Q07jV#sXXHmuYIV(dN`IJ-RFYN6Yp`dc~B
zDnKH^<xfSFhur=%xJ!|cfOyn!?d<}e42VsRRPJ1K)t6muBrr>`@SeCPDi0D;=*AM{
zG=`s_Ybiv(9t@wh=O4Px`ph~G1>DvdIy;nwq=7BWisxAepEv5O6%bvm&%pc@bi&=M
zIgwHP<(&5bA3rPID;d~v!wk9M2a2Z8op#2SpX_+#&{PruNAuCsFIpZ=wMnS7A+|=E
zm^0R%Ftw4G=ua6MJYtf|%x-}Mu(K8SE)8i}qRtqYj0;i?Yr65XrY&yfvKBJ3TFw1x
z!P6j!cS+oVw1~;Sx*n5kpla_eQbNNOHYynZ6;;2~|Gz1Q&`vFraVmePXXF-CRYQ15
z=V>TrQ84O+Lg(BveB^194v~CF<@=e@%D~jTn>QsZW7+vs2VBQpJx&KLnX){7qz@W1
z@%LHzP)HB9_yRc6K}%#Rp;J;Pi|^T|f1_)4*V)@rcfwMS&~2=!XB0&Hos((42}RHo
z4Z_~CXrT|3UTDlHXS!8<YJ1Jd0!;)Zco-`hOBIamA@o7mB_#Kn8q6q9<&5y4w80yI
zDP(%0uiPTJ#r>o)1?$}MRY?q%;b$px#1;~BR_u&Q5UA*xvV`J#k&kkmYpFm!gsuc%
zI+`mFKtvTL*$+r|bLWQv`Tb4l@uWF`lf2LPKzzKwQcR7GDZ@R!51{}iPn|N4zSui^
z>SKAH<!vgih~+iD2T1o<TY?2;R>`1nH*I>i9O%lJetC2{b-Ztp=-OU+iXJ4{c@js?
zl-0nl6~_{H{j&M6nj$4$LQ6~fKkO#?(!m{D6zf6%P~LXZx8Fs`uY8Xw&lXEbQpH*A
zeB=vj?zi&HFS~TFQUjAL>m$BQ`7MxUE;+a)Kf>4)Cj+f>!QLWp0}Q?&c@8zU_t4wV
z&g+gYYsOXqv!D%0ps`?<Jq0#gzLCtW(1!HOa+8)8$)nTDdY}4tKeXyrr(o=)7^PQE
zJYduyFn^#;`?na^q0qk=b<X)F&D{dB-8CXArduXf>Y&(aO#-c>dG?FrTh-iOf6g!Q
a8~~4pBkg0FXSELBFaX}z0#}Z8rTzzr51erT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small_flash_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/small_flash_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ff19cde080fb5bb5befe72894e69b6640edca1a
GIT binary patch
literal 2484
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
a8~~4pBkg0FXSELBFaX}z0#}Z8rTzzr51erT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/small_pixel.png b/Resources/Textures/Objects/Misc/meteor.rsi/small_pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c729ac87e9396c7156b483d25d26ecc9714c033
GIT binary patch
literal 2458
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/meteor.rsi/space_dust.png b/Resources/Textures/Objects/Misc/meteor.rsi/space_dust.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e13a867d8da7ada3018efeec3235b0aaa58573e
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQ0M
z#WAE}&f95$T+E6*F3~SEza`8&ytsmo|CwpjvI+fcizl0I3Mi{%nfOFf{nhKjjd=~y
z5B4(#dFA(Pz4kneLHnXcp$5Zb4yF}x-po(t?BAWU)>rt{t)Np|luQ_!6h9Qo94@_~
z%KVZ|fTQOcpQ4JGe+zTQ1P)%ts%00QOlNGiV?Ds~Ds(YBt8QtdXoD{wkdnyX#wPn<
z;%;uYP>bYq@(gM_jwj?X<bSwW`F%@{llF=`eP>*kZe>YOosb=UUca>Q+MBiM{cTJy
zrkb4U5ox%dA+dc=Th9~I6i26B2Yz*Np4evp@XcNR|H7|Y1l>v)UE&YtHOTIgdB7}a
Xvg!Y+NERDlC@^@s`njxgN@xNA?pb~N

literal 0
HcmV?d00001


From 06c8238164c3b278245c94f5e91c5195fc836084 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 03:39:49 +0000
Subject: [PATCH 495/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 51fcaa28a05f..8211adf57ec4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: blueDev2
-  changes:
-  - message: Generalized bounties to allow selling them off-station
-    type: Tweak
-  id: 6240
-  time: '2024-03-28T04:06:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26469
 - author: Simyon
   changes:
   - message: The space dragon can now open doors by bumping into them!
@@ -3848,3 +3841,16 @@
   id: 6739
   time: '2024-06-15T03:23:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28999
+- author: EmoGarbage404
+  changes:
+  - message: Revamped meteors. Meteors now crash through several walls before exploding.
+      They can still come in a weaker "space dust" form where they don't break through
+      structures.
+    type: Add
+  - message: Meteor and space dust events now occur on regular intervals during a
+      round rather than being tied to station events. Expect to see more of them during
+      a round.
+    type: Add
+  id: 6740
+  time: '2024-06-15T03:38:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28974

From 748e5831e834b192852533e5ce166b11a17d8cbb 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 496/568] Add moon boots (#29009)

---
 Content.Client/Clothing/MagbootsSystem.cs     |   8 --
 .../Components/MovedByPressureComponent.cs    |  31 --------
 .../AtmosphereSystem.HighPressureDelta.cs     |   1 +
 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 ++++++
 .../Clothing/SharedMagbootsSystem.cs          |  72 +++++++++++++++---
 Content.Shared/Gravity/SharedGravitySystem.cs |  37 +++++----
 .../Inventory/InventorySystem.Relay.cs        |   2 +
 .../Entities/Clothing/Shoes/misc.yml          |  18 +++++
 .../Entities/Structures/Machines/lathe.yml    |  11 +--
 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 ++++++++
 23 files changed, 211 insertions(+), 124 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 a3d39eafded8..000000000000
--- 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 ca830767bda8..000000000000
--- 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 cb50ff114e0f..2e41e45d3f8c 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -1,5 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
+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 3838ad168d1b..000000000000
--- 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 404cc6390577..d896fba71c49 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 ea62d4a81954..6807b9df4a4e 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 779b2f59719d..f53d658ebd7f 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 000000000000..8a4e2c6d4c9a
--- /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 000000000000..a8fcbdd2eb3e
--- /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 000000000000..c5b2ee3dfc8b
--- /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/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs
index 27fb0c1a5024..bb3b05074f2f 100644
--- a/Content.Shared/Clothing/SharedMagbootsSystem.cs
+++ b/Content.Shared/Clothing/SharedMagbootsSystem.cs
@@ -1,5 +1,8 @@
 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.Slippery;
@@ -9,8 +12,9 @@
 
 namespace Content.Shared.Clothing;
 
-public abstract class SharedMagbootsSystem : EntitySystem
+public sealed class SharedMagbootsSystem : EntitySystem
 {
+    [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!;
     [Dependency] private readonly ClothingSystem _clothing = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
@@ -29,6 +33,11 @@ public override void Initialize()
         SubscribeLocalEvent<MagbootsComponent, GetItemActionsEvent>(OnGetActions);
         SubscribeLocalEvent<MagbootsComponent, ToggleMagbootsEvent>(OnToggleMagboots);
         SubscribeLocalEvent<MagbootsComponent, MapInitEvent>(OnMapInit);
+
+        SubscribeLocalEvent<MagbootsComponent, ClothingGotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<MagbootsComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
+
+        SubscribeLocalEvent<MagbootsComponent, InventoryRelayedEvent<IsWeightlessEvent>>(OnIsWeightless);
     }
 
     private void OnMapInit(EntityUid uid, MagbootsComponent component, MapInitEvent args)
@@ -37,6 +46,16 @@ private void OnMapInit(EntityUid uid, MagbootsComponent component, MapInitEvent
         Dirty(uid, component);
     }
 
+    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);
+    }
+
     private void OnToggleMagboots(EntityUid uid, MagbootsComponent component, ToggleMagbootsEvent args)
     {
         if (args.Handled)
@@ -51,9 +70,11 @@ private void ToggleMagboots(EntityUid uid, MagbootsComponent magboots)
     {
         magboots.On = !magboots.On;
 
-        if (_sharedContainer.TryGetContainingContainer(uid, out var container) &&
+        if (_sharedContainer.TryGetContainingContainer((uid, Transform(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))
         {
@@ -66,9 +87,28 @@ private void ToggleMagboots(EntityUid uid, MagbootsComponent magboots)
         Dirty(uid, magboots);
     }
 
-    protected virtual void UpdateMagbootEffects(EntityUid parent, EntityUid uid, bool state, MagbootsComponent? component) { }
+    public 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;
+        }
 
-    protected void OnChanged(EntityUid uid, MagbootsComponent component)
+        if (state)
+        {
+            _alerts.ShowAlert(parent, component.MagbootsAlert);
+        }
+        else
+        {
+            _alerts.ClearAlert(parent, component.MagbootsAlert);
+        }
+    }
+
+    private void OnChanged(EntityUid uid, MagbootsComponent component)
     {
         _sharedActions.SetToggled(component.ToggleActionEntity, component.On);
         _clothingSpeedModifier.SetClothingSpeedModifierEnabled(uid, component.On);
@@ -79,10 +119,12 @@ private void AddToggleVerb(EntityUid uid, MagbootsComponent component, GetVerbsE
         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?
+        ActivationVerb verb = new()
+        {
+            Text = Loc.GetString("toggle-magboots-verb-get-data-text"),
+            Act = () => ToggleMagboots(uid, component),
+            // TODO VERB ICON add toggle icon? maybe a computer on/off symbol?
+        };
         args.Verbs.Add(verb);
     }
 
@@ -96,6 +138,18 @@ private void OnGetActions(EntityUid uid, MagbootsComponent component, GetItemAct
     {
         args.AddAction(ref component.ToggleActionEntity, component.ToggleAction);
     }
+
+    private void OnIsWeightless(Entity<MagbootsComponent> ent, ref InventoryRelayedEvent<IsWeightlessEvent> args)
+    {
+        if (args.Args.Handled)
+            return;
+
+        if (!ent.Comp.On)
+            return;
+
+        args.Args.IsWeightless = false;
+        args.Args.Handled = true;
+    }
 }
 
-public sealed partial class ToggleMagbootsEvent : InstantActionEvent {}
+public sealed partial class ToggleMagbootsEvent : InstantActionEvent;
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index df13be51fd4e..42a6d5d1f802 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;
@@ -15,7 +13,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";
@@ -30,6 +27,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;
 
@@ -40,18 +42,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;
         }
 
@@ -74,9 +64,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);
@@ -90,9 +82,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)
                 {
@@ -145,4 +138,10 @@ public GravityComponentState(bool enabled)
             }
         }
     }
+
+    [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 6bd65622f172..ea368884e050 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -3,6 +3,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;
@@ -30,6 +31,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 cbea9d319d91..22cd13af6005 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -134,3 +134,21 @@
     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
+  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/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 0ef76381f000..66af73088dc7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -208,7 +208,7 @@
       - MagazineBoxRifle
       - MagazineLightRifle
       - MagazineLightRifleEmpty
-      - MagazinePistol 
+      - MagazinePistol
       - MagazinePistolEmpty
       - MagazinePistolSubMachineGun
       - MagazinePistolSubMachineGunEmpty
@@ -308,6 +308,7 @@
       - WeaponGauntletGorilla
       - SynthesizerInstrument
       - ClothingShoesBootsMagSci
+      - ClothingShoesBootsMoon
       - ClothingShoesBootsSpeed
       - NodeScanner
       - HolofanProjector
@@ -707,7 +708,7 @@
     staticRecipes:
       - BoxLethalshot
       - BoxShotgunFlare
-      - BoxShotgunPractice 
+      - BoxShotgunPractice
       - BoxShotgunSlug
       - ClothingEyesHudSecurity
       - CombatKnife
@@ -724,7 +725,7 @@
       - MagazineBoxRiflePractice
       - MagazineLightRifle
       - MagazineLightRifleEmpty
-      - MagazinePistol 
+      - MagazinePistol
       - MagazinePistolEmpty
       - MagazinePistolSubMachineGun
       - MagazinePistolSubMachineGunEmpty
@@ -837,8 +838,8 @@
         - MagazineBoxRifle
         - MagazineLightRifle
         - MagazineLightRifleEmpty
-        - MagazinePistol 
-        - MagazinePistolEmpty 
+        - MagazinePistol
+        - MagazinePistolEmpty
         - MagazineRifle
         - MagazineRifleEmpty
         - MagazineShotgun
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index ab13dc4573fe..378392bae170 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 77adfcf5d5a7..34443e78f00c 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -68,6 +68,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 000000000000..2c2d49e03102
--- /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 d6b8b34f25f6538d14ab91afe715d2ad7fdc4640 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 03:44:29 +0000
Subject: [PATCH 497/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8211adf57ec4..e03e30b1a9d9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Simyon
-  changes:
-  - message: The space dragon can now open doors by bumping into them!
-    type: Tweak
-  id: 6241
-  time: '2024-03-28T05:41:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26490
 - author: EmoGarbage404
   changes:
   - message: Various announcements now announce location on the map (near Medical,
@@ -3854,3 +3847,11 @@
   id: 6740
   time: '2024-06-15T03:38:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28974
+- author: EmoGarbage404
+  changes:
+  - message: Added Moon Boots! This science research item allows you to move like
+      you're in zero-gravity.
+    type: Add
+  id: 6741
+  time: '2024-06-15T03:43:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29009

From d907e4ef577e6df595a77c7c87e5f864ee38ad0c Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 00:01:22 -0400
Subject: [PATCH 498/568] make pulled uncuffing slower & reduce uncuff spam
 cooldown (#29008)

* prevent people being pulled from uncuffing themselves

* block -> modify duration
---
 .../Cuffs/Components/HandcuffComponent.cs        |  6 ++++++
 Content.Shared/Cuffs/SharedCuffableSystem.cs     |  5 ++++-
 .../Movement/Pulling/Systems/PullingSystem.cs    | 16 ++++++++++++++++
 .../Entities/Objects/Misc/handcuffs.yml          |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index 30577da064f7..289f587239b5 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -105,3 +105,9 @@ public record struct UncuffAttemptEvent(EntityUid User, EntityUid Target)
     public readonly EntityUid Target = Target;
     public bool Cancelled = false;
 }
+
+/// <summary>
+/// Event raised on an entity being uncuffed to determine any modifiers to the amount of time it takes to uncuff them.
+/// </summary>
+[ByRefEvent]
+public record struct ModifyUncuffDurationEvent(EntityUid User, EntityUid Target, float Duration);
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 1ced3c8d6cb8..0e506f938e65 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -561,7 +561,10 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
                 return;
             }
 
-            var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime;
+
+            var ev = new ModifyUncuffDurationEvent(user, target, isOwner ? cuff.BreakoutTime : cuff.UncuffTime);
+            RaiseLocalEvent(user, ref ev);
+            var uncuffTime = ev.Duration;
 
             if (isOwner)
             {
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 225810daed2f..161868370ead 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Alert;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Cuffs.Components;
 using Content.Shared.Database;
 using Content.Shared.Hands;
 using Content.Shared.Hands.EntitySystems;
@@ -12,6 +13,7 @@
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Movement.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Pulling.Events;
 using Content.Shared.Standing;
 using Content.Shared.Throwing;
@@ -43,6 +45,7 @@ public sealed class PullingSystem : EntitySystem
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {
@@ -56,6 +59,7 @@ public override void Initialize()
         SubscribeLocalEvent<PullableComponent, JointRemovedEvent>(OnJointRemoved);
         SubscribeLocalEvent<PullableComponent, GetVerbsEvent<Verb>>(AddPullVerbs);
         SubscribeLocalEvent<PullableComponent, EntGotInsertedIntoContainerMessage>(OnPullableContainerInsert);
+        SubscribeLocalEvent<PullableComponent, ModifyUncuffDurationEvent>(OnModifyUncuffDuration);
 
         SubscribeLocalEvent<PullerComponent, EntGotInsertedIntoContainerMessage>(OnPullerContainerInsert);
         SubscribeLocalEvent<PullerComponent, EntityUnpausedEvent>(OnPullerUnpaused);
@@ -94,6 +98,18 @@ private void OnPullableContainerInsert(Entity<PullableComponent> ent, ref EntGot
         TryStopPull(ent.Owner, ent.Comp);
     }
 
+    private void OnModifyUncuffDuration(Entity<PullableComponent> ent, ref ModifyUncuffDurationEvent args)
+    {
+        if (!ent.Comp.BeingPulled)
+            return;
+
+        // We don't care if the person is being uncuffed by someone else
+        if (args.User != args.Target)
+            return;
+
+        args.Duration *= 2;
+    }
+
     public override void Shutdown()
     {
         base.Shutdown();
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index f7038861279c..a502c7140496 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -27,7 +27,7 @@
     guides:
     - Security
   - type: UseDelay
-    delay: 30
+    delay: 3
 
 - type: entity
   name: makeshift handcuffs

From 2953e87f1ca6f7ffe5a542342cc87e648be7f7ff Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 04:02:28 +0000
Subject: [PATCH 499/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e03e30b1a9d9..97d11497b951 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Various announcements now announce location on the map (near Medical,
-      etc.) instead of simply displaying coordinates.
-    type: Tweak
-  id: 6242
-  time: '2024-03-28T05:53:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26437
 - author: Tayrtahn
   changes:
   - message: Arcade machines now advertise and make noise to bring in players.
@@ -3855,3 +3847,14 @@
   id: 6741
   time: '2024-06-15T03:43:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29009
+- author: EmoGarbage404
+  changes:
+  - message: Attempting to uncuff oneself while being pulled will now take twice as
+      long.
+    type: Tweak
+  - message: Reduced cooldown after attempting to uncuff oneself back to previous
+      values.
+    type: Tweak
+  id: 6742
+  time: '2024-06-15T04:01:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29008

From c339773b5f6823630e9fa04bbec2dd1d87e521ff Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Sat, 15 Jun 2024 00:41:25 -0400
Subject: [PATCH 500/568] Fixes the ShowRulesCommand and the client not syncing
 rules correctly (#28752)

---
 .../Systems/Info/InfoUIController.cs          | 30 +++++++++++++------
 Content.Server/Info/RulesManager.cs           | 21 +++++++------
 Content.Server/Info/ShowRulesCommand.cs       | 16 +++++-----
 Content.Shared/CCVar/CCVars.cs                |  2 +-
 Content.Shared/Info/RulesMessages.cs          | 10 +++++--
 5 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
index 1e431b17fcf5..3706e890922b 100644
--- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
+++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs
@@ -1,12 +1,10 @@
 using Content.Client.Gameplay;
 using Content.Client.Info;
-using Content.Shared.CCVar;
 using Content.Shared.Guidebook;
 using Content.Shared.Info;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 
@@ -14,21 +12,27 @@ namespace Content.Client.UserInterface.Systems.Info;
 
 public sealed class InfoUIController : UIController, IOnStateExited<GameplayState>
 {
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
     [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ILogManager _logMan = default!;
 
     private RulesPopup? _rulesPopup;
     private RulesAndInfoWindow? _infoWindow;
+    private ISawmill _sawmill = default!;
+
+    [ValidatePrototypeId<GuideEntryPrototype>]
+    private const string DefaultRuleset = "DefaultRuleset";
+
+    public ProtoId<GuideEntryPrototype> RulesEntryId = DefaultRuleset;
 
     public override void Initialize()
     {
         base.Initialize();
 
-
+        _sawmill = _logMan.GetSawmill("rules");
         _netManager.RegisterNetMessage<RulesAcceptedMessage>();
-        _netManager.RegisterNetMessage<ShowRulesPopupMessage>(OnShowRulesPopupMessage);
+        _netManager.RegisterNetMessage<SendRulesInformationMessage>(OnRulesInformationMessage);
 
         _consoleHost.RegisterCommand("fuckrules",
             "",
@@ -39,9 +43,12 @@ public override void Initialize()
         });
     }
 
-    private void OnShowRulesPopupMessage(ShowRulesPopupMessage message)
+    private void OnRulesInformationMessage(SendRulesInformationMessage message)
     {
-        ShowRules(message.PopupTime);
+        RulesEntryId = message.CoreRules;
+
+        if (message.ShouldShowRules)
+            ShowRules(message.PopupTime);
     }
 
     public void OnStateExited(GameplayState state)
@@ -84,8 +91,13 @@ private void OnAcceptPressed()
 
     public GuideEntryPrototype GetCoreRuleEntry()
     {
-        var guide = _cfg.GetCVar(CCVars.RulesFile);
-        var guideEntryPrototype = _prototype.Index<GuideEntryPrototype>(guide);
+        if (!_prototype.TryIndex(RulesEntryId, out var guideEntryPrototype))
+        {
+            guideEntryPrototype = _prototype.Index<GuideEntryPrototype>(DefaultRuleset);
+            _sawmill.Error($"Couldn't find the following prototype: {RulesEntryId}. Falling back to {DefaultRuleset}, please check that the server has the rules set up correctly");
+            return guideEntryPrototype;
+        }
+
         return guideEntryPrototype;
     }
 
diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs
index 168e5846b968..f4d9e57bd4dd 100644
--- a/Content.Server/Info/RulesManager.cs
+++ b/Content.Server/Info/RulesManager.cs
@@ -18,22 +18,25 @@ public sealed class RulesManager
     public void Initialize()
     {
         _netManager.Connected += OnConnected;
-        _netManager.RegisterNetMessage<ShowRulesPopupMessage>();
+        _netManager.RegisterNetMessage<SendRulesInformationMessage>();
         _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 isLocalhost = IPAddress.IsLoopback(e.Channel.RemoteEndPoint.Address) &&
+                               _cfg.GetCVar(CCVars.RulesExemptLocal);
 
         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);
+        var hasCooldown = lastRead > LastValidReadTime;
+
+        var showRulesMessage = new SendRulesInformationMessage
+        {
+            PopupTime = _cfg.GetCVar(CCVars.RulesWaitTime),
+            CoreRules = _cfg.GetCVar(CCVars.RulesFile),
+            ShouldShowRules = !isLocalhost && !hasCooldown
+        };
+        _netManager.ServerSendMessage(showRulesMessage, e.Channel);
     }
 
     private async void OnRulesAccepted(RulesAcceptedMessage message)
diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
index b13b8d11a5a5..eb3fb08db0e2 100644
--- a/Content.Server/Info/ShowRulesCommand.cs
+++ b/Content.Server/Info/ShowRulesCommand.cs
@@ -12,6 +12,10 @@ namespace Content.Server.Info;
 [AdminCommand(AdminFlags.Admin)]
 public sealed class ShowRulesCommand : IConsoleCommand
 {
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
     public string Command => "showrules";
     public string Description => "Opens the rules popup for the specified player.";
     public string Help => "showrules <username> [seconds]";
@@ -25,8 +29,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             case 1:
             {
                 target = args[0];
-                var configurationManager = IoCManager.Resolve<IConfigurationManager>();
-                seconds = configurationManager.GetCVar(CCVars.RulesWaitTime);
+                seconds = _configuration.GetCVar(CCVars.RulesWaitTime);
                 break;
             }
             case 2:
@@ -48,15 +51,14 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
 
-        var message = new ShowRulesPopupMessage { PopupTime = seconds };
-
-        if (!IoCManager.Resolve<IPlayerManager>().TryGetSessionByUsername(target, out var player))
+        if (!_player.TryGetSessionByUsername(target, out var player))
         {
             shell.WriteError("Unable to find a player with that name.");
            return;
         }
 
-        var netManager = IoCManager.Resolve<INetManager>();
-        netManager.ServerSendMessage(message, player.Channel);
+        var coreRules = _configuration.GetCVar(CCVars.RulesFile);
+        var message = new SendRulesInformationMessage { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true};
+        _net.ServerSendMessage(message, player.Channel);
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index e3f0f6543873..a9cc2d11dab0 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1856,7 +1856,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", false, CVar.SERVERONLY);
+            CVarDef.Create("rules.exempt_local", true, CVar.SERVERONLY);
 
 
         /*
diff --git a/Content.Shared/Info/RulesMessages.cs b/Content.Shared/Info/RulesMessages.cs
index ac7400238f08..999e5441dafb 100644
--- a/Content.Shared/Info/RulesMessages.cs
+++ b/Content.Shared/Info/RulesMessages.cs
@@ -5,22 +5,28 @@
 namespace Content.Shared.Info;
 
 /// <summary>
-///  Sent by the server to show the rules to the client instantly.
+///  Sent by the server when the client connects to sync the client rules and displaying a popup with them if necessitated.
 /// </summary>
-public sealed class ShowRulesPopupMessage : NetMessage
+public sealed class SendRulesInformationMessage : NetMessage
 {
     public override MsgGroups MsgGroup => MsgGroups.Command;
 
     public float PopupTime { get; set; }
+    public string CoreRules { get; set; } = string.Empty;
+    public bool ShouldShowRules { get; set; }
 
     public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
     {
         PopupTime = buffer.ReadFloat();
+        CoreRules = buffer.ReadString();
+        ShouldShowRules = buffer.ReadBoolean();
     }
 
     public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
     {
         buffer.Write(PopupTime);
+        buffer.Write(CoreRules);
+        buffer.Write(ShouldShowRules);
     }
 }
 

From ba24cc8f5c453d111c59e5b332b10b33e10ae3fb Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 01:20:42 -0400
Subject: [PATCH 501/568] Fix drinking from openable containers (#29010)

---
 Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
index 0a7a8d88f33c..85a94a7ec68e 100644
--- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -62,7 +62,7 @@ private void OnUse(Entity<OpenableComponent> ent, ref UseInHandEvent args)
         if (args.Handled || !ent.Comp.OpenableByHand)
             return;
 
-        args.Handled = TryToggle(ent, args.User);
+        args.Handled = TryOpen(ent, ent, args.User);
     }
 
     private void OnActivated(Entity<OpenableComponent> ent, ref ActivateInWorldEvent args)

From 16e7fec5e820041c2edac756662a15c54a2f7a48 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 05:21:49 +0000
Subject: [PATCH 502/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 97d11497b951..ef08bf29ebc2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: Tayrtahn
-  changes:
-  - message: Arcade machines now advertise and make noise to bring in players.
-    type: Add
-  - message: Space Villain arcade machines have a new screen animation.
-    type: Tweak
-  id: 6243
-  time: '2024-03-28T06:28:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24200
 - author: EmoGarbage404
   changes:
   - message: The revenant essence alert now displays the exact amount of essence.
@@ -3858,3 +3849,11 @@
   id: 6742
   time: '2024-06-15T04:01:22.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29008
+- author: EmoGarbage404
+  changes:
+  - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly
+      opening and closing.
+    type: Fix
+  id: 6743
+  time: '2024-06-15T05:20:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29010

From 65424e02532744e0694ccbe93c4001952f695b67 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sat, 15 Jun 2024 06:01:13 +0000
Subject: [PATCH 503/568] saltern update (#29001)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/saltern.yml | 165 ++++++++++++++++++++++++-------------
 1 file changed, 110 insertions(+), 55 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 09df7eeb527e..c9d3218c45fb 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -772,7 +772,8 @@ entities:
           6,6:
             2: 35049
           7,5:
-            0: 36063
+            0: 35999
+            3: 64
             2: 4096
           7,6:
             2: 53196
@@ -783,7 +784,7 @@ entities:
             2: 57344
           8,5:
             0: 272
-            3: 17472
+            4: 17472
           8,6:
             2: 65345
           8,7:
@@ -824,10 +825,10 @@ entities:
             0: 53759
           11,2:
             0: 4319
-            4: 49152
+            5: 49152
           11,3:
             0: 61457
-            4: 204
+            5: 204
           11,-1:
             0: 30583
           11,4:
@@ -839,9 +840,9 @@ entities:
             0: 28791
           12,2:
             0: 119
-            4: 28672
+            5: 28672
           12,3:
-            4: 119
+            5: 119
             0: 61440
           12,-1:
             0: 29311
@@ -1259,17 +1260,17 @@ entities:
           8,8:
             2: 65534
           9,5:
-            5: 4368
-            4: 17472
+            6: 4368
+            5: 17472
           9,6:
             2: 7936
           10,5:
-            4: 4368
-            6: 17472
+            5: 4368
+            7: 17472
           10,6:
             2: 3840
           11,5:
-            4: 21840
+            5: 21840
           11,6:
             2: 3856
           12,5:
@@ -1425,6 +1426,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 23.57087
+          - 88.67137
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -14253,6 +14269,11 @@ entities:
     - type: Transform
       pos: 33.5,-17.5
       parent: 31
+  - uid: 9867
+    components:
+    - type: Transform
+      pos: 48.5,19.5
+      parent: 31
   - uid: 9927
     components:
     - type: Transform
@@ -15333,6 +15354,11 @@ entities:
     - type: Transform
       pos: -27.5,-18.5
       parent: 31
+  - uid: 11305
+    components:
+    - type: Transform
+      pos: 48.5,20.5
+      parent: 31
   - uid: 11328
     components:
     - type: Transform
@@ -15368,6 +15394,11 @@ entities:
     - type: Transform
       pos: 17.5,11.5
       parent: 31
+  - uid: 11384
+    components:
+    - type: Transform
+      pos: 48.5,21.5
+      parent: 31
   - uid: 11415
     components:
     - type: Transform
@@ -15433,6 +15464,66 @@ entities:
     - type: Transform
       pos: -25.5,-3.5
       parent: 31
+  - uid: 11454
+    components:
+    - type: Transform
+      pos: 48.5,22.5
+      parent: 31
+  - uid: 11455
+    components:
+    - type: Transform
+      pos: 48.5,23.5
+      parent: 31
+  - uid: 11456
+    components:
+    - type: Transform
+      pos: 48.5,24.5
+      parent: 31
+  - uid: 11457
+    components:
+    - type: Transform
+      pos: 49.5,24.5
+      parent: 31
+  - uid: 11458
+    components:
+    - type: Transform
+      pos: 50.5,24.5
+      parent: 31
+  - uid: 11459
+    components:
+    - type: Transform
+      pos: 51.5,24.5
+      parent: 31
+  - uid: 11460
+    components:
+    - type: Transform
+      pos: 52.5,24.5
+      parent: 31
+  - uid: 11461
+    components:
+    - type: Transform
+      pos: 52.5,23.5
+      parent: 31
+  - uid: 11462
+    components:
+    - type: Transform
+      pos: 52.5,22.5
+      parent: 31
+  - uid: 11463
+    components:
+    - type: Transform
+      pos: 52.5,21.5
+      parent: 31
+  - uid: 11464
+    components:
+    - type: Transform
+      pos: 52.5,20.5
+      parent: 31
+  - uid: 11465
+    components:
+    - type: Transform
+      pos: 52.5,19.5
+      parent: 31
 - proto: CableApcStack
   entities:
   - uid: 94
@@ -28356,46 +28447,6 @@ entities:
     - type: Transform
       pos: 16.5,-29.5
       parent: 31
-- proto: CrateEngineeringSecure
-  entities:
-  - uid: 11305
-    components:
-    - type: MetaData
-      desc: Stores logic gates that control the salvage-atmos airlocks.
-      name: logic gate crate
-    - type: Transform
-      pos: 30.5,21.5
-      parent: 31
-    - 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:
-          - 11306
-          - 11307
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: CrateEngineeringSingularityContainment
   entities:
   - uid: 6437
@@ -49183,7 +49234,9 @@ entities:
   - uid: 11306
     components:
     - type: Transform
-      parent: 11305
+      anchored: True
+      pos: 31.5,20.5
+      parent: 31
     - type: DeviceLinkSink
       links:
       - 9067
@@ -49196,11 +49249,13 @@ entities:
         - Output: DoorBolt
     - type: Physics
       canCollide: False
-    - type: InsideEntityStorage
+      bodyType: Static
   - uid: 11307
     components:
     - type: Transform
-      parent: 11305
+      anchored: True
+      pos: 31.5,21.5
+      parent: 31
     - type: DeviceLinkSink
       links:
       - 6522
@@ -49213,7 +49268,7 @@ entities:
         - Output: DoorBolt
     - type: Physics
       canCollide: False
-    - type: InsideEntityStorage
+      bodyType: Static
 - proto: MachineAnomalyGenerator
   entities:
   - uid: 6098

From 7afbe3c98e6c19ede53b16c7dadc2bb24ec9741c Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Sat, 15 Jun 2024 01:02:56 -0500
Subject: [PATCH 504/568] Adds 2 new space ruins (#28971)

adds 2 new space ruins
---
 Resources/Maps/Ruins/chunked_tcomms.yml       |   217 +
 Resources/Maps/Ruins/empty_flagship.yml       | 13115 ++++++++++++++++
 Resources/Maps/Ruins/relaystation.yml         |   760 -
 .../Prototypes/Entities/Stations/base.yml     |     3 +-
 4 files changed, 13334 insertions(+), 761 deletions(-)
 create mode 100644 Resources/Maps/Ruins/chunked_tcomms.yml
 create mode 100644 Resources/Maps/Ruins/empty_flagship.yml
 delete mode 100644 Resources/Maps/Ruins/relaystation.yml

diff --git a/Resources/Maps/Ruins/chunked_tcomms.yml b/Resources/Maps/Ruins/chunked_tcomms.yml
new file mode 100644
index 000000000000..d17b925bf2c2
--- /dev/null
+++ b/Resources/Maps/Ruins/chunked_tcomms.yml
@@ -0,0 +1,217 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  128: Lattice
+  129: Plating
+  1: PlatingDamaged
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.4375,0.984375
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAQAAAAABAQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAQAAAAABAQAAAAACAQAAAAAAAQAAAAACgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABgAAAAAAAgAAAAAAAgAAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Remains
+          decals:
+            0: 7,-2
+    - type: GridAtmosphere
+      version: 2
+      data:
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: ClothingHeadsetGrey
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 4.4739795,-2.5042162
+      parent: 1
+- proto: LootSpawnerEncryptionKey
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+- proto: LootSpawnerIndustrial
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+- proto: MachineFrame
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+- proto: MachineFrameDestroyed
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+- proto: PosterLegitHereForYourSafety
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+- proto: ReinforcedGirder
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+- proto: SheetPlasteel1
+  entities:
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+- proto: TelecomServer
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
+- proto: UnfinishedMachineFrame
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+- proto: WallReinforced
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+...
diff --git a/Resources/Maps/Ruins/empty_flagship.yml b/Resources/Maps/Ruins/empty_flagship.yml
new file mode 100644
index 000000000000..92800f54b8d1
--- /dev/null
+++ b/Resources/Maps/Ruins/empty_flagship.yml
@@ -0,0 +1,13115 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  15: FloorBar
+  22: FloorBrokenWood
+  82: FloorReinforced
+  85: FloorShowroom
+  96: FloorSteel
+  99: FloorSteelCheckerLight
+  100: FloorSteelDamaged
+  115: FloorWhite
+  125: FloorWood
+  128: Lattice
+  129: Plating
+  133: PlatingDamaged
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: empty flagship
+    - type: Transform
+      pos: -1.109375,2.5
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: UgAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACUgAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAABUgAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAACZAAAAAACYAAAAAADZAAAAAADZAAAAAAEYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADUgAAAAAAYAAAAAACYAAAAAADZAAAAAABYAAAAAACZAAAAAACZAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACUgAAAAAAYAAAAAABYAAAAAAAZAAAAAADhQAAAAACZAAAAAAAZAAAAAAAhQAAAAABZAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABUgAAAAAAYAAAAAAAYAAAAAAAhQAAAAAAgQAAAAAAhQAAAAABgQAAAAAAgQAAAAAAhQAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAACUgAAAAAAYAAAAAACZAAAAAADhQAAAAABgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAZAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAhQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgAAAAAAAhQAAAAAAgQAAAAAAhQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAChQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAUgAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAACgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAhQAAAAACgQAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAACUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgAAAAAAAhQAAAAABhQAAAAABUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAhQAAAAABgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAABUgAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAAD
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: UgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAAD
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: YAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAACgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: gQAAAAAAYAAAAAAAYAAAAAABgQAAAAAADwAAAAABDwAAAAABDwAAAAACDwAAAAACDwAAAAAADwAAAAAADwAAAAADDwAAAAACgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYwAAAAADYwAAAAAAYwAAAAABYwAAAAADYwAAAAAAYwAAAAADYwAAAAACYwAAAAADgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYwAAAAADYwAAAAABYwAAAAACYwAAAAACYwAAAAADYwAAAAACYwAAAAADYwAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYwAAAAACYwAAAAABYwAAAAACYwAAAAAAYwAAAAACYwAAAAAAYwAAAAABYwAAAAACgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: gQAAAAAAYAAAAAACYAAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAADcwAAAAAAcwAAAAAAcwAAAAACcwAAAAABgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAcwAAAAABcwAAAAACcwAAAAACcwAAAAAAcwAAAAACcwAAAAABcwAAAAABcwAAAAADgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAACcwAAAAABcwAAAAACcwAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAACDwAAAAAADwAAAAACDwAAAAAADwAAAAACDwAAAAAADwAAAAADDwAAAAACgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAADwAAAAAADwAAAAACDwAAAAADDwAAAAADDwAAAAADDwAAAAACDwAAAAAADwAAAAABgQAAAAAAYAAAAAACZAAAAAAChQAAAAACgQAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAACDwAAAAABDwAAAAABDwAAAAABDwAAAAADDwAAAAABDwAAAAAADwAAAAADgQAAAAAAZAAAAAAEZAAAAAABhQAAAAACgQAAAAAAYAAAAAABYAAAAAADgQAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAABDwAAAAADDwAAAAAADwAAAAAADwAAAAADgQAAAAAAYAAAAAAAZAAAAAAEhQAAAAABgQAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAACDwAAAAACDwAAAAADDwAAAAABDwAAAAABDwAAAAACDwAAAAADDwAAAAADgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAADwAAAAAADwAAAAAADwAAAAACDwAAAAABDwAAAAACDwAAAAADDwAAAAAADwAAAAADgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAADwAAAAAADwAAAAACDwAAAAACDwAAAAABDwAAAAABDwAAAAAADwAAAAADDwAAAAADgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAAADwAAAAACDwAAAAABDwAAAAABDwAAAAACDwAAAAABDwAAAAADDwAAAAABgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAADwAAAAAADwAAAAABDwAAAAADDwAAAAAADwAAAAADDwAAAAADDwAAAAABDwAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAA
+          version: 6
+        1,-2:
+          ind: 1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZAAAAAAEZAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAZAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAZAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhQAAAAAAhQAAAAABgQAAAAAAZAAAAAABVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAhQAAAAAAgQAAAAAAZAAAAAABVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAZAAAAAABgQAAAAAAZAAAAAABVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAhQAAAAACgQAAAAAAgQAAAAAAZAAAAAAEVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAhQAAAAACZAAAAAACgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAZAAAAAAAgQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAVQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          version: 6
+        2,-2:
+          ind: 2,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAAAcwAAAAABcwAAAAADcwAAAAAAcwAAAAADcwAAAAADgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAcwAAAAABcwAAAAACcwAAAAABcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAABgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAACcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAADcwAAAAABcwAAAAAAcwAAAAABcwAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAcwAAAAABcwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAABcwAAAAACcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADcwAAAAABcwAAAAABcwAAAAAAcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAADgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAcwAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAADcwAAAAABcwAAAAAAcwAAAAADgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAcwAAAAACcwAAAAACcwAAAAADcwAAAAABcwAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAACgQAAAAAAhQAAAAACZAAAAAADZAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAhQAAAAAAhQAAAAAChQAAAAAChQAAAAABgQAAAAAAZAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAhQAAAAAAgAAAAAAAgAAAAAAAhQAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAhQAAAAABgQAAAAAAhQAAAAAAhQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAABgAAAAAAAhQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAgQAAAAAAhQAAAAABhQAAAAABAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAABgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAhQAAAAABhQAAAAAChQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAAhQAAAAACgAAAAAAAhQAAAAABhQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAABgQAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAhQAAAAAAhQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAhQAAAAAAgAAAAAAAhQAAAAAAhQAAAAABgQAAAAAA
+          version: 6
+        3,0:
+          ind: 3,0
+          tiles: YAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAAAZAAAAAACZAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,-1:
+          ind: 3,-1
+          tiles: fQAAAAADfQAAAAACfQAAAAAAfQAAAAAAfQAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAACfQAAAAAAfQAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAABgQAAAAAAfQAAAAAAfQAAAAADFgAAAAAFFgAAAAACFgAAAAAEgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAhQAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABZAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAhQAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAADZAAAAAADhQAAAAABZAAAAAAEYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAZAAAAAAAYAAAAAACYAAAAAABYAAAAAACZAAAAAAAhQAAAAAAZAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAZAAAAAACYAAAAAACYAAAAAADYAAAAAABZAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAZAAAAAAEYAAAAAADYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAACZAAAAAAAZAAAAAAEZAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAABZAAAAAADZAAAAAADZAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAD
+          version: 6
+        3,-2:
+          ind: 3,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAAAZAAAAAACZAAAAAAEZAAAAAAEYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAACfQAAAAABfQAAAAADgQAAAAAAYAAAAAADZAAAAAABZAAAAAAEYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAfQAAAAACfQAAAAACfQAAAAAAfQAAAAACfQAAAAACgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAfQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADgQAAAAAAfQAAAAABfQAAAAABfQAAAAACfQAAAAACfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAAAfQAAAAADfQAAAAACfQAAAAACgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAAAgQAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        4,0:
+          ind: 4,0
+          tiles: YAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        4,-1:
+          ind: 4,-1
+          tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAA
+          version: 6
+        4,-2:
+          ind: 4,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          version: 6
+        5,0:
+          ind: 5,0
+          tiles: YAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        5,-1:
+          ind: 5,-1
+          tiles: YAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        5,-2:
+          ind: 5,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAhQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          version: 6
+        6,-1:
+          ind: 6,-1
+          tiles: YAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAACUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAD
+          version: 6
+        6,0:
+          ind: 6,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        6,-2:
+          ind: 6,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAhQAAAAAChQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAC
+          version: 6
+        7,0:
+          ind: 7,0
+          tiles: YAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        7,-1:
+          ind: 7,-1
+          tiles: YAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        7,-2:
+          ind: 7,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#3100007F'
+            id: Dirt
+          decals:
+            43: 34.06549,-6.739004
+        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#FFFFFF66'
+            id: Dirt
+          decals:
+            44: 21.10283,-12.718225
+        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#FFFFFFFF'
+            id: Dirt
+          decals:
+            36: 17,5
+            37: 17,4
+            41: 10,6
+            42: 9,5
+        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            39: 16,6
+            40: 16,-2
+        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            38: 17,6
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            29: 48,-5
+        - node:
+            color: '#DE3A3A96'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            19: 51,-3
+            20: 50,-3
+            21: 49,-3
+            22: 48,-4
+        - node:
+            color: '#DE3A3A96'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            13: 51,-9
+            14: 50,-9
+            15: 49,-9
+            16: 52,-6
+            17: 52,-5
+            18: 52,-4
+        - node:
+            color: '#DE3A3A96'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            3: 48,-4
+            4: 49,-9
+            5: 50,-9
+            6: 51,-9
+        - node:
+            color: '#DE3A3A96'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            7: 51,-3
+            8: 50,-3
+            9: 49,-3
+            10: 52,-4
+            11: 52,-5
+            12: 52,-6
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Remains
+          decals:
+            30: 112,-1
+        - node:
+            cleanable: True
+            zIndex: 1
+            color: '#FFFFFFFF'
+            id: Remains
+          decals:
+            33: 3,-2
+            34: 30,-2
+            35: 61,-21
+            45: 59,-16
+        - node:
+            color: '#DE3A3A96'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            0: 48,-3
+        - node:
+            color: '#DE3A3A96'
+            id: ThreeQuarterTileOverlayGreyscale270
+          decals:
+            1: 48,-9
+        - node:
+            color: '#DE3A3A96'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            2: 52,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNE
+          decals:
+            25: 62,-19
+            27: 62,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSE
+          decals:
+            24: 62,-21
+            26: 62,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            23: 62,-20
+            28: 62,-4
+        - node:
+            cleanable: True
+            zIndex: 1
+            angle: 1.3962634015954636 rad
+            color: '#310000EF'
+            id: splatter
+          decals:
+            31: 32.54619,-10.905022
+        - node:
+            cleanable: True
+            zIndex: 1
+            angle: 1.3962634015954636 rad
+            color: '#310000FF'
+            id: splatter
+          decals:
+            32: 36.03916,-14.974812
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 65535
+          0,-1:
+            0: 65280
+          -1,0:
+            0: 34952
+          0,1:
+            0: 36863
+          -1,1:
+            0: 2184
+          1,0:
+            0: 65535
+          1,1:
+            0: 33023
+            1: 22784
+          1,-1:
+            0: 65280
+          2,0:
+            0: 65535
+          2,1:
+            0: 8191
+          2,-1:
+            0: 65288
+          3,0:
+            0: 65535
+          3,1:
+            0: 4095
+          3,-1:
+            0: 65295
+          4,0:
+            0: 48059
+          4,1:
+            0: 4083
+          -1,-1:
+            0: 34816
+          2,-4:
+            0: 32900
+            1: 8
+          2,-5:
+            1: 17604
+            0: 32768
+          2,-3:
+            0: 35020
+            1: 17408
+          2,-2:
+            1: 35908
+            0: 16392
+          3,-4:
+            0: 61695
+          3,-3:
+            0: 8191
+          3,-2:
+            0: 65279
+            1: 256
+          3,-5:
+            1: 4986
+            0: 60544
+          4,-4:
+            0: 47291
+          4,-3:
+            0: 35771
+          4,-2:
+            0: 48059
+          4,-1:
+            0: 47883
+          4,-5:
+            0: 48059
+          5,-4:
+            0: 65535
+          5,-3:
+            0: 65535
+          5,-2:
+            0: 65535
+          5,-1:
+            0: 65295
+          5,-5:
+            0: 65535
+          5,0:
+            0: 65535
+          6,-4:
+            0: 65535
+          6,-3:
+            0: 65535
+          6,-2:
+            0: 65535
+          6,-1:
+            0: 65295
+          6,-5:
+            0: 65535
+          6,0:
+            0: 65535
+          7,-4:
+            0: 65535
+          7,-3:
+            0: 65535
+          7,-2:
+            0: 65535
+          7,-1:
+            0: 65295
+          7,-5:
+            0: 65535
+          7,0:
+            0: 65535
+          5,1:
+            0: 4080
+          6,1:
+            0: 4080
+          7,1:
+            0: 4080
+          8,0:
+            0: 26231
+          8,1:
+            0: 4086
+          8,-1:
+            0: 26350
+          9,0:
+            0: 65530
+          9,1:
+            0: 4080
+          9,-1:
+            0: 65535
+          10,0:
+            0: 65535
+          10,1:
+            0: 4080
+          10,-1:
+            0: 65535
+          11,1:
+            0: 34678
+          11,0:
+            0: 61038
+          11,-1:
+            0: 58982
+          12,0:
+            0: 65295
+          8,-4:
+            0: 26214
+          8,-3:
+            0: 26350
+          8,-2:
+            0: 26214
+          8,-5:
+            0: 26222
+          9,-4:
+            0: 4095
+          9,-3:
+            0: 61695
+          9,-2:
+            0: 65535
+          9,-5:
+            0: 65535
+          10,-4:
+            0: 4095
+          10,-3:
+            0: 61695
+          10,-2:
+            0: 65535
+          10,-5:
+            0: 65535
+          11,-3:
+            0: 26367
+          11,-4:
+            0: 26214
+          11,-2:
+            0: 61166
+          11,-5:
+            0: 26214
+          12,-4:
+            0: 53247
+          12,-3:
+            0: 62719
+          12,-2:
+            0: 65535
+          12,-1:
+            0: 61695
+          4,-8:
+            0: 65280
+          3,-8:
+            0: 65328
+          4,-7:
+            0: 65459
+          3,-7:
+            0: 65519
+            1: 16
+          4,-6:
+            0: 7099
+          3,-6:
+            0: 2510
+            1: 9777
+          5,-8:
+            0: 65280
+          5,-7:
+            0: 48112
+          5,-6:
+            0: 3003
+          6,-8:
+            0: 65280
+          6,-7:
+            0: 65520
+          6,-6:
+            0: 2735
+          7,-8:
+            0: 65280
+          7,-7:
+            0: 65520
+          7,-6:
+            0: 2735
+          8,-8:
+            0: 65280
+          8,-7:
+            0: 30310
+          8,-6:
+            0: 58983
+          9,-8:
+            0: 65280
+          9,-7:
+            0: 65520
+          9,-6:
+            0: 65535
+          10,-8:
+            0: 65280
+          10,-7:
+            0: 65520
+          10,-6:
+            0: 65535
+          11,-8:
+            0: 30592
+          11,-7:
+            0: 28390
+          11,-6:
+            0: 26350
+          12,-7:
+            0: 4080
+          12,-6:
+            0: 61695
+          12,-5:
+            0: 65535
+          0,-7:
+            1: 51335
+            0: 8
+          -1,-7:
+            1: 12
+          0,-8:
+            1: 35040
+          1,-8:
+            1: 6384
+            0: 32768
+          1,-7:
+            0: 32793
+            1: 30854
+          2,-8:
+            1: 1072
+            0: 51392
+          2,-7:
+            0: 32905
+            1: 32326
+          1,-6:
+            1: 8
+          2,-6:
+            0: 2060
+            1: 17600
+          13,0:
+            0: 30479
+          13,-1:
+            0: 63709
+          13,1:
+            1: 4
+          14,0:
+            0: 15
+          14,-1:
+            0: 63487
+          15,0:
+            0: 15
+          15,-1:
+            0: 61567
+          16,0:
+            0: 15
+          13,-4:
+            0: 52701
+          13,-3:
+            0: 65535
+          13,-2:
+            0: 53759
+          13,-5:
+            0: 53725
+          14,-4:
+            0: 65535
+          14,-3:
+            0: 65535
+          14,-2:
+            0: 61695
+          14,-5:
+            0: 61695
+          15,-4:
+            0: 49151
+          15,-3:
+            0: 65535
+          15,-2:
+            0: 28927
+          15,-5:
+            0: 61567
+          16,-4:
+            0: 65535
+          16,-3:
+            0: 65535
+          16,-2:
+            0: 65535
+          16,-1:
+            0: 61695
+          13,-7:
+            0: 1904
+          13,-6:
+            0: 55551
+          14,-6:
+            0: 62719
+          15,-6:
+            0: 28927
+          16,-6:
+            0: 61695
+          16,-5:
+            0: 65535
+          17,0:
+            0: 15
+          17,-1:
+            0: 61695
+          18,0:
+            0: 15
+          18,-1:
+            0: 61695
+          19,0:
+            0: 15
+          19,-1:
+            0: 61559
+          20,0:
+            0: 3
+            1: 64
+          17,-4:
+            0: 65535
+          17,-3:
+            0: 65535
+          17,-2:
+            0: 65535
+          17,-5:
+            0: 65535
+          18,-4:
+            0: 65535
+          18,-3:
+            0: 65535
+          18,-2:
+            0: 65535
+          18,-5:
+            0: 65535
+          19,-4:
+            0: 30583
+          19,-3:
+            0: 30719
+          19,-2:
+            0: 30583
+          19,-5:
+            0: 30583
+          20,-4:
+            0: 4095
+          20,-3:
+            0: 61440
+          20,-2:
+            0: 13311
+          20,-1:
+            0: 13107
+          17,-6:
+            0: 61695
+          18,-6:
+            0: 61695
+          19,-6:
+            0: 28927
+          20,-6:
+            0: 13107
+          20,-5:
+            0: 13107
+          21,-4:
+            0: 4095
+          21,-3:
+            0: 61440
+          21,-2:
+            0: 57599
+          21,-1:
+            0: 3822
+          22,-4:
+            0: 4095
+          22,-3:
+            0: 61440
+          22,-2:
+            0: 61695
+          22,-1:
+            0: 4095
+          23,-4:
+            0: 4095
+          23,-3:
+            0: 61440
+          23,-2:
+            0: 61695
+          23,-1:
+            0: 4095
+          24,-4:
+            0: 4095
+          24,-3:
+            0: 61440
+          24,-2:
+            0: 61951
+          24,-1:
+            0: 4095
+          20,-7:
+            0: 16384
+          21,-6:
+            0: 57344
+          21,-5:
+            0: 3822
+          22,-6:
+            0: 4096
+            1: 24576
+          22,-5:
+            0: 4083
+            1: 4
+          23,-5:
+            1: 240
+            0: 3840
+          24,-5:
+            1: 113
+            0: 8072
+          25,-4:
+            0: 4095
+          25,-3:
+            0: 61440
+          25,-2:
+            0: 61695
+          25,-1:
+            0: 4095
+          26,-4:
+            0: 4095
+          26,-3:
+            0: 61440
+          26,-2:
+            0: 61695
+          26,-1:
+            0: 4095
+          27,-4:
+            0: 4095
+          27,-3:
+            0: 61440
+          27,-2:
+            0: 35071
+          27,-1:
+            0: 34952
+          27,-5:
+            0: 34952
+          28,-4:
+            0: 4095
+          28,-3:
+            0: 61440
+          28,-2:
+            0: 65535
+          28,-1:
+            0: 65535
+          27,0:
+            0: 8
+            1: 64
+          28,0:
+            0: 15
+          25,-5:
+            0: 4095
+          25,-6:
+            1: 4096
+            0: 57344
+          26,-6:
+            0: 61440
+          26,-5:
+            0: 4095
+          27,-7:
+            0: 16384
+          27,-6:
+            0: 34952
+          28,-6:
+            0: 65535
+          28,-5:
+            0: 65535
+          29,0:
+            0: 15
+          29,-1:
+            0: 65535
+          30,0:
+            0: 15
+          30,-1:
+            0: 65535
+          31,0:
+            0: 3
+            1: 32
+          31,-1:
+            0: 13107
+          29,-4:
+            0: 4095
+          29,-3:
+            0: 61440
+          29,-2:
+            0: 65535
+          29,-5:
+            0: 65535
+          30,-4:
+            0: 4095
+          30,-3:
+            0: 61440
+          30,-2:
+            0: 65535
+          30,-5:
+            0: 65535
+          31,-4:
+            0: 819
+            1: 8192
+          31,-3:
+            0: 12288
+            1: 512
+          31,-2:
+            0: 13107
+          31,-5:
+            0: 13107
+          29,-6:
+            0: 65535
+          30,-6:
+            0: 65535
+          31,-6:
+            0: 13107
+          31,-7:
+            1: 8192
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirCanister
+  entities:
+  - uid: 933
+    components:
+    - type: Transform
+      pos: 62.5,-18.5
+      parent: 1
+  - uid: 934
+    components:
+    - type: Transform
+      pos: 62.5,-4.5
+      parent: 1
+- proto: Airlock
+  entities:
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 32.5,1.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 37.5,0.5
+      parent: 1
+  - uid: 558
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-24.5
+      parent: 1
+  - uid: 2239
+    components:
+    - type: Transform
+      pos: 32.5,-23.5
+      parent: 1
+- proto: AirlockCommand
+  entities:
+  - uid: 723
+    components:
+    - type: Transform
+      pos: 50.5,-12.5
+      parent: 1
+  - uid: 1243
+    components:
+    - type: Transform
+      pos: 96.5,-16.5
+      parent: 1
+  - uid: 1277
+    components:
+    - type: Transform
+      pos: 96.5,-5.5
+      parent: 1
+- proto: AirlockEngineering
+  entities:
+  - uid: 781
+    components:
+    - type: Transform
+      pos: 58.5,-1.5
+      parent: 1
+  - uid: 842
+    components:
+    - type: Transform
+      pos: 58.5,-21.5
+      parent: 1
+- proto: AirlockEngineeringGlass
+  entities:
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 18.5,-28.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 18.5,-29.5
+      parent: 1
+- proto: AirlockExternal
+  entities:
+  - uid: 1269
+    components:
+    - type: Transform
+      pos: 63.5,-19.5
+      parent: 1
+  - uid: 1270
+    components:
+    - type: Transform
+      pos: 63.5,-3.5
+      parent: 1
+- proto: AirlockFreezer
+  entities:
+  - uid: 556
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-22.5
+      parent: 1
+  - uid: 559
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-22.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-22.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-22.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-26.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 23.5,-22.5
+      parent: 1
+- proto: AirlockGlass
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 18.5,6.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 18.5,5.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 35.5,-2.5
+      parent: 1
+    - type: Door
+      secondsUntilStateChange: -1077.4529
+      state: Opening
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 35.5,-3.5
+      parent: 1
+  - uid: 1271
+    components:
+    - type: Transform
+      pos: 81.5,-1.5
+      parent: 1
+  - uid: 1272
+    components:
+    - type: Transform
+      pos: 80.5,-1.5
+      parent: 1
+  - uid: 1334
+    components:
+    - type: Transform
+      pos: 80.5,-21.5
+      parent: 1
+  - uid: 1335
+    components:
+    - type: Transform
+      pos: 81.5,-21.5
+      parent: 1
+- proto: AirlockMedical
+  entities:
+  - uid: 639
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,-19.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,-20.5
+      parent: 1
+- proto: AirlockSecurity
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      pos: 50.5,-9.5
+      parent: 1
+- proto: AirlockShuttle
+  entities:
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 54.5,3.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 47.5,3.5
+      parent: 1
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 47.5,2.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 54.5,2.5
+      parent: 1
+  - uid: 1273
+    components:
+    - type: Transform
+      pos: 47.5,-25.5
+      parent: 1
+  - uid: 1274
+    components:
+    - type: Transform
+      pos: 47.5,-26.5
+      parent: 1
+  - uid: 1275
+    components:
+    - type: Transform
+      pos: 54.5,-26.5
+      parent: 1
+  - uid: 1276
+    components:
+    - type: Transform
+      pos: 54.5,-25.5
+      parent: 1
+  - uid: 1400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-15.5
+      parent: 1
+  - uid: 1401
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-21.5
+      parent: 1
+  - uid: 1421
+    components:
+    - type: Transform
+      pos: 123.5,-6.5
+      parent: 1
+  - uid: 1422
+    components:
+    - type: Transform
+      pos: 123.5,-1.5
+      parent: 1
+- proto: APCHyperCapacity
+  entities:
+  - uid: 2160
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-2.5
+      parent: 1
+- proto: BaseComputer
+  entities:
+  - uid: 399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-6.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 21.5,3.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 23.5,3.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 25.5,3.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 29.5,3.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 29.5,1.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 25.5,1.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 23.5,1.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 21.5,1.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 21.5,-0.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 23.5,-0.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 25.5,-0.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 27.5,-0.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 29.5,-0.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 48.5,-20.5
+      parent: 1
+- proto: BedsheetCaptain
+  entities:
+  - uid: 719
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-20.5
+      parent: 1
+- proto: BedsheetWhite
+  entities:
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 29.5,3.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 29.5,1.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 25.5,1.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 23.5,1.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 21.5,1.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 21.5,3.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 23.5,3.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 21.5,-0.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 23.5,-0.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 25.5,-0.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 27.5,-0.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 29.5,-0.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 25.5,3.5
+      parent: 1
+- proto: BlastDoor
+  entities:
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 32.5,-9.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 32.5,-10.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 32.5,-12.5
+      parent: 1
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 18.5,-11.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 18.5,-10.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 12.5,-13.5
+      parent: 1
+  - uid: 1552
+    components:
+    - type: Transform
+      pos: 32.5,-11.5
+      parent: 1
+- proto: BlastDoorFrame
+  entities:
+  - uid: 457
+    components:
+    - type: Transform
+      anchored: True
+      pos: 12.5,-8.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 31.5,-24.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 17.5,-10.5
+      parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 1
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 16.5,-10.5
+      parent: 1
+  - uid: 1239
+    components:
+    - type: Transform
+      pos: 43.5,-28.5
+      parent: 1
+  - uid: 1241
+    components:
+    - type: Transform
+      pos: 86.5,-3.5
+      parent: 1
+  - uid: 1443
+    components:
+    - type: Transform
+      pos: 25.5,-28.5
+      parent: 1
+  - uid: 1445
+    components:
+    - type: Transform
+      pos: 21.5,-28.5
+      parent: 1
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 24.5,-28.5
+      parent: 1
+  - uid: 1447
+    components:
+    - type: Transform
+      pos: 26.5,-28.5
+      parent: 1
+  - uid: 1448
+    components:
+    - type: Transform
+      pos: 20.5,-28.5
+      parent: 1
+  - uid: 1449
+    components:
+    - type: Transform
+      pos: 19.5,-28.5
+      parent: 1
+  - uid: 1450
+    components:
+    - type: Transform
+      pos: 22.5,-28.5
+      parent: 1
+  - uid: 1451
+    components:
+    - type: Transform
+      pos: 23.5,-28.5
+      parent: 1
+  - uid: 1485
+    components:
+    - type: Transform
+      pos: 27.5,-28.5
+      parent: 1
+  - uid: 1486
+    components:
+    - type: Transform
+      pos: 29.5,-28.5
+      parent: 1
+  - uid: 1487
+    components:
+    - type: Transform
+      pos: 28.5,-28.5
+      parent: 1
+  - uid: 1490
+    components:
+    - type: Transform
+      pos: 30.5,-28.5
+      parent: 1
+  - uid: 1491
+    components:
+    - type: Transform
+      pos: 31.5,-28.5
+      parent: 1
+  - uid: 1492
+    components:
+    - type: Transform
+      pos: 32.5,-28.5
+      parent: 1
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 33.5,-28.5
+      parent: 1
+  - uid: 1494
+    components:
+    - type: Transform
+      pos: 33.5,-27.5
+      parent: 1
+  - uid: 1495
+    components:
+    - type: Transform
+      pos: 33.5,-26.5
+      parent: 1
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: 33.5,-25.5
+      parent: 1
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: 33.5,-24.5
+      parent: 1
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 1
+  - uid: 1499
+    components:
+    - type: Transform
+      pos: 33.5,-22.5
+      parent: 1
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 33.5,-21.5
+      parent: 1
+  - uid: 1501
+    components:
+    - type: Transform
+      pos: 33.5,-20.5
+      parent: 1
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: 33.5,-19.5
+      parent: 1
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: 33.5,-18.5
+      parent: 1
+  - uid: 1504
+    components:
+    - type: Transform
+      pos: 33.5,-17.5
+      parent: 1
+  - uid: 1505
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 1
+  - uid: 1506
+    components:
+    - type: Transform
+      pos: 33.5,-15.5
+      parent: 1
+  - uid: 1507
+    components:
+    - type: Transform
+      pos: 33.5,-14.5
+      parent: 1
+  - uid: 1508
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 1
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: 33.5,-12.5
+      parent: 1
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: 33.5,-11.5
+      parent: 1
+  - uid: 1511
+    components:
+    - type: Transform
+      pos: 33.5,-10.5
+      parent: 1
+  - uid: 1512
+    components:
+    - type: Transform
+      pos: 33.5,-9.5
+      parent: 1
+  - uid: 1513
+    components:
+    - type: Transform
+      pos: 33.5,-8.5
+      parent: 1
+  - uid: 1514
+    components:
+    - type: Transform
+      pos: 33.5,-7.5
+      parent: 1
+  - uid: 1515
+    components:
+    - type: Transform
+      pos: 33.5,-6.5
+      parent: 1
+  - uid: 1516
+    components:
+    - type: Transform
+      pos: 33.5,-5.5
+      parent: 1
+  - uid: 1517
+    components:
+    - type: Transform
+      pos: 33.5,-4.5
+      parent: 1
+  - uid: 1518
+    components:
+    - type: Transform
+      pos: 33.5,-3.5
+      parent: 1
+  - uid: 1519
+    components:
+    - type: Transform
+      pos: 33.5,-2.5
+      parent: 1
+  - uid: 1520
+    components:
+    - type: Transform
+      pos: 33.5,-1.5
+      parent: 1
+  - uid: 1521
+    components:
+    - type: Transform
+      pos: 33.5,-0.5
+      parent: 1
+  - uid: 1522
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 1
+  - uid: 1523
+    components:
+    - type: Transform
+      pos: 33.5,1.5
+      parent: 1
+  - uid: 1524
+    components:
+    - type: Transform
+      pos: 33.5,2.5
+      parent: 1
+  - uid: 1525
+    components:
+    - type: Transform
+      pos: 33.5,3.5
+      parent: 1
+  - uid: 1526
+    components:
+    - type: Transform
+      pos: 33.5,4.5
+      parent: 1
+  - uid: 1527
+    components:
+    - type: Transform
+      pos: 33.5,5.5
+      parent: 1
+  - uid: 1528
+    components:
+    - type: Transform
+      pos: 32.5,5.5
+      parent: 1
+  - uid: 1529
+    components:
+    - type: Transform
+      pos: 31.5,5.5
+      parent: 1
+  - uid: 1530
+    components:
+    - type: Transform
+      pos: 30.5,5.5
+      parent: 1
+  - uid: 1531
+    components:
+    - type: Transform
+      pos: 29.5,5.5
+      parent: 1
+  - uid: 1532
+    components:
+    - type: Transform
+      pos: 28.5,5.5
+      parent: 1
+  - uid: 1533
+    components:
+    - type: Transform
+      pos: 27.5,5.5
+      parent: 1
+  - uid: 1534
+    components:
+    - type: Transform
+      pos: 26.5,5.5
+      parent: 1
+  - uid: 1535
+    components:
+    - type: Transform
+      pos: 25.5,5.5
+      parent: 1
+  - uid: 1536
+    components:
+    - type: Transform
+      pos: 24.5,5.5
+      parent: 1
+  - uid: 1537
+    components:
+    - type: Transform
+      pos: 23.5,5.5
+      parent: 1
+  - uid: 1538
+    components:
+    - type: Transform
+      pos: 22.5,5.5
+      parent: 1
+  - uid: 1539
+    components:
+    - type: Transform
+      pos: 21.5,5.5
+      parent: 1
+  - uid: 1540
+    components:
+    - type: Transform
+      pos: 20.5,5.5
+      parent: 1
+  - uid: 1541
+    components:
+    - type: Transform
+      pos: 19.5,5.5
+      parent: 1
+  - uid: 1542
+    components:
+    - type: Transform
+      pos: 18.5,5.5
+      parent: 1
+  - uid: 1543
+    components:
+    - type: Transform
+      pos: 17.5,5.5
+      parent: 1
+  - uid: 1544
+    components:
+    - type: Transform
+      pos: 16.5,5.5
+      parent: 1
+  - uid: 1545
+    components:
+    - type: Transform
+      pos: 15.5,5.5
+      parent: 1
+  - uid: 1546
+    components:
+    - type: Transform
+      pos: 14.5,5.5
+      parent: 1
+  - uid: 1547
+    components:
+    - type: Transform
+      pos: 13.5,5.5
+      parent: 1
+  - uid: 1548
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 1
+  - uid: 1549
+    components:
+    - type: Transform
+      pos: 30.5,0.5
+      parent: 1
+  - uid: 1550
+    components:
+    - type: Transform
+      pos: 31.5,0.5
+      parent: 1
+  - uid: 1551
+    components:
+    - type: Transform
+      pos: 30.5,1.5
+      parent: 1
+  - uid: 1553
+    components:
+    - type: Transform
+      pos: 29.5,1.5
+      parent: 1
+  - uid: 1554
+    components:
+    - type: Transform
+      pos: 28.5,1.5
+      parent: 1
+  - uid: 1555
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 1
+  - uid: 1556
+    components:
+    - type: Transform
+      pos: 26.5,1.5
+      parent: 1
+  - uid: 1557
+    components:
+    - type: Transform
+      pos: 25.5,1.5
+      parent: 1
+  - uid: 1558
+    components:
+    - type: Transform
+      pos: 24.5,1.5
+      parent: 1
+  - uid: 1559
+    components:
+    - type: Transform
+      pos: 23.5,1.5
+      parent: 1
+  - uid: 1560
+    components:
+    - type: Transform
+      pos: 22.5,1.5
+      parent: 1
+  - uid: 1561
+    components:
+    - type: Transform
+      pos: 21.5,1.5
+      parent: 1
+  - uid: 1562
+    components:
+    - type: Transform
+      pos: 20.5,1.5
+      parent: 1
+  - uid: 1594
+    components:
+    - type: Transform
+      pos: 34.5,5.5
+      parent: 1
+  - uid: 1595
+    components:
+    - type: Transform
+      pos: 34.5,5.5
+      parent: 1
+  - uid: 1596
+    components:
+    - type: Transform
+      pos: 35.5,5.5
+      parent: 1
+  - uid: 1597
+    components:
+    - type: Transform
+      pos: 36.5,5.5
+      parent: 1
+  - uid: 1598
+    components:
+    - type: Transform
+      pos: 37.5,5.5
+      parent: 1
+  - uid: 1599
+    components:
+    - type: Transform
+      pos: 38.5,5.5
+      parent: 1
+  - uid: 1600
+    components:
+    - type: Transform
+      pos: 39.5,5.5
+      parent: 1
+  - uid: 1601
+    components:
+    - type: Transform
+      pos: 40.5,5.5
+      parent: 1
+  - uid: 1602
+    components:
+    - type: Transform
+      pos: 41.5,5.5
+      parent: 1
+  - uid: 1603
+    components:
+    - type: Transform
+      pos: 42.5,5.5
+      parent: 1
+  - uid: 1604
+    components:
+    - type: Transform
+      pos: 43.5,5.5
+      parent: 1
+  - uid: 1605
+    components:
+    - type: Transform
+      pos: 44.5,5.5
+      parent: 1
+  - uid: 1606
+    components:
+    - type: Transform
+      pos: 45.5,5.5
+      parent: 1
+  - uid: 1607
+    components:
+    - type: Transform
+      pos: 45.5,4.5
+      parent: 1
+  - uid: 1608
+    components:
+    - type: Transform
+      pos: 45.5,3.5
+      parent: 1
+  - uid: 1609
+    components:
+    - type: Transform
+      pos: 48.5,0.5
+      parent: 1
+  - uid: 1610
+    components:
+    - type: Transform
+      pos: 50.5,0.5
+      parent: 1
+  - uid: 1611
+    components:
+    - type: Transform
+      pos: 45.5,2.5
+      parent: 1
+  - uid: 1612
+    components:
+    - type: Transform
+      pos: 45.5,1.5
+      parent: 1
+  - uid: 1613
+    components:
+    - type: Transform
+      pos: 45.5,0.5
+      parent: 1
+  - uid: 1614
+    components:
+    - type: Transform
+      pos: 45.5,-0.5
+      parent: 1
+  - uid: 1615
+    components:
+    - type: Transform
+      pos: 46.5,0.5
+      parent: 1
+  - uid: 1616
+    components:
+    - type: Transform
+      pos: 47.5,0.5
+      parent: 1
+  - uid: 1617
+    components:
+    - type: Transform
+      pos: 49.5,0.5
+      parent: 1
+  - uid: 1618
+    components:
+    - type: Transform
+      pos: 51.5,0.5
+      parent: 1
+  - uid: 1619
+    components:
+    - type: Transform
+      pos: 52.5,0.5
+      parent: 1
+  - uid: 1620
+    components:
+    - type: Transform
+      pos: 53.5,0.5
+      parent: 1
+  - uid: 1621
+    components:
+    - type: Transform
+      pos: 54.5,0.5
+      parent: 1
+  - uid: 1622
+    components:
+    - type: Transform
+      pos: 55.5,0.5
+      parent: 1
+  - uid: 1623
+    components:
+    - type: Transform
+      pos: 56.5,0.5
+      parent: 1
+  - uid: 1624
+    components:
+    - type: Transform
+      pos: 57.5,0.5
+      parent: 1
+  - uid: 1625
+    components:
+    - type: Transform
+      pos: 58.5,0.5
+      parent: 1
+  - uid: 1626
+    components:
+    - type: Transform
+      pos: 59.5,0.5
+      parent: 1
+  - uid: 1627
+    components:
+    - type: Transform
+      pos: 60.5,0.5
+      parent: 1
+  - uid: 1628
+    components:
+    - type: Transform
+      pos: 61.5,0.5
+      parent: 1
+  - uid: 1629
+    components:
+    - type: Transform
+      pos: 62.5,0.5
+      parent: 1
+  - uid: 1630
+    components:
+    - type: Transform
+      pos: 63.5,0.5
+      parent: 1
+  - uid: 1631
+    components:
+    - type: Transform
+      pos: 64.5,0.5
+      parent: 1
+  - uid: 1632
+    components:
+    - type: Transform
+      pos: 65.5,0.5
+      parent: 1
+  - uid: 1633
+    components:
+    - type: Transform
+      pos: 66.5,0.5
+      parent: 1
+  - uid: 1634
+    components:
+    - type: Transform
+      pos: 67.5,0.5
+      parent: 1
+  - uid: 1635
+    components:
+    - type: Transform
+      pos: 68.5,0.5
+      parent: 1
+  - uid: 1636
+    components:
+    - type: Transform
+      pos: 69.5,0.5
+      parent: 1
+  - uid: 1637
+    components:
+    - type: Transform
+      pos: 70.5,0.5
+      parent: 1
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: 71.5,0.5
+      parent: 1
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: 72.5,0.5
+      parent: 1
+  - uid: 1640
+    components:
+    - type: Transform
+      pos: 73.5,0.5
+      parent: 1
+  - uid: 1641
+    components:
+    - type: Transform
+      pos: 74.5,0.5
+      parent: 1
+  - uid: 1642
+    components:
+    - type: Transform
+      pos: 58.5,-0.5
+      parent: 1
+  - uid: 1643
+    components:
+    - type: Transform
+      pos: 58.5,-1.5
+      parent: 1
+  - uid: 1644
+    components:
+    - type: Transform
+      pos: 58.5,-2.5
+      parent: 1
+  - uid: 1645
+    components:
+    - type: Transform
+      pos: 58.5,-3.5
+      parent: 1
+  - uid: 1646
+    components:
+    - type: Transform
+      pos: 59.5,-3.5
+      parent: 1
+  - uid: 1647
+    components:
+    - type: Transform
+      pos: 57.5,-3.5
+      parent: 1
+  - uid: 1648
+    components:
+    - type: Transform
+      pos: 56.5,-3.5
+      parent: 1
+  - uid: 1649
+    components:
+    - type: Transform
+      pos: 55.5,-3.5
+      parent: 1
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: 60.5,-3.5
+      parent: 1
+  - uid: 1651
+    components:
+    - type: Transform
+      pos: 61.5,-3.5
+      parent: 1
+  - uid: 1652
+    components:
+    - type: Transform
+      pos: 62.5,-3.5
+      parent: 1
+  - uid: 1653
+    components:
+    - type: Transform
+      pos: 63.5,-3.5
+      parent: 1
+  - uid: 1659
+    components:
+    - type: Transform
+      pos: 54.5,-3.5
+      parent: 1
+  - uid: 1660
+    components:
+    - type: Transform
+      pos: 30.5,-24.5
+      parent: 1
+  - uid: 1661
+    components:
+    - type: Transform
+      pos: 18.5,-28.5
+      parent: 1
+  - uid: 1662
+    components:
+    - type: Transform
+      pos: 32.5,-24.5
+      parent: 1
+  - uid: 1663
+    components:
+    - type: Transform
+      pos: 17.5,-28.5
+      parent: 1
+  - uid: 1665
+    components:
+    - type: Transform
+      pos: 29.5,-24.5
+      parent: 1
+  - uid: 1666
+    components:
+    - type: Transform
+      pos: 28.5,-24.5
+      parent: 1
+  - uid: 1680
+    components:
+    - type: Transform
+      pos: 99.5,-3.5
+      parent: 1
+  - uid: 1685
+    components:
+    - type: Transform
+      pos: 117.5,-22.5
+      parent: 1
+  - uid: 1697
+    components:
+    - type: Transform
+      pos: 56.5,-14.5
+      parent: 1
+  - uid: 1702
+    components:
+    - type: Transform
+      pos: 115.5,-22.5
+      parent: 1
+  - uid: 1703
+    components:
+    - type: Transform
+      pos: 114.5,-22.5
+      parent: 1
+  - uid: 1704
+    components:
+    - type: Transform
+      pos: 116.5,-22.5
+      parent: 1
+  - uid: 1705
+    components:
+    - type: Transform
+      pos: 119.5,-22.5
+      parent: 1
+  - uid: 1706
+    components:
+    - type: Transform
+      pos: 118.5,-22.5
+      parent: 1
+  - uid: 1707
+    components:
+    - type: Transform
+      pos: 121.5,-22.5
+      parent: 1
+  - uid: 1708
+    components:
+    - type: Transform
+      pos: 120.5,-22.5
+      parent: 1
+  - uid: 1709
+    components:
+    - type: Transform
+      pos: 122.5,-16.5
+      parent: 1
+  - uid: 1710
+    components:
+    - type: Transform
+      pos: 122.5,-17.5
+      parent: 1
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: 122.5,-14.5
+      parent: 1
+  - uid: 1712
+    components:
+    - type: Transform
+      pos: 122.5,-15.5
+      parent: 1
+  - uid: 1713
+    components:
+    - type: Transform
+      pos: 122.5,-19.5
+      parent: 1
+  - uid: 1714
+    components:
+    - type: Transform
+      pos: 122.5,-20.5
+      parent: 1
+  - uid: 1715
+    components:
+    - type: Transform
+      pos: 122.5,-18.5
+      parent: 1
+  - uid: 1716
+    components:
+    - type: Transform
+      pos: 94.5,-14.5
+      parent: 1
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: 95.5,-14.5
+      parent: 1
+  - uid: 1718
+    components:
+    - type: Transform
+      pos: 78.5,-11.5
+      parent: 1
+  - uid: 1719
+    components:
+    - type: Transform
+      pos: 84.5,-14.5
+      parent: 1
+  - uid: 1720
+    components:
+    - type: Transform
+      pos: 89.5,-14.5
+      parent: 1
+  - uid: 1721
+    components:
+    - type: Transform
+      pos: 77.5,-11.5
+      parent: 1
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: 85.5,-14.5
+      parent: 1
+  - uid: 1723
+    components:
+    - type: Transform
+      pos: 90.5,-14.5
+      parent: 1
+  - uid: 1724
+    components:
+    - type: Transform
+      pos: 59.5,-22.5
+      parent: 1
+  - uid: 1725
+    components:
+    - type: Transform
+      pos: 86.5,-14.5
+      parent: 1
+  - uid: 1726
+    components:
+    - type: Transform
+      pos: 91.5,-14.5
+      parent: 1
+  - uid: 1727
+    components:
+    - type: Transform
+      pos: 76.5,-11.5
+      parent: 1
+  - uid: 1728
+    components:
+    - type: Transform
+      pos: 87.5,-14.5
+      parent: 1
+  - uid: 1729
+    components:
+    - type: Transform
+      pos: 92.5,-14.5
+      parent: 1
+  - uid: 1730
+    components:
+    - type: Transform
+      pos: 60.5,-22.5
+      parent: 1
+  - uid: 1731
+    components:
+    - type: Transform
+      pos: 88.5,-14.5
+      parent: 1
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: 93.5,-14.5
+      parent: 1
+  - uid: 1733
+    components:
+    - type: Transform
+      pos: 61.5,-22.5
+      parent: 1
+  - uid: 1734
+    components:
+    - type: Transform
+      pos: 74.5,-22.5
+      parent: 1
+  - uid: 1735
+    components:
+    - type: Transform
+      pos: 77.5,-22.5
+      parent: 1
+  - uid: 1736
+    components:
+    - type: Transform
+      pos: 75.5,-11.5
+      parent: 1
+  - uid: 1737
+    components:
+    - type: Transform
+      pos: 75.5,-22.5
+      parent: 1
+  - uid: 1738
+    components:
+    - type: Transform
+      pos: 78.5,-22.5
+      parent: 1
+  - uid: 1739
+    components:
+    - type: Transform
+      pos: 62.5,-22.5
+      parent: 1
+  - uid: 1740
+    components:
+    - type: Transform
+      pos: 76.5,-22.5
+      parent: 1
+  - uid: 1741
+    components:
+    - type: Transform
+      pos: 79.5,-22.5
+      parent: 1
+  - uid: 1742
+    components:
+    - type: Transform
+      pos: 74.5,-11.5
+      parent: 1
+  - uid: 1743
+    components:
+    - type: Transform
+      pos: 81.5,-17.5
+      parent: 1
+  - uid: 1744
+    components:
+    - type: Transform
+      pos: 81.5,-14.5
+      parent: 1
+  - uid: 1745
+    components:
+    - type: Transform
+      pos: 63.5,-22.5
+      parent: 1
+  - uid: 1746
+    components:
+    - type: Transform
+      pos: 81.5,-16.5
+      parent: 1
+  - uid: 1747
+    components:
+    - type: Transform
+      pos: 82.5,-14.5
+      parent: 1
+  - uid: 1748
+    components:
+    - type: Transform
+      pos: 73.5,-11.5
+      parent: 1
+  - uid: 1749
+    components:
+    - type: Transform
+      pos: 81.5,-15.5
+      parent: 1
+  - uid: 1750
+    components:
+    - type: Transform
+      pos: 83.5,-14.5
+      parent: 1
+  - uid: 1751
+    components:
+    - type: Transform
+      pos: 72.5,-11.5
+      parent: 1
+  - uid: 1752
+    components:
+    - type: Transform
+      pos: 80.5,-22.5
+      parent: 1
+  - uid: 1753
+    components:
+    - type: Transform
+      pos: 81.5,-20.5
+      parent: 1
+  - uid: 1754
+    components:
+    - type: Transform
+      pos: 64.5,-22.5
+      parent: 1
+  - uid: 1755
+    components:
+    - type: Transform
+      pos: 81.5,-22.5
+      parent: 1
+  - uid: 1756
+    components:
+    - type: Transform
+      pos: 81.5,-19.5
+      parent: 1
+  - uid: 1757
+    components:
+    - type: Transform
+      pos: 67.5,-11.5
+      parent: 1
+  - uid: 1758
+    components:
+    - type: Transform
+      pos: 81.5,-21.5
+      parent: 1
+  - uid: 1759
+    components:
+    - type: Transform
+      pos: 81.5,-18.5
+      parent: 1
+  - uid: 1760
+    components:
+    - type: Transform
+      pos: 65.5,-22.5
+      parent: 1
+  - uid: 1761
+    components:
+    - type: Transform
+      pos: 102.5,-14.5
+      parent: 1
+  - uid: 1762
+    components:
+    - type: Transform
+      pos: 105.5,-14.5
+      parent: 1
+  - uid: 1763
+    components:
+    - type: Transform
+      pos: 68.5,-11.5
+      parent: 1
+  - uid: 1764
+    components:
+    - type: Transform
+      pos: 103.5,-14.5
+      parent: 1
+  - uid: 1765
+    components:
+    - type: Transform
+      pos: 106.5,-14.5
+      parent: 1
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: 66.5,-22.5
+      parent: 1
+  - uid: 1767
+    components:
+    - type: Transform
+      pos: 104.5,-14.5
+      parent: 1
+  - uid: 1768
+    components:
+    - type: Transform
+      pos: 107.5,-14.5
+      parent: 1
+  - uid: 1769
+    components:
+    - type: Transform
+      pos: 69.5,-11.5
+      parent: 1
+  - uid: 1770
+    components:
+    - type: Transform
+      pos: 96.5,-14.5
+      parent: 1
+  - uid: 1771
+    components:
+    - type: Transform
+      pos: 99.5,-14.5
+      parent: 1
+  - uid: 1772
+    components:
+    - type: Transform
+      pos: 67.5,-22.5
+      parent: 1
+  - uid: 1773
+    components:
+    - type: Transform
+      pos: 97.5,-14.5
+      parent: 1
+  - uid: 1774
+    components:
+    - type: Transform
+      pos: 100.5,-14.5
+      parent: 1
+  - uid: 1775
+    components:
+    - type: Transform
+      pos: 68.5,-22.5
+      parent: 1
+  - uid: 1776
+    components:
+    - type: Transform
+      pos: 98.5,-14.5
+      parent: 1
+  - uid: 1777
+    components:
+    - type: Transform
+      pos: 101.5,-14.5
+      parent: 1
+  - uid: 1778
+    components:
+    - type: Transform
+      pos: 70.5,-11.5
+      parent: 1
+  - uid: 1779
+    components:
+    - type: Transform
+      pos: 114.5,-14.5
+      parent: 1
+  - uid: 1780
+    components:
+    - type: Transform
+      pos: 117.5,-14.5
+      parent: 1
+  - uid: 1781
+    components:
+    - type: Transform
+      pos: 69.5,-22.5
+      parent: 1
+  - uid: 1782
+    components:
+    - type: Transform
+      pos: 115.5,-14.5
+      parent: 1
+  - uid: 1783
+    components:
+    - type: Transform
+      pos: 118.5,-14.5
+      parent: 1
+  - uid: 1784
+    components:
+    - type: Transform
+      pos: 71.5,-10.5
+      parent: 1
+  - uid: 1785
+    components:
+    - type: Transform
+      pos: 116.5,-14.5
+      parent: 1
+  - uid: 1786
+    components:
+    - type: Transform
+      pos: 119.5,-14.5
+      parent: 1
+  - uid: 1787
+    components:
+    - type: Transform
+      pos: 70.5,-22.5
+      parent: 1
+  - uid: 1788
+    components:
+    - type: Transform
+      pos: 108.5,-14.5
+      parent: 1
+  - uid: 1789
+    components:
+    - type: Transform
+      pos: 109.5,-14.5
+      parent: 1
+  - uid: 1790
+    components:
+    - type: Transform
+      pos: 71.5,-11.5
+      parent: 1
+  - uid: 1791
+    components:
+    - type: Transform
+      pos: 110.5,-14.5
+      parent: 1
+  - uid: 1792
+    components:
+    - type: Transform
+      pos: 112.5,-14.5
+      parent: 1
+  - uid: 1793
+    components:
+    - type: Transform
+      pos: 71.5,-22.5
+      parent: 1
+  - uid: 1794
+    components:
+    - type: Transform
+      pos: 111.5,-14.5
+      parent: 1
+  - uid: 1795
+    components:
+    - type: Transform
+      pos: 113.5,-14.5
+      parent: 1
+  - uid: 1796
+    components:
+    - type: Transform
+      pos: 72.5,-22.5
+      parent: 1
+  - uid: 1797
+    components:
+    - type: Transform
+      pos: 121.5,-14.5
+      parent: 1
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: 120.5,-14.5
+      parent: 1
+  - uid: 1799
+    components:
+    - type: Transform
+      pos: 73.5,-22.5
+      parent: 1
+  - uid: 1800
+    components:
+    - type: Transform
+      pos: 64.5,-3.5
+      parent: 1
+  - uid: 1801
+    components:
+    - type: Transform
+      pos: 65.5,-3.5
+      parent: 1
+  - uid: 1802
+    components:
+    - type: Transform
+      pos: 71.5,-9.5
+      parent: 1
+  - uid: 1803
+    components:
+    - type: Transform
+      pos: 63.5,-19.5
+      parent: 1
+  - uid: 1804
+    components:
+    - type: Transform
+      pos: 62.5,-19.5
+      parent: 1
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: 71.5,-7.5
+      parent: 1
+  - uid: 1806
+    components:
+    - type: Transform
+      pos: 40.5,-17.5
+      parent: 1
+  - uid: 1807
+    components:
+    - type: Transform
+      pos: 34.5,-19.5
+      parent: 1
+  - uid: 1808
+    components:
+    - type: Transform
+      pos: 71.5,-8.5
+      parent: 1
+  - uid: 1809
+    components:
+    - type: Transform
+      pos: 40.5,-14.5
+      parent: 1
+  - uid: 1810
+    components:
+    - type: Transform
+      pos: 35.5,-19.5
+      parent: 1
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: 71.5,-6.5
+      parent: 1
+  - uid: 1812
+    components:
+    - type: Transform
+      pos: 43.5,-15.5
+      parent: 1
+  - uid: 1813
+    components:
+    - type: Transform
+      pos: 36.5,-19.5
+      parent: 1
+  - uid: 1814
+    components:
+    - type: Transform
+      pos: 67.5,-3.5
+      parent: 1
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: 37.5,-19.5
+      parent: 1
+  - uid: 1817
+    components:
+    - type: Transform
+      pos: 66.5,-3.5
+      parent: 1
+  - uid: 1818
+    components:
+    - type: Transform
+      pos: 36.5,-15.5
+      parent: 1
+  - uid: 1819
+    components:
+    - type: Transform
+      pos: 38.5,-19.5
+      parent: 1
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: 71.5,-5.5
+      parent: 1
+  - uid: 1821
+    components:
+    - type: Transform
+      pos: 37.5,-15.5
+      parent: 1
+  - uid: 1822
+    components:
+    - type: Transform
+      pos: 39.5,-19.5
+      parent: 1
+  - uid: 1823
+    components:
+    - type: Transform
+      pos: 68.5,-3.5
+      parent: 1
+  - uid: 1824
+    components:
+    - type: Transform
+      pos: 40.5,-20.5
+      parent: 1
+  - uid: 1825
+    components:
+    - type: Transform
+      pos: 40.5,-19.5
+      parent: 1
+  - uid: 1826
+    components:
+    - type: Transform
+      pos: 71.5,-4.5
+      parent: 1
+  - uid: 1827
+    components:
+    - type: Transform
+      pos: 40.5,-21.5
+      parent: 1
+  - uid: 1828
+    components:
+    - type: Transform
+      pos: 40.5,-18.5
+      parent: 1
+  - uid: 1829
+    components:
+    - type: Transform
+      pos: 69.5,-3.5
+      parent: 1
+  - uid: 1830
+    components:
+    - type: Transform
+      pos: 50.5,-14.5
+      parent: 1
+  - uid: 1832
+    components:
+    - type: Transform
+      pos: 71.5,-3.5
+      parent: 1
+  - uid: 1833
+    components:
+    - type: Transform
+      pos: 50.5,-15.5
+      parent: 1
+  - uid: 1834
+    components:
+    - type: Transform
+      pos: 46.5,-11.5
+      parent: 1
+  - uid: 1835
+    components:
+    - type: Transform
+      pos: 70.5,-3.5
+      parent: 1
+  - uid: 1836
+    components:
+    - type: Transform
+      pos: 56.5,-11.5
+      parent: 1
+  - uid: 1837
+    components:
+    - type: Transform
+      pos: 47.5,-11.5
+      parent: 1
+  - uid: 1838
+    components:
+    - type: Transform
+      pos: 48.5,-11.5
+      parent: 1
+  - uid: 1839
+    components:
+    - type: Transform
+      pos: 57.5,-11.5
+      parent: 1
+  - uid: 1840
+    components:
+    - type: Transform
+      pos: 61.5,-8.5
+      parent: 1
+  - uid: 1841
+    components:
+    - type: Transform
+      pos: 61.5,-7.5
+      parent: 1
+  - uid: 1842
+    components:
+    - type: Transform
+      pos: 57.5,-8.5
+      parent: 1
+  - uid: 1843
+    components:
+    - type: Transform
+      pos: 56.5,-8.5
+      parent: 1
+  - uid: 1844
+    components:
+    - type: Transform
+      pos: 55.5,-22.5
+      parent: 1
+  - uid: 1845
+    components:
+    - type: Transform
+      pos: 54.5,-22.5
+      parent: 1
+  - uid: 1846
+    components:
+    - type: Transform
+      pos: 50.5,-18.5
+      parent: 1
+  - uid: 1847
+    components:
+    - type: Transform
+      pos: 50.5,-19.5
+      parent: 1
+  - uid: 1848
+    components:
+    - type: Transform
+      pos: 50.5,-12.5
+      parent: 1
+  - uid: 1849
+    components:
+    - type: Transform
+      pos: 55.5,-8.5
+      parent: 1
+  - uid: 1850
+    components:
+    - type: Transform
+      pos: 45.5,-14.5
+      parent: 1
+  - uid: 1851
+    components:
+    - type: Transform
+      pos: 56.5,-22.5
+      parent: 1
+  - uid: 1852
+    components:
+    - type: Transform
+      pos: 53.5,-22.5
+      parent: 1
+  - uid: 1853
+    components:
+    - type: Transform
+      pos: 50.5,-16.5
+      parent: 1
+  - uid: 1854
+    components:
+    - type: Transform
+      pos: 50.5,-17.5
+      parent: 1
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: 50.5,-13.5
+      parent: 1
+  - uid: 1856
+    components:
+    - type: Transform
+      pos: 54.5,-8.5
+      parent: 1
+  - uid: 1857
+    components:
+    - type: Transform
+      pos: 45.5,-13.5
+      parent: 1
+  - uid: 1858
+    components:
+    - type: Transform
+      pos: 45.5,-21.5
+      parent: 1
+  - uid: 1859
+    components:
+    - type: Transform
+      pos: 52.5,-22.5
+      parent: 1
+  - uid: 1860
+    components:
+    - type: Transform
+      pos: 36.5,-23.5
+      parent: 1
+  - uid: 1861
+    components:
+    - type: Transform
+      pos: 37.5,-23.5
+      parent: 1
+  - uid: 1862
+    components:
+    - type: Transform
+      pos: 39.5,-23.5
+      parent: 1
+  - uid: 1863
+    components:
+    - type: Transform
+      pos: 38.5,-15.5
+      parent: 1
+  - uid: 1864
+    components:
+    - type: Transform
+      pos: 45.5,-15.5
+      parent: 1
+  - uid: 1865
+    components:
+    - type: Transform
+      pos: 57.5,-22.5
+      parent: 1
+  - uid: 1866
+    components:
+    - type: Transform
+      pos: 51.5,-22.5
+      parent: 1
+  - uid: 1867
+    components:
+    - type: Transform
+      pos: 43.5,-19.5
+      parent: 1
+  - uid: 1868
+    components:
+    - type: Transform
+      pos: 34.5,-28.5
+      parent: 1
+  - uid: 1869
+    components:
+    - type: Transform
+      pos: 40.5,-13.5
+      parent: 1
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: 39.5,-15.5
+      parent: 1
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: 45.5,-12.5
+      parent: 1
+  - uid: 1872
+    components:
+    - type: Transform
+      pos: 58.5,-22.5
+      parent: 1
+  - uid: 1873
+    components:
+    - type: Transform
+      pos: 50.5,-22.5
+      parent: 1
+  - uid: 1874
+    components:
+    - type: Transform
+      pos: 40.5,-22.5
+      parent: 1
+  - uid: 1875
+    components:
+    - type: Transform
+      pos: 40.5,-23.5
+      parent: 1
+  - uid: 1876
+    components:
+    - type: Transform
+      pos: 40.5,-24.5
+      parent: 1
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: 40.5,-25.5
+      parent: 1
+  - uid: 1878
+    components:
+    - type: Transform
+      pos: 45.5,-16.5
+      parent: 1
+  - uid: 1879
+    components:
+    - type: Transform
+      pos: 45.5,-27.5
+      parent: 1
+  - uid: 1880
+    components:
+    - type: Transform
+      pos: 48.5,-22.5
+      parent: 1
+  - uid: 1881
+    components:
+    - type: Transform
+      pos: 38.5,-23.5
+      parent: 1
+  - uid: 1882
+    components:
+    - type: Transform
+      pos: 41.5,-19.5
+      parent: 1
+  - uid: 1883
+    components:
+    - type: Transform
+      pos: 42.5,-19.5
+      parent: 1
+  - uid: 1884
+    components:
+    - type: Transform
+      pos: 42.5,-28.5
+      parent: 1
+  - uid: 1885
+    components:
+    - type: Transform
+      pos: 45.5,-17.5
+      parent: 1
+  - uid: 1886
+    components:
+    - type: Transform
+      pos: 45.5,-22.5
+      parent: 1
+  - uid: 1887
+    components:
+    - type: Transform
+      pos: 49.5,-22.5
+      parent: 1
+  - uid: 1888
+    components:
+    - type: Transform
+      pos: 38.5,-28.5
+      parent: 1
+  - uid: 1889
+    components:
+    - type: Transform
+      pos: 36.5,-28.5
+      parent: 1
+  - uid: 1890
+    components:
+    - type: Transform
+      pos: 37.5,-28.5
+      parent: 1
+  - uid: 1891
+    components:
+    - type: Transform
+      pos: 41.5,-28.5
+      parent: 1
+  - uid: 1892
+    components:
+    - type: Transform
+      pos: 45.5,-18.5
+      parent: 1
+  - uid: 1893
+    components:
+    - type: Transform
+      pos: 45.5,-26.5
+      parent: 1
+  - uid: 1894
+    components:
+    - type: Transform
+      pos: 46.5,-22.5
+      parent: 1
+  - uid: 1895
+    components:
+    - type: Transform
+      pos: 42.5,-23.5
+      parent: 1
+  - uid: 1896
+    components:
+    - type: Transform
+      pos: 41.5,-23.5
+      parent: 1
+  - uid: 1897
+    components:
+    - type: Transform
+      pos: 40.5,-28.5
+      parent: 1
+  - uid: 1898
+    components:
+    - type: Transform
+      pos: 43.5,-23.5
+      parent: 1
+  - uid: 1899
+    components:
+    - type: Transform
+      pos: 45.5,-19.5
+      parent: 1
+  - uid: 1900
+    components:
+    - type: Transform
+      pos: 45.5,-25.5
+      parent: 1
+  - uid: 1901
+    components:
+    - type: Transform
+      pos: 47.5,-22.5
+      parent: 1
+  - uid: 1902
+    components:
+    - type: Transform
+      pos: 40.5,-26.5
+      parent: 1
+  - uid: 1903
+    components:
+    - type: Transform
+      pos: 45.5,-28.5
+      parent: 1
+  - uid: 1904
+    components:
+    - type: Transform
+      pos: 39.5,-28.5
+      parent: 1
+  - uid: 1905
+    components:
+    - type: Transform
+      pos: 44.5,-28.5
+      parent: 1
+  - uid: 1906
+    components:
+    - type: Transform
+      pos: 45.5,-20.5
+      parent: 1
+  - uid: 1907
+    components:
+    - type: Transform
+      pos: 45.5,-24.5
+      parent: 1
+  - uid: 1908
+    components:
+    - type: Transform
+      pos: 58.5,-20.5
+      parent: 1
+  - uid: 1909
+    components:
+    - type: Transform
+      pos: 40.5,-16.5
+      parent: 1
+  - uid: 1910
+    components:
+    - type: Transform
+      pos: 40.5,-15.5
+      parent: 1
+  - uid: 1911
+    components:
+    - type: Transform
+      pos: 42.5,-15.5
+      parent: 1
+  - uid: 1912
+    components:
+    - type: Transform
+      pos: 41.5,-15.5
+      parent: 1
+  - uid: 1913
+    components:
+    - type: Transform
+      pos: 35.5,-28.5
+      parent: 1
+  - uid: 1914
+    components:
+    - type: Transform
+      pos: 45.5,-23.5
+      parent: 1
+  - uid: 1915
+    components:
+    - type: Transform
+      pos: 58.5,-21.5
+      parent: 1
+  - uid: 1916
+    components:
+    - type: Transform
+      pos: 61.5,-19.5
+      parent: 1
+  - uid: 1917
+    components:
+    - type: Transform
+      pos: 60.5,-19.5
+      parent: 1
+  - uid: 1918
+    components:
+    - type: Transform
+      pos: 55.5,-19.5
+      parent: 1
+  - uid: 1919
+    components:
+    - type: Transform
+      pos: 59.5,-19.5
+      parent: 1
+  - uid: 1920
+    components:
+    - type: Transform
+      pos: 56.5,-19.5
+      parent: 1
+  - uid: 1921
+    components:
+    - type: Transform
+      pos: 57.5,-19.5
+      parent: 1
+  - uid: 1922
+    components:
+    - type: Transform
+      pos: 58.5,-19.5
+      parent: 1
+  - uid: 1923
+    components:
+    - type: Transform
+      pos: 55.5,-14.5
+      parent: 1
+  - uid: 1924
+    components:
+    - type: Transform
+      pos: 60.5,-8.5
+      parent: 1
+  - uid: 1925
+    components:
+    - type: Transform
+      pos: 59.5,-8.5
+      parent: 1
+  - uid: 1926
+    components:
+    - type: Transform
+      pos: 61.5,-13.5
+      parent: 1
+  - uid: 1927
+    components:
+    - type: Transform
+      pos: 61.5,-9.5
+      parent: 1
+  - uid: 1928
+    components:
+    - type: Transform
+      pos: 59.5,-11.5
+      parent: 1
+  - uid: 1929
+    components:
+    - type: Transform
+      pos: 54.5,-11.5
+      parent: 1
+  - uid: 1930
+    components:
+    - type: Transform
+      pos: 51.5,-11.5
+      parent: 1
+  - uid: 1931
+    components:
+    - type: Transform
+      pos: 50.5,-11.5
+      parent: 1
+  - uid: 1932
+    components:
+    - type: Transform
+      pos: 58.5,-14.5
+      parent: 1
+  - uid: 1933
+    components:
+    - type: Transform
+      pos: 57.5,-14.5
+      parent: 1
+  - uid: 1934
+    components:
+    - type: Transform
+      pos: 59.5,-14.5
+      parent: 1
+  - uid: 1935
+    components:
+    - type: Transform
+      pos: 60.5,-14.5
+      parent: 1
+  - uid: 1936
+    components:
+    - type: Transform
+      pos: 61.5,-14.5
+      parent: 1
+  - uid: 1937
+    components:
+    - type: Transform
+      pos: 61.5,-11.5
+      parent: 1
+  - uid: 1938
+    components:
+    - type: Transform
+      pos: 60.5,-11.5
+      parent: 1
+  - uid: 1939
+    components:
+    - type: Transform
+      pos: 53.5,-11.5
+      parent: 1
+  - uid: 1940
+    components:
+    - type: Transform
+      pos: 52.5,-11.5
+      parent: 1
+  - uid: 1941
+    components:
+    - type: Transform
+      pos: 49.5,-11.5
+      parent: 1
+  - uid: 1942
+    components:
+    - type: Transform
+      pos: 61.5,-12.5
+      parent: 1
+  - uid: 1943
+    components:
+    - type: Transform
+      pos: 54.5,-14.5
+      parent: 1
+  - uid: 1944
+    components:
+    - type: Transform
+      pos: 55.5,-11.5
+      parent: 1
+  - uid: 1945
+    components:
+    - type: Transform
+      pos: 61.5,-10.5
+      parent: 1
+  - uid: 1946
+    components:
+    - type: Transform
+      pos: 58.5,-11.5
+      parent: 1
+  - uid: 1947
+    components:
+    - type: Transform
+      pos: 117.5,-20.5
+      parent: 1
+  - uid: 1948
+    components:
+    - type: Transform
+      pos: 58.5,-8.5
+      parent: 1
+  - uid: 1949
+    components:
+    - type: Transform
+      pos: 76.5,0.5
+      parent: 1
+  - uid: 1950
+    components:
+    - type: Transform
+      pos: 77.5,0.5
+      parent: 1
+  - uid: 1951
+    components:
+    - type: Transform
+      pos: 78.5,0.5
+      parent: 1
+  - uid: 1952
+    components:
+    - type: Transform
+      pos: 79.5,0.5
+      parent: 1
+  - uid: 1953
+    components:
+    - type: Transform
+      pos: 81.5,0.5
+      parent: 1
+  - uid: 1954
+    components:
+    - type: Transform
+      pos: 121.5,-0.5
+      parent: 1
+  - uid: 1955
+    components:
+    - type: Transform
+      pos: 120.5,-0.5
+      parent: 1
+  - uid: 1956
+    components:
+    - type: Transform
+      pos: 122.5,-0.5
+      parent: 1
+  - uid: 1957
+    components:
+    - type: Transform
+      pos: 121.5,-7.5
+      parent: 1
+  - uid: 1958
+    components:
+    - type: Transform
+      pos: 81.5,-1.5
+      parent: 1
+  - uid: 1959
+    components:
+    - type: Transform
+      pos: 112.5,-7.5
+      parent: 1
+  - uid: 1960
+    components:
+    - type: Transform
+      pos: 113.5,-7.5
+      parent: 1
+  - uid: 1961
+    components:
+    - type: Transform
+      pos: 114.5,-7.5
+      parent: 1
+  - uid: 1962
+    components:
+    - type: Transform
+      pos: 115.5,-7.5
+      parent: 1
+  - uid: 1963
+    components:
+    - type: Transform
+      pos: 116.5,-7.5
+      parent: 1
+  - uid: 1964
+    components:
+    - type: Transform
+      pos: 117.5,-7.5
+      parent: 1
+  - uid: 1965
+    components:
+    - type: Transform
+      pos: 118.5,-7.5
+      parent: 1
+  - uid: 1966
+    components:
+    - type: Transform
+      pos: 119.5,-7.5
+      parent: 1
+  - uid: 1967
+    components:
+    - type: Transform
+      pos: 111.5,-7.5
+      parent: 1
+  - uid: 1968
+    components:
+    - type: Transform
+      pos: 104.5,-7.5
+      parent: 1
+  - uid: 1969
+    components:
+    - type: Transform
+      pos: 99.5,-7.5
+      parent: 1
+  - uid: 1970
+    components:
+    - type: Transform
+      pos: 86.5,-7.5
+      parent: 1
+  - uid: 1971
+    components:
+    - type: Transform
+      pos: 90.5,-18.5
+      parent: 1
+  - uid: 1972
+    components:
+    - type: Transform
+      pos: 113.5,-22.5
+      parent: 1
+  - uid: 1973
+    components:
+    - type: Transform
+      pos: 112.5,-22.5
+      parent: 1
+  - uid: 1974
+    components:
+    - type: Transform
+      pos: 112.5,-21.5
+      parent: 1
+  - uid: 1975
+    components:
+    - type: Transform
+      pos: 112.5,-20.5
+      parent: 1
+  - uid: 1976
+    components:
+    - type: Transform
+      pos: 112.5,-19.5
+      parent: 1
+  - uid: 1977
+    components:
+    - type: Transform
+      pos: 112.5,-18.5
+      parent: 1
+  - uid: 1978
+    components:
+    - type: Transform
+      pos: 112.5,-17.5
+      parent: 1
+  - uid: 1979
+    components:
+    - type: Transform
+      pos: 112.5,-16.5
+      parent: 1
+  - uid: 1980
+    components:
+    - type: Transform
+      pos: 117.5,-15.5
+      parent: 1
+  - uid: 1981
+    components:
+    - type: Transform
+      pos: 117.5,-16.5
+      parent: 1
+  - uid: 1982
+    components:
+    - type: Transform
+      pos: 112.5,-15.5
+      parent: 1
+  - uid: 1983
+    components:
+    - type: Transform
+      pos: 117.5,-18.5
+      parent: 1
+  - uid: 1984
+    components:
+    - type: Transform
+      pos: 122.5,-21.5
+      parent: 1
+  - uid: 1985
+    components:
+    - type: Transform
+      pos: 117.5,-21.5
+      parent: 1
+  - uid: 1986
+    components:
+    - type: Transform
+      pos: 122.5,-22.5
+      parent: 1
+  - uid: 1987
+    components:
+    - type: Transform
+      pos: 75.5,0.5
+      parent: 1
+  - uid: 1988
+    components:
+    - type: Transform
+      pos: 81.5,-0.5
+      parent: 1
+  - uid: 1989
+    components:
+    - type: Transform
+      pos: 80.5,0.5
+      parent: 1
+  - uid: 1990
+    components:
+    - type: Transform
+      pos: 117.5,-17.5
+      parent: 1
+  - uid: 1991
+    components:
+    - type: Transform
+      pos: 117.5,-19.5
+      parent: 1
+  - uid: 1992
+    components:
+    - type: Transform
+      pos: 85.5,-7.5
+      parent: 1
+  - uid: 1993
+    components:
+    - type: Transform
+      pos: 87.5,-7.5
+      parent: 1
+  - uid: 1994
+    components:
+    - type: Transform
+      pos: 100.5,-7.5
+      parent: 1
+  - uid: 1995
+    components:
+    - type: Transform
+      pos: 103.5,-7.5
+      parent: 1
+  - uid: 1996
+    components:
+    - type: Transform
+      pos: 84.5,-7.5
+      parent: 1
+  - uid: 1997
+    components:
+    - type: Transform
+      pos: 88.5,-7.5
+      parent: 1
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: 98.5,-7.5
+      parent: 1
+  - uid: 1999
+    components:
+    - type: Transform
+      pos: 105.5,-7.5
+      parent: 1
+  - uid: 2000
+    components:
+    - type: Transform
+      pos: 83.5,-7.5
+      parent: 1
+  - uid: 2001
+    components:
+    - type: Transform
+      pos: 89.5,-7.5
+      parent: 1
+  - uid: 2002
+    components:
+    - type: Transform
+      pos: 97.5,-7.5
+      parent: 1
+  - uid: 2003
+    components:
+    - type: Transform
+      pos: 106.5,-7.5
+      parent: 1
+  - uid: 2004
+    components:
+    - type: Transform
+      pos: 82.5,-7.5
+      parent: 1
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: 90.5,-7.5
+      parent: 1
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: 96.5,-7.5
+      parent: 1
+  - uid: 2007
+    components:
+    - type: Transform
+      pos: 107.5,-7.5
+      parent: 1
+  - uid: 2008
+    components:
+    - type: Transform
+      pos: 81.5,-7.5
+      parent: 1
+  - uid: 2009
+    components:
+    - type: Transform
+      pos: 91.5,-7.5
+      parent: 1
+  - uid: 2010
+    components:
+    - type: Transform
+      pos: 95.5,-7.5
+      parent: 1
+  - uid: 2011
+    components:
+    - type: Transform
+      pos: 108.5,-7.5
+      parent: 1
+  - uid: 2012
+    components:
+    - type: Transform
+      pos: 81.5,-6.5
+      parent: 1
+  - uid: 2013
+    components:
+    - type: Transform
+      pos: 92.5,-7.5
+      parent: 1
+  - uid: 2014
+    components:
+    - type: Transform
+      pos: 94.5,-7.5
+      parent: 1
+  - uid: 2015
+    components:
+    - type: Transform
+      pos: 109.5,-7.5
+      parent: 1
+  - uid: 2016
+    components:
+    - type: Transform
+      pos: 81.5,-5.5
+      parent: 1
+  - uid: 2017
+    components:
+    - type: Transform
+      pos: 93.5,-7.5
+      parent: 1
+  - uid: 2018
+    components:
+    - type: Transform
+      pos: 101.5,-7.5
+      parent: 1
+  - uid: 2019
+    components:
+    - type: Transform
+      pos: 110.5,-7.5
+      parent: 1
+  - uid: 2020
+    components:
+    - type: Transform
+      pos: 81.5,-4.5
+      parent: 1
+  - uid: 2021
+    components:
+    - type: Transform
+      pos: 81.5,-3.5
+      parent: 1
+  - uid: 2022
+    components:
+    - type: Transform
+      pos: 81.5,-2.5
+      parent: 1
+  - uid: 2023
+    components:
+    - type: Transform
+      pos: 102.5,-7.5
+      parent: 1
+  - uid: 2024
+    components:
+    - type: Transform
+      pos: 45.5,-9.5
+      parent: 1
+  - uid: 2025
+    components:
+    - type: Transform
+      pos: 45.5,-10.5
+      parent: 1
+  - uid: 2026
+    components:
+    - type: Transform
+      pos: 45.5,-3.5
+      parent: 1
+  - uid: 2027
+    components:
+    - type: Transform
+      pos: 45.5,-5.5
+      parent: 1
+  - uid: 2028
+    components:
+    - type: Transform
+      pos: 45.5,-2.5
+      parent: 1
+  - uid: 2029
+    components:
+    - type: Transform
+      pos: 43.5,-11.5
+      parent: 1
+  - uid: 2030
+    components:
+    - type: Transform
+      pos: 41.5,-11.5
+      parent: 1
+  - uid: 2031
+    components:
+    - type: Transform
+      pos: 40.5,-11.5
+      parent: 1
+  - uid: 2032
+    components:
+    - type: Transform
+      pos: 39.5,-11.5
+      parent: 1
+  - uid: 2033
+    components:
+    - type: Transform
+      pos: 36.5,-11.5
+      parent: 1
+  - uid: 2034
+    components:
+    - type: Transform
+      pos: 35.5,-11.5
+      parent: 1
+  - uid: 2035
+    components:
+    - type: Transform
+      pos: 45.5,-7.5
+      parent: 1
+  - uid: 2036
+    components:
+    - type: Transform
+      pos: 45.5,-8.5
+      parent: 1
+  - uid: 2037
+    components:
+    - type: Transform
+      pos: 45.5,-6.5
+      parent: 1
+  - uid: 2038
+    components:
+    - type: Transform
+      pos: 45.5,-4.5
+      parent: 1
+  - uid: 2039
+    components:
+    - type: Transform
+      pos: 45.5,-1.5
+      parent: 1
+  - uid: 2040
+    components:
+    - type: Transform
+      pos: 44.5,-11.5
+      parent: 1
+  - uid: 2041
+    components:
+    - type: Transform
+      pos: 45.5,-11.5
+      parent: 1
+  - uid: 2042
+    components:
+    - type: Transform
+      pos: 42.5,-11.5
+      parent: 1
+  - uid: 2043
+    components:
+    - type: Transform
+      pos: 38.5,-11.5
+      parent: 1
+  - uid: 2044
+    components:
+    - type: Transform
+      pos: 37.5,-11.5
+      parent: 1
+  - uid: 2045
+    components:
+    - type: Transform
+      pos: 34.5,-11.5
+      parent: 1
+  - uid: 2046
+    components:
+    - type: Transform
+      pos: 114.5,-0.5
+      parent: 1
+  - uid: 2047
+    components:
+    - type: Transform
+      pos: 112.5,-5.5
+      parent: 1
+  - uid: 2048
+    components:
+    - type: Transform
+      pos: 112.5,-4.5
+      parent: 1
+  - uid: 2049
+    components:
+    - type: Transform
+      pos: 113.5,-0.5
+      parent: 1
+  - uid: 2050
+    components:
+    - type: Transform
+      pos: 112.5,-6.5
+      parent: 1
+  - uid: 2051
+    components:
+    - type: Transform
+      pos: 112.5,-3.5
+      parent: 1
+  - uid: 2052
+    components:
+    - type: Transform
+      pos: 112.5,-0.5
+      parent: 1
+  - uid: 2053
+    components:
+    - type: Transform
+      pos: 122.5,-7.5
+      parent: 1
+  - uid: 2054
+    components:
+    - type: Transform
+      pos: 112.5,-2.5
+      parent: 1
+  - uid: 2055
+    components:
+    - type: Transform
+      pos: 122.5,-1.5
+      parent: 1
+  - uid: 2056
+    components:
+    - type: Transform
+      pos: 122.5,-6.5
+      parent: 1
+  - uid: 2057
+    components:
+    - type: Transform
+      pos: 122.5,-2.5
+      parent: 1
+  - uid: 2058
+    components:
+    - type: Transform
+      pos: 122.5,-4.5
+      parent: 1
+  - uid: 2059
+    components:
+    - type: Transform
+      pos: 100.5,-3.5
+      parent: 1
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 101.5,-3.5
+      parent: 1
+  - uid: 2061
+    components:
+    - type: Transform
+      pos: 102.5,-3.5
+      parent: 1
+  - uid: 2062
+    components:
+    - type: Transform
+      pos: 104.5,-3.5
+      parent: 1
+  - uid: 2063
+    components:
+    - type: Transform
+      pos: 105.5,-3.5
+      parent: 1
+  - uid: 2064
+    components:
+    - type: Transform
+      pos: 106.5,-3.5
+      parent: 1
+  - uid: 2065
+    components:
+    - type: Transform
+      pos: 103.5,-3.5
+      parent: 1
+  - uid: 2066
+    components:
+    - type: Transform
+      pos: 112.5,-1.5
+      parent: 1
+  - uid: 2067
+    components:
+    - type: Transform
+      pos: 122.5,-3.5
+      parent: 1
+  - uid: 2068
+    components:
+    - type: Transform
+      pos: 122.5,-5.5
+      parent: 1
+  - uid: 2069
+    components:
+    - type: Transform
+      pos: 100.5,-18.5
+      parent: 1
+  - uid: 2070
+    components:
+    - type: Transform
+      pos: 101.5,-18.5
+      parent: 1
+  - uid: 2071
+    components:
+    - type: Transform
+      pos: 102.5,-18.5
+      parent: 1
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: 103.5,-18.5
+      parent: 1
+  - uid: 2073
+    components:
+    - type: Transform
+      pos: 96.5,-15.5
+      parent: 1
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: 96.5,-16.5
+      parent: 1
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: 96.5,-17.5
+      parent: 1
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: 93.5,-3.5
+      parent: 1
+  - uid: 2077
+    components:
+    - type: Transform
+      pos: 117.5,-1.5
+      parent: 1
+  - uid: 2078
+    components:
+    - type: Transform
+      pos: 115.5,-0.5
+      parent: 1
+  - uid: 2083
+    components:
+    - type: Transform
+      pos: 50.5,-10.5
+      parent: 1
+  - uid: 2084
+    components:
+    - type: Transform
+      pos: 50.5,-9.5
+      parent: 1
+  - uid: 2085
+    components:
+    - type: Transform
+      pos: 96.5,-5.5
+      parent: 1
+  - uid: 2086
+    components:
+    - type: Transform
+      pos: 117.5,-3.5
+      parent: 1
+  - uid: 2087
+    components:
+    - type: Transform
+      pos: 116.5,-0.5
+      parent: 1
+  - uid: 2088
+    components:
+    - type: Transform
+      pos: 88.5,-18.5
+      parent: 1
+  - uid: 2089
+    components:
+    - type: Transform
+      pos: 87.5,-18.5
+      parent: 1
+  - uid: 2090
+    components:
+    - type: Transform
+      pos: 86.5,-18.5
+      parent: 1
+  - uid: 2091
+    components:
+    - type: Transform
+      pos: 96.5,-3.5
+      parent: 1
+  - uid: 2092
+    components:
+    - type: Transform
+      pos: 117.5,-5.5
+      parent: 1
+  - uid: 2093
+    components:
+    - type: Transform
+      pos: 117.5,-0.5
+      parent: 1
+  - uid: 2094
+    components:
+    - type: Transform
+      pos: 104.5,-18.5
+      parent: 1
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: 105.5,-18.5
+      parent: 1
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: 89.5,-18.5
+      parent: 1
+  - uid: 2097
+    components:
+    - type: Transform
+      pos: 96.5,-4.5
+      parent: 1
+  - uid: 2098
+    components:
+    - type: Transform
+      pos: 117.5,-6.5
+      parent: 1
+  - uid: 2099
+    components:
+    - type: Transform
+      pos: 118.5,-0.5
+      parent: 1
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: 50.5,-5.5
+      parent: 1
+  - uid: 2101
+    components:
+    - type: Transform
+      pos: 50.5,-4.5
+      parent: 1
+  - uid: 2102
+    components:
+    - type: Transform
+      pos: 50.5,-3.5
+      parent: 1
+  - uid: 2104
+    components:
+    - type: Transform
+      pos: 94.5,-3.5
+      parent: 1
+  - uid: 2105
+    components:
+    - type: Transform
+      pos: 117.5,-4.5
+      parent: 1
+  - uid: 2106
+    components:
+    - type: Transform
+      pos: 119.5,-0.5
+      parent: 1
+  - uid: 2107
+    components:
+    - type: Transform
+      pos: 50.5,-8.5
+      parent: 1
+  - uid: 2108
+    components:
+    - type: Transform
+      pos: 50.5,-7.5
+      parent: 1
+  - uid: 2109
+    components:
+    - type: Transform
+      pos: 50.5,-6.5
+      parent: 1
+  - uid: 2112
+    components:
+    - type: Transform
+      pos: 95.5,-3.5
+      parent: 1
+  - uid: 2113
+    components:
+    - type: Transform
+      pos: 96.5,-6.5
+      parent: 1
+  - uid: 2115
+    components:
+    - type: Transform
+      pos: 92.5,-3.5
+      parent: 1
+  - uid: 2116
+    components:
+    - type: Transform
+      pos: 91.5,-3.5
+      parent: 1
+  - uid: 2117
+    components:
+    - type: Transform
+      pos: 90.5,-3.5
+      parent: 1
+  - uid: 2118
+    components:
+    - type: Transform
+      pos: 89.5,-3.5
+      parent: 1
+  - uid: 2119
+    components:
+    - type: Transform
+      pos: 87.5,-3.5
+      parent: 1
+  - uid: 2120
+    components:
+    - type: Transform
+      pos: 88.5,-3.5
+      parent: 1
+  - uid: 2121
+    components:
+    - type: Transform
+      pos: 97.5,-3.5
+      parent: 1
+  - uid: 2122
+    components:
+    - type: Transform
+      pos: 98.5,-3.5
+      parent: 1
+  - uid: 2123
+    components:
+    - type: Transform
+      pos: 117.5,-2.5
+      parent: 1
+  - uid: 2126
+    components:
+    - type: Transform
+      pos: 120.5,-7.5
+      parent: 1
+  - uid: 2128
+    components:
+    - type: Transform
+      pos: 12.5,5.5
+      parent: 1
+  - uid: 2129
+    components:
+    - type: Transform
+      pos: 11.5,5.5
+      parent: 1
+  - uid: 2130
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 2131
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 1
+  - uid: 2147
+    components:
+    - type: Transform
+      pos: 18.5,-10.5
+      parent: 1
+  - uid: 2151
+    components:
+    - type: Transform
+      pos: 20.5,-10.5
+      parent: 1
+  - uid: 2152
+    components:
+    - type: Transform
+      pos: 19.5,-10.5
+      parent: 1
+  - uid: 2153
+    components:
+    - type: Transform
+      pos: 20.5,-13.5
+      parent: 1
+  - uid: 2154
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 1
+  - uid: 2155
+    components:
+    - type: Transform
+      pos: 20.5,-11.5
+      parent: 1
+  - uid: 2156
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 1
+  - uid: 2157
+    components:
+    - type: Transform
+      pos: 20.5,-17.5
+      parent: 1
+  - uid: 2158
+    components:
+    - type: Transform
+      pos: 20.5,-18.5
+      parent: 1
+  - uid: 2159
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 1
+  - uid: 2169
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 2170
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 2171
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 2172
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 2173
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 2174
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 2175
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 2176
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 2177
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 2178
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 1
+  - uid: 2179
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 2180
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 2182
+    components:
+    - type: Transform
+      pos: 20.5,-20.5
+      parent: 1
+  - uid: 2183
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 1
+  - uid: 2188
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 2189
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 2190
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 2191
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 2192
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 2193
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 2194
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 2195
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 2196
+    components:
+    - type: Transform
+      pos: 34.5,-3.5
+      parent: 1
+  - uid: 2197
+    components:
+    - type: Transform
+      pos: 35.5,-3.5
+      parent: 1
+  - uid: 2198
+    components:
+    - type: Transform
+      pos: 36.5,-3.5
+      parent: 1
+  - uid: 2199
+    components:
+    - type: Transform
+      pos: 37.5,-3.5
+      parent: 1
+  - uid: 2200
+    components:
+    - type: Transform
+      pos: 37.5,-2.5
+      parent: 1
+  - uid: 2201
+    components:
+    - type: Transform
+      pos: 37.5,-1.5
+      parent: 1
+  - uid: 2202
+    components:
+    - type: Transform
+      pos: 37.5,-0.5
+      parent: 1
+  - uid: 2203
+    components:
+    - type: Transform
+      pos: 37.5,1.5
+      parent: 1
+  - uid: 2204
+    components:
+    - type: Transform
+      pos: 37.5,0.5
+      parent: 1
+  - uid: 2205
+    components:
+    - type: Transform
+      pos: 38.5,1.5
+      parent: 1
+  - uid: 2206
+    components:
+    - type: Transform
+      pos: 40.5,1.5
+      parent: 1
+  - uid: 2207
+    components:
+    - type: Transform
+      pos: 41.5,1.5
+      parent: 1
+  - uid: 2208
+    components:
+    - type: Transform
+      pos: 42.5,1.5
+      parent: 1
+  - uid: 2209
+    components:
+    - type: Transform
+      pos: 39.5,1.5
+      parent: 1
+  - uid: 2210
+    components:
+    - type: Transform
+      pos: 38.5,-3.5
+      parent: 1
+  - uid: 2211
+    components:
+    - type: Transform
+      pos: 39.5,-3.5
+      parent: 1
+  - uid: 2212
+    components:
+    - type: Transform
+      pos: 40.5,-3.5
+      parent: 1
+  - uid: 2213
+    components:
+    - type: Transform
+      pos: 41.5,-3.5
+      parent: 1
+  - uid: 2214
+    components:
+    - type: Transform
+      pos: 42.5,-3.5
+      parent: 1
+  - uid: 2215
+    components:
+    - type: Transform
+      pos: 37.5,-4.5
+      parent: 1
+  - uid: 2216
+    components:
+    - type: Transform
+      pos: 37.5,-5.5
+      parent: 1
+  - uid: 2217
+    components:
+    - type: Transform
+      pos: 37.5,-6.5
+      parent: 1
+  - uid: 2218
+    components:
+    - type: Transform
+      pos: 37.5,-7.5
+      parent: 1
+  - uid: 2219
+    components:
+    - type: Transform
+      pos: 38.5,-7.5
+      parent: 1
+  - uid: 2220
+    components:
+    - type: Transform
+      pos: 39.5,-7.5
+      parent: 1
+  - uid: 2221
+    components:
+    - type: Transform
+      pos: 39.5,-7.5
+      parent: 1
+  - uid: 2222
+    components:
+    - type: Transform
+      pos: 40.5,-7.5
+      parent: 1
+  - uid: 2223
+    components:
+    - type: Transform
+      pos: 41.5,-7.5
+      parent: 1
+  - uid: 2224
+    components:
+    - type: Transform
+      pos: 42.5,-7.5
+      parent: 1
+  - uid: 2225
+    components:
+    - type: Transform
+      pos: 27.5,-24.5
+      parent: 1
+  - uid: 2226
+    components:
+    - type: Transform
+      pos: 26.5,-24.5
+      parent: 1
+  - uid: 2227
+    components:
+    - type: Transform
+      pos: 25.5,-24.5
+      parent: 1
+  - uid: 2228
+    components:
+    - type: Transform
+      pos: 24.5,-24.5
+      parent: 1
+  - uid: 2229
+    components:
+    - type: Transform
+      pos: 24.5,-25.5
+      parent: 1
+  - uid: 2230
+    components:
+    - type: Transform
+      pos: 24.5,-26.5
+      parent: 1
+  - uid: 2231
+    components:
+    - type: Transform
+      pos: 23.5,-26.5
+      parent: 1
+  - uid: 2232
+    components:
+    - type: Transform
+      pos: 22.5,-26.5
+      parent: 1
+  - uid: 2233
+    components:
+    - type: Transform
+      pos: 21.5,-26.5
+      parent: 1
+  - uid: 2234
+    components:
+    - type: Transform
+      pos: 20.5,-26.5
+      parent: 1
+  - uid: 2235
+    components:
+    - type: Transform
+      pos: 20.5,-25.5
+      parent: 1
+  - uid: 2236
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
+      parent: 1
+  - uid: 2237
+    components:
+    - type: Transform
+      pos: 20.5,-23.5
+      parent: 1
+  - uid: 2238
+    components:
+    - type: Transform
+      pos: 20.5,-22.5
+      parent: 1
+  - uid: 2240
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 1
+  - uid: 2241
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 1
+  - uid: 2242
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 1
+  - uid: 2243
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 1
+  - uid: 2244
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+  - uid: 2245
+    components:
+    - type: Transform
+      pos: 12.5,-12.5
+      parent: 1
+  - uid: 2246
+    components:
+    - type: Transform
+      pos: 12.5,-13.5
+      parent: 1
+  - uid: 2249
+    components:
+    - type: Transform
+      pos: 46.5,-26.5
+      parent: 1
+  - uid: 2250
+    components:
+    - type: Transform
+      pos: 47.5,-26.5
+      parent: 1
+  - uid: 2251
+    components:
+    - type: Transform
+      pos: 48.5,-26.5
+      parent: 1
+  - uid: 2252
+    components:
+    - type: Transform
+      pos: 49.5,-26.5
+      parent: 1
+  - uid: 2253
+    components:
+    - type: Transform
+      pos: 50.5,-26.5
+      parent: 1
+  - uid: 2254
+    components:
+    - type: Transform
+      pos: 51.5,-26.5
+      parent: 1
+  - uid: 2255
+    components:
+    - type: Transform
+      pos: 52.5,-26.5
+      parent: 1
+  - uid: 2256
+    components:
+    - type: Transform
+      pos: 53.5,-26.5
+      parent: 1
+  - uid: 2257
+    components:
+    - type: Transform
+      pos: 46.5,3.5
+      parent: 1
+  - uid: 2258
+    components:
+    - type: Transform
+      pos: 47.5,3.5
+      parent: 1
+  - uid: 2259
+    components:
+    - type: Transform
+      pos: 48.5,3.5
+      parent: 1
+  - uid: 2260
+    components:
+    - type: Transform
+      pos: 49.5,3.5
+      parent: 1
+  - uid: 2261
+    components:
+    - type: Transform
+      pos: 50.5,3.5
+      parent: 1
+  - uid: 2262
+    components:
+    - type: Transform
+      pos: 51.5,3.5
+      parent: 1
+  - uid: 2263
+    components:
+    - type: Transform
+      pos: 52.5,3.5
+      parent: 1
+  - uid: 2264
+    components:
+    - type: Transform
+      pos: 53.5,3.5
+      parent: 1
+  - uid: 2266
+    components:
+    - type: Transform
+      pos: 20.5,0.5
+      parent: 1
+  - uid: 2267
+    components:
+    - type: Transform
+      pos: 20.5,-0.5
+      parent: 1
+  - uid: 2268
+    components:
+    - type: Transform
+      pos: 20.5,-1.5
+      parent: 1
+  - uid: 2269
+    components:
+    - type: Transform
+      pos: 20.5,-2.5
+      parent: 1
+  - uid: 2270
+    components:
+    - type: Transform
+      pos: 21.5,-2.5
+      parent: 1
+  - uid: 2271
+    components:
+    - type: Transform
+      pos: 21.5,-3.5
+      parent: 1
+  - uid: 2272
+    components:
+    - type: Transform
+      pos: 21.5,-4.5
+      parent: 1
+- proto: CableApcStack1
+  entities:
+  - uid: 1664
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.436966,-27.524946
+      parent: 1
+  - uid: 2081
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 91.33842,-18.44619
+      parent: 1
+  - uid: 2247
+    components:
+    - type: Transform
+      pos: 12.438142,-14.644106
+      parent: 1
+  - uid: 2248
+    components:
+    - type: Transform
+      pos: 12.485017,-8.572691
+      parent: 1
+- proto: CableApcStack10
+  entities:
+  - uid: 2082
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 94.12803,-18.509699
+      parent: 1
+  - uid: 2150
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.9671464,5.7231894
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 1237
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 2133
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 2135
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 2138
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 2139
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 2140
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 2141
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 2142
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 2143
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 2144
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 2145
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 2148
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 2161
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 2162
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 2163
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 2164
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 2165
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 2166
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 2167
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 2168
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+- proto: CableMVStack1
+  entities:
+  - uid: 2146
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.3421464,4.3950644
+      parent: 1
+  - uid: 2149
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.4671464,4.4731894
+      parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 2132
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 2134
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 2137
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+- proto: Cautery
+  entities:
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 41.220383,-13.268032
+      parent: 1
+- proto: Chair
+  entities:
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 42.5,-5.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 41.5,-5.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-7.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-6.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-3.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-4.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-2.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 42.5,-1.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-6.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-7.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-2.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-3.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 41.5,-1.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,-8.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,-8.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-6.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 38.5,-5.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 37.5,-5.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-6.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-7.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-7.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-8.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-8.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-4.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-23.5
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 59.5,-9.5
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-8.5
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-10.5
+      parent: 1
+  - uid: 835
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-11.5
+      parent: 1
+  - uid: 836
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-12.5
+      parent: 1
+  - uid: 837
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-14.5
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-15.5
+      parent: 1
+- proto: ChairWood
+  entities:
+  - uid: 716
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-16.5
+      parent: 1
+- proto: ClosetL3Security
+  entities:
+  - uid: 729
+    components:
+    - type: Transform
+      pos: 52.5,-5.5
+      parent: 1
+  - uid: 730
+    components:
+    - type: Transform
+      pos: 52.5,-4.5
+      parent: 1
+- proto: ClosetToolFilled
+  entities:
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 17.5,-1.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 16.5,-1.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 15.5,-1.5
+      parent: 1
+- proto: ClothingBackpackDuffelSurgeryFilled
+  entities:
+  - uid: 662
+    components:
+    - type: Transform
+      pos: 41.751633,-13.424282
+      parent: 1
+- proto: computerBodyScanner
+  entities:
+  - uid: 647
+    components:
+    - type: Transform
+      pos: 43.5,-16.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 36.5,-16.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 43.5,-13.5
+      parent: 1
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 36.5,-13.5
+      parent: 1
+- proto: ComputerBroken
+  entities:
+  - uid: 433
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-15.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-14.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-15.5
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-11.5
+      parent: 1
+- proto: ComputerFrame
+  entities:
+  - uid: 824
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-8.5
+      parent: 1
+  - uid: 827
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-8.5
+      parent: 1
+  - uid: 830
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-10.5
+      parent: 1
+  - uid: 932
+    components:
+    - type: Transform
+      pos: 71.5,-12.5
+      parent: 1
+  - uid: 1831
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-20.5
+      parent: 1
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 1656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-2.5
+      parent: 1
+- proto: ContainmentFieldGenerator
+  entities:
+  - uid: 1366
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 125.5,-23.5
+      parent: 1
+  - uid: 1367
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 125.5,-13.5
+      parent: 1
+  - uid: 1423
+    components:
+    - type: Transform
+      pos: 125.5,-8.5
+      parent: 1
+  - uid: 1424
+    components:
+    - type: Transform
+      pos: 125.5,0.5
+      parent: 1
+- proto: CrateEmergencyInternals
+  entities:
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 19.5,-12.5
+      parent: 1
+- proto: CrateEmergencyRadiation
+  entities:
+  - uid: 1459
+    components:
+    - type: Transform
+      pos: 26.5,-18.5
+      parent: 1
+- proto: CrateEmptySpawner
+  entities:
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 22.5,-8.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      pos: 22.5,-9.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      pos: 22.5,-11.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 1453
+    components:
+    - type: Transform
+      pos: 25.5,-18.5
+      parent: 1
+  - uid: 1457
+    components:
+    - type: Transform
+      pos: 20.5,-18.5
+      parent: 1
+  - uid: 1476
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 1
+  - uid: 1477
+    components:
+    - type: Transform
+      pos: 23.5,-18.5
+      parent: 1
+  - uid: 1478
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 1
+  - uid: 1479
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
+      parent: 1
+  - uid: 2186
+    components:
+    - type: Transform
+      pos: 19.5,-8.5
+      parent: 1
+- proto: CrateEngineeringSolar
+  entities:
+  - uid: 1455
+    components:
+    - type: Transform
+      pos: 25.5,-19.5
+      parent: 1
+- proto: CrateFilledSpawner
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 25.5,-9.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 25.5,-11.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 423
+    components:
+    - type: Transform
+      pos: 25.5,-12.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 22.5,-10.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 428
+    components:
+    - type: Transform
+      pos: 22.5,-7.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 22.5,-13.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 22.5,-14.5
+      parent: 1
+    - type: RandomSpawner
+      offset: 0.2
+  - uid: 2187
+    components:
+    - type: Transform
+      pos: 19.5,-7.5
+      parent: 1
+- proto: CrateGenericSteel
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 25.5,-14.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 25.5,-13.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      pos: 25.5,-7.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 25.5,-8.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 25.5,-10.5
+      parent: 1
+- proto: CratePlasma
+  entities:
+  - uid: 1452
+    components:
+    - type: Transform
+      pos: 24.5,-19.5
+      parent: 1
+  - uid: 1454
+    components:
+    - type: Transform
+      pos: 24.5,-18.5
+      parent: 1
+- proto: CrateWeaponSecure
+  entities:
+  - uid: 446
+    components:
+    - type: Transform
+      pos: 19.5,-13.5
+      parent: 1
+- proto: DeployableBarrier
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 17.5,-12.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 31.5,-11.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      pos: 31.5,-10.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      pos: 31.5,-12.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 31.5,-9.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 17.5,-9.5
+      parent: 1
+  - uid: 468
+    components:
+    - type: Transform
+      pos: 17.5,-11.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      pos: 17.5,-10.5
+      parent: 1
+  - uid: 1470
+    components:
+    - type: Transform
+      pos: 19.5,-16.5
+      parent: 1
+  - uid: 1471
+    components:
+    - type: Transform
+      pos: 19.5,-17.5
+      parent: 1
+  - uid: 1474
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 1
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: 20.5,-17.5
+      parent: 1
+- proto: Emitter
+  entities:
+  - uid: 1418
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 122.5,-13.5
+      parent: 1
+  - uid: 1419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 122.5,-23.5
+      parent: 1
+  - uid: 1431
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 122.5,0.5
+      parent: 1
+  - uid: 1432
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 122.5,-8.5
+      parent: 1
+- proto: FoodCondimentBottleEnzyme
+  entities:
+  - uid: 2080
+    components:
+    - type: Transform
+      pos: 36.55369,3.5419717
+      parent: 1
+- proto: GravityGenerator
+  entities:
+  - uid: 2265
+    components:
+    - type: Transform
+      pos: 21.5,-4.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 107.5,-2.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 63.5,-7.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 63.5,-9.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 63.5,-8.5
+      parent: 1
+  - uid: 462
+    components:
+    - type: Transform
+      pos: 63.5,-11.5
+      parent: 1
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 63.5,-10.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 63.5,-13.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 63.5,-12.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 63.5,-14.5
+      parent: 1
+  - uid: 667
+    components:
+    - type: Transform
+      pos: 63.5,-15.5
+      parent: 1
+  - uid: 753
+    components:
+    - type: Transform
+      pos: 63.5,-16.5
+      parent: 1
+  - uid: 754
+    components:
+    - type: Transform
+      pos: 63.5,-6.5
+      parent: 1
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 85.5,-3.5
+      parent: 1
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 85.5,-1.5
+      parent: 1
+  - uid: 757
+    components:
+    - type: Transform
+      pos: 85.5,-2.5
+      parent: 1
+  - uid: 758
+    components:
+    - type: Transform
+      pos: 88.5,-1.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      pos: 90.5,-1.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 87.5,-1.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 89.5,-1.5
+      parent: 1
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 86.5,-1.5
+      parent: 1
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 93.5,-1.5
+      parent: 1
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 91.5,-1.5
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 95.5,-1.5
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 92.5,-1.5
+      parent: 1
+  - uid: 928
+    components:
+    - type: Transform
+      pos: 105.5,-1.5
+      parent: 1
+  - uid: 987
+    components:
+    - type: Transform
+      pos: 94.5,-1.5
+      parent: 1
+  - uid: 988
+    components:
+    - type: Transform
+      pos: 107.5,-3.5
+      parent: 1
+  - uid: 989
+    components:
+    - type: Transform
+      pos: 104.5,-1.5
+      parent: 1
+  - uid: 990
+    components:
+    - type: Transform
+      pos: 101.5,-1.5
+      parent: 1
+  - uid: 991
+    components:
+    - type: Transform
+      pos: 106.5,-1.5
+      parent: 1
+  - uid: 994
+    components:
+    - type: Transform
+      pos: 103.5,-1.5
+      parent: 1
+  - uid: 995
+    components:
+    - type: Transform
+      pos: 100.5,-1.5
+      parent: 1
+  - uid: 998
+    components:
+    - type: Transform
+      pos: 98.5,-1.5
+      parent: 1
+  - uid: 999
+    components:
+    - type: Transform
+      pos: 102.5,-1.5
+      parent: 1
+  - uid: 1000
+    components:
+    - type: Transform
+      pos: 97.5,-1.5
+      parent: 1
+  - uid: 1001
+    components:
+    - type: Transform
+      pos: 107.5,-1.5
+      parent: 1
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: 99.5,-1.5
+      parent: 1
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: 96.5,-1.5
+      parent: 1
+  - uid: 1005
+    components:
+    - type: Transform
+      pos: 101.5,-20.5
+      parent: 1
+  - uid: 1012
+    components:
+    - type: Transform
+      pos: 106.5,-20.5
+      parent: 1
+  - uid: 1022
+    components:
+    - type: Transform
+      pos: 107.5,-20.5
+      parent: 1
+  - uid: 1023
+    components:
+    - type: Transform
+      pos: 103.5,-20.5
+      parent: 1
+  - uid: 1030
+    components:
+    - type: Transform
+      pos: 104.5,-20.5
+      parent: 1
+  - uid: 1031
+    components:
+    - type: Transform
+      pos: 107.5,-19.5
+      parent: 1
+  - uid: 1032
+    components:
+    - type: Transform
+      pos: 102.5,-20.5
+      parent: 1
+  - uid: 1218
+    components:
+    - type: Transform
+      pos: 105.5,-20.5
+      parent: 1
+  - uid: 1219
+    components:
+    - type: Transform
+      pos: 88.5,-20.5
+      parent: 1
+  - uid: 1220
+    components:
+    - type: Transform
+      pos: 107.5,-18.5
+      parent: 1
+  - uid: 1227
+    components:
+    - type: Transform
+      pos: 87.5,-20.5
+      parent: 1
+  - uid: 1228
+    components:
+    - type: Transform
+      pos: 85.5,-18.5
+      parent: 1
+  - uid: 1229
+    components:
+    - type: Transform
+      pos: 85.5,-20.5
+      parent: 1
+  - uid: 1230
+    components:
+    - type: Transform
+      pos: 85.5,-19.5
+      parent: 1
+  - uid: 1282
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,0.5
+      parent: 1
+  - uid: 1283
+    components:
+    - type: Transform
+      pos: 86.5,-20.5
+      parent: 1
+  - uid: 1289
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-7.5
+      parent: 1
+  - uid: 1308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-0.5
+      parent: 1
+  - uid: 1313
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-8.5
+      parent: 1
+  - uid: 1316
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-5.5
+      parent: 1
+  - uid: 1318
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-2.5
+      parent: 1
+  - uid: 1319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-4.5
+      parent: 1
+  - uid: 1368
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-14.5
+      parent: 1
+  - uid: 1369
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-13.5
+      parent: 1
+  - uid: 1371
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-16.5
+      parent: 1
+  - uid: 1372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-17.5
+      parent: 1
+  - uid: 1373
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-23.5
+      parent: 1
+  - uid: 1374
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-22.5
+      parent: 1
+  - uid: 1375
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-20.5
+      parent: 1
+  - uid: 1376
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-19.5
+      parent: 1
+  - uid: 1377
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-18.5
+      parent: 1
+- proto: GrilleBroken
+  entities:
+  - uid: 1259
+    components:
+    - type: Transform
+      pos: 89.5,-20.5
+      parent: 1
+  - uid: 1287
+    components:
+    - type: Transform
+      pos: 100.5,-20.5
+      parent: 1
+  - uid: 1317
+    components:
+    - type: Transform
+      pos: 123.5,-3.5
+      parent: 1
+- proto: HandLabeler
+  entities:
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: 27.839834,-9.886635
+      parent: 1
+- proto: Hemostat
+  entities:
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 38.345383,-13.221157
+      parent: 1
+- proto: KitchenMicrowave
+  entities:
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 43.5,3.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 42.5,3.5
+      parent: 1
+- proto: LockerDetective
+  entities:
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 19.5,3.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 19.5,1.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 19.5,-0.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 19.5,2.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 19.5,0.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 19.5,-1.5
+      parent: 1
+- proto: LockerElectricalSuppliesFilled
+  entities:
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+- proto: LockerFreezerBase
+  entities:
+  - uid: 2103
+    components:
+    - type: Transform
+      pos: 40.5,3.5
+      parent: 1
+  - uid: 2110
+    components:
+    - type: Transform
+      pos: 41.5,3.5
+      parent: 1
+- proto: LockerSecurity
+  entities:
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 52.5,-2.5
+      parent: 1
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 52.5,-3.5
+      parent: 1
+- proto: LockerSteel
+  entities:
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 52.5,-20.5
+      parent: 1
+- proto: LockerWeldingSuppliesFilled
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 1
+- proto: LootSpawnerArmoryArmorOnly
+  entities:
+  - uid: 463
+    components:
+    - type: Transform
+      pos: 17.5,-15.5
+      parent: 1
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 48.5,-2.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: 48.5,-2.5
+      parent: 1
+  - uid: 732
+    components:
+    - type: Transform
+      pos: 48.5,-3.5
+      parent: 1
+- proto: LootSpawnerIndustrial
+  entities:
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 1428
+    components:
+    - type: Transform
+      pos: 60.5,-18.5
+      parent: 1
+  - uid: 1429
+    components:
+    - type: Transform
+      pos: 54.5,-2.5
+      parent: 1
+- proto: LootSpawnerIndustrialFluff
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 16.5,-23.5
+      parent: 1
+  - uid: 1430
+    components:
+    - type: Transform
+      pos: 54.5,-3.5
+      parent: 1
+  - uid: 2111
+    components:
+    - type: Transform
+      pos: 99.5,-13.5
+      parent: 1
+- proto: LootSpawnerMaterials
+  entities:
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: 54.5,-18.5
+      parent: 1
+  - uid: 1427
+    components:
+    - type: Transform
+      pos: 54.5,-19.5
+      parent: 1
+- proto: LootSpawnerMaterialsHighValueConstruction
+  entities:
+  - uid: 1426
+    components:
+    - type: Transform
+      pos: 54.5,-20.5
+      parent: 1
+- proto: LootSpawnerMedicalClassy
+  entities:
+  - uid: 664
+    components:
+    - type: Transform
+      pos: 43.5,-19.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      pos: 42.5,-22.5
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      pos: 37.5,-13.5
+      parent: 1
+- proto: LootSpawnerRandomCrateEngineering
+  entities:
+  - uid: 1240
+    components:
+    - type: Transform
+      pos: 19.5,-19.5
+      parent: 1
+  - uid: 1456
+    components:
+    - type: Transform
+      pos: 19.5,-18.5
+      parent: 1
+  - uid: 1458
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 1
+  - uid: 1467
+    components:
+    - type: Transform
+      pos: 21.5,-18.5
+      parent: 1
+  - uid: 1468
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 1
+- proto: LootSpawnerRandomCrateSecurity
+  entities:
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 19.5,-14.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 19.5,-15.5
+      parent: 1
+- proto: LootSpawnerSecurity
+  entities:
+  - uid: 1231
+    components:
+    - type: Transform
+      pos: 17.5,-4.5
+      parent: 1
+  - uid: 1370
+    components:
+    - type: Transform
+      pos: 62.5,-13.5
+      parent: 1
+- proto: MachineFrame
+  entities:
+  - uid: 895
+    components:
+    - type: Transform
+      pos: 67.5,-11.5
+      parent: 1
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 68.5,-11.5
+      parent: 1
+  - uid: 897
+    components:
+    - type: Transform
+      pos: 69.5,-11.5
+      parent: 1
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 74.5,-11.5
+      parent: 1
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 75.5,-11.5
+      parent: 1
+  - uid: 902
+    components:
+    - type: Transform
+      pos: 76.5,-11.5
+      parent: 1
+  - uid: 904
+    components:
+    - type: Transform
+      pos: 78.5,-11.5
+      parent: 1
+  - uid: 1234
+    components:
+    - type: Transform
+      pos: 42.5,-26.5
+      parent: 1
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: 42.5,-24.5
+      parent: 1
+  - uid: 1480
+    components:
+    - type: Transform
+      pos: 36.5,-26.5
+      parent: 1
+  - uid: 1481
+    components:
+    - type: Transform
+      pos: 36.5,-24.5
+      parent: 1
+  - uid: 1482
+    components:
+    - type: Transform
+      pos: 39.5,-26.5
+      parent: 1
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: 39.5,-24.5
+      parent: 1
+- proto: MagazinePistolSubMachineGunEmpty
+  entities:
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 4.945919,4.3761344
+      parent: 1
+- proto: MagazinePistolSubMachineGunTopMountedEmpty
+  entities:
+  - uid: 1698
+    components:
+    - type: Transform
+      pos: 14.469492,4.7017136
+      parent: 1
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: 120.48175,-7.394827
+      parent: 1
+- proto: MagazineShotgunEmpty
+  entities:
+  - uid: 1242
+    components:
+    - type: Transform
+      pos: 56.248035,-14.895625
+      parent: 1
+- proto: MaintenanceToolSpawner
+  entities:
+  - uid: 1460
+    components:
+    - type: Transform
+      pos: 21.5,-1.5
+      parent: 1
+  - uid: 1461
+    components:
+    - type: Transform
+      pos: 22.5,-16.5
+      parent: 1
+  - uid: 1462
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 1
+  - uid: 1463
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 1
+  - uid: 1464
+    components:
+    - type: Transform
+      pos: 23.5,-16.5
+      parent: 1
+- proto: MaintenanceWeaponSpawner
+  entities:
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: 98.5,-18.5
+      parent: 1
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 668
+    components:
+    - type: Transform
+      pos: 43.517258,-22.231878
+      parent: 1
+- proto: OperatingTable
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 43.5,-17.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 36.5,-17.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 43.5,-14.5
+      parent: 1
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 36.5,-14.5
+      parent: 1
+- proto: PartRodMetal1
+  entities:
+  - uid: 1284
+    components:
+    - type: Transform
+      pos: 89.383995,-19.754372
+      parent: 1
+  - uid: 1402
+    components:
+    - type: Transform
+      pos: 123.46295,-3.4430885
+      parent: 1
+- proto: PartRodMetal10
+  entities:
+  - uid: 1285
+    components:
+    - type: Transform
+      pos: 91.71212,-18.379372
+      parent: 1
+- proto: PlasmaCanister
+  entities:
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 24.5,-3.5
+      parent: 1
+- proto: PortableGeneratorSuperPacman
+  entities:
+  - uid: 1484
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 1
+- proto: PoweredlightEmpty
+  entities:
+  - uid: 1570
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-16.5
+      parent: 1
+  - uid: 1688
+    components:
+    - type: Transform
+      pos: 90.5,-13.5
+      parent: 1
+  - uid: 1689
+    components:
+    - type: Transform
+      pos: 98.5,-13.5
+      parent: 1
+  - uid: 1690
+    components:
+    - type: Transform
+      pos: 106.5,-13.5
+      parent: 1
+  - uid: 1694
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 106.5,-8.5
+      parent: 1
+  - uid: 1695
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 114.5,-8.5
+      parent: 1
+- proto: PoweredlightLED
+  entities:
+  - uid: 116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 33.5,6.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-1.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 17.5,6.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 37.5,3.5
+      parent: 1
+  - uid: 1312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 82.5,-8.5
+      parent: 1
+  - uid: 1434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 1435
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-21.5
+      parent: 1
+  - uid: 1436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-8.5
+      parent: 1
+  - uid: 1437
+    components:
+    - type: Transform
+      pos: 25.5,6.5
+      parent: 1
+  - uid: 1438
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-13.5
+      parent: 1
+  - uid: 1439
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-0.5
+      parent: 1
+  - uid: 1440
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-29.5
+      parent: 1
+  - uid: 1441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-29.5
+      parent: 1
+  - uid: 1442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-26.5
+      parent: 1
+  - uid: 1444
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 1
+  - uid: 1488
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-1.5
+      parent: 1
+  - uid: 1489
+    components:
+    - type: Transform
+      pos: 30.5,3.5
+      parent: 1
+  - uid: 1563
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-6.5
+      parent: 1
+  - uid: 1564
+    components:
+    - type: Transform
+      pos: 21.5,3.5
+      parent: 1
+  - uid: 1565
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-1.5
+      parent: 1
+  - uid: 1566
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-8.5
+      parent: 1
+  - uid: 1567
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-13.5
+      parent: 1
+  - uid: 1568
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-13.5
+      parent: 1
+  - uid: 1569
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-9.5
+      parent: 1
+  - uid: 1571
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-5.5
+      parent: 1
+  - uid: 1572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,-12.5
+      parent: 1
+  - uid: 1573
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-16.5
+      parent: 1
+  - uid: 1574
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-7.5
+      parent: 1
+  - uid: 1575
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-1.5
+      parent: 1
+  - uid: 1576
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-23.5
+      parent: 1
+  - uid: 1577
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-16.5
+      parent: 1
+  - uid: 1578
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-23.5
+      parent: 1
+  - uid: 1579
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-0.5
+      parent: 1
+  - uid: 1580
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-29.5
+      parent: 1
+  - uid: 1581
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,5.5
+      parent: 1
+  - uid: 1582
+    components:
+    - type: Transform
+      pos: 45.5,6.5
+      parent: 1
+  - uid: 1583
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-0.5
+      parent: 1
+  - uid: 1584
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-8.5
+      parent: 1
+  - uid: 1585
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-13.5
+      parent: 1
+  - uid: 1586
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-21.5
+      parent: 1
+  - uid: 1587
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-28.5
+      parent: 1
+  - uid: 1654
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-11.5
+      parent: 1
+  - uid: 1655
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,-11.5
+      parent: 1
+  - uid: 1657
+    components:
+    - type: Transform
+      pos: 61.5,-6.5
+      parent: 1
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: 55.5,-6.5
+      parent: 1
+  - uid: 1667
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-11.5
+      parent: 1
+  - uid: 1668
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-19.5
+      parent: 1
+  - uid: 1669
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-14.5
+      parent: 1
+  - uid: 1670
+    components:
+    - type: Transform
+      pos: 55.5,-18.5
+      parent: 1
+  - uid: 1671
+    components:
+    - type: Transform
+      pos: 61.5,-18.5
+      parent: 1
+  - uid: 1672
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-0.5
+      parent: 1
+  - uid: 1673
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-4.5
+      parent: 1
+  - uid: 1674
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-4.5
+      parent: 1
+  - uid: 1675
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-4.5
+      parent: 1
+  - uid: 1676
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-16.5
+      parent: 1
+  - uid: 1677
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-16.5
+      parent: 1
+  - uid: 1678
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-0.5
+      parent: 1
+  - uid: 1679
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 77.5,-0.5
+      parent: 1
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 69.5,-22.5
+      parent: 1
+  - uid: 1682
+    components:
+    - type: Transform
+      pos: 61.5,-22.5
+      parent: 1
+  - uid: 1683
+    components:
+    - type: Transform
+      pos: 49.5,-22.5
+      parent: 1
+  - uid: 1684
+    components:
+    - type: Transform
+      pos: 77.5,-22.5
+      parent: 1
+  - uid: 1686
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-17.5
+      parent: 1
+  - uid: 1687
+    components:
+    - type: Transform
+      pos: 82.5,-13.5
+      parent: 1
+  - uid: 1691
+    components:
+    - type: Transform
+      pos: 114.5,-13.5
+      parent: 1
+  - uid: 1692
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 90.5,-8.5
+      parent: 1
+  - uid: 1693
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 98.5,-8.5
+      parent: 1
+  - uid: 2114
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-20.5
+      parent: 1
+  - uid: 2125
+    components:
+    - type: Transform
+      pos: 71.5,-2.5
+      parent: 1
+- proto: Rack
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 17.5,-17.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 17.5,-15.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 17.5,-16.5
+      parent: 1
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 17.5,-5.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 17.5,-4.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      pos: 17.5,-6.5
+      parent: 1
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 1
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 15.5,-3.5
+      parent: 1
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 48.5,-3.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 48.5,-5.5
+      parent: 1
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 48.5,-4.5
+      parent: 1
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 48.5,-2.5
+      parent: 1
+  - uid: 935
+    components:
+    - type: Transform
+      pos: 54.5,-2.5
+      parent: 1
+  - uid: 936
+    components:
+    - type: Transform
+      pos: 54.5,-3.5
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      pos: 54.5,-4.5
+      parent: 1
+  - uid: 938
+    components:
+    - type: Transform
+      pos: 54.5,-18.5
+      parent: 1
+  - uid: 939
+    components:
+    - type: Transform
+      pos: 54.5,-19.5
+      parent: 1
+  - uid: 940
+    components:
+    - type: Transform
+      pos: 54.5,-20.5
+      parent: 1
+- proto: RandomSoap
+  entities:
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 21.5,-23.5
+      parent: 1
+- proto: ReinforcedGirder
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,7.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,7.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 11.5,-8.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+  - uid: 546
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-25.5
+      parent: 1
+  - uid: 547
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-24.5
+      parent: 1
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 16.5,-20.5
+      parent: 1
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 12.5,-30.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 13.5,-30.5
+      parent: 1
+  - uid: 692
+    components:
+    - type: Transform
+      pos: 53.5,-6.5
+      parent: 1
+  - uid: 724
+    components:
+    - type: Transform
+      pos: 52.5,-9.5
+      parent: 1
+  - uid: 725
+    components:
+    - type: Transform
+      pos: 47.5,-4.5
+      parent: 1
+  - uid: 843
+    components:
+    - type: Transform
+      pos: 55.5,-21.5
+      parent: 1
+  - uid: 941
+    components:
+    - type: Transform
+      pos: 56.5,-1.5
+      parent: 1
+  - uid: 942
+    components:
+    - type: Transform
+      pos: 57.5,-1.5
+      parent: 1
+- proto: RollingPin
+  entities:
+  - uid: 2079
+    components:
+    - type: Transform
+      pos: 39.42869,3.5263467
+      parent: 1
+- proto: RubberStampApproved
+  entities:
+  - uid: 1593
+    components:
+    - type: Transform
+      pos: 51.504005,-15.395966
+      parent: 1
+- proto: SalvageCanisterSpawner
+  entities:
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 25.5,-3.5
+      parent: 1
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 25.5,-4.5
+      parent: 1
+- proto: SalvageHumanCorpseSpawner
+  entities:
+  - uid: 1701
+    components:
+    - type: Transform
+      pos: 116.5,-7.5
+      parent: 1
+- proto: SalvageMaterialCrateSpawner
+  entities:
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 27.5,-3.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 27.5,-4.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 26.5,-3.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 26.5,-4.5
+      parent: 1
+  - uid: 1465
+    components:
+    - type: Transform
+      pos: 21.5,-16.5
+      parent: 1
+  - uid: 1466
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 1
+  - uid: 2184
+    components:
+    - type: Transform
+      pos: 22.5,-12.5
+      parent: 1
+  - uid: 2185
+    components:
+    - type: Transform
+      pos: 19.5,-9.5
+      parent: 1
+- proto: SalvageMobSpawner
+  entities:
+  - uid: 1588
+    components:
+    - type: Transform
+      pos: 121.5,-2.5
+      parent: 1
+  - uid: 1589
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 1
+  - uid: 1590
+    components:
+    - type: Transform
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 1591
+    components:
+    - type: Transform
+      pos: 12.5,-12.5
+      parent: 1
+  - uid: 1592
+    components:
+    - type: Transform
+      pos: 15.5,-28.5
+      parent: 1
+- proto: SalvageMobSpawner75
+  entities:
+  - uid: 1232
+    components:
+    - type: Transform
+      pos: 111.5,-7.5
+      parent: 1
+  - uid: 1433
+    components:
+    - type: Transform
+      pos: 122.5,-3.5
+      parent: 1
+- proto: SawElectric
+  entities:
+  - uid: 663
+    components:
+    - type: Transform
+      pos: 37.767258,-14.627407
+      parent: 1
+- proto: Scalpel
+  entities:
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 38.986008,-13.518032
+      parent: 1
+- proto: ShardGlassReinforced
+  entities:
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 11.663511,-4.0794153
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 1
+  - uid: 1286
+    components:
+    - type: Transform
+      pos: 88.76036,-18.52459
+      parent: 1
+  - uid: 1288
+    components:
+    - type: Transform
+      pos: 90.66661,-19.80584
+      parent: 1
+  - uid: 1290
+    components:
+    - type: Transform
+      pos: 100.25953,-19.61834
+      parent: 1
+  - uid: 1346
+    components:
+    - type: Transform
+      pos: 95.812454,-18.054329
+      parent: 1
+  - uid: 1405
+    components:
+    - type: Transform
+      pos: 124.60358,-3.4430885
+      parent: 1
+- proto: SheetPlasteel1
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 11.457185,-30.582111
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 7.44156,-29.519611
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 2.8634348,-24.238361
+      parent: 1
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 15.528238,-19.046759
+      parent: 1
+  - uid: 612
+    components:
+    - type: Transform
+      pos: 11.323664,-16.746466
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 51.5,-12.5
+      parent: 1
+- proto: SheetSteel1
+  entities:
+  - uid: 118
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.4674037,-0.40548372
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.4409523,0.6101413
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.4253273,3.5788913
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.648506,1.1570163
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 14.389973,-26.965555
+      parent: 1
+- proto: SignalButton
+  entities:
+  - uid: 1233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-9.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        383: []
+        510: []
+- proto: SinkEmpty
+  entities:
+  - uid: 554
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-25.5
+      parent: 1
+  - uid: 555
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-26.5
+      parent: 1
+- proto: SMESBasicEmpty
+  entities:
+  - uid: 1236
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 1238
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 2136
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+- proto: SubstationBasicEmpty
+  entities:
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+- proto: TableFrame
+  entities:
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 13.5,-25.5
+      parent: 1
+  - uid: 605
+    components:
+    - type: Transform
+      pos: 13.5,-27.5
+      parent: 1
+  - uid: 2127
+    components:
+    - type: Transform
+      pos: 13.5,-26.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 99
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,3.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,3.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,3.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,3.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,3.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 42.5,0.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 43.5,0.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 40.5,0.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 41.5,0.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 39.5,0.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,3.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-7.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-6.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-3.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-2.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-7.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-2.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-6.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-7.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-6.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-7.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-6.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-3.5
+      parent: 1
+  - uid: 642
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-21.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-20.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-19.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 42.5,-13.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 41.5,-13.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: 40.5,-13.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 39.5,-13.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 38.5,-13.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 37.5,-13.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-6.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-6.5
+      parent: 1
+  - uid: 807
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-6.5
+      parent: 1
+  - uid: 808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-6.5
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-6.5
+      parent: 1
+  - uid: 810
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-6.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-6.5
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-6.5
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-6.5
+      parent: 1
+  - uid: 814
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-16.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-16.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-16.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-16.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-16.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-16.5
+      parent: 1
+  - uid: 820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-16.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-16.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-16.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-9.5
+      parent: 1
+  - uid: 828
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-13.5
+      parent: 1
+  - uid: 1815
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-22.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 712
+    components:
+    - type: Transform
+      pos: 52.5,-15.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
+      pos: 51.5,-15.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      pos: 51.5,-16.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 51.5,-17.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-19.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,6.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 1
+- proto: ToiletDirtyWater
+  entities:
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 25.5,-21.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 27.5,-21.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 29.5,-21.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      pos: 31.5,-21.5
+      parent: 1
+- proto: ToyRubberDuck
+  entities:
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 19.517994,-21.428076
+      parent: 1
+- proto: trayScanner
+  entities:
+  - uid: 2181
+    components:
+    - type: Transform
+      pos: 7.497275,-1.3804722
+      parent: 1
+- proto: TritiumCanister
+  entities:
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 24.5,-4.5
+      parent: 1
+- proto: UnfinishedMachineFrame
+  entities:
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 72.5,-11.5
+      parent: 1
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 73.5,-11.5
+      parent: 1
+  - uid: 903
+    components:
+    - type: Transform
+      pos: 77.5,-11.5
+      parent: 1
+- proto: VendingMachineCigs
+  entities:
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 31.5,3.5
+      parent: 1
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 48.5,-13.5
+      parent: 1
+- proto: VendingMachineCoffee
+  entities:
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 48.5,-14.5
+      parent: 1
+- proto: WallReinforced
+  entities:
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 18.5,-20.5
+      parent: 1
+  - uid: 404
+    components:
+    - type: Transform
+      pos: 18.5,-3.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 18.5,-4.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 18.5,-5.5
+      parent: 1
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 18.5,-6.5
+      parent: 1
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 18.5,-7.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 18.5,-8.5
+      parent: 1
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 18.5,-9.5
+      parent: 1
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 18.5,-12.5
+      parent: 1
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 18.5,-13.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 18.5,-14.5
+      parent: 1
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 18.5,-15.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      pos: 18.5,-16.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 18.5,-17.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 1
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      pos: 10.5,-13.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 10.5,-14.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: 17.5,-8.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: 16.5,-8.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 15.5,-8.5
+      parent: 1
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 14.5,-8.5
+      parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 13.5,-8.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 13.5,-13.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 14.5,-13.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      pos: 17.5,-13.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 17.5,-20.5
+      parent: 1
+  - uid: 1469
+    components:
+    - type: Transform
+      pos: 18.5,-18.5
+      parent: 1
+- proto: WallShuttle
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 19.5,4.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 12.5,-2.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 13.5,-2.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 14.5,-2.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 15.5,-2.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 16.5,-2.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 17.5,-2.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 18.5,-2.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 18.5,-1.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 18.5,-0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 18.5,0.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 18.5,1.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 18.5,3.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 18.5,2.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-12.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,7.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,7.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,7.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,7.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,7.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,7.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,7.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,7.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,7.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 18.5,7.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 18.5,4.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-27.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-27.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-27.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-27.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-27.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-24.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-27.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-15.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-27.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-14.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-21.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-23.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-13.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-25.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-21.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-17.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-22.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-26.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-20.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-23.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-27.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-25.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-22.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-24.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-27.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-27.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-16.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-18.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-17.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-26.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-18.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-19.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 36.5,0.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 20.5,4.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 21.5,4.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 22.5,4.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 23.5,4.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 24.5,4.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 25.5,4.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 26.5,4.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 27.5,4.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 28.5,4.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 29.5,4.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 30.5,4.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 31.5,4.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 32.5,4.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-21.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 19.5,-2.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 20.5,-2.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 21.5,-2.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 22.5,-2.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 23.5,-2.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 24.5,-2.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 25.5,-2.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 26.5,-2.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 27.5,-2.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 28.5,-2.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 29.5,-2.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 30.5,-2.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 31.5,-2.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 32.5,-2.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 32.5,-1.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 32.5,-0.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 32.5,2.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 32.5,3.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 20.5,7.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 21.5,7.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 22.5,7.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 23.5,7.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 24.5,7.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 25.5,7.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 26.5,7.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 28.5,7.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 29.5,7.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 30.5,7.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: 31.5,7.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 32.5,7.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 33.5,7.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 34.5,7.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 35.5,7.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 36.5,7.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 37.5,7.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 38.5,7.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 39.5,7.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 35.5,4.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 35.5,3.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 35.5,2.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 35.5,1.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 35.5,0.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 35.5,-0.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 35.5,-1.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-4.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 36.5,4.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 37.5,4.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 38.5,4.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 39.5,4.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 40.5,4.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 41.5,4.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 45.5,7.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 44.5,7.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 43.5,7.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 42.5,7.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 41.5,7.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 40.5,7.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,7.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,6.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,1.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,4.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,1.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,4.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,4.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,4.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,5.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: 38.5,0.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-5.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-6.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-7.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-8.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-9.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-9.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-9.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-9.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-9.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-9.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-9.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-9.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-9.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-1.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-4.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-6.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-5.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-7.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-8.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-9.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-3.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-2.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-12.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-3.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-4.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-12.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-8.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-7.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-6.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-5.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-12.5
+      parent: 1
+  - uid: 351
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-12.5
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-12.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-12.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-12.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-12.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-12.5
+      parent: 1
+  - uid: 357
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-13.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-14.5
+      parent: 1
+  - uid: 359
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-13.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-14.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-15.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-16.5
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-15.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-16.5
+      parent: 1
+  - uid: 365
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-17.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-18.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-19.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-20.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-20.5
+      parent: 1
+  - uid: 370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-20.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-20.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-20.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-20.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-20.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-20.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-20.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-20.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-20.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-20.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-20.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-20.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,1.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,3.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,2.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,4.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,1.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,4.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-0.5
+      parent: 1
+  - uid: 496
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,4.5
+      parent: 1
+  - uid: 497
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,1.5
+      parent: 1
+  - uid: 498
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,4.5
+      parent: 1
+  - uid: 499
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,4.5
+      parent: 1
+  - uid: 500
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,1.5
+      parent: 1
+  - uid: 501
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,1.5
+      parent: 1
+  - uid: 502
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,4.5
+      parent: 1
+  - uid: 503
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,1.5
+      parent: 1
+  - uid: 504
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,1.5
+      parent: 1
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 53.5,-2.5
+      parent: 1
+  - uid: 506
+    components:
+    - type: Transform
+      pos: 53.5,-1.5
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      pos: 49.5,-9.5
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 48.5,-9.5
+      parent: 1
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 48.5,-12.5
+      parent: 1
+  - uid: 511
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-2.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,0.5
+      parent: 1
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 53.5,-5.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 53.5,-3.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: 53.5,-4.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-21.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-22.5
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-21.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-22.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-22.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-21.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-21.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-22.5
+      parent: 1
+  - uid: 524
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-21.5
+      parent: 1
+  - uid: 525
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-22.5
+      parent: 1
+  - uid: 526
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-21.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-22.5
+      parent: 1
+  - uid: 528
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-25.5
+      parent: 1
+  - uid: 529
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-26.5
+      parent: 1
+  - uid: 530
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-27.5
+      parent: 1
+  - uid: 531
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-27.5
+      parent: 1
+  - uid: 532
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-27.5
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-27.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-27.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-27.5
+      parent: 1
+  - uid: 536
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-27.5
+      parent: 1
+  - uid: 537
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-27.5
+      parent: 1
+  - uid: 538
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-27.5
+      parent: 1
+  - uid: 539
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-27.5
+      parent: 1
+  - uid: 540
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-27.5
+      parent: 1
+  - uid: 541
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-25.5
+      parent: 1
+  - uid: 542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-24.5
+      parent: 1
+  - uid: 543
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-23.5
+      parent: 1
+  - uid: 544
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-22.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-23.5
+      parent: 1
+  - uid: 548
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-26.5
+      parent: 1
+  - uid: 549
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-27.5
+      parent: 1
+  - uid: 550
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-27.5
+      parent: 1
+  - uid: 551
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-27.5
+      parent: 1
+  - uid: 552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-27.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 18.5,-30.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 19.5,-30.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 20.5,-30.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 21.5,-30.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 22.5,-30.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 23.5,-30.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 24.5,-30.5
+      parent: 1
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 25.5,-30.5
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      pos: 26.5,-30.5
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 27.5,-30.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 28.5,-30.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 29.5,-30.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 30.5,-30.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 31.5,-30.5
+      parent: 1
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 32.5,-30.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 33.5,-30.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 34.5,-30.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 35.5,-30.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 36.5,-30.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 37.5,-30.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 38.5,-30.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 39.5,-30.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 40.5,-30.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 41.5,-30.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 42.5,-30.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 43.5,-30.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 44.5,-30.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 17.5,-30.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 16.5,-30.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 15.5,-30.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 14.5,-30.5
+      parent: 1
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 45.5,-30.5
+      parent: 1
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 46.5,-30.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 47.5,-29.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-27.5
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-28.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-24.5
+      parent: 1
+  - uid: 625
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-24.5
+      parent: 1
+  - uid: 626
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-27.5
+      parent: 1
+  - uid: 627
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-27.5
+      parent: 1
+  - uid: 628
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-27.5
+      parent: 1
+  - uid: 629
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-27.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-27.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-27.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-24.5
+      parent: 1
+  - uid: 633
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-24.5
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-24.5
+      parent: 1
+  - uid: 635
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-24.5
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-24.5
+      parent: 1
+  - uid: 637
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-24.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-27.5
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: 47.5,-21.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 48.5,-21.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 47.5,-20.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 47.5,-19.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 47.5,-18.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 47.5,-17.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 47.5,-16.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 47.5,-15.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 47.5,-14.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 47.5,-13.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 47.5,-12.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 47.5,-9.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 47.5,-8.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 47.5,-3.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 47.5,-1.5
+      parent: 1
+  - uid: 685
+    components:
+    - type: Transform
+      pos: 48.5,-1.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      pos: 49.5,-1.5
+      parent: 1
+  - uid: 687
+    components:
+    - type: Transform
+      pos: 50.5,-1.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: 51.5,-1.5
+      parent: 1
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 52.5,-1.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 51.5,-9.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      pos: 53.5,-14.5
+      parent: 1
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 53.5,-13.5
+      parent: 1
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 52.5,-12.5
+      parent: 1
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 53.5,-12.5
+      parent: 1
+  - uid: 698
+    components:
+    - type: Transform
+      pos: 53.5,-15.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 53.5,-16.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 53.5,-17.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      pos: 53.5,-18.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 53.5,-19.5
+      parent: 1
+  - uid: 703
+    components:
+    - type: Transform
+      pos: 53.5,-20.5
+      parent: 1
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 53.5,-21.5
+      parent: 1
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 52.5,-21.5
+      parent: 1
+  - uid: 707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-12.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-21.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-21.5
+      parent: 1
+  - uid: 711
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-21.5
+      parent: 1
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 54.5,-21.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 56.5,-21.5
+      parent: 1
+  - uid: 735
+    components:
+    - type: Transform
+      pos: 57.5,-21.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: 54.5,-17.5
+      parent: 1
+  - uid: 737
+    components:
+    - type: Transform
+      pos: 55.5,-17.5
+      parent: 1
+  - uid: 738
+    components:
+    - type: Transform
+      pos: 56.5,-17.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 57.5,-17.5
+      parent: 1
+  - uid: 740
+    components:
+    - type: Transform
+      pos: 58.5,-17.5
+      parent: 1
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 59.5,-17.5
+      parent: 1
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 60.5,-17.5
+      parent: 1
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 59.5,-21.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 60.5,-21.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 61.5,-21.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 62.5,-21.5
+      parent: 1
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 63.5,-21.5
+      parent: 1
+  - uid: 748
+    components:
+    - type: Transform
+      pos: 63.5,-20.5
+      parent: 1
+  - uid: 749
+    components:
+    - type: Transform
+      pos: 63.5,-18.5
+      parent: 1
+  - uid: 750
+    components:
+    - type: Transform
+      pos: 63.5,-17.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 62.5,-17.5
+      parent: 1
+  - uid: 752
+    components:
+    - type: Transform
+      pos: 61.5,-17.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: 63.5,-5.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      pos: 62.5,-5.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: 61.5,-5.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      pos: 60.5,-5.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      pos: 59.5,-5.5
+      parent: 1
+  - uid: 769
+    components:
+    - type: Transform
+      pos: 58.5,-5.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      pos: 57.5,-5.5
+      parent: 1
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 56.5,-5.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      pos: 55.5,-5.5
+      parent: 1
+  - uid: 773
+    components:
+    - type: Transform
+      pos: 54.5,-5.5
+      parent: 1
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 63.5,-4.5
+      parent: 1
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 63.5,-2.5
+      parent: 1
+  - uid: 776
+    components:
+    - type: Transform
+      pos: 63.5,-1.5
+      parent: 1
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 62.5,-1.5
+      parent: 1
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 61.5,-1.5
+      parent: 1
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 60.5,-1.5
+      parent: 1
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 59.5,-1.5
+      parent: 1
+  - uid: 782
+    components:
+    - type: Transform
+      pos: 54.5,-1.5
+      parent: 1
+  - uid: 829
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-12.5
+      parent: 1
+  - uid: 844
+    components:
+    - type: Transform
+      pos: 55.5,-24.5
+      parent: 1
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 56.5,-24.5
+      parent: 1
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 57.5,-24.5
+      parent: 1
+  - uid: 847
+    components:
+    - type: Transform
+      pos: 58.5,-24.5
+      parent: 1
+  - uid: 848
+    components:
+    - type: Transform
+      pos: 59.5,-24.5
+      parent: 1
+  - uid: 849
+    components:
+    - type: Transform
+      pos: 60.5,-24.5
+      parent: 1
+  - uid: 850
+    components:
+    - type: Transform
+      pos: 61.5,-24.5
+      parent: 1
+  - uid: 851
+    components:
+    - type: Transform
+      pos: 62.5,-24.5
+      parent: 1
+  - uid: 852
+    components:
+    - type: Transform
+      pos: 63.5,-24.5
+      parent: 1
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 64.5,-21.5
+      parent: 1
+  - uid: 854
+    components:
+    - type: Transform
+      pos: 65.5,-21.5
+      parent: 1
+  - uid: 855
+    components:
+    - type: Transform
+      pos: 66.5,-21.5
+      parent: 1
+  - uid: 856
+    components:
+    - type: Transform
+      pos: 67.5,-21.5
+      parent: 1
+  - uid: 857
+    components:
+    - type: Transform
+      pos: 68.5,-21.5
+      parent: 1
+  - uid: 858
+    components:
+    - type: Transform
+      pos: 69.5,-21.5
+      parent: 1
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 70.5,-21.5
+      parent: 1
+  - uid: 860
+    components:
+    - type: Transform
+      pos: 71.5,-21.5
+      parent: 1
+  - uid: 861
+    components:
+    - type: Transform
+      pos: 72.5,-21.5
+      parent: 1
+  - uid: 862
+    components:
+    - type: Transform
+      pos: 73.5,-21.5
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 74.5,-21.5
+      parent: 1
+  - uid: 864
+    components:
+    - type: Transform
+      pos: 74.5,-1.5
+      parent: 1
+  - uid: 865
+    components:
+    - type: Transform
+      pos: 73.5,-1.5
+      parent: 1
+  - uid: 866
+    components:
+    - type: Transform
+      pos: 72.5,-1.5
+      parent: 1
+  - uid: 867
+    components:
+    - type: Transform
+      pos: 71.5,-1.5
+      parent: 1
+  - uid: 868
+    components:
+    - type: Transform
+      pos: 70.5,-1.5
+      parent: 1
+  - uid: 869
+    components:
+    - type: Transform
+      pos: 69.5,-1.5
+      parent: 1
+  - uid: 870
+    components:
+    - type: Transform
+      pos: 68.5,-1.5
+      parent: 1
+  - uid: 871
+    components:
+    - type: Transform
+      pos: 67.5,-1.5
+      parent: 1
+  - uid: 872
+    components:
+    - type: Transform
+      pos: 66.5,-1.5
+      parent: 1
+  - uid: 873
+    components:
+    - type: Transform
+      pos: 65.5,-1.5
+      parent: 1
+  - uid: 874
+    components:
+    - type: Transform
+      pos: 64.5,-1.5
+      parent: 1
+  - uid: 875
+    components:
+    - type: Transform
+      pos: 55.5,1.5
+      parent: 1
+  - uid: 876
+    components:
+    - type: Transform
+      pos: 56.5,1.5
+      parent: 1
+  - uid: 877
+    components:
+    - type: Transform
+      pos: 57.5,1.5
+      parent: 1
+  - uid: 878
+    components:
+    - type: Transform
+      pos: 58.5,1.5
+      parent: 1
+  - uid: 879
+    components:
+    - type: Transform
+      pos: 59.5,1.5
+      parent: 1
+  - uid: 880
+    components:
+    - type: Transform
+      pos: 60.5,1.5
+      parent: 1
+  - uid: 881
+    components:
+    - type: Transform
+      pos: 61.5,1.5
+      parent: 1
+  - uid: 882
+    components:
+    - type: Transform
+      pos: 62.5,1.5
+      parent: 1
+  - uid: 883
+    components:
+    - type: Transform
+      pos: 63.5,1.5
+      parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      pos: 64.5,1.5
+      parent: 1
+  - uid: 885
+    components:
+    - type: Transform
+      pos: 65.5,1.5
+      parent: 1
+  - uid: 886
+    components:
+    - type: Transform
+      pos: 66.5,1.5
+      parent: 1
+  - uid: 887
+    components:
+    - type: Transform
+      pos: 67.5,1.5
+      parent: 1
+  - uid: 888
+    components:
+    - type: Transform
+      pos: 68.5,1.5
+      parent: 1
+  - uid: 889
+    components:
+    - type: Transform
+      pos: 69.5,1.5
+      parent: 1
+  - uid: 890
+    components:
+    - type: Transform
+      pos: 70.5,1.5
+      parent: 1
+  - uid: 891
+    components:
+    - type: Transform
+      pos: 71.5,1.5
+      parent: 1
+  - uid: 892
+    components:
+    - type: Transform
+      pos: 72.5,1.5
+      parent: 1
+  - uid: 893
+    components:
+    - type: Transform
+      pos: 73.5,1.5
+      parent: 1
+  - uid: 894
+    components:
+    - type: Transform
+      pos: 74.5,1.5
+      parent: 1
+  - uid: 905
+    components:
+    - type: Transform
+      pos: 79.5,-9.5
+      parent: 1
+  - uid: 906
+    components:
+    - type: Transform
+      pos: 79.5,-8.5
+      parent: 1
+  - uid: 907
+    components:
+    - type: Transform
+      pos: 79.5,-7.5
+      parent: 1
+  - uid: 908
+    components:
+    - type: Transform
+      pos: 79.5,-6.5
+      parent: 1
+  - uid: 909
+    components:
+    - type: Transform
+      pos: 79.5,-5.5
+      parent: 1
+  - uid: 910
+    components:
+    - type: Transform
+      pos: 79.5,-4.5
+      parent: 1
+  - uid: 911
+    components:
+    - type: Transform
+      pos: 79.5,-3.5
+      parent: 1
+  - uid: 912
+    components:
+    - type: Transform
+      pos: 79.5,-2.5
+      parent: 1
+  - uid: 913
+    components:
+    - type: Transform
+      pos: 79.5,-1.5
+      parent: 1
+  - uid: 914
+    components:
+    - type: Transform
+      pos: 78.5,-1.5
+      parent: 1
+  - uid: 915
+    components:
+    - type: Transform
+      pos: 77.5,-1.5
+      parent: 1
+  - uid: 916
+    components:
+    - type: Transform
+      pos: 76.5,-1.5
+      parent: 1
+  - uid: 917
+    components:
+    - type: Transform
+      pos: 75.5,-1.5
+      parent: 1
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 79.5,-21.5
+      parent: 1
+  - uid: 919
+    components:
+    - type: Transform
+      pos: 78.5,-21.5
+      parent: 1
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 77.5,-21.5
+      parent: 1
+  - uid: 921
+    components:
+    - type: Transform
+      pos: 76.5,-21.5
+      parent: 1
+  - uid: 922
+    components:
+    - type: Transform
+      pos: 75.5,-21.5
+      parent: 1
+  - uid: 923
+    components:
+    - type: Transform
+      pos: 79.5,-20.5
+      parent: 1
+  - uid: 924
+    components:
+    - type: Transform
+      pos: 79.5,-19.5
+      parent: 1
+  - uid: 925
+    components:
+    - type: Transform
+      pos: 79.5,-18.5
+      parent: 1
+  - uid: 926
+    components:
+    - type: Transform
+      pos: 79.5,-17.5
+      parent: 1
+  - uid: 927
+    components:
+    - type: Transform
+      pos: 79.5,-16.5
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      pos: 79.5,-14.5
+      parent: 1
+  - uid: 930
+    components:
+    - type: Transform
+      pos: 79.5,-13.5
+      parent: 1
+  - uid: 931
+    components:
+    - type: Transform
+      pos: 79.5,-12.5
+      parent: 1
+  - uid: 943
+    components:
+    - type: Transform
+      pos: 75.5,1.5
+      parent: 1
+  - uid: 944
+    components:
+    - type: Transform
+      pos: 76.5,1.5
+      parent: 1
+  - uid: 945
+    components:
+    - type: Transform
+      pos: 77.5,1.5
+      parent: 1
+  - uid: 946
+    components:
+    - type: Transform
+      pos: 78.5,1.5
+      parent: 1
+  - uid: 947
+    components:
+    - type: Transform
+      pos: 79.5,1.5
+      parent: 1
+  - uid: 948
+    components:
+    - type: Transform
+      pos: 80.5,1.5
+      parent: 1
+  - uid: 949
+    components:
+    - type: Transform
+      pos: 81.5,1.5
+      parent: 1
+  - uid: 951
+    components:
+    - type: Transform
+      pos: 82.5,0.5
+      parent: 1
+  - uid: 952
+    components:
+    - type: Transform
+      pos: 82.5,-0.5
+      parent: 1
+  - uid: 953
+    components:
+    - type: Transform
+      pos: 82.5,-1.5
+      parent: 1
+  - uid: 954
+    components:
+    - type: Transform
+      pos: 83.5,-9.5
+      parent: 1
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 80.5,-9.5
+      parent: 1
+  - uid: 956
+    components:
+    - type: Transform
+      pos: 81.5,-9.5
+      parent: 1
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 82.5,-9.5
+      parent: 1
+  - uid: 958
+    components:
+    - type: Transform
+      pos: 82.5,-5.5
+      parent: 1
+  - uid: 959
+    components:
+    - type: Transform
+      pos: 82.5,-4.5
+      parent: 1
+  - uid: 960
+    components:
+    - type: Transform
+      pos: 82.5,-3.5
+      parent: 1
+  - uid: 961
+    components:
+    - type: Transform
+      pos: 82.5,-2.5
+      parent: 1
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 83.5,-5.5
+      parent: 1
+  - uid: 963
+    components:
+    - type: Transform
+      pos: 83.5,-4.5
+      parent: 1
+  - uid: 964
+    components:
+    - type: Transform
+      pos: 83.5,-3.5
+      parent: 1
+  - uid: 965
+    components:
+    - type: Transform
+      pos: 83.5,-2.5
+      parent: 1
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 84.5,-2.5
+      parent: 1
+  - uid: 967
+    components:
+    - type: Transform
+      pos: 84.5,-3.5
+      parent: 1
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 84.5,-4.5
+      parent: 1
+  - uid: 969
+    components:
+    - type: Transform
+      pos: 84.5,-5.5
+      parent: 1
+  - uid: 970
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 84.5,-1.5
+      parent: 1
+  - uid: 971
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-5.5
+      parent: 1
+  - uid: 972
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-5.5
+      parent: 1
+  - uid: 973
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 87.5,-5.5
+      parent: 1
+  - uid: 974
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-5.5
+      parent: 1
+  - uid: 975
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-5.5
+      parent: 1
+  - uid: 976
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-5.5
+      parent: 1
+  - uid: 977
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 91.5,-5.5
+      parent: 1
+  - uid: 978
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 91.5,-9.5
+      parent: 1
+  - uid: 979
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-9.5
+      parent: 1
+  - uid: 980
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-9.5
+      parent: 1
+  - uid: 981
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-9.5
+      parent: 1
+  - uid: 982
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 87.5,-9.5
+      parent: 1
+  - uid: 983
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-9.5
+      parent: 1
+  - uid: 984
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-9.5
+      parent: 1
+  - uid: 985
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 84.5,-9.5
+      parent: 1
+  - uid: 986
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 83.5,-1.5
+      parent: 1
+  - uid: 1006
+    components:
+    - type: Transform
+      pos: 123.5,1.5
+      parent: 1
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: 121.5,1.5
+      parent: 1
+  - uid: 1008
+    components:
+    - type: Transform
+      pos: 123.5,-9.5
+      parent: 1
+  - uid: 1009
+    components:
+    - type: Transform
+      pos: 122.5,1.5
+      parent: 1
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: 124.5,1.5
+      parent: 1
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: 122.5,-9.5
+      parent: 1
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: 124.5,-9.5
+      parent: 1
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: 107.5,-9.5
+      parent: 1
+  - uid: 1034
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 95.5,-5.5
+      parent: 1
+  - uid: 1035
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 94.5,-5.5
+      parent: 1
+  - uid: 1036
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 93.5,-5.5
+      parent: 1
+  - uid: 1037
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 92.5,-5.5
+      parent: 1
+  - uid: 1038
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 97.5,-5.5
+      parent: 1
+  - uid: 1039
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 98.5,-5.5
+      parent: 1
+  - uid: 1040
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 99.5,-5.5
+      parent: 1
+  - uid: 1041
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 100.5,-5.5
+      parent: 1
+  - uid: 1042
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 101.5,-5.5
+      parent: 1
+  - uid: 1043
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 102.5,-5.5
+      parent: 1
+  - uid: 1044
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 103.5,-5.5
+      parent: 1
+  - uid: 1045
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 104.5,-5.5
+      parent: 1
+  - uid: 1046
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 105.5,-5.5
+      parent: 1
+  - uid: 1047
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 106.5,-5.5
+      parent: 1
+  - uid: 1048
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 107.5,-5.5
+      parent: 1
+  - uid: 1088
+    components:
+    - type: Transform
+      pos: 106.5,-9.5
+      parent: 1
+  - uid: 1089
+    components:
+    - type: Transform
+      pos: 105.5,-9.5
+      parent: 1
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: 104.5,-9.5
+      parent: 1
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: 103.5,-9.5
+      parent: 1
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: 102.5,-9.5
+      parent: 1
+  - uid: 1093
+    components:
+    - type: Transform
+      pos: 101.5,-9.5
+      parent: 1
+  - uid: 1094
+    components:
+    - type: Transform
+      pos: 100.5,-9.5
+      parent: 1
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 99.5,-9.5
+      parent: 1
+  - uid: 1096
+    components:
+    - type: Transform
+      pos: 98.5,-9.5
+      parent: 1
+  - uid: 1097
+    components:
+    - type: Transform
+      pos: 97.5,-9.5
+      parent: 1
+  - uid: 1098
+    components:
+    - type: Transform
+      pos: 96.5,-9.5
+      parent: 1
+  - uid: 1099
+    components:
+    - type: Transform
+      pos: 95.5,-9.5
+      parent: 1
+  - uid: 1100
+    components:
+    - type: Transform
+      pos: 94.5,-9.5
+      parent: 1
+  - uid: 1101
+    components:
+    - type: Transform
+      pos: 93.5,-9.5
+      parent: 1
+  - uid: 1102
+    components:
+    - type: Transform
+      pos: 92.5,-9.5
+      parent: 1
+  - uid: 1103
+    components:
+    - type: Transform
+      pos: 108.5,-1.5
+      parent: 1
+  - uid: 1104
+    components:
+    - type: Transform
+      pos: 108.5,-2.5
+      parent: 1
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 108.5,-3.5
+      parent: 1
+  - uid: 1106
+    components:
+    - type: Transform
+      pos: 108.5,-4.5
+      parent: 1
+  - uid: 1107
+    components:
+    - type: Transform
+      pos: 108.5,-5.5
+      parent: 1
+  - uid: 1108
+    components:
+    - type: Transform
+      pos: 109.5,-1.5
+      parent: 1
+  - uid: 1109
+    components:
+    - type: Transform
+      pos: 109.5,-2.5
+      parent: 1
+  - uid: 1110
+    components:
+    - type: Transform
+      pos: 109.5,-3.5
+      parent: 1
+  - uid: 1111
+    components:
+    - type: Transform
+      pos: 109.5,-4.5
+      parent: 1
+  - uid: 1112
+    components:
+    - type: Transform
+      pos: 109.5,-5.5
+      parent: 1
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: 110.5,-1.5
+      parent: 1
+  - uid: 1114
+    components:
+    - type: Transform
+      pos: 110.5,-2.5
+      parent: 1
+  - uid: 1115
+    components:
+    - type: Transform
+      pos: 110.5,-3.5
+      parent: 1
+  - uid: 1116
+    components:
+    - type: Transform
+      pos: 110.5,-4.5
+      parent: 1
+  - uid: 1117
+    components:
+    - type: Transform
+      pos: 110.5,-5.5
+      parent: 1
+  - uid: 1118
+    components:
+    - type: Transform
+      pos: 110.5,-0.5
+      parent: 1
+  - uid: 1119
+    components:
+    - type: Transform
+      pos: 110.5,0.5
+      parent: 1
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: 114.5,1.5
+      parent: 1
+  - uid: 1122
+    components:
+    - type: Transform
+      pos: 113.5,1.5
+      parent: 1
+  - uid: 1123
+    components:
+    - type: Transform
+      pos: 112.5,1.5
+      parent: 1
+  - uid: 1124
+    components:
+    - type: Transform
+      pos: 111.5,1.5
+      parent: 1
+  - uid: 1125
+    components:
+    - type: Transform
+      pos: 108.5,-9.5
+      parent: 1
+  - uid: 1126
+    components:
+    - type: Transform
+      pos: 109.5,-9.5
+      parent: 1
+  - uid: 1127
+    components:
+    - type: Transform
+      pos: 110.5,-9.5
+      parent: 1
+  - uid: 1128
+    components:
+    - type: Transform
+      pos: 111.5,-9.5
+      parent: 1
+  - uid: 1129
+    components:
+    - type: Transform
+      pos: 112.5,-9.5
+      parent: 1
+  - uid: 1130
+    components:
+    - type: Transform
+      pos: 113.5,-9.5
+      parent: 1
+  - uid: 1131
+    components:
+    - type: Transform
+      pos: 114.5,-9.5
+      parent: 1
+  - uid: 1132
+    components:
+    - type: Transform
+      pos: 80.5,-12.5
+      parent: 1
+  - uid: 1133
+    components:
+    - type: Transform
+      pos: 81.5,-12.5
+      parent: 1
+  - uid: 1134
+    components:
+    - type: Transform
+      pos: 82.5,-12.5
+      parent: 1
+  - uid: 1135
+    components:
+    - type: Transform
+      pos: 83.5,-12.5
+      parent: 1
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: 84.5,-12.5
+      parent: 1
+  - uid: 1137
+    components:
+    - type: Transform
+      pos: 85.5,-12.5
+      parent: 1
+  - uid: 1138
+    components:
+    - type: Transform
+      pos: 86.5,-12.5
+      parent: 1
+  - uid: 1139
+    components:
+    - type: Transform
+      pos: 87.5,-12.5
+      parent: 1
+  - uid: 1140
+    components:
+    - type: Transform
+      pos: 88.5,-12.5
+      parent: 1
+  - uid: 1141
+    components:
+    - type: Transform
+      pos: 89.5,-12.5
+      parent: 1
+  - uid: 1142
+    components:
+    - type: Transform
+      pos: 90.5,-12.5
+      parent: 1
+  - uid: 1143
+    components:
+    - type: Transform
+      pos: 91.5,-12.5
+      parent: 1
+  - uid: 1144
+    components:
+    - type: Transform
+      pos: 92.5,-12.5
+      parent: 1
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: 93.5,-12.5
+      parent: 1
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: 94.5,-12.5
+      parent: 1
+  - uid: 1147
+    components:
+    - type: Transform
+      pos: 95.5,-12.5
+      parent: 1
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: 96.5,-12.5
+      parent: 1
+  - uid: 1149
+    components:
+    - type: Transform
+      pos: 97.5,-12.5
+      parent: 1
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: 98.5,-12.5
+      parent: 1
+  - uid: 1151
+    components:
+    - type: Transform
+      pos: 99.5,-12.5
+      parent: 1
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: 100.5,-12.5
+      parent: 1
+  - uid: 1153
+    components:
+    - type: Transform
+      pos: 101.5,-12.5
+      parent: 1
+  - uid: 1154
+    components:
+    - type: Transform
+      pos: 102.5,-12.5
+      parent: 1
+  - uid: 1155
+    components:
+    - type: Transform
+      pos: 103.5,-12.5
+      parent: 1
+  - uid: 1156
+    components:
+    - type: Transform
+      pos: 104.5,-12.5
+      parent: 1
+  - uid: 1157
+    components:
+    - type: Transform
+      pos: 105.5,-12.5
+      parent: 1
+  - uid: 1158
+    components:
+    - type: Transform
+      pos: 106.5,-12.5
+      parent: 1
+  - uid: 1159
+    components:
+    - type: Transform
+      pos: 107.5,-12.5
+      parent: 1
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: 108.5,-12.5
+      parent: 1
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: 109.5,-12.5
+      parent: 1
+  - uid: 1162
+    components:
+    - type: Transform
+      pos: 110.5,-12.5
+      parent: 1
+  - uid: 1163
+    components:
+    - type: Transform
+      pos: 64.5,-24.5
+      parent: 1
+  - uid: 1164
+    components:
+    - type: Transform
+      pos: 65.5,-24.5
+      parent: 1
+  - uid: 1165
+    components:
+    - type: Transform
+      pos: 66.5,-24.5
+      parent: 1
+  - uid: 1166
+    components:
+    - type: Transform
+      pos: 67.5,-24.5
+      parent: 1
+  - uid: 1167
+    components:
+    - type: Transform
+      pos: 68.5,-24.5
+      parent: 1
+  - uid: 1168
+    components:
+    - type: Transform
+      pos: 69.5,-24.5
+      parent: 1
+  - uid: 1169
+    components:
+    - type: Transform
+      pos: 70.5,-24.5
+      parent: 1
+  - uid: 1170
+    components:
+    - type: Transform
+      pos: 71.5,-24.5
+      parent: 1
+  - uid: 1171
+    components:
+    - type: Transform
+      pos: 72.5,-24.5
+      parent: 1
+  - uid: 1172
+    components:
+    - type: Transform
+      pos: 73.5,-24.5
+      parent: 1
+  - uid: 1173
+    components:
+    - type: Transform
+      pos: 74.5,-24.5
+      parent: 1
+  - uid: 1174
+    components:
+    - type: Transform
+      pos: 75.5,-24.5
+      parent: 1
+  - uid: 1175
+    components:
+    - type: Transform
+      pos: 76.5,-24.5
+      parent: 1
+  - uid: 1176
+    components:
+    - type: Transform
+      pos: 77.5,-24.5
+      parent: 1
+  - uid: 1177
+    components:
+    - type: Transform
+      pos: 78.5,-24.5
+      parent: 1
+  - uid: 1178
+    components:
+    - type: Transform
+      pos: 79.5,-24.5
+      parent: 1
+  - uid: 1179
+    components:
+    - type: Transform
+      pos: 80.5,-24.5
+      parent: 1
+  - uid: 1180
+    components:
+    - type: Transform
+      pos: 81.5,-24.5
+      parent: 1
+  - uid: 1182
+    components:
+    - type: Transform
+      pos: 82.5,-19.5
+      parent: 1
+  - uid: 1183
+    components:
+    - type: Transform
+      pos: 82.5,-23.5
+      parent: 1
+  - uid: 1184
+    components:
+    - type: Transform
+      pos: 82.5,-22.5
+      parent: 1
+  - uid: 1185
+    components:
+    - type: Transform
+      pos: 82.5,-21.5
+      parent: 1
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 82.5,-20.5
+      parent: 1
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: 82.5,-18.5
+      parent: 1
+  - uid: 1188
+    components:
+    - type: Transform
+      pos: 82.5,-17.5
+      parent: 1
+  - uid: 1189
+    components:
+    - type: Transform
+      pos: 82.5,-16.5
+      parent: 1
+  - uid: 1190
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-17.5
+      parent: 1
+  - uid: 1191
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-18.5
+      parent: 1
+  - uid: 1192
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-16.5
+      parent: 1
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: 83.5,-20.5
+      parent: 1
+  - uid: 1194
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-16.5
+      parent: 1
+  - uid: 1195
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-19.5
+      parent: 1
+  - uid: 1196
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-17.5
+      parent: 1
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 84.5,-20.5
+      parent: 1
+  - uid: 1198
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-18.5
+      parent: 1
+  - uid: 1199
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-19.5
+      parent: 1
+  - uid: 1200
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 85.5,-16.5
+      parent: 1
+  - uid: 1201
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 86.5,-16.5
+      parent: 1
+  - uid: 1202
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-16.5
+      parent: 1
+  - uid: 1203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 88.5,-16.5
+      parent: 1
+  - uid: 1204
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 89.5,-16.5
+      parent: 1
+  - uid: 1205
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 90.5,-16.5
+      parent: 1
+  - uid: 1206
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 91.5,-16.5
+      parent: 1
+  - uid: 1207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 92.5,-16.5
+      parent: 1
+  - uid: 1208
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 93.5,-16.5
+      parent: 1
+  - uid: 1209
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 94.5,-16.5
+      parent: 1
+  - uid: 1210
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 95.5,-16.5
+      parent: 1
+  - uid: 1211
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 97.5,-16.5
+      parent: 1
+  - uid: 1212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 98.5,-16.5
+      parent: 1
+  - uid: 1213
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 99.5,-16.5
+      parent: 1
+  - uid: 1214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 100.5,-16.5
+      parent: 1
+  - uid: 1215
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 101.5,-16.5
+      parent: 1
+  - uid: 1216
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 102.5,-16.5
+      parent: 1
+  - uid: 1217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 103.5,-16.5
+      parent: 1
+  - uid: 1223
+    components:
+    - type: Transform
+      pos: 121.5,-9.5
+      parent: 1
+  - uid: 1224
+    components:
+    - type: Transform
+      pos: 119.5,-9.5
+      parent: 1
+  - uid: 1225
+    components:
+    - type: Transform
+      pos: 118.5,-9.5
+      parent: 1
+  - uid: 1226
+    components:
+    - type: Transform
+      pos: 120.5,-9.5
+      parent: 1
+  - uid: 1245
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 104.5,-16.5
+      parent: 1
+  - uid: 1246
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 105.5,-16.5
+      parent: 1
+  - uid: 1247
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 106.5,-16.5
+      parent: 1
+  - uid: 1248
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 107.5,-16.5
+      parent: 1
+  - uid: 1249
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 108.5,-16.5
+      parent: 1
+  - uid: 1250
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 108.5,-17.5
+      parent: 1
+  - uid: 1251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 108.5,-18.5
+      parent: 1
+  - uid: 1252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 108.5,-19.5
+      parent: 1
+  - uid: 1253
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 108.5,-20.5
+      parent: 1
+  - uid: 1254
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 109.5,-16.5
+      parent: 1
+  - uid: 1255
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 109.5,-17.5
+      parent: 1
+  - uid: 1256
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 109.5,-18.5
+      parent: 1
+  - uid: 1257
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 109.5,-19.5
+      parent: 1
+  - uid: 1258
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 109.5,-20.5
+      parent: 1
+  - uid: 1260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-16.5
+      parent: 1
+  - uid: 1261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-17.5
+      parent: 1
+  - uid: 1262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-18.5
+      parent: 1
+  - uid: 1263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-19.5
+      parent: 1
+  - uid: 1264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-20.5
+      parent: 1
+  - uid: 1265
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-21.5
+      parent: 1
+  - uid: 1266
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-22.5
+      parent: 1
+  - uid: 1267
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 110.5,-23.5
+      parent: 1
+  - uid: 1291
+    components:
+    - type: Transform
+      pos: 117.5,-9.5
+      parent: 1
+  - uid: 1292
+    components:
+    - type: Transform
+      pos: 116.5,-9.5
+      parent: 1
+  - uid: 1293
+    components:
+    - type: Transform
+      pos: 115.5,-9.5
+      parent: 1
+  - uid: 1309
+    components:
+    - type: Transform
+      pos: 120.5,1.5
+      parent: 1
+  - uid: 1310
+    components:
+    - type: Transform
+      pos: 116.5,1.5
+      parent: 1
+  - uid: 1311
+    components:
+    - type: Transform
+      pos: 115.5,1.5
+      parent: 1
+  - uid: 1328
+    components:
+    - type: Transform
+      pos: 118.5,1.5
+      parent: 1
+  - uid: 1329
+    components:
+    - type: Transform
+      pos: 119.5,1.5
+      parent: 1
+  - uid: 1330
+    components:
+    - type: Transform
+      pos: 117.5,1.5
+      parent: 1
+  - uid: 1336
+    components:
+    - type: Transform
+      pos: 111.5,-12.5
+      parent: 1
+  - uid: 1337
+    components:
+    - type: Transform
+      pos: 112.5,-12.5
+      parent: 1
+  - uid: 1338
+    components:
+    - type: Transform
+      pos: 113.5,-12.5
+      parent: 1
+  - uid: 1339
+    components:
+    - type: Transform
+      pos: 114.5,-12.5
+      parent: 1
+  - uid: 1340
+    components:
+    - type: Transform
+      pos: 115.5,-12.5
+      parent: 1
+  - uid: 1341
+    components:
+    - type: Transform
+      pos: 116.5,-12.5
+      parent: 1
+  - uid: 1342
+    components:
+    - type: Transform
+      pos: 117.5,-12.5
+      parent: 1
+  - uid: 1343
+    components:
+    - type: Transform
+      pos: 118.5,-12.5
+      parent: 1
+  - uid: 1344
+    components:
+    - type: Transform
+      pos: 119.5,-12.5
+      parent: 1
+  - uid: 1345
+    components:
+    - type: Transform
+      pos: 120.5,-12.5
+      parent: 1
+  - uid: 1347
+    components:
+    - type: Transform
+      pos: 122.5,-12.5
+      parent: 1
+  - uid: 1348
+    components:
+    - type: Transform
+      pos: 123.5,-12.5
+      parent: 1
+  - uid: 1349
+    components:
+    - type: Transform
+      pos: 124.5,-12.5
+      parent: 1
+  - uid: 1351
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 111.5,-24.5
+      parent: 1
+  - uid: 1352
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 112.5,-24.5
+      parent: 1
+  - uid: 1353
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 113.5,-24.5
+      parent: 1
+  - uid: 1354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 114.5,-24.5
+      parent: 1
+  - uid: 1355
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 115.5,-24.5
+      parent: 1
+  - uid: 1356
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 116.5,-24.5
+      parent: 1
+  - uid: 1357
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 117.5,-24.5
+      parent: 1
+  - uid: 1358
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 118.5,-24.5
+      parent: 1
+  - uid: 1359
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 119.5,-24.5
+      parent: 1
+  - uid: 1360
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 120.5,-24.5
+      parent: 1
+  - uid: 1361
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 121.5,-24.5
+      parent: 1
+  - uid: 1362
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 122.5,-24.5
+      parent: 1
+  - uid: 1363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-24.5
+      parent: 1
+  - uid: 1364
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 124.5,-24.5
+      parent: 1
+  - uid: 1420
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 121.5,-12.5
+      parent: 1
+  - uid: 2124
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 79.5,-15.5
+      parent: 1
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,7.5
+      parent: 1
+  - uid: 494
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,4.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-30.5
+      parent: 1
+  - uid: 950
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 82.5,1.5
+      parent: 1
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: 110.5,1.5
+      parent: 1
+  - uid: 1181
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 82.5,-24.5
+      parent: 1
+  - uid: 1268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 110.5,-24.5
+      parent: 1
+  - uid: 1314
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 125.5,1.5
+      parent: 1
+  - uid: 1315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 125.5,-9.5
+      parent: 1
+  - uid: 1350
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 125.5,-12.5
+      parent: 1
+  - uid: 1365
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 125.5,-24.5
+      parent: 1
+- proto: WardrobeEngineeringFilled
+  entities:
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 12.5,-1.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 13.5,-1.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 1
+- proto: WaterTankFull
+  entities:
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 29.5,-3.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 29.5,-4.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 28.5,-3.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 28.5,-4.5
+      parent: 1
+- proto: WeaponSubMachineGunWt550
+  entities:
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: 112.5164,-0.47590828
+      parent: 1
+- proto: WeaponTurretHostile
+  entities:
+  - uid: 992
+    components:
+    - type: Transform
+      pos: 98.5,-2.5
+      parent: 1
+  - uid: 1004
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 86.5,-19.5
+      parent: 1
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: 94.5,-2.5
+      parent: 1
+  - uid: 1027
+    components:
+    - type: Transform
+      pos: 90.5,-2.5
+      parent: 1
+  - uid: 1029
+    components:
+    - type: Transform
+      pos: 86.5,-2.5
+      parent: 1
+  - uid: 1244
+    components:
+    - type: Transform
+      pos: 102.5,-2.5
+      parent: 1
+  - uid: 1331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 106.5,-19.5
+      parent: 1
+  - uid: 1332
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 102.5,-19.5
+      parent: 1
+  - uid: 1333
+    components:
+    - type: Transform
+      pos: 106.5,-2.5
+      parent: 1
+  - uid: 1472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-11.5
+      parent: 1
+- proto: WeldingFuelTankFull
+  entities:
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 31.5,-3.5
+      parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      pos: 31.5,-4.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: 30.5,-3.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 30.5,-4.5
+      parent: 1
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-4.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-3.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-15.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      pos: 17.5,-6.5
+      parent: 1
+  - uid: 783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-6.5
+      parent: 1
+  - uid: 784
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-7.5
+      parent: 1
+  - uid: 785
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-8.5
+      parent: 1
+  - uid: 786
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-9.5
+      parent: 1
+  - uid: 787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-10.5
+      parent: 1
+  - uid: 788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-11.5
+      parent: 1
+  - uid: 789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-12.5
+      parent: 1
+  - uid: 790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-13.5
+      parent: 1
+  - uid: 791
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-14.5
+      parent: 1
+  - uid: 792
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-15.5
+      parent: 1
+  - uid: 793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-16.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-16.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-15.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-14.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-13.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-12.5
+      parent: 1
+  - uid: 799
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-11.5
+      parent: 1
+  - uid: 800
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-10.5
+      parent: 1
+  - uid: 801
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-9.5
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-8.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-7.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-6.5
+      parent: 1
+  - uid: 993
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 88.5,-1.5
+      parent: 1
+  - uid: 996
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 91.5,-1.5
+      parent: 1
+  - uid: 997
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 92.5,-1.5
+      parent: 1
+  - uid: 1014
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 94.5,-1.5
+      parent: 1
+  - uid: 1015
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 93.5,-1.5
+      parent: 1
+  - uid: 1016
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 86.5,-1.5
+      parent: 1
+  - uid: 1018
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 96.5,-1.5
+      parent: 1
+  - uid: 1019
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 95.5,-1.5
+      parent: 1
+  - uid: 1020
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 97.5,-1.5
+      parent: 1
+  - uid: 1021
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 98.5,-1.5
+      parent: 1
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 90.5,-1.5
+      parent: 1
+  - uid: 1025
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 85.5,-1.5
+      parent: 1
+  - uid: 1026
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 89.5,-1.5
+      parent: 1
+  - uid: 1028
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-1.5
+      parent: 1
+  - uid: 1049
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 99.5,-1.5
+      parent: 1
+  - uid: 1050
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 100.5,-1.5
+      parent: 1
+  - uid: 1051
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 101.5,-1.5
+      parent: 1
+  - uid: 1052
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 102.5,-1.5
+      parent: 1
+  - uid: 1053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 103.5,-1.5
+      parent: 1
+  - uid: 1054
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 104.5,-1.5
+      parent: 1
+  - uid: 1055
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 105.5,-1.5
+      parent: 1
+  - uid: 1056
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 106.5,-1.5
+      parent: 1
+  - uid: 1057
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 107.5,-1.5
+      parent: 1
+  - uid: 1058
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 107.5,-1.5
+      parent: 1
+  - uid: 1059
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 107.5,-2.5
+      parent: 1
+  - uid: 1060
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 107.5,-3.5
+      parent: 1
+  - uid: 1061
+    components:
+    - type: Transform
+      pos: 107.5,-3.5
+      parent: 1
+  - uid: 1062
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 107.5,-3.5
+      parent: 1
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 107.5,-2.5
+      parent: 1
+  - uid: 1064
+    components:
+    - type: Transform
+      pos: 106.5,-1.5
+      parent: 1
+  - uid: 1065
+    components:
+    - type: Transform
+      pos: 105.5,-1.5
+      parent: 1
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: 104.5,-1.5
+      parent: 1
+  - uid: 1067
+    components:
+    - type: Transform
+      pos: 103.5,-1.5
+      parent: 1
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: 102.5,-1.5
+      parent: 1
+  - uid: 1069
+    components:
+    - type: Transform
+      pos: 101.5,-1.5
+      parent: 1
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: 100.5,-1.5
+      parent: 1
+  - uid: 1071
+    components:
+    - type: Transform
+      pos: 99.5,-1.5
+      parent: 1
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 98.5,-1.5
+      parent: 1
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: 97.5,-1.5
+      parent: 1
+  - uid: 1074
+    components:
+    - type: Transform
+      pos: 96.5,-1.5
+      parent: 1
+  - uid: 1075
+    components:
+    - type: Transform
+      pos: 95.5,-1.5
+      parent: 1
+  - uid: 1076
+    components:
+    - type: Transform
+      pos: 94.5,-1.5
+      parent: 1
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 93.5,-1.5
+      parent: 1
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: 92.5,-1.5
+      parent: 1
+  - uid: 1079
+    components:
+    - type: Transform
+      pos: 91.5,-1.5
+      parent: 1
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: 90.5,-1.5
+      parent: 1
+  - uid: 1081
+    components:
+    - type: Transform
+      pos: 89.5,-1.5
+      parent: 1
+  - uid: 1082
+    components:
+    - type: Transform
+      pos: 88.5,-1.5
+      parent: 1
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: 87.5,-1.5
+      parent: 1
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: 86.5,-1.5
+      parent: 1
+  - uid: 1085
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-2.5
+      parent: 1
+  - uid: 1086
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-3.5
+      parent: 1
+  - uid: 1087
+    components:
+    - type: Transform
+      pos: 85.5,-3.5
+      parent: 1
+  - uid: 1221
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-5.5
+      parent: 1
+  - uid: 1222
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-4.5
+      parent: 1
+  - uid: 1278
+    components:
+    - type: Transform
+      pos: 85.5,-20.5
+      parent: 1
+  - uid: 1279
+    components:
+    - type: Transform
+      pos: 86.5,-20.5
+      parent: 1
+  - uid: 1280
+    components:
+    - type: Transform
+      pos: 87.5,-20.5
+      parent: 1
+  - uid: 1281
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-7.5
+      parent: 1
+  - uid: 1294
+    components:
+    - type: Transform
+      pos: 101.5,-20.5
+      parent: 1
+  - uid: 1295
+    components:
+    - type: Transform
+      pos: 102.5,-20.5
+      parent: 1
+  - uid: 1296
+    components:
+    - type: Transform
+      pos: 103.5,-20.5
+      parent: 1
+  - uid: 1297
+    components:
+    - type: Transform
+      pos: 104.5,-20.5
+      parent: 1
+  - uid: 1298
+    components:
+    - type: Transform
+      pos: 105.5,-20.5
+      parent: 1
+  - uid: 1299
+    components:
+    - type: Transform
+      pos: 106.5,-20.5
+      parent: 1
+  - uid: 1300
+    components:
+    - type: Transform
+      pos: 107.5,-20.5
+      parent: 1
+  - uid: 1301
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 107.5,-18.5
+      parent: 1
+  - uid: 1302
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 107.5,-19.5
+      parent: 1
+  - uid: 1303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-18.5
+      parent: 1
+  - uid: 1304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-19.5
+      parent: 1
+  - uid: 1305
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 86.5,-20.5
+      parent: 1
+  - uid: 1306
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-20.5
+      parent: 1
+  - uid: 1307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-8.5
+      parent: 1
+  - uid: 1320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 101.5,-20.5
+      parent: 1
+  - uid: 1321
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 102.5,-20.5
+      parent: 1
+  - uid: 1322
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 103.5,-20.5
+      parent: 1
+  - uid: 1323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 104.5,-20.5
+      parent: 1
+  - uid: 1324
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 105.5,-20.5
+      parent: 1
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 106.5,-20.5
+      parent: 1
+  - uid: 1326
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 107.5,-18.5
+      parent: 1
+  - uid: 1327
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 85.5,-18.5
+      parent: 1
+  - uid: 1378
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-13.5
+      parent: 1
+  - uid: 1379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-14.5
+      parent: 1
+  - uid: 1380
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-16.5
+      parent: 1
+  - uid: 1381
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-17.5
+      parent: 1
+  - uid: 1382
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-18.5
+      parent: 1
+  - uid: 1383
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-19.5
+      parent: 1
+  - uid: 1384
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-20.5
+      parent: 1
+  - uid: 1385
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-22.5
+      parent: 1
+  - uid: 1386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-23.5
+      parent: 1
+  - uid: 1387
+    components:
+    - type: Transform
+      pos: 123.5,-14.5
+      parent: 1
+  - uid: 1388
+    components:
+    - type: Transform
+      pos: 123.5,-20.5
+      parent: 1
+  - uid: 1389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-22.5
+      parent: 1
+  - uid: 1390
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-16.5
+      parent: 1
+  - uid: 1391
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-13.5
+      parent: 1
+  - uid: 1392
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-14.5
+      parent: 1
+  - uid: 1393
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-16.5
+      parent: 1
+  - uid: 1394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-17.5
+      parent: 1
+  - uid: 1395
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-18.5
+      parent: 1
+  - uid: 1396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-19.5
+      parent: 1
+  - uid: 1397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-20.5
+      parent: 1
+  - uid: 1398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-22.5
+      parent: 1
+  - uid: 1399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-23.5
+      parent: 1
+  - uid: 1403
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-2.5
+      parent: 1
+  - uid: 1404
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-2.5
+      parent: 1
+  - uid: 1406
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-4.5
+      parent: 1
+  - uid: 1407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-5.5
+      parent: 1
+  - uid: 1408
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,0.5
+      parent: 1
+  - uid: 1409
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-0.5
+      parent: 1
+  - uid: 1410
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,0.5
+      parent: 1
+  - uid: 1411
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,-0.5
+      parent: 1
+  - uid: 1412
+    components:
+    - type: Transform
+      pos: 123.5,-0.5
+      parent: 1
+  - uid: 1413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-2.5
+      parent: 1
+  - uid: 1414
+    components:
+    - type: Transform
+      pos: 123.5,-5.5
+      parent: 1
+  - uid: 1415
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 123.5,-7.5
+      parent: 1
+  - uid: 1416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-7.5
+      parent: 1
+  - uid: 1417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 123.5,-8.5
+      parent: 1
+...
diff --git a/Resources/Maps/Ruins/relaystation.yml b/Resources/Maps/Ruins/relaystation.yml
deleted file mode 100644
index 9588a0771d5b..000000000000
--- a/Resources/Maps/Ruins/relaystation.yml
+++ /dev/null
@@ -1,760 +0,0 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  29: FloorDark
-  54: FloorGreenCircuit
-  120: Lattice
-  121: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 2
-    components:
-    - type: MetaData
-    - type: Transform
-      parent: invalid
-    - type: MapGrid
-      chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAANgAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAANgAAAAAAHQAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,0:
-          ind: 0,0
-          tiles: HQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: BecomesStation
-      id: Empty
-    - type: OccluderTree
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            0: 0,0
-            1: -2,0
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            2: -2,-3
-            3: 0,-3
-    - type: SpreaderGrid
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          -1,-1:
-            0: 65535
-          -1,0:
-            0: 65535
-          0,0:
-            0: 65535
-          0,-1:
-            0: 65527
-          -2,-1:
-            0: 34944
-          -1,-2:
-            0: 65514
-          -1,-3:
-            0: 32768
-          -2,0:
-            0: 34952
-          -2,1:
-            0: 8
-          -1,1:
-            0: 18090
-          -1,2:
-            0: 34956
-          0,1:
-            0: 4906
-          0,2:
-            0: 1
-          0,-2:
-            0: 30514
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: GasTileOverlay
-    - type: RadiationGridResistance
-- proto: AirlockExternalGlassLocked
-  entities:
-  - uid: 35
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 34
-    - type: DeviceLinkSource
-      linkedPorts:
-        34:
-        - DoorStatus: DoorBolt
-- proto: AirlockExternalLocked
-  entities:
-  - uid: 34
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 35
-    - type: DeviceLinkSource
-      linkedPorts:
-        35:
-        - DoorStatus: DoorBolt
-- proto: APCBasic
-  entities:
-  - uid: 64
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 2
-- proto: BaseComputer
-  entities:
-  - uid: 89
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 2
-- proto: CableApcExtension
-  entities:
-  - uid: 65
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 2
-  - uid: 66
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 2
-  - uid: 67
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 2
-  - uid: 68
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 2
-  - uid: 69
-    components:
-    - type: Transform
-      pos: -0.5,0.5
-      parent: 2
-  - uid: 70
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 2
-  - uid: 71
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 72
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 2
-  - uid: 73
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 2
-  - uid: 74
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 2
-  - uid: 75
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 2
-  - uid: 76
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 2
-- proto: CableHV
-  entities:
-  - uid: 46
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 2
-  - uid: 47
-    components:
-    - type: Transform
-      pos: -3.5,-0.5
-      parent: 2
-  - uid: 48
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 2
-  - uid: 51
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 2
-  - uid: 52
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 2
-  - uid: 53
-    components:
-    - type: Transform
-      pos: -0.5,0.5
-      parent: 2
-  - uid: 54
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 2
-  - uid: 55
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 2
-  - uid: 56
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 2
-  - uid: 58
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 2
-  - uid: 59
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 2
-- proto: CableMV
-  entities:
-  - uid: 60
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 2
-  - uid: 61
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 2
-  - uid: 62
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 2
-  - uid: 63
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 2
-- proto: CableTerminal
-  entities:
-  - uid: 49
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-0.5
-      parent: 2
-- proto: Catwalk
-  entities:
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 2
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 2
-- proto: ChairOfficeDark
-  entities:
-  - uid: 95
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
-      parent: 2
-- proto: EncryptionKeyCargo
-  entities:
-  - uid: 82
-    components:
-    - type: Transform
-      parent: 81
-    - type: Physics
-      canCollide: False
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 86
-    components:
-    - type: Transform
-      parent: 85
-    - type: Physics
-      canCollide: False
-- proto: EncryptionKeyEngineering
-  entities:
-  - uid: 80
-    components:
-    - type: Transform
-      parent: 79
-    - type: Physics
-      canCollide: False
-- proto: EncryptionKeySecurity
-  entities:
-  - uid: 84
-    components:
-    - type: Transform
-      parent: 83
-    - type: Physics
-      canCollide: False
-- proto: FaxMachineBase
-  entities:
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 2
-    - type: FaxMachine
-      name: Relay Station
-- proto: GeneratorBasic
-  entities:
-  - uid: 45
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 2
-- proto: Grille
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      pos: 0.5,-6.5
-      parent: 2
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 2
-  - uid: 41
-    components:
-    - type: Transform
-      pos: -1.5,-6.5
-      parent: 2
-  - uid: 42
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 2
-- proto: PosterLegitNanotrasenLogo
-  entities:
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 2
-- proto: PottedPlantBioluminscent
-  entities:
-  - uid: 87
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 2
-- proto: PowerDrill
-  entities:
-  - uid: 100
-    components:
-    - type: Transform
-      pos: 0.53125,2.5
-      parent: 2
-- proto: Poweredlight
-  entities:
-  - uid: 92
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 2
-  - uid: 97
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-0.5
-      parent: 2
-- proto: ReinforcedWindow
-  entities:
-  - uid: 29
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 2
-  - uid: 30
-    components:
-    - type: Transform
-      pos: -1.5,-6.5
-      parent: 2
-  - uid: 36
-    components:
-    - type: Transform
-      pos: 0.5,-6.5
-      parent: 2
-  - uid: 37
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 2
-- proto: SalvageLootSpawner
-  entities:
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 2
-- proto: SignSpace
-  entities:
-  - uid: 43
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 2
-- proto: SignTelecomms
-  entities:
-  - uid: 44
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 2
-- proto: SMESBasic
-  entities:
-  - uid: 50
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 2
-- proto: SubstationBasic
-  entities:
-  - uid: 57
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 2
-- proto: TableReinforced
-  entities:
-  - uid: 88
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 2
-  - uid: 90
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 2
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 2
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 2
-  - uid: 94
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 2
-- proto: TelecomServer
-  entities:
-  - uid: 79
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 80
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-  - uid: 81
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 82
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 84
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 0.5,-0.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 86
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-- proto: WallRiveted
-  entities:
-  - uid: 1
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 2
-  - uid: 3
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 2
-  - uid: 4
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 2
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 2
-  - uid: 6
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 2
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 2
-  - uid: 8
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 2
-  - uid: 9
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 2
-  - uid: 10
-    components:
-    - type: Transform
-      pos: 2.5,2.5
-      parent: 2
-  - uid: 11
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 2
-  - uid: 12
-    components:
-    - type: Transform
-      pos: 1.5,3.5
-      parent: 2
-  - uid: 13
-    components:
-    - type: Transform
-      pos: 0.5,3.5
-      parent: 2
-  - uid: 14
-    components:
-    - type: Transform
-      pos: -0.5,3.5
-      parent: 2
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 2
-  - uid: 16
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 2
-  - uid: 17
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 2
-  - uid: 18
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 2
-  - uid: 19
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 2
-  - uid: 20
-    components:
-    - type: Transform
-      pos: -4.5,1.5
-      parent: 2
-  - uid: 21
-    components:
-    - type: Transform
-      pos: -4.5,0.5
-      parent: 2
-  - uid: 22
-    components:
-    - type: Transform
-      pos: -4.5,-0.5
-      parent: 2
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -4.5,-1.5
-      parent: 2
-  - uid: 24
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 2
-  - uid: 25
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 2
-  - uid: 26
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 2
-  - uid: 27
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 2
-  - uid: 28
-    components:
-    - type: Transform
-      pos: -2.5,-4.5
-      parent: 2
-  - uid: 31
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 2
-  - uid: 32
-    components:
-    - type: Transform
-      pos: 1.5,-4.5
-      parent: 2
-  - uid: 33
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 2
-  - uid: 38
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 2
-...
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 130d8f02d5ca..6a1abdfbe3dc 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -69,11 +69,12 @@
           maxCount: 2
           stationGrid: false
           paths:
+          - /Maps/Ruins/chunked_tcomms.yml
           - /Maps/Ruins/biodome_satellite.yml
           - /Maps/Ruins/derelict.yml
           - /Maps/Ruins/djstation.yml
+          - /Maps/Ruins/empty_flagship.yml
           - /Maps/Ruins/old_ai_sat.yml
-          - /Maps/Ruins/relaystation.yml
           - /Maps/Ruins/syndicate_dropship.yml
           - /Maps/Ruins/whiteship_ancient.yml
           - /Maps/Ruins/whiteship_bluespacejumper.yml

From 62b9e423c9e1812a3ad801a3719893af005a0f58 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 06:04:02 +0000
Subject: [PATCH 505/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ef08bf29ebc2..a7db0a71b1a9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: The revenant essence alert now displays the exact amount of essence.
-    type: Add
-  id: 6244
-  time: '2024-03-28T06:32:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25452
 - author: deltanedas
   changes:
   - message: Voicemasks can now mimic speech verbs, like flutters or growls.
@@ -3857,3 +3850,10 @@
   id: 6743
   time: '2024-06-15T05:20:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29010
+- author: Flareguy
+  changes:
+  - message: Replaced RelayStation with a more fair ruin.
+    type: Remove
+  id: 6744
+  time: '2024-06-15T06:02:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28971

From bb61191b24509cc0a5e65c87226c69634f8137dd Mon Sep 17 00:00:00 2001
From: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date: Fri, 14 Jun 2024 23:35:34 -0700
Subject: [PATCH 506/568] Set ahelp new player icon to use minutes, not seconds
 (#29014)

Replace seconds with minutes
---
 Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index af977f763c6c..0f5f72cc27a4 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -75,7 +75,7 @@ public BwoinkControl()
                 if (info.Antag && info.ActiveThisRound)
                     sb.Append(new Rune(0x1F5E1)); // 🗡
 
-                if (info.OverallPlaytime <= TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
+                if (info.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
                     sb.Append(new Rune(0x23F2)); // ⏲
 
                 sb.AppendFormat("\"{0}\"", text);
@@ -226,7 +226,7 @@ private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
             if (pl.Antag)
                 sb.Append(new Rune(0x1F5E1)); // 🗡
 
-            if (pl.OverallPlaytime <= TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
+            if (pl.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)))
                 sb.Append(new Rune(0x23F2)); // ⏲
 
             sb.AppendFormat("\"{0}\"", pl.CharacterName);

From a3d9f7291d55ca9bff37162ad35c8f7ec516bf67 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 15 Jun 2024 18:42:25 +1200
Subject: [PATCH 507/568] Fix IComponentFactory mock in benchmark (#29015)

---
 Content.Benchmarks/EntityManagerGetAllComponents.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Benchmarks/EntityManagerGetAllComponents.cs b/Content.Benchmarks/EntityManagerGetAllComponents.cs
index 0b9683a4abb6..8e02b8d71de6 100644
--- a/Content.Benchmarks/EntityManagerGetAllComponents.cs
+++ b/Content.Benchmarks/EntityManagerGetAllComponents.cs
@@ -47,6 +47,7 @@ public void Setup()
 
             var componentFactory = new Mock<IComponentFactory>();
             componentFactory.Setup(p => p.GetComponent<DummyComponent>()).Returns(new DummyComponent());
+            componentFactory.Setup(m => m.GetIndex(typeof(DummyComponent))).Returns(CompIdx.Index<DummyComponent>());
             componentFactory.Setup(p => p.GetRegistration(It.IsAny<DummyComponent>())).Returns(dummyReg);
             componentFactory.Setup(p => p.GetAllRegistrations()).Returns(new[] { dummyReg });
             componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] { CompIdx.Index<DummyComponent>() });

From f0fbedd6408e4a8f7b4e2614961cc94c3f946d84 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:52:49 +1000
Subject: [PATCH 508/568] Fix RoleLoadout equality (#28737)

* Fix RoleLoadout equality

Knew it was janky but thought SequenceEqual was better than it is so we just do it manually.

* Also implement this
---
 .../Preferences/Loadouts/Loadout.cs           | 19 +++++++++++++++++-
 .../Preferences/Loadouts/RoleLoadout.cs       | 20 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Preferences/Loadouts/Loadout.cs b/Content.Shared/Preferences/Loadouts/Loadout.cs
index dbe440f58b8e..c1d20cd3de42 100644
--- a/Content.Shared/Preferences/Loadouts/Loadout.cs
+++ b/Content.Shared/Preferences/Loadouts/Loadout.cs
@@ -7,8 +7,25 @@ namespace Content.Shared.Preferences.Loadouts;
 /// Specifies the selected prototype and custom data for a loadout.
 /// </summary>
 [Serializable, NetSerializable, DataDefinition]
-public sealed partial class Loadout
+public sealed partial class Loadout : IEquatable<Loadout>
 {
     [DataField]
     public ProtoId<LoadoutPrototype> Prototype;
+
+    public bool Equals(Loadout? other)
+    {
+        if (ReferenceEquals(null, other)) return false;
+        if (ReferenceEquals(this, other)) return true;
+        return Prototype.Equals(other.Prototype);
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return ReferenceEquals(this, obj) || obj is Loadout other && Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        return Prototype.GetHashCode();
+    }
 }
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index 5f8e24621a97..d2fc8df55910 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -295,7 +295,25 @@ public bool Equals(RoleLoadout? other)
     {
         if (ReferenceEquals(null, other)) return false;
         if (ReferenceEquals(this, other)) return true;
-        return Role.Equals(other.Role) && SelectedLoadouts.SequenceEqual(other.SelectedLoadouts) && Points == other.Points;
+
+        if (!Role.Equals(other.Role) ||
+            SelectedLoadouts.Count != other.SelectedLoadouts.Count ||
+            Points != other.Points)
+        {
+            return false;
+        }
+
+        // Tried using SequenceEqual but it stinky so.
+        foreach (var (key, value) in SelectedLoadouts)
+        {
+            if (!other.SelectedLoadouts.TryGetValue(key, out var otherValue) ||
+                !otherValue.SequenceEqual(value))
+            {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     public override bool Equals(object? obj)

From 8f12e90b90a6749d783b1f2c8588241749ceeeb2 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:53:42 +1000
Subject: [PATCH 509/568] Don't use invalid defaults for loadouts (#28740)

* Don't use invalid defaults for loadouts

At the time it made more sense but now with species specific stuff it's better to have nothing.

* Loadout SetDefault only applies valid loadouts
---
 Content.Client/Lobby/LobbyUIController.cs     |  4 +--
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |  2 +-
 .../Station/Systems/StationSpawningSystem.cs  | 15 ++++++-----
 Content.Shared/Clothing/LoadoutSystem.cs      | 16 ++++++++++-
 .../Preferences/HumanoidCharacterProfile.cs   |  6 ++---
 .../Loadouts/Effects/GroupLoadoutEffect.cs    |  2 +-
 .../Effects/JobRequirementLoadoutEffect.cs    |  8 +++++-
 .../Loadouts/Effects/LoadoutEffect.cs         |  2 +-
 .../Effects/PointsCostLoadoutEffect.cs        |  2 +-
 .../Loadouts/Effects/SpeciesLoadoutEffect.cs  |  2 +-
 .../Preferences/Loadouts/RoleLoadout.cs       | 27 +++++++++++++++----
 11 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index aa66b7731d15..e4a13ed8c6b7 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -294,7 +294,7 @@ public void GiveDummyJobClothesLoadout(EntityUid dummy, JobPrototype? jobProto,
 
         if (_prototypeManager.HasIndex<RoleLoadoutPrototype>(LoadoutSystem.GetJobPrototype(job.ID)))
         {
-            var loadout = profile.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), profile.Species, EntityManager, _prototypeManager);
+            var loadout = profile.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), _playerManager.LocalSession, profile.Species, EntityManager, _prototypeManager);
             GiveDummyLoadout(dummy, loadout);
         }
     }
@@ -414,7 +414,7 @@ public EntityUid LoadProfileEntity(HumanoidCharacterProfile? humanoid, JobProtot
 
             if (_prototypeManager.HasIndex<RoleLoadoutPrototype>(LoadoutSystem.GetJobPrototype(job.ID)))
             {
-                var loadout = humanoid.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), humanoid.Species, EntityManager, _prototypeManager);
+                var loadout = humanoid.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), _playerManager.LocalSession, humanoid.Species, EntityManager, _prototypeManager);
                 GiveDummyLoadout(dummyEnt, loadout);
             }
         }
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 18f986fc7ddf..e8e619ae6dc6 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -946,7 +946,7 @@ public void RefreshJobs()
                             if (loadout == null)
                             {
                                 loadout = new RoleLoadout(roleLoadoutProto.ID);
-                                loadout.SetDefault(_prototypeManager);
+                                loadout.SetDefault(Profile, _playerManager.LocalSession, _prototypeManager);
                             }
 
                             OpenLoadout(job, loadout, roleLoadoutProto);
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index d30c9fc111d4..e960a2bbbe2c 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -26,6 +26,7 @@
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
@@ -39,18 +40,18 @@ namespace Content.Server.Station.Systems;
 [PublicAPI]
 public sealed class StationSpawningSystem : SharedStationSpawningSystem
 {
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly ActorSystem _actors = default!;
+    [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!;
+    [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
     [Dependency] private readonly IdCardSystem _cardSystem = default!;
-    [Dependency] private readonly PdaSystem _pdaSystem = default!;
-    [Dependency] private readonly SharedAccessSystem _accessSystem = default!;
     [Dependency] private readonly IdentitySystem _identity = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
-
-    [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!;
-    [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!;
+    [Dependency] private readonly PdaSystem _pdaSystem = default!;
+    [Dependency] private readonly SharedAccessSystem _accessSystem = default!;
 
     private bool _randomizeCharacters;
 
@@ -198,7 +199,7 @@ public EntityUid SpawnPlayerMob(
             if (loadout == null)
             {
                 loadout = new RoleLoadout(jobLoadout);
-                loadout.SetDefault(_prototypeManager);
+                loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager);
             }
 
             EquipRoleLoadout(entity.Value, loadout, roleProto);
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
index 3136b4b4b330..f1b1dc36d907 100644
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ b/Content.Shared/Clothing/LoadoutSystem.cs
@@ -1,8 +1,11 @@
 using System.Linq;
 using Content.Shared.Clothing.Components;
+using Content.Shared.Humanoid;
+using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Roles;
 using Content.Shared.Station;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -15,6 +18,7 @@ public sealed class LoadoutSystem : EntitySystem
 {
     // Shared so we can predict it for placement manager.
 
+    [Dependency] private readonly ActorSystem _actors = default!;
     [Dependency] private readonly SharedStationSpawningSystem _station = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -125,7 +129,17 @@ private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent a
         var id = _random.Pick(component.RoleLoadout);
         var proto = _protoMan.Index(id);
         var loadout = new RoleLoadout(id);
-        loadout.SetDefault(_protoMan, true);
+        loadout.SetDefault(GetProfile(uid), _actors.GetSession(uid), _protoMan, true);
         _station.EquipRoleLoadout(uid, loadout, proto);
     }
+
+    public HumanoidCharacterProfile GetProfile(EntityUid? uid)
+    {
+        if (TryComp(uid, out HumanoidAppearanceComponent? appearance))
+        {
+            return HumanoidCharacterProfile.DefaultWithSpecies(appearance.Species);
+        }
+
+        return HumanoidCharacterProfile.Random();
+    }
 }
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index fd95848d2c6b..22b4ed981507 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -690,15 +690,15 @@ public HumanoidCharacterProfile WithLoadout(RoleLoadout loadout)
             return profile;
         }
 
-        public RoleLoadout GetLoadoutOrDefault(string id, ProtoId<SpeciesPrototype>? species, IEntityManager entManager, IPrototypeManager protoManager)
+        public RoleLoadout GetLoadoutOrDefault(string id, ICommonSession? session, ProtoId<SpeciesPrototype>? species, IEntityManager entManager, IPrototypeManager protoManager)
         {
             if (!_loadouts.TryGetValue(id, out var loadout))
             {
                 loadout = new RoleLoadout(id);
-                loadout.SetDefault(protoManager, force: true);
+                loadout.SetDefault(this, session, protoManager, force: true);
             }
 
-            loadout.SetDefault(protoManager);
+            loadout.SetDefault(this, session, protoManager);
             return loadout;
         }
 
diff --git a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
index 258d9a4dbb23..47e3bea77197 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
@@ -13,7 +13,7 @@ public sealed partial class GroupLoadoutEffect : LoadoutEffect
     [DataField(required: true)]
     public ProtoId<LoadoutEffectGroupPrototype> Proto;
 
-    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason)
+    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         var effectsProto = collection.Resolve<IPrototypeManager>().Index(Proto);
 
diff --git a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
index 54576d3a53a9..4a40e2c65e64 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
@@ -15,8 +15,14 @@ public sealed partial class JobRequirementLoadoutEffect : LoadoutEffect
     [DataField(required: true)]
     public JobRequirement Requirement = default!;
 
-    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason)
+    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession? session, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason)
     {
+        if (session == null)
+        {
+            reason = FormattedMessage.Empty;
+            return true;
+        }
+
         var manager = collection.Resolve<ISharedPlaytimeManager>();
         var playtimes = manager.GetPlayTimes(session);
         return JobRequirements.TryRequirementMet(Requirement, playtimes, out reason,
diff --git a/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
index f35b14e2e0da..a9cbfc5fd5ea 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
@@ -13,7 +13,7 @@ public abstract partial class LoadoutEffect
     public abstract bool Validate(
         HumanoidCharacterProfile profile,
         RoleLoadout loadout,
-        ICommonSession session,
+        ICommonSession? session,
         IDependencyCollection collection,
         [NotNullWhen(false)] out FormattedMessage? reason);
 
diff --git a/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
index 842b4cfc0361..734dc25ba418 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
@@ -13,7 +13,7 @@ public sealed partial class PointsCostLoadoutEffect : LoadoutEffect
     public override bool Validate(
         HumanoidCharacterProfile profile,
         RoleLoadout loadout,
-        ICommonSession session,
+        ICommonSession? session,
         IDependencyCollection collection,
         [NotNullWhen(false)] out FormattedMessage? reason)
     {
diff --git a/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
index 8f886dd2ab89..4ec46a834835 100644
--- a/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
+++ b/Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
@@ -11,7 +11,7 @@ public sealed partial class SpeciesLoadoutEffect : LoadoutEffect
     [DataField(required: true)]
     public List<ProtoId<SpeciesPrototype>> Species = new();
 
-    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession session, IDependencyCollection collection,
+    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, ICommonSession? session, IDependencyCollection collection,
         [NotNullWhen(false)] out FormattedMessage? reason)
     {
         if (Species.Contains(profile.Species))
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index d2fc8df55910..d02929cd9657 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -166,12 +166,15 @@ private void Apply(LoadoutPrototype loadoutProto)
     /// <summary>
     /// Resets the selected loadouts to default if no data is present.
     /// </summary>
-    /// <param name="force">Clear existing data first</param>
-    public void SetDefault(IPrototypeManager protoManager, bool force = false)
+    public void SetDefault(HumanoidCharacterProfile? profile, ICommonSession? session, IPrototypeManager protoManager, bool force = false)
     {
+        if (profile == null)
+            return;
+
         if (force)
             SelectedLoadouts.Clear();
 
+        var collection = IoCManager.Instance!;
         var roleProto = protoManager.Index(Role);
 
         for (var i = roleProto.Groups.Count - 1; i >= 0; i--)
@@ -184,14 +187,28 @@ public void SetDefault(IPrototypeManager protoManager, bool force = false)
             if (SelectedLoadouts.ContainsKey(group))
                 continue;
 
-            SelectedLoadouts[group] = new List<Loadout>();
+            var loadouts = new List<Loadout>();
+            SelectedLoadouts[group] = loadouts;
 
             if (groupProto.MinLimit > 0)
             {
                 // Apply any loadouts we can.
                 for (var j = 0; j < Math.Min(groupProto.MinLimit, groupProto.Loadouts.Count); j++)
                 {
-                    AddLoadout(group, groupProto.Loadouts[j], protoManager);
+                    if (!protoManager.TryIndex(groupProto.Loadouts[j], out var loadoutProto))
+                        continue;
+
+                    var defaultLoadout = new Loadout()
+                    {
+                        Prototype = loadoutProto.ID,
+                    };
+
+                    // Not valid so don't default to it anyway.
+                    if (!IsValid(profile, session, defaultLoadout.Prototype, collection, out _))
+                        continue;
+
+                    loadouts.Add(defaultLoadout);
+                    Apply(loadoutProto);
                 }
             }
         }
@@ -200,7 +217,7 @@ public void SetDefault(IPrototypeManager protoManager, bool force = false)
     /// <summary>
     /// Returns whether a loadout is valid or not.
     /// </summary>
-    public bool IsValid(HumanoidCharacterProfile profile, ICommonSession session, ProtoId<LoadoutPrototype> loadout, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool IsValid(HumanoidCharacterProfile profile, ICommonSession? session, ProtoId<LoadoutPrototype> loadout, IDependencyCollection collection, [NotNullWhen(false)] out FormattedMessage? reason)
     {
         reason = null;
 

From 7b6e30d68846354be9c3a82fc1fc92952e10a7d5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 06:53:55 +0000
Subject: [PATCH 510/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a7db0a71b1a9..b8440617eccb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Voicemasks can now mimic speech verbs, like flutters or growls.
-    type: Tweak
-  id: 6245
-  time: '2024-03-28T06:36:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25768
 - author: EmoGarbage404
   changes:
   - message: Electrocution damage is no longer based on the power supplied and is
@@ -3857,3 +3850,11 @@
   id: 6744
   time: '2024-06-15T06:02:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28971
+- author: metalgearsloth
+  changes:
+  - message: Fix the character profile sometimes thinking there's changes to save
+      even if the loadouts haven't changed.
+    type: Fix
+  id: 6745
+  time: '2024-06-15T06:52:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28737

From 9b8c5441919cdb9edfce7b7fbe4ad70aaa125aa8 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 15 Jun 2024 17:18:48 +1000
Subject: [PATCH 511/568] Update submodule to 225.0.0 (#29016)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index fcd507d1f9e6..2fa83181e2f4 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit fcd507d1f9e6fffb96bc4228d7f3d78577f0ff2e
+Subproject commit 2fa83181e2f4472120fe280f4598197f436faf22

From 9dc9e22d13e261346ad67328c70819181f085b91 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Sat, 15 Jun 2024 11:25:42 +0000
Subject: [PATCH 512/568] Bwoink fix (#28899)

* Fix incorrect usage of loc string

* Make it so you can no longer ahelp someone who is no longer selected
---
 Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs | 2 +-
 Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index 0f5f72cc27a4..ddd66623bd4e 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -243,9 +243,9 @@ private void SwitchToChannel(NetUserId? ch)
         {
             UpdateButtons();
 
+            AHelpHelper.HideAllPanels();
             if (ch != null)
             {
-                AHelpHelper.HideAllPanels();
                 var panel = AHelpHelper.EnsurePanel(ch.Value);
                 panel.Visible = true;
             }
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
index 999eba4d29dc..30f9d24df1df 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
@@ -18,7 +18,7 @@ public BwoinkWindow()
             {
                 if (sel is null)
                 {
-                    Title = Loc.GetString("bwoink-none-selected");
+                    Title = Loc.GetString("bwoink-title-none-selected");
                     return;
                 }
 

From e16bf41da16fe99d2da228c5871528b0a1a5a1fb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 11:26:48 +0000
Subject: [PATCH 513/568] Automatic changelog update

---
 Resources/Changelog/Admin.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 1a46012bed35..0ef47a775b64 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -305,5 +305,13 @@ Entries:
   id: 37
   time: '2024-06-13T06:38:44.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28876
+- author: nikthechampiongr
+  changes:
+  - message: The ahelp panel properly deselects a player when they are no longer on
+      the player list.
+    type: Fix
+  id: 38
+  time: '2024-06-15T11:25:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28899
 Name: Admin
 Order: 1

From 31d1d3b6e792d6edc6550211ad71fc78ddbe898c Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 09:19:23 -0400
Subject: [PATCH 514/568] fix borgs getting deleted by salvage magnets (#29006)

---
 Content.Server/Salvage/SalvageSystem.Magnet.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs
index 4b7291298b26..3fe4baca8b63 100644
--- a/Content.Server/Salvage/SalvageSystem.Magnet.cs
+++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs
@@ -130,17 +130,20 @@ private void EndMagnet(Entity<SalvageMagnetDataComponent> data)
             }
 
             // Uhh yeah don't delete mobs or whatever
-            var mobQuery = AllEntityQuery<HumanoidAppearanceComponent, MobStateComponent, TransformComponent>();
+            var mobQuery = AllEntityQuery<MobStateComponent, TransformComponent>();
             _detachEnts.Clear();
 
-            while (mobQuery.MoveNext(out var mobUid, out _, out _, out var xform))
+            while (mobQuery.MoveNext(out var mobUid, out _, out var xform))
             {
                 if (xform.GridUid == null || !data.Comp.ActiveEntities.Contains(xform.GridUid.Value) || xform.MapUid == null)
                     continue;
 
+                if (_salvMobQuery.HasComp(mobUid))
+                    continue;
+
                 // Can't parent directly to map as it runs grid traversal.
                 _detachEnts.Add(((mobUid, xform), xform.MapUid.Value, _transform.GetWorldPosition(xform)));
-                _transform.DetachParentToNull(mobUid, xform);
+                _transform.DetachEntity(mobUid, xform);
             }
 
             // Go and cleanup the active ents.

From 7e4c7607e6d46c2792924c004f7f40117dcdb3e9 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 13:20:29 +0000
Subject: [PATCH 515/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b8440617eccb..35503f2ac5d5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Electrocution damage is no longer based on the power supplied and is
-      instead based on the wire voltage (LV, MV, or HV).
-    type: Tweak
-  id: 6246
-  time: '2024-03-28T20:44:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26455
 - author: Jake Huxell
   changes:
   - message: Late join menu correctly respects client role restrictions.
@@ -3858,3 +3850,11 @@
   id: 6745
   time: '2024-06-15T06:52:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28737
+- author: EmoGarbage404
+  changes:
+  - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks
+      disappearing.
+    type: Fix
+  id: 6746
+  time: '2024-06-15T13:19:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29006

From 71eb4d91786b1b3eccbcd61dd5e10dff184fe197 Mon Sep 17 00:00:00 2001
From: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:03:20 +0200
Subject: [PATCH 516/568] CVarify meteor behavior (#29030)

* CVarify meteor behavior

* Cache value to reduce CVar calls, hook into OnValueChanged

* _cfg is still null at construction time, fixed by just making it set up on Started instead

* Invoke immediately! Learning more every step of the way.

* Move cached value initialisation to Initialize call

* Add explicit supercall
---
 .../Components/MeteorSchedulerComponent.cs    | 11 -----------
 .../StationEvents/MeteorSchedulerSystem.cs    | 19 +++++++++++++++++--
 Content.Shared/CCVar/CCVars.cs                | 12 ++++++++++++
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs
index e71a284a893b..23337f9261ed 100644
--- a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs
+++ b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs
@@ -21,15 +21,4 @@ public sealed partial class MeteorSchedulerComponent : Component
     [DataField, AutoPausedField]
     public TimeSpan NextSwarmTime = TimeSpan.Zero;
 
-    /// <summary>
-    /// The minimum time between swarms
-    /// </summary>
-    [DataField]
-    public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f);
-
-    /// <summary>
-    /// The maximum time between swarms
-    /// </summary>
-    [DataField]
-    public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f);
 }
diff --git a/Content.Server/StationEvents/MeteorSchedulerSystem.cs b/Content.Server/StationEvents/MeteorSchedulerSystem.cs
index 3ad88a7d8911..c5162293603a 100644
--- a/Content.Server/StationEvents/MeteorSchedulerSystem.cs
+++ b/Content.Server/StationEvents/MeteorSchedulerSystem.cs
@@ -1,7 +1,9 @@
 using Content.Server.GameTicking.Rules;
 using Content.Server.StationEvents.Components;
+using Content.Shared.CCVar;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Random.Helpers;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.StationEvents;
@@ -13,12 +15,24 @@ namespace Content.Server.StationEvents;
 public sealed class MeteorSchedulerSystem : GameRuleSystem<MeteorSchedulerComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    private TimeSpan _meteorMinDelay;
+    private TimeSpan _meteorMaxDelay;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _cfg.OnValueChanged(CCVars.MeteorSwarmMinTime, f => { _meteorMinDelay = TimeSpan.FromMinutes(f); }, true);
+        _cfg.OnValueChanged(CCVars.MeteorSwarmMaxTime, f => { _meteorMaxDelay = TimeSpan.FromMinutes(f); }, true);
+    }
 
     protected override void Started(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
 
-        component.NextSwarmTime = Timing.CurTime + RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay);
+        component.NextSwarmTime = Timing.CurTime + RobustRandom.Next(_meteorMinDelay, _meteorMaxDelay);
     }
 
     protected override void ActiveTick(EntityUid uid, MeteorSchedulerComponent component, GameRuleComponent gameRule, float frameTime)
@@ -28,7 +42,8 @@ protected override void ActiveTick(EntityUid uid, MeteorSchedulerComponent compo
         if (Timing.CurTime < component.NextSwarmTime)
             return;
         RunSwarm((uid, component));
-        component.NextSwarmTime += RobustRandom.Next(component.MinSwarmDelay, component.MaxSwarmDelay);
+
+        component.NextSwarmTime += RobustRandom.Next(_meteorMinDelay, _meteorMaxDelay);
     }
 
     private void RunSwarm(Entity<MeteorSchedulerComponent> ent)
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index a9cc2d11dab0..886ace654dba 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -124,6 +124,18 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<float>
             EventsRampingAverageChaos = CVarDef.Create("events.ramping_average_chaos", 6f, CVar.ARCHIVE | CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Minimum time between meteor swarms in minutes.
+        /// </summary>
+        public static readonly CVarDef<float>
+            MeteorSwarmMinTime = CVarDef.Create("events.meteor_swarm_min_time", 7.5f, CVar.ARCHIVE | CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Maximum time between meteor swarms in minutes.
+        /// </summary>
+        public static readonly CVarDef<float>
+            MeteorSwarmMaxTime = CVarDef.Create("events.meteor_swarm_max_time", 12.5f, CVar.ARCHIVE | CVar.SERVERONLY);
+
         /*
          * Game
          */

From 789453adf0cf1b3310f75ef3ac5b1240a09be9b8 Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Sat, 15 Jun 2024 08:17:16 -0700
Subject: [PATCH 517/568] Make firelock warning light not require power and add
 a PointLight (#29024)

* Add a PointLight to firelocks when warnings are active

* Remove power requirement for lights
---
 Content.Client/Doors/FirelockSystem.cs            | 15 ++++++---------
 Content.Server/Doors/Systems/FirelockSystem.cs    |  9 ++++++++-
 .../Structures/Doors/Firelocks/firelock.yml       |  6 ++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index f64b4c8e5222..ad869391f4b8 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -25,15 +25,12 @@ private void OnAppearanceChange(EntityUid uid, FirelockComponent comp, ref Appea
         if (!_appearanceSystem.TryGetData<DoorState>(uid, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        if (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.Powered, out var powered, args.Component) && powered)
-        {
-            boltedVisible = _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var lights, args.Component) && lights;
-            unlitVisible =
-                state == DoorState.Closing
-                ||  state == DoorState.Opening
-                ||  state == DoorState.Denying
-                || (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights);
-        }
+        boltedVisible = _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var lights, args.Component) && lights;
+        unlitVisible =
+            state == DoorState.Closing
+            ||  state == DoorState.Opening
+            ||  state == DoorState.Denying
+            || (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights);
 
         args.Sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible && !boltedVisible);
         args.Sprite.LayerSetVisible(DoorVisualLayers.BaseBolted, boltedVisible);
diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs
index c7da404fe880..7cb31b5b4e05 100644
--- a/Content.Server/Doors/Systems/FirelockSystem.cs
+++ b/Content.Server/Doors/Systems/FirelockSystem.cs
@@ -6,9 +6,9 @@
 using Content.Server.Shuttles.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
-using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
+using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Doors.Systems
@@ -20,6 +20,7 @@ public sealed class FirelockSystem : SharedFirelockSystem
         [Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedMapSystem _mapping = default!;
+        [Dependency] private readonly PointLightSystem _pointLight = default!;
 
         private const int UpdateInterval = 30;
         private int _accumulatedTicks;
@@ -53,6 +54,7 @@ public override void Update(float frameTime)
             var airtightQuery = GetEntityQuery<AirtightComponent>();
             var appearanceQuery = GetEntityQuery<AppearanceComponent>();
             var xformQuery = GetEntityQuery<TransformComponent>();
+            var pointLightQuery = GetEntityQuery<PointLightComponent>();
 
             var query = EntityQueryEnumerator<FirelockComponent, DoorComponent>();
             while (query.MoveNext(out var uid, out var firelock, out var door))
@@ -74,6 +76,11 @@ public override void Update(float frameTime)
                     firelock.Temperature = fire;
                     firelock.Pressure = pressure;
                     Dirty(uid, firelock);
+
+                    if (pointLightQuery.TryComp(uid, out var pointLight))
+                    {
+                        _pointLight.SetEnabled(uid, fire | pressure, pointLight);
+                    }
                 }
             }
         }
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index d6815abcdc6a..e4b242430118 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -109,6 +109,12 @@
       access: [ [ "Engineering" ] ]
     - type: PryUnpowered
       pryModifier: 0.5
+    - type: PointLight
+      energy: 0.5
+      radius: 1.75
+      color: Red
+      enabled: false
+      castShadows: false
 
 - type: entity
   id: Firelock

From ba16cd19b201febe36b096ed21ed43b2445f3377 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 15:18:22 +0000
Subject: [PATCH 518/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 35503f2ac5d5..f01608a2ee75 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Jake Huxell
-  changes:
-  - message: Late join menu correctly respects client role restrictions.
-    type: Fix
-  id: 6247
-  time: '2024-03-29T02:30:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26498
 - author: Jake Huxell
   changes:
   - message: Reduced game build warning count.
@@ -3858,3 +3851,12 @@
   id: 6746
   time: '2024-06-15T13:19:23.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29006
+- author: ShadowCommander
+  changes:
+  - message: Added a red light to firelocks when their warning lights are active.
+    type: Add
+  - message: Firelocks no longer require power to show warning lights.
+    type: Tweak
+  id: 6747
+  time: '2024-06-15T15:17:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29024

From ca58811bdb68a62c8702a56914d766d0a021fec5 Mon Sep 17 00:00:00 2001
From: Ian <ignaz.k@live.de>
Date: Sat, 15 Jun 2024 17:44:56 +0200
Subject: [PATCH 519/568] make the donk microwave drop the correct board on
 normal deconstruction (#29037)

* make the donk microwave drop the correct board on normal deconstruction

* removed the unnecessary SyndicateMicrowaveMachineBoard tag
---
 .../Devices/Circuitboards/Machine/production.yml   | 14 ++++++++++++++
 .../Entities/Structures/Machines/microwave.yml     |  4 ++--
 Resources/Prototypes/tags.yml                      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index d41923b569d0..b25c394f825a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1021,6 +1021,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/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 3b6fbf7f5f77..314a5c1ce548 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -121,5 +121,5 @@
     sprite: Structures/Machines/microwave_syndie.rsi
     drawdepth: SmallObjects
     snapCardinals: true
-
-
+  - type: Machine
+    board: SyndicateMicrowaveMachineCircuitboard
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index d60b6329865b..0857f601e2c4 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -254,7 +254,7 @@
 
 - type: Tag
   id: CableCoil
-  
+
 - type: Tag
   id: Candle
 

From 5dbee6fc413d11544da7e98f6231c28a7f76f56f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 15:46:02 +0000
Subject: [PATCH 520/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f01608a2ee75..8cc6791c9a11 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Jake Huxell
-  changes:
-  - message: Reduced game build warning count.
-    type: Fix
-  id: 6248
-  time: '2024-03-29T05:28:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26518
 - author: wafehling
   changes:
   - message: Added a chemistry recipe to make crystal shards.
@@ -3860,3 +3853,10 @@
   id: 6747
   time: '2024-06-15T15:17:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29024
+- author: Ian321
+  changes:
+  - message: Donk co. microwaves now have their own machine board.
+    type: Fix
+  id: 6748
+  time: '2024-06-15T15:44:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29037

From 81e41f8e8d000f6d420ce67134dc7eb49b0034ca Mon Sep 17 00:00:00 2001
From: BombasterDS <115770678+BombasterDS@users.noreply.github.com>
Date: Sun, 16 Jun 2024 03:50:55 +1000
Subject: [PATCH 521/568] Mannequin (#29004)

* Mannequin

* rsi license fix

* damage container fix

* container fix

hope this works

* layers fix + appearance comp (mb it help?)

* maybe fixed?

* one day it will work...

* can't even understand why test failing... (maybe fix?)

* last try?
---
 .../Medical/SuitSensors/SuitSensorSystem.cs   |   2 +-
 .../Structures/Decoration/mannequin.yml       |  95 ++++++++++++++++++
 .../mannequin_inventory_template.yml          |  64 ++++++++++++
 .../Graphs/furniture/mannequin.yml            |  31 ++++++
 .../Recipes/Construction/furniture.yml        |  18 ++++
 .../Decoration/mannequin.rsi/mannequin.png    | Bin 0 -> 1274 bytes
 .../Decoration/mannequin.rsi/meta.json        |  15 +++
 7 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
 create mode 100644 Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml
 create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml
 create mode 100644 Resources/Textures/Structures/Decoration/mannequin.rsi/mannequin.png
 create mode 100644 Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json

diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index 1acbf292f03a..e0917f32a844 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -308,7 +308,7 @@ public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = n
             return null;
 
         // check if sensor is enabled and worn by user
-        if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || transform.GridUid == null)
+        if (sensor.Mode == SuitSensorMode.SensorOff || sensor.User == null || !HasComp<MobStateComponent>(sensor.User) || transform.GridUid == null)
             return null;
 
         // try to get mobs id from ID slot
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
new file mode 100644
index 000000000000..4a2b0d3c3f47
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
@@ -0,0 +1,95 @@
+- type: entity
+  id: Mannequin
+  parent: BaseStructureDynamic
+  name: mannequin
+  description: It can wear any clothing with style.
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: Structures/Decoration/mannequin.rsi
+    state: mannequin
+    noRot: true
+    layers:
+    - map: [ "mannequin" ]
+      sprite: Structures/Decoration/mannequin.rsi
+      state: mannequin
+    - map: [ "jumpsuit" ]
+    - map: [ "outerClothing" ]
+    - map: [ "eyes" ]
+    - map: [ "neck" ]
+    - map: [ "back" ]
+    - map: [ "mask" ]
+    - map: [ "head" ] 
+  - type: Rotatable
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.2
+        density: 200
+        mask:
+        - MachineMask
+        layer:
+        - MidImpassable
+        - BulletImpassable
+  - type: InteractionOutline
+  - type: Construction
+    graph: Mannequin
+    node: mannequin
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:EmptyAllContainersBehaviour
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: ContainerContainer
+    containers:
+      jumpsuit: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      outerClothing: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      neck: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      mask: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      eyes: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      head: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      suitstorage: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+      back: !type:ContainerSlot
+        showEnts: False
+        occludes: False
+        ent: null
+  - type: Inventory
+    templateId: mannequin
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
\ No newline at end of file
diff --git a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml
new file mode 100644
index 000000000000..80b9c6eea4e6
--- /dev/null
+++ b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml
@@ -0,0 +1,64 @@
+- type: inventoryTemplate
+  id: mannequin
+  slots:
+    - name: jumpsuit
+      slotTexture: uniform
+      slotFlags: INNERCLOTHING
+      stripTime: 3
+      uiWindowPos: 0,1
+      strippingWindowPos: 1,2
+      displayName: Jumpsuit
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      stripTime: 3
+      uiWindowPos: 1,1
+      strippingWindowPos: 2,2
+      displayName: Suit
+    - name: neck
+      slotTexture: neck
+      slotFlags: NECK
+      stripTime: 3
+      uiWindowPos: 0,2
+      strippingWindowPos: 0,1
+      displayName: Neck
+    - name: mask
+      stripTime: 3
+      slotTexture: mask
+      slotFlags: MASK
+      uiWindowPos: 1,2
+      strippingWindowPos: 1,1
+      displayName: Mask
+    - name: eyes
+      slotTexture: glasses
+      slotFlags: EYES
+      stripTime: 3
+      uiWindowPos: 0,3
+      strippingWindowPos: 0,0
+      displayName: Eyes
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      stripTime: 3
+      uiWindowPos: 1,3
+      strippingWindowPos: 1,0
+      displayName: Head
+    - name: suitstorage
+      slotTexture: suit_storage
+      slotFlags:   SUITSTORAGE
+      slotGroup: MainHotbar
+      stripTime: 3
+      uiWindowPos: 2,0
+      strippingWindowPos: 1,3
+      dependsOn: outerClothing
+      dependsOnComponents:
+      - type: AllowSuitStorage
+      displayName: Suit Storage
+    - name: back
+      slotTexture: back
+      fullTextureName: template_small
+      slotFlags: BACK
+      stripTime: 3
+      uiWindowPos: 3,0
+      strippingWindowPos: 0,2
+      displayName: Back
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml
new file mode 100644
index 000000000000..f83a3b1e95ef
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml
@@ -0,0 +1,31 @@
+- type: constructionGraph
+  id: Mannequin
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+        - to: mannequin
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: WoodPlank
+              amount: 5
+            - material: MetalRod
+              amount: 2
+              doAfter: 2
+    - node: mannequin
+      entity: Mannequin
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank
+              amount: 5
+            - !type:SpawnPrototype
+              prototype: PartRodMetal
+              amount: 2
+          steps:
+            - tool: Screwing
+              doAfter: 3
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 5f7ec9c92d81..ea11a09b9653 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -902,3 +902,21 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+- type: construction
+  id: Mannequin
+  name: mannequin
+  description: Wooden mannequin designed for clothing displaying
+  graph: Mannequin
+  startNode: start
+  targetNode: mannequin
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/mannequin.rsi
+    state: mannequin
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/mannequin.rsi/mannequin.png b/Resources/Textures/Structures/Decoration/mannequin.rsi/mannequin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f362c698ba49c09b3391db5fc4814a982e0e6d2
GIT binary patch
literal 1274
zcmV<W1O@wvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(v`IukRCt{2TEB1GMil-;(}aG6m2DLcVhBMbw-ykfj^H9g5oC}(Ws^MyNHQ9&
zHUr*_OhqTJ9{OK2e}LP;=+?BZJ2hxwr%)BAjw(|WDMq4r9TX~}NU6G`cyergfFSZj
z@_YB`-FwG-2TU-*l}3p5#;x@n0RT;@;M?yHnV-XoufKXkjGBtG;)ySQk(K;T`X-vn
z85(a&06=((u)F;w$y}d<ae9naEa{7%T7aF$d2%OxvrVp50RXv-KO<=QGuP*!{rPLB
z%@4mobMe-Cj@-?p&{WPko$oecb2Uq74WPl!<2<>WNx^!nyMANkr}6+zsi0AL?dm*l
zv<z)z&!Tpj&DAV<=W-7G@OzO<Fx*<tkuMf+xc&rIekOxASF>a#wSc%JKxtU``MAV2
z6O59dDh2?+&cg>pmSq5d(y#ykVhDkc|6YEzVWC(vp*AdE{8Xy#JbXYhi5Mc&Q>a#}
z_(wM}9~BXuo`T+N;ra0^?Cl5V2|@4=eQ`IrS#Jj+z1c!^da83xkRk-dKlBhVw3>q)
zfP>sVHv<|7LGe??fNt_};7vtwoSz%!!1G}+v;e!$4njYbl!4bAya+B8?mjyR{qe8X
zx0C0FiQoP@rRJyd0993Ci%`}Zoe$8?!$G-!H-EPXGvW3;?%Xi(%ga+He(HCDdQC-H
zk0241I&EdW0WpNY1+e)s7jw0<@>6+$EX%l^oOg5{01{CNx0CY_1D*=WvW)vn$<9A-
zV<s%({!)^OpGtswO?7qNMj|Q&?g90h>NxL>2Z4J)<eJ>~H^a2(*(ouIpB2;|&<}=b
z1wI7oHFaPXVBu$45z?D2S6f&VxCFtOu;|DF-N!8a)S4C6oG%@Qg^uz(-U!FdKhPN7
z7zID|>+og6M1XM{@WH|!f8&Y+qvB`wfWHmrH*buJe=-DUk-wKE`Fl>c^J=@S{1Z%Y
z$-q2!-rmTOh#W_`cme={)&soo^huu7RRy|I@x{+{(>H}j<g?WK61mc_aCB1QCc@Jv
zdGh&Es#B=-!%v+Cw>NT*&I3SP60m%0fy<<*xAT7asRfw5k%aYDcU5QO5}zqW_?qll
z9%tpJzN_-8IMVt&6MwxnvONma0_aM`-WTM6T`A@Pug<gbQwy-Se;9iH+UWts8huHM
z6}nP!b=FT1WLgu9$Z;H%bu1?&C=Cn8rBeWWQsLhIVW_YM0szam761S*RrWuCDGPiu
z8^vP0T^|qy0V`?umYJZjl1@St1jHo)i*X4n>16O(V0$A+KAQa)O|6R9JKwRtSq-2?
zVJ%B+!Fz3pC+4Ybp!R@IrFw_ZM(;Tfc-gR=@UB`70+j&vv~w7Pg2X7fuKa=swE#Tx
zJr6K@fMz<6HGWe87oQ()Y61Gqxj)nx!1O5198cu$hnU#5$+YN)C({tPh-r|e^8kYY
z2QP}QF{hdBc3ul2UN(q=fTI)lOWOZ|N&v48@(g~%a0j+kwi{m4O`dCl{ieIT*Cj8+
z{(!O71}_UH0*u>$af4Za!djNJS7*k%KcM%R7R*zai?Tn!FRuI$pw63i9sau?-{)Mf
kwxH0x55VU0Y8w{+0jj;5&U!?FnE(I)07*qoM6N<$f=H@g6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json b/Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json
new file mode 100644
index 000000000000..8edc1539e900
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/mannequin.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made By BombasterDS",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "mannequin",
+	  "directions": 4
+    }
+  ]
+}

From 30cdb90ac217c4e599c53eed10e693af098df1f6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 17:52:01 +0000
Subject: [PATCH 522/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8cc6791c9a11..15928df18889 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: wafehling
-  changes:
-  - message: Added a chemistry recipe to make crystal shards.
-    type: Add
-  id: 6249
-  time: '2024-03-29T06:13:52.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26269
 - author: Crotalus
   changes:
   - message: Reagent grinder auto-modes
@@ -3860,3 +3853,10 @@
   id: 6748
   time: '2024-06-15T15:44:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29037
+- author: BombasterDS
+  changes:
+  - message: Added craftable mannequin that you can hang clothing on!
+    type: Add
+  id: 6749
+  time: '2024-06-15T17:50:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29004

From 6835e6b4aa40967ca7263a2ae8391a33ab2d0b2d Mon Sep 17 00:00:00 2001
From: Partmedia <kevinz5000@gmail.com>
Date: Sat, 15 Jun 2024 13:05:57 -0800
Subject: [PATCH 523/568] Adjust TEG efficiency curve, remove heat transfer
 limit (#29050)

The TEG used to limit hot-cold energy transfer based on actual power drawn, and had maximum efficiency at whatever temperature difference. This PR adjusts the hot-cold energy transfer to be uncapped, "venting" the excess heat that is not used to generate power, and adds an efficiency curve that limits efficiency at low thermal temperatures.

People have been cheesing the TEG by hooking up the hot end to the CO2 miner (which produces infinite, room-temperature gas) and the cold end to a space radiator.

With this change, you will actually need to set up a burn chamber in order to get appreciable power out of the TEG (see below).

If you build a gas holding chamber, you will have to throttle the gas flowing into the TEG instead of constantly cycling the gas through over and over again.
---
 .../Power/Generation/Teg/TegSystem.cs         | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs
index 540bd6c4832a..bc1bff052ce4 100644
--- a/Content.Server/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Server/Power/Generation/Teg/TegSystem.cs
@@ -128,7 +128,6 @@ private void GeneratorUpdate(EntityUid uid, TegGeneratorComponent component, ref
         // Shift ramp position based on demand and generation from previous tick.
         var curRamp = component.RampPosition;
         var lastDraw = supplier.CurrentSupply;
-        // Limit amount lost/gained based on power factor.
         curRamp = MathHelper.Clamp(lastDraw, curRamp / component.RampFactor, curRamp * component.RampFactor);
         curRamp = MathF.Max(curRamp, component.RampMinimum);
         component.RampPosition = curRamp;
@@ -138,17 +137,28 @@ private void GeneratorUpdate(EntityUid uid, TegGeneratorComponent component, ref
         if (airA.Pressure > 0 && airB.Pressure > 0)
         {
             var hotA = airA.Temperature > airB.Temperature;
-            var cHot = hotA ? cA : cB;
-
-            // Calculate maximum amount of energy to generate this tick based on ramping above.
-            // This clamps the thermal energy transfer as well.
-            var targetEnergy = curRamp / _atmosphere.AtmosTickRate;
-            var transferMax = targetEnergy / (component.ThermalEfficiency * component.PowerFactor);
 
             // Calculate thermal and electrical energy transfer between the two sides.
-            var δT = MathF.Abs(airA.Temperature - airB.Temperature);
-            var transfer = Math.Min(δT * cA * cB / (cA + cB - cHot * component.ThermalEfficiency), transferMax);
-            electricalEnergy = transfer * component.ThermalEfficiency * component.PowerFactor;
+            // Assume temperature equalizes, i.e. Ta*cA + Tb*cB = Tf*(cA+cB)
+            var Tf = (airA.Temperature * cA + airB.Temperature * cB) / (cA + cB);
+            // The maximum energy we can extract is (Ta - Tf)*cA, which is equal to (Tf - Tb)*cB
+            var Wmax = MathF.Abs(airA.Temperature - Tf) * cA;
+
+            var N = component.ThermalEfficiency;
+
+            // Calculate Carnot efficiency
+            var Thot = hotA ? airA.Temperature : airB.Temperature;
+            var Tcold = hotA ? airB.Temperature : airA.Temperature;
+            var Nmax = 1 - Tcold / Thot;
+            N = MathF.Min(N, Nmax); // clamp by Carnot efficiency
+
+            // Reduce efficiency at low temperature differences to encourage burn chambers (instead
+            // of just feeding the TEG room temperature gas from an infinite gas miner).
+            var dT = Thot - Tcold;
+            N *= MathF.Tanh(dT/700); // https://www.wolframalpha.com/input?i=tanh(x/700)+from+0+to+1000
+
+            var transfer = Wmax * N;
+            electricalEnergy = transfer * component.PowerFactor;
             var outTransfer = transfer * (1 - component.ThermalEfficiency);
 
             // Adjust thermal energy in transferred gas mixtures.

From a9610d4f850c7227ef298de535153c3746462b2a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 21:07:04 +0000
Subject: [PATCH 524/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 15928df18889..7609a5604802 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Crotalus
-  changes:
-  - message: Reagent grinder auto-modes
-    type: Add
-  id: 6250
-  time: '2024-03-29T06:30:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26290
 - author: deltanedas
   changes:
   - message: Multiple bombs exploding at once on a tile now combine to have a larger
@@ -3860,3 +3853,10 @@
   id: 6749
   time: '2024-06-15T17:50:55.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29004
+- author: notafet
+  changes:
+  - message: The TEG must now be operated at higher temperatures to generate power.
+    type: Tweak
+  id: 6750
+  time: '2024-06-15T21:05:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29050

From 6d3d92cd50fc36e45437bd899152269cf380a56e Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sat, 15 Jun 2024 23:32:49 +0200
Subject: [PATCH 525/568] Fix mime mask loadout minlimit (#29056)

---
 Resources/Prototypes/Loadouts/loadout_groups.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 7f8a9ff4e488..cf9866faaedd 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -402,7 +402,6 @@
 - type: loadoutGroup
   id: MimeMask
   name: loadout-group-mime-mask
-  minLimit: 0
   loadouts:
   - MimeMask
   - MimeMaskSad

From b70f222cf1d564838fb81ea830adfad312338087 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 21:33:56 +0000
Subject: [PATCH 526/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7609a5604802..5ccd6cc516c3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - message: Multiple bombs exploding at once on a tile now combine to have a larger
-      explosion rather than stacking the same small explosion.
-    type: Tweak
-  id: 6251
-  time: '2024-03-29T23:46:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25664
 - author: Mephisto72
   changes:
   - message: Ion Storms are now more likely to alter a Borg's laws.
@@ -3860,3 +3852,10 @@
   id: 6750
   time: '2024-06-15T21:05:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29050
+- author: lzk228
+  changes:
+  - message: Fixed ability for mime to not choose any mask.
+    type: Fix
+  id: 6751
+  time: '2024-06-15T21:32:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29056

From 2ddebba0e9a2889c8b2623aad6d6fa6c2b384b2a Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sat, 15 Jun 2024 14:35:05 -0700
Subject: [PATCH 527/568] Fix speech bubble occlusion being checked from the
 player's position instead of the eye's (#29012)

---
 .../UserInterface/Systems/Chat/ChatUIController.cs           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 334ba6087380..904b922baa0b 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -16,9 +16,8 @@
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
-using Content.Shared.Decals;
 using Content.Shared.Damage.ForceSay;
-using Content.Shared.Examine;
+using Content.Shared.Decals;
 using Content.Shared.Input;
 using Content.Shared.Radio;
 using Robust.Client.GameObjects;
@@ -626,7 +625,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
-            ? _transform?.GetMapCoordinates(player.Value) ?? MapCoordinates.Nullspace
+            ? _eye.CurrentEye.Position
             : MapCoordinates.Nullspace;
 
         var occluded = player != null && _examine.IsOccluded(player.Value);

From a2affe3d000c2476259ba5ef7f525bbf7de12ec9 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 528/568] =?UTF-8?q?=20add=20=F0=9F=91=B7=20JobCondition=20?=
 =?UTF-8?q?system=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:
---
 .../ReagentEffectConditions/JobCondition.cs   | 49 +++++++++++++++++++
 .../ContentLocalizationManager.cs             | 16 +++++-
 .../en-US/guidebook/chemistry/conditions.ftl  |  3 ++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs

diff --git a/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs b/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs
new file mode 100644
index 000000000000..0ede69004927
--- /dev/null
+++ b/Content.Server/Chemistry/ReagentEffectConditions/JobCondition.cs
@@ -0,0 +1,49 @@
+using System.Linq;
+using Content.Shared.Chemistry.Reagent;
+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.Chemistry.ReagentEffectConditions
+{    
+    public sealed partial class JobCondition : ReagentEffectCondition
+    {
+        [DataField(required: true)] public List<ProtoId<JobPrototype>> Job;
+                
+        public override bool Condition(ReagentEffectArgs args)
+        {   
+            args.EntityManager.TryGetComponent<MindContainerComponent>(args.SolutionEntity, 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.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs
index 7d40182f6cc8..ad8890ae0fdb 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 6cbfc13a7974..95aaf9126d7e 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 6d6da1267a666cc155b2682260939d7198ef252d Mon Sep 17 00:00:00 2001
From: FunTust <49007663+FunTust@users.noreply.github.com>
Date: Sun, 16 Jun 2024 00:42:13 +0300
Subject: [PATCH 529/568] ToggleVisualLayers hair disappeared fix (#28949)

* Update ClothingSystem.cs

* did it in a better way

* Update ClothingSystem.cs
---
 .../Clothing/EntitySystems/ClothingSystem.cs  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index e8bfb789613e..1e2825a49a5b 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -92,26 +92,29 @@ private void ToggleVisualLayers(EntityUid equipee, HashSet<HumanoidVisualLayers>
             InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee);
 
             bool shouldLayerShow = true;
-            while (enumerator.NextItem(out EntityUid item))
+            while (enumerator.NextItem(out EntityUid item, out SlotDefinition? slot))
             {
                 if (TryComp(item, out HideLayerClothingComponent? comp))
                 {
                     if (comp.Slots.Contains(layer))
                     {
-                        //Checks for mask toggling. TODO: Make a generic system for this
-                        if (comp.HideOnToggle && TryComp(item, out MaskComponent? mask) && TryComp(item, out ClothingComponent? clothing))
+                        if (TryComp(item, out ClothingComponent? clothing) && clothing.Slots == slot.SlotFlags)
                         {
-                            if (clothing.EquippedPrefix != mask.EquippedPrefix)
+                            //Checks for mask toggling. TODO: Make a generic system for this
+                            if (comp.HideOnToggle && TryComp(item, out MaskComponent? mask))
+                            {
+                                if (clothing.EquippedPrefix != mask.EquippedPrefix)
+                                {
+                                    shouldLayerShow = false;
+                                    break;
+                                }
+                            }
+                            else
                             {
                                 shouldLayerShow = false;
                                 break;
                             }
                         }
-                        else
-                        {
-                            shouldLayerShow = false;
-                            break;
-                        }
                     }
                 }
             }

From 2a710ee4f69c7b86d9a5e2c7a8699ab4ab6aa27a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 21:43:19 +0000
Subject: [PATCH 530/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5ccd6cc516c3..dba15544fdc2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Mephisto72
-  changes:
-  - message: Ion Storms are now more likely to alter a Borg's laws.
-    type: Tweak
-  id: 6252
-  time: '2024-03-30T00:01:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26539
 - author: arimah
   changes:
   - message: Holoparasites, holoclowns and other guardians correctly transfer damage
@@ -3859,3 +3852,10 @@
   id: 6751
   time: '2024-06-15T21:32:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29056
+- author: FunTust
+  changes:
+  - message: Fixed hair disappearing when hats are tucked away in a pocket.
+    type: Fix
+  id: 6752
+  time: '2024-06-15T21:42:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28949

From 280b0a1c249e329a0f9a311cb04651ac5ec3bfb5 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Sat, 15 Jun 2024 17:38:28 -0500
Subject: [PATCH 531/568] Adds New Shoes to Sec loadouts (#29018)

* Adds New Shoes to Sec loadouts

* Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
---
 .../Prototypes/Catalog/Fills/Items/misc.yml   | 34 +++++++++++++++----
 .../VendingMachines/Inventories/secdrobe.yml  |  4 +--
 .../Clothing/Shoes/base_clothingshoes.yml     | 10 ++++++
 .../Entities/Clothing/Shoes/boots.yml         |  2 +-
 .../Jobs/Security/security_officer.yml        | 11 +++++-
 .../Prototypes/Loadouts/loadout_groups.yml    |  1 +
 6 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
index 543cd604a2fb..816f3ba8d49b 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
@@ -1,12 +1,32 @@
 - type: entity
   id: ClothingShoesBootsCombatFilled
-  parent: ClothingShoesBootsCombat
-  suffix: Filled
-  components:
-  - type: ContainerFill
-    containers:
-      item:
-      - CombatKnife
+  parent:
+  - ClothingShoesBootsCombat
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsJackFilled
+  parent:
+  - ClothingShoesBootsJack
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsWinterSecFilled
+  parent:
+  - ClothingShoesBootsWinterSec
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesBootsCowboyBlackFilled
+  parent:
+  - ClothingShoesBootsCowboyBlack
+  - ClothingShoesBootsSecFilled
+
+- type: entity
+  id: ClothingShoesHighheelBootsFilled
+  parent:
+  - ClothingShoesHighheelBoots
+  - ClothingShoesBootsSecFilled
 
 - type: entity
   id: ClothingShoesBootsMercFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index c4d937b8412f..5b733f0d3549 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -19,9 +19,7 @@
     ClothingOuterWinterSec: 2
     ClothingOuterArmorBasic: 2
     ClothingNeckScarfStripedRed: 3
-    ClothingOuterArmorBasicSlim: 2 
+    ClothingOuterArmorBasicSlim: 2
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
-    ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index a0f56966bb59..d096ee3ff177 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -52,6 +52,16 @@
           - Knife
           - Sidearm
 
+- type: entity
+  abstract: true
+  id: ClothingShoesBootsSecFilled
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - CombatKnife
+
 - type: entity
   abstract: true
   parent: ClothingShoesBaseButcherable
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index af32fa581841..33f5d36e3664 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -143,7 +143,7 @@
     sprite: Clothing/Shoes/Boots/winterbootssci.rsi
 
 - type: entity
-  parent: ClothingShoesBaseWinterBoots
+  parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase]
   id: ClothingShoesBootsWinterSec
   name: security winter boots
   components:
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 321cc46feb56..dfce25809f83 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -187,6 +187,15 @@
   equipment:
     shoes: ClothingShoesBootsCombatFilled
 
+- type: loadout
+  id: JackBoots
+  equipment: JackBoots
+
+- type: startingGear
+  id: JackBoots
+  equipment:
+    shoes: ClothingShoesBootsJackFilled
+
 - type: loadout
   id: SecurityWinterBoots
   equipment: SecurityWinterBoots
@@ -194,7 +203,7 @@
 - type: startingGear
   id: SecurityWinterBoots
   equipment:
-    shoes: ClothingShoesBootsWinterSec
+    shoes: ClothingShoesBootsWinterSecFilled
 
 # PDA
 - type: loadout
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index cf9866faaedd..0fab367fc90e 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -882,6 +882,7 @@
   name: loadout-group-security-shoes
   loadouts:
   - CombatBoots
+  - JackBoots
   - SecurityWinterBoots
 
 - type: loadoutGroup

From 904f15fed7bad9cf35afc8464f4f26be92867d04 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 15 Jun 2024 22:39:34 +0000
Subject: [PATCH 532/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index dba15544fdc2..0a127c4684ed 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: arimah
-  changes:
-  - message: Holoparasites, holoclowns and other guardians correctly transfer damage
-      to their hosts again.
-    type: Fix
-  id: 6253
-  time: '2024-03-30T01:25:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26541
 - author: Boaz1111
   changes:
   - message: Added an industrial reagent grinder to the basic hydroponics research.
@@ -3859,3 +3851,12 @@
   id: 6752
   time: '2024-06-15T21:42:13.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28949
+- author: Cojoke-dot
+  changes:
+  - message: You can now find Jackboots in the security load-outs
+    type: Add
+  - message: The Sec drobe no longer has a Cowboy hat or boots
+    type: Remove
+  id: 6753
+  time: '2024-06-15T22:38:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29018

From c063347ed697c1441812766e9008cd031dadc8f5 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 19:24:15 -0400
Subject: [PATCH 533/568] fix meteor announcement color (#29058)

---
 Content.Server/StationEvents/Events/MeteorSwarmSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
index e085a2e159e1..6a67930c4d24 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
@@ -29,7 +29,7 @@ protected override void Added(EntityUid uid, MeteorSwarmComponent component, Gam
         component.WaveCounter = component.Waves.Next(RobustRandom);
 
         if (component.Announcement is { } locId)
-            _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Yellow);
+            _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Gold);
         _audio.PlayGlobal(component.AnnouncementSound, Filter.Broadcast(), true);
     }
 

From 97761e49cabe4da259459ea90c400e3b2aeb0bbc Mon Sep 17 00:00:00 2001
From: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Date: Sat, 15 Jun 2024 20:24:29 -0400
Subject: [PATCH 534/568] Change "they're" to "their" in the lungs cargo
 bounty: Fixes #29051 (#29064)

change they're to their
---
 Resources/Locale/en-US/cargo/bounties.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl
index b332517c70d2..09424e49097f 100644
--- a/Resources/Locale/en-US/cargo/bounties.ftl
+++ b/Resources/Locale/en-US/cargo/bounties.ftl
@@ -89,7 +89,7 @@ bounty-description-instrument = The hottest new band in the galaxy, Cindy Kate a
 bounty-description-knife = One of our top commanders recently won a brand new set of knives on an official Nanotrasen gameshow. Unforunately, we don't have a set on hand. Send us a bunch of sharp things so we can throw something together,
 bounty-description-lemon = Dr Jones's kid is starting up a lemonade stand. Small issue: lemons don't get shipped to this sector. Fix that for a nice reward.
 bounty-description-lime = After a heavy drinking session, Admiral Pastich developed a strong addiction to fresh lime wedges. Send us some limes so we can prepare him his new favorite snack.
-bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, they're lungs aren't fighting so hard anymore. Send them some new ones.
+bounty-description-lung = The pro-smoking league has been fighting to keep cigarettes on our stations for millennia. Unfortunately, their lungs aren't fighting so hard anymore. Send them some new ones.
 bounty-description-monkey-cube = Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes.
 bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike.
 bounty-description-pancake = Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen.

From ddd7008bfe146967fdf01ec58df29051f96f6c2c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 15 Jun 2024 20:25:34 -0400
Subject: [PATCH 535/568] Update Credits (#29065)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
---
 Resources/Credits/GitHub.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index f240c9524751..15d75d4487aa 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, whateverusername0, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem

From 17aa1f98a1f779eecb3c4f8b9198ca3e1935f604 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 16 Jun 2024 00:25:34 +0000
Subject: [PATCH 536/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0a127c4684ed..b5522bd050db 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Boaz1111
-  changes:
-  - message: Added an industrial reagent grinder to the basic hydroponics research.
-      It grinds things into reagents like a recycler.
-    type: Add
-  id: 6254
-  time: '2024-03-30T02:46:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25020
 - author: SonicHDC
   changes:
   - message: Added unzipping for lab coats!
@@ -3860,3 +3852,10 @@
   id: 6753
   time: '2024-06-15T22:38:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29018
+- author: Keer-Sar
+  changes:
+  - message: Fixed a spelling error in the cargo bounty for lungs.
+    type: Fix
+  id: 6754
+  time: '2024-06-16T00:24:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29064

From e633fe801bb4755aa6015612b432571b687ce6ca Mon Sep 17 00:00:00 2001
From: Partmedia <kevinz5000@gmail.com>
Date: Sat, 15 Jun 2024 17:06:54 -0800
Subject: [PATCH 537/568] Widen power monitoring widget (#29062)

---
 Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index 1427df051534..74752ddc5343 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -482,7 +482,7 @@ public PowerMonitoringButton()
         {
             HorizontalAlignment = HAlignment.Right,
             Align = Label.AlignMode.Right,
-            SetWidth = 72f,
+            SetWidth = 80f,
             Margin = new Thickness(10, 0, 0, 0),
             ClipText = true,
         };

From c2f88b2e17981bfa5f11ffc9807b61e7197a6a8f Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 21:10:21 -0400
Subject: [PATCH 538/568] fix exclusive borg module bug (#29038)

---
 Content.Server/Silicons/Borgs/BorgSystem.Modules.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index f372f7df1a50..8f43635ccc86 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -281,15 +281,13 @@ public bool CanInsertModule(EntityUid uid, EntityUid module, BorgChassisComponen
                 if (!TryComp<ItemBorgModuleComponent>(containedModuleUid, out var containedItemModuleComp))
                     continue;
 
-                for (int i = 0; i < itemModuleComp.Items.Count; i++)
+                if (containedItemModuleComp.Items.All(itemModuleComp.Items.Contains) &&
+                    containedItemModuleComp.Items.Count == itemModuleComp.Items.Count)
                 {
-                    if (itemModuleComp.Items[i] != containedItemModuleComp.Items[i])
-                        continue;
+                    if (user != null)
+                        Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value);
+                    return false;
                 }
-
-                if (user != null)
-                    Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value);
-                return false;
             }
         }
 

From 2fde5ac580c63637004c7fe24cb6fa64ba5c9830 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Sat, 15 Jun 2024 20:25:51 -0500
Subject: [PATCH 539/568] Cleans up ClothingShoesBootsMagSyndie in magboots.yml
 (#28653)

* Remove Explosive Component from ClothingShoesBootsMagSyndie

* Makes BaseJetpack a parent of ClothingShoesBootsMagSyndie

* fix boots in hand looking like jetpack bug

* make syndicate magboots child of magboots
---
 .../Entities/Clothing/Shoes/magboots.yml      | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index e80ed74305c6..d934a8b97e13 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -81,7 +81,7 @@
     price: 3000
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: [ClothingShoesBootsMag, BaseJetpack]
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
   description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters.
@@ -106,27 +106,9 @@
       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: Item
+    sprite: null
+    size: Normal
 
 - type: entity
   id: ActionBaseToggleMagboots

From dfe9d5264c9d2aa706b97e3dcfb4ad1eb7c5aa14 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 21:32:01 -0400
Subject: [PATCH 540/568] Slightly speed up borgsystem module check (#29070)

---
 Content.Server/Silicons/Borgs/BorgSystem.Modules.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index 8f43635ccc86..746d75f0d856 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -281,8 +281,8 @@ public bool CanInsertModule(EntityUid uid, EntityUid module, BorgChassisComponen
                 if (!TryComp<ItemBorgModuleComponent>(containedModuleUid, out var containedItemModuleComp))
                     continue;
 
-                if (containedItemModuleComp.Items.All(itemModuleComp.Items.Contains) &&
-                    containedItemModuleComp.Items.Count == itemModuleComp.Items.Count)
+                if (containedItemModuleComp.Items.Count == itemModuleComp.Items.Count &&
+                    containedItemModuleComp.Items.All(itemModuleComp.Items.Contains))
                 {
                     if (user != null)
                         Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value);

From 65af00afc4fec803288f819ca4cdc45d2193adf3 Mon Sep 17 00:00:00 2001
From: Keer-Sar <144283718+Keer-Sar@users.noreply.github.com>
Date: Sat, 15 Jun 2024 22:06:12 -0400
Subject: [PATCH 541/568] Fixes capitalization mistake when non-humanoids
 insert things into machines: Fixes #28997 (#29071)

add CAPITALIZE()
---
 Resources/Locale/en-US/machine/machine.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/machine/machine.ftl b/Resources/Locale/en-US/machine/machine.ftl
index ce8873df6f87..13d9e76b9d25 100644
--- a/Resources/Locale/en-US/machine/machine.ftl
+++ b/Resources/Locale/en-US/machine/machine.ftl
@@ -1,4 +1,4 @@
-machine-insert-item = {THE($user)} inserted {THE($item)} into {THE($machine)}.
+machine-insert-item = {CAPITALIZE(THE($user))} inserted {THE($item)} into {THE($machine)}.
 
 machine-upgrade-examinable-verb-text = Upgrades
 machine-upgrade-examinable-verb-message = Examine the machine upgrades.

From a341c3a1e93545af8e63b0802e2ef68a406117eb Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 16 Jun 2024 02:07:18 +0000
Subject: [PATCH 542/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b5522bd050db..fca8bcdaad2e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SonicHDC
-  changes:
-  - message: Added unzipping for lab coats!
-    type: Add
-  id: 6255
-  time: '2024-03-30T03:31:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26494
 - author: Zealith-Gamer
   changes:
   - message: Items being pulled no longer spin when being thrown.
@@ -3859,3 +3852,11 @@
   id: 6754
   time: '2024-06-16T00:24:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29064
+- author: Keer-Sar
+  changes:
+  - message: Non-humanoids' names are now capitalized when inserting materials into
+      machines.
+    type: Fix
+  id: 6755
+  time: '2024-06-16T02:06:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29071

From 3644602fb830004428464eb35b80cc71520838d2 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 15 Jun 2024 23:38:17 -0400
Subject: [PATCH 543/568] Fix magboots not needing a grid to work (#29034)

* Fix magboots not needing a grid to work

* ok fix it for realsies
---
 Content.Shared/Clothing/MagbootsComponent.cs  |  6 ++++
 .../Clothing/SharedMagbootsSystem.cs          |  5 +++
 Content.Shared/Gravity/SharedGravitySystem.cs | 32 ++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Clothing/MagbootsComponent.cs b/Content.Shared/Clothing/MagbootsComponent.cs
index 0d074ff38b69..b3fb607a38be 100644
--- a/Content.Shared/Clothing/MagbootsComponent.cs
+++ b/Content.Shared/Clothing/MagbootsComponent.cs
@@ -20,4 +20,10 @@ public sealed partial class MagbootsComponent : Component
 
     [DataField]
     public ProtoId<AlertPrototype> MagbootsAlert = "Magboots";
+
+    /// <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;
 }
diff --git a/Content.Shared/Clothing/SharedMagbootsSystem.cs b/Content.Shared/Clothing/SharedMagbootsSystem.cs
index bb3b05074f2f..68145936152e 100644
--- a/Content.Shared/Clothing/SharedMagbootsSystem.cs
+++ b/Content.Shared/Clothing/SharedMagbootsSystem.cs
@@ -17,6 +17,7 @@ public sealed class SharedMagbootsSystem : EntitySystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly ClothingSpeedModifierSystem _clothingSpeedModifier = default!;
     [Dependency] private readonly ClothingSystem _clothing = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly SharedActionsSystem _sharedActions = default!;
     [Dependency] private readonly SharedActionsSystem _actionContainer = default!;
@@ -147,6 +148,10 @@ private void OnIsWeightless(Entity<MagbootsComponent> ent, ref InventoryRelayedE
         if (!ent.Comp.On)
             return;
 
+        // do not cancel weightlessness if the person is in off-grid.
+        if (ent.Comp.RequiresGrid && !_gravity.EntityOnGravitySupportingGridOrMap(ent.Owner))
+            return;
+
         args.Args.IsWeightless = false;
         args.Args.Handled = true;
     }
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index 42a6d5d1f802..2f532d0f1d34 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.cs
@@ -17,6 +17,8 @@ public abstract partial class SharedGravitySystem : EntitySystem
         [ValidatePrototypeId<AlertPrototype>]
         public const string WeightlessAlert = "Weightless";
 
+        private EntityQuery<GravityComponent> _gravityQuery;
+
         public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, TransformComponent? xform = null)
         {
             Resolve(uid, ref body, false);
@@ -36,15 +38,35 @@ public bool IsWeightless(EntityUid uid, PhysicsComponent? body = null, Transform
                 return true;
 
             // If grid / map has gravity
-            if (TryComp<GravityComponent>(xform.GridUid, out var gravity) && gravity.Enabled ||
-                 TryComp<GravityComponent>(xform.MapUid, out var mapGravity) && mapGravity.Enabled)
-            {
+            if (EntityGridOrMapHaveGravity((uid, xform)))
                 return false;
-            }
 
             return true;
         }
 
+        /// <summary>
+        /// Checks if a given entity is currently standing on a grid or map that supports having gravity at all.
+        /// </summary>
+        public bool EntityOnGravitySupportingGridOrMap(Entity<TransformComponent?> entity)
+        {
+            entity.Comp ??= Transform(entity);
+
+            return _gravityQuery.HasComp(entity.Comp.GridUid) ||
+                   _gravityQuery.HasComp(entity.Comp.MapUid);
+        }
+
+
+        /// <summary>
+        /// Checks if a given entity is currently standing on a grid or map that has gravity of some kind.
+        /// </summary>
+        public bool EntityGridOrMapHaveGravity(Entity<TransformComponent?> entity)
+        {
+            entity.Comp ??= Transform(entity);
+
+            return _gravityQuery.TryComp(entity.Comp.GridUid, out var gravity) && gravity.Enabled ||
+                   _gravityQuery.TryComp(entity.Comp.MapUid, out var mapGravity) && mapGravity.Enabled;
+        }
+
         public override void Initialize()
         {
             base.Initialize();
@@ -54,6 +76,8 @@ public override void Initialize()
             SubscribeLocalEvent<GravityChangedEvent>(OnGravityChange);
             SubscribeLocalEvent<GravityComponent, ComponentGetState>(OnGetState);
             SubscribeLocalEvent<GravityComponent, ComponentHandleState>(OnHandleState);
+
+            _gravityQuery = GetEntityQuery<GravityComponent>();
         }
 
         public override void Update(float frameTime)

From 732576b518e0baf156868e7241a6f79cd518e009 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 16 Jun 2024 03:39:23 +0000
Subject: [PATCH 544/568] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fca8bcdaad2e..8ceaead43554 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Zealith-Gamer
-  changes:
-  - message: Items being pulled no longer spin when being thrown.
-    type: Fix
-  id: 6256
-  time: '2024-03-30T03:35:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26504
 - author: Plykiya
   changes:
   - message: Hyposprays can now be toggled to draw from solution containers like jugs
@@ -3860,3 +3853,10 @@
   id: 6755
   time: '2024-06-16T02:06:12.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/29071
+- author: EmoGarbage404
+  changes:
+  - message: Magboots no longer work when off-grid.
+    type: Fix
+  id: 6756
+  time: '2024-06-16T03:38:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/29034

From 9348a5cea609f6ccb5045341bd83422a20cc0e8c Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 16 Jun 2024 06:43:22 -0400
Subject: [PATCH 545/568] Apc & Substation resprite (#28998)

* substation

* apcs

* top pixels

* new screens
---
 .../Power/APC/ApcVisualizerComponent.cs       |   2 +-
 .../Entities/Structures/Power/apc.yml         |  15 +-
 .../Entities/Structures/Power/substation.yml  |  11 +-
 .../Structures/Power/apc.rsi/base.png         | Bin 370 -> 676 bytes
 .../Structures/Power/apc.rsi/broken.png       | Bin 673 -> 1061 bytes
 .../Power/apc.rsi/channel0-auto_off.png       | Bin 154 -> 0 bytes
 .../Power/apc.rsi/channel0-auto_on.png        | Bin 156 -> 0 bytes
 .../Power/apc.rsi/channel0-manual_off.png     | Bin 157 -> 0 bytes
 .../Power/apc.rsi/channel0-manual_on.png      | Bin 158 -> 0 bytes
 .../Power/apc.rsi/channel1-auto_off.png       | Bin 154 -> 0 bytes
 .../Power/apc.rsi/channel1-auto_on.png        | Bin 156 -> 0 bytes
 .../Power/apc.rsi/channel1-manual_off.png     | Bin 157 -> 0 bytes
 .../Power/apc.rsi/channel1-manual_on.png      | Bin 158 -> 0 bytes
 .../Power/apc.rsi/channel2-auto_off.png       | Bin 154 -> 0 bytes
 .../Power/apc.rsi/channel2-auto_on.png        | Bin 156 -> 0 bytes
 .../Power/apc.rsi/channel2-manual_off.png     | Bin 157 -> 0 bytes
 .../Power/apc.rsi/channel2-manual_on.png      | Bin 158 -> 0 bytes
 .../Power/apc.rsi/display-charging.png        | Bin 434 -> 809 bytes
 .../Structures/Power/apc.rsi/display-full.png | Bin 275 -> 381 bytes
 .../Structures/Power/apc.rsi/display-lack.png | Bin 282 -> 557 bytes
 .../Power/apc.rsi/display-remote.png          | Bin 337 -> 510 bytes
 .../Structures/Power/apc.rsi/emag-unlit.png   | Bin 387 -> 436 bytes
 .../Structures/Power/apc.rsi/frame.png        | Bin 436 -> 610 bytes
 .../Structures/Power/apc.rsi/lock0-locked.png | Bin 155 -> 131 bytes
 .../Power/apc.rsi/lock0-unlocked.png          | Bin 158 -> 0 bytes
 .../Structures/Power/apc.rsi/lock1-locked.png | Bin 154 -> 131 bytes
 .../Power/apc.rsi/lock1-unlocked.png          | Bin 158 -> 0 bytes
 .../Structures/Power/apc.rsi/meta.json        | 166 ++++++++++++------
 .../Structures/Power/apc.rsi/panel.png        | Bin 142 -> 162 bytes
 .../Structures/Power/apc.rsi/static.png       | Bin 384 -> 452 bytes
 .../Power/substation.rsi/charging.png         | Bin 1105 -> 197 bytes
 .../Structures/Power/substation.rsi/dead.png  | Bin 1110 -> 162 bytes
 .../Structures/Power/substation.rsi/full.png  | Bin 1108 -> 124 bytes
 .../Structures/Power/substation.rsi/meta.json |  65 +++++--
 .../Power/substation.rsi/screen.png           | Bin 1652 -> 182 bytes
 .../Power/substation.rsi/screen_wall.png      | Bin 0 -> 330 bytes
 .../Power/substation.rsi/substation.png       | Bin 2291 -> 657 bytes
 .../substation.rsi/substation_static.png      | Bin 2444 -> 650 bytes
 .../Power/substation.rsi/substation_wall.png  | Bin 1364 -> 588 bytes
 .../substation.rsi/substation_wall_static.png | Bin 1504 -> 339 bytes
 40 files changed, 186 insertions(+), 73 deletions(-)
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
 delete mode 100644 Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
 create mode 100644 Resources/Textures/Structures/Power/substation.rsi/screen_wall.png

diff --git a/Content.Client/Power/APC/ApcVisualizerComponent.cs b/Content.Client/Power/APC/ApcVisualizerComponent.cs
index 87cb70019f50..e356a8017728 100644
--- a/Content.Client/Power/APC/ApcVisualizerComponent.cs
+++ b/Content.Client/Power/APC/ApcVisualizerComponent.cs
@@ -87,7 +87,7 @@ public sealed partial class ApcVisualsComponent : Component
     /// </summary>
     [DataField("screenColors")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#2e8ad1"), Color.FromHex("#3db83b"), Color.FromHex("#ffac1c")};
+    public Color[] ScreenColors = new Color[(byte)ApcChargeState.NumStates]{Color.FromHex("#d1332e"), Color.FromHex("#dcdc28"), Color.FromHex("#82ff4c"), Color.FromHex("#ffac1c")};
 
     /// <summary>
     /// The sprite state of the unlit overlay used for the APC screen when the APC has been emagged.
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 71e450649544..1621ac858cdf 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -35,21 +35,26 @@
     - state: display-charging
       shader: unshaded
       map: ["enum.ApcVisualLayers.ChargeState"]
-    - state: lock0-unlocked
+    - state: lock0-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.InterfaceLock"]
-    - state: lock1-unlocked
+      visible: false
+    - state: lock1-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.PanelLock"]
-    - state: channel0-auto_on
+      visible: false
+    - state: lock1-locked #when these are implemented get actual sprites.
       shader: unshaded
       map: ["enum.ApcVisualLayers.Equipment"]
-    - state: channel1-auto_on
+      visible: false
+    - state: lock1-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.Lighting"]
-    - state: channel2-auto_on
+      visible: false
+    - state: lock1-locked
       shader: unshaded
       map: ["enum.ApcVisualLayers.Environment"]
+      visible: false
   - type: Appearance
   - type: ApcVisuals
   - type: Battery
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 347b18ecaee9..692f027386b8 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -23,8 +23,8 @@
   - type: ExaminableBattery
   - type: PointLight
     radius: 1.5
-    energy: 1.6
-    color: "#3db83b"
+    energy: 1
+    color: "#ff6900"
     castShadows: false
   - type: NodeContainer
     examinable: true
@@ -126,10 +126,11 @@
       path: /Audio/Ambience/Objects/buzzing.ogg
   - type: PointLight
     radius: 1.5
-    energy: 1.6
-    color: "#3db83b"
+    energy: 1
+    color: "#ff6900"
     netsync: false
     castShadows: false
+    offset: 0, -0.2
   - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
@@ -151,7 +152,7 @@
     sprite: Structures/Power/substation.rsi
     layers:
     - state: substation_wall
-    - state: screen
+    - state: screen_wall
       shader: unshaded
   - type: Battery
     maxCharge: 2000000
diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png
index 2b42c54935a53e44d836c54983a944700b94b17d..68b83101d21fc74be03e53fcb4682cefeba232d7 100644
GIT binary patch
literal 676
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V2bl}aSW-L
z^LCbD_8|v}ws`M@sz*KZ!rVK%7k`tt_$r^GSyK8!{>3}{j>XjnbssFbuvFws*o6yA
z1*|;t3pWKX-D0})$)~$tUwrpzteJCi`tAySe}-rE!JBItBY*6xUy(G&qR;={^GZ>B
zhm$Erj=S%+J+J&=^FC$n6rmumobAzHs%#k!RP8-hVRKIA|9Nu;2CKP!MY$rb0_IF-
z%M;3^pI)=R$iN`r^yJ!-OfH6uea!jivmVcT88aobN#Q`&Rws!zjwXh$Re!JVI?esS
ztI#Jsje&uu-I<52`OhJD2K}sLD^uoar<VrZZI*u|cin5NpJ{^GY|X2-t;&0rl>@oD
zjeqObhfM!k{!=zx>ch{r^-}6m8*b)s<+d!Daw^$+qv*S`-5Fb>)L&0hv7Gn6%4Ys~
zMvFb7eUEpjwOI7HDS!E0Ya-PvZ@T*~A4A`B@$RD^E3D=!`CdNLKIbNbaH31AiszK`
z&#%_0e?C-m-#$dptwc(p<w6xll<@=MQwEdV@A1A^^oMT&m-05vEy7DUfYcX#2SK--
z;0(5a7Qx#hSq!cc8+{k5g2WczVOV95B)ya^piS`hlXonPw+xbIpOH*Z>bc>T$q5#;
zlYM1y$bjcC2=$0^y}!INXQD25=qcWy+FfpcJ@4dCnYK7&+lei$mo^;+(o0$|{d4O$
zB{p+Yz^(i20XLO`#k{K7AoOlVpn@r_m*SWpbQZ%@U8Br}Ugixz_1glLZa)-yTPa#>
z)d!vhn_Rc)guGOBNbUBCUJ-Py?UdNY)+C9xM2TZ6@_ygWM2RYL+yo{&22WQ%mvv4F
FO#t9gD2)IB

literal 370
zcmV-&0ge8NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SBuPX;RCt_YVHjXA>VQ!Pj5=V{0R$ajXyg8$QcKPs*~v(@13<vu
z#Ed~%S%xgj=dE0aSDv5)zP^0}rfX`-2wIkym<M*~-MddP^pouX5P0<LC79;m;J~To
z$B!Ribsz^^x^xsQ_VD3D24*$^${hd$+S=N1Hpp;v2f%=yo;94_wsRZx9DvPYY=CAV
zK#b)eK(i3|^5qLr>Zl$9a#G@88abZvsiR2<w6t^)R0GR?q?8#%Ie?HaC;<c=aO?V6
zMo@9AC?yXMVr&2u@1P)u(V#Nn{<DX8i(#T100VE{;4jfY2~I#n1x^!EPm%*b#pzdu
zHw-VH<IaYl9CGFISvXBBAj$!tXdp)2%a<=vXsS7YmSEHYqYfB#z<@gd0KzzhBLLa@
QjQ{`u07*qoM6N<$g5Uv@b^rhX

diff --git a/Resources/Textures/Structures/Power/apc.rsi/broken.png b/Resources/Textures/Structures/Power/apc.rsi/broken.png
index 092694c371fa9c18fdb01aab86fb6eb7912b4520..bb54b4bdc7dc14ced556ef1191947ba42336fa2a 100644
GIT binary patch
literal 1061
zcmV+=1ls$FP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&-$_J4RCt{2n!igUX&A>pImgTpJfq?=K|%y;)0~Q=xWaDW4i;`(!AiU9x3s+G
z{(%cyq&O=r7F@70g@`K}@8G%=6HXHF<%*!0hy%i0k(*f;*U99^JCp3qr^%biJ8$0i
z$@9+hJo&y5^ZzCh^#uIL=kpGLrfJ@_hlhu*_s!4Gdu_|IxVX4@ah=LQGYo;<-CeTT
zEU8qAR4N5PCX;#A&$28m%i`qZ1VvG3x7%2j#o^(h@AxBcfa&RJ*4Nj)_vv){S)be6
zTd#d^aKM}2-|(shZ;fA>oSgI>f8-6|QYaKKP4kPNX_|(rs$5@R1MsQ^|5U-=u)B`?
z%}{44kw&9|VHhkeEq!)fRaF2sHa38c$9(@S`~=L*%+PE$ea9Ue1K74rxm@P#><q&&
z0K8w_Fbt~IDgbwPcTfTT23^;?jypC6fQ}Jzxg4cZ$y@x^))v)jl}4ihbUff={vGex
zq19?JJ3H$;=13br)3nYn$|qNMjo|M0QmKS#n%MTI{r<<hANljIp8=SgoAdpSkv4#f
z`{aMR-wTBTxm*ri*HKmVvuA^4S=`^>v$wbBZI_oA=_rs)CJ{maolxh7yHct2tgq`4
zuE#W+P1@}?M@L7#-!ak#a48mxsH#dPlVN#z*}HyobK|wArlzng3)3{I*X!7}&Gz;-
z#bVKS?2%4|*VfjYWHQO(;-Z)RO-xLnC<>2{k6yoey-qfpMNt%LwHgZx3jmy-p964u
zdivrzN7?`Yx~@Ay2y|WNgAn}iUuYBJHE_lL{#z=Q3M(rsq|<4RkB`0f=H@0s2;VjO
zZh<h0k)XKG0{0cJfbXbOD%5H<uiw*l5PT<=&*z<C6eHzwxo-pLy6ymc5Q1NTlPAfI
z5U<ho_rCWJ<N+YR80p571vvYVKnR>moW$x5aMg8z-3S~7WECSpS-AvOJMF|O3HWU&
z;|5NIWECSp=`4Eq1U7)IVkByMN`++<BT?gPfG~=Ys0ri&GK-O@@r?pu6eCd+C=ALh
zMxw?yw1iQNL`~O;$u35sCU7Pws~CxzKpp_{ijlG55*)YfT;jlv1FMeTJzo`_MaRU%
z#KgqJ#Ke3x^qi;5Qj4Neq54vXWgT6UeI)Kn^ko29YEcv_)IjG0WT{1As!#(Rk&&eq
zg{eXfWB^%eQJ5;!z=xz{sYPL_P(2$!mRb~*3e~p<$Wn{KR-t;10<zSis8p!F!=Nm+
zC~Os~=TumhS`?KE)z^Ravecp|RH%V6L0M{1m?~7?9st8vi^ficlBE`njS3}8Es9mB
fn3$NDm~i+PH1XVyuIG`M00000NkvXXu0mjfa=Qk1

literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<TQ%OWYRCt{2md|U`U>L{0rLs#~sT$c2)KFF}Qawn-)3z!e^s>VW
zBJ;M3NB;wF!-GeK9d_Aqh|=R&D?2!UAa21eTBL&#qLNvNPD~5E)jZF5LqwOPztls&
zP@X*R`;zbHee&jM4&fhb05AX;01N;E0WM5jYjtb#_C+z$F#sud@lwa;&o<xq&IbZC
zzFHiYmL3F}&CT7x`1lD_tDiZi>y_e4cL1c1W{snwC@7c9?sztv<(#6bs=SU&mzNiL
zJ|2%FI+W}lK#0up`8+C>3g?Dlu!$FnG&_46=57UvcmkUn8@&UdosxMblR>FeI&ht+
zz{v10wl(d*1K2hI?UZ&*l4Y4I@F!6PY}<rgw+X=ao^1h$@{5vFUMLiPTj#AnkU{}m
znN+Y=e8lE-*n}u=Hk)pKYHZ&ycR9zA&VZwq-(v_}f%*CS9A{>3{xa^(#p^dYan&7r
z{%XtjzM%jfE-a#73Iy2sphl=2r^aM#t82L4u<`ix4McXH@H`#L>FHb0w3kSwQqXms
z<DMObZW_LAI23@8W$kywsly4Z9-VTWSKT>kK=ejP$0d$QDebNgQYZjw#|>Dx7X|J{
zld!+7BkAdI@87AY*X!8QsvIc~t55*+7|xtkTI)Y-#L{VecgAAJBo~fUtJNaTPh9sF
z0K#zZ6JIB-*G@&8_k2`FVl;*?y9PQ{TaD=Hk&_r1im|DXBuRe<fJ#j}_8L>;p}$-4
zIQj}e=fDZAbLSP;ST`jx-hTiuL@$gx0`NfeO#lB^aliEw>ZkBE<j&{#00000NkvXX
Hu0mjfFswER

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
deleted file mode 100644
index ba84b7d6db5e4c2ee15f5dcf63d39039410deb60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCpzq
z;uumf=k3LfoD2#)tQR@@9vMX*biI4fZf>Yp;2j6))`IJQz8yUO$r7lTfk8mnAmsVI
rJhiK~w(L``O_CA&%mfw(5)HG(PMzQs*>mIBR*;aVtDnm{r-UW|8(uC3

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
deleted file mode 100644
index 6cce72f795f187e080345f39b4b5a6e9535b9b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCp<u
z;uumf=k3LVybJ;YtQYUPxSK37a?NO-%qHT%>%t!6k@D=*di|ena_m6W3=IERZag`D
sD{fYZ{8uZ5-3vC|oG%U*2N82j7=6_^m7e&ye*kekUHx3vIVCg!0K)?-FaQ7m

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
deleted file mode 100644
index 61ae057d5085bb2a6c165614501c52abdf490ffe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCqC$
z;uumf=k3LfybJ;&t{3$;wx5fz3if=nXjAh!hI+OnW+|ba+biFC&YOCi5vZP_!Jg6f
t=f-UzQzu-FVc&71C+FL9R**OtsQbQ|#POi8Amks2>*?y}vd$@?2>`gKFL(d|

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
deleted file mode 100644
index 6cc48bd1a558767f688af4a78c0bf534ee09ea7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>Y@B
z;uumf=k3KnUIqaP*N6AjIyIbDC^ZXkaVR&;%sgcBp!Mvz%AM=)mu<D-1FC0W_`_MS
uuy^a$l9Lx#y>58YJL&AdJz#MV@n8w(H+hbuTrIOQKwM8(KbLh*2~7YMBQbOU

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
deleted file mode 100644
index b31bed6c6ba591c8660a9e211dd27d4db3d469b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCpzq
z;uumf=k3LfoD2#)tQR@@9vMX*biI4fZf>Yp;2j6))`IJQz8yUO$r7j-2o%&3R-D^=
q*Jo9A6`#ghRZE>`tPlx?hS_3jTAU(@U(S?*L_A&nT-G@yGywn(LoBNR

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
deleted file mode 100644
index 959a05cde084609af24c0ab328d3801f3c99a511..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCp<u
z;uumf=k3LVybJ;YtQYUPxSK37a?NO-%qHT%>%t!6k@D=*di|ena_m6WK=6li!^!@w
rdrel_y()Dmb4=ZAuMd%6V3=dVI4hP@=|aSUwICr+S3j3^P6<r_l$R=j

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
deleted file mode 100644
index 3bb505ecb86d8e7b7e5515cf74eae2fbb9eede3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCqC$
z;uumf=k3LfybJ;&t{3$;wx5fz3if=nXjAh!hI+OnW+|ba+biFC&YOCi5vU#r>Y1uO
tCFicxQe3^0uVAC(%{S+{ArcG>>b^BG91k>gZ-b0x@O1TaS?83{1OQgvEN=h+

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
deleted file mode 100644
index bd8b013310c1d9c9f962be5514144a43fa8e4d49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>Y@B
z;uumf=k3KnUIqaP*N6AjIyIbDC^ZXkaVR&;%sgcBp!Mvz%AM=)mu<D-1F8ptAHolu
uq_eYMPFfs#o$;i!>g>Ojj1U=y2TM2?%5xl*wb88viFmsDxvX<aXaWF!NiA3a

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
deleted file mode 100644
index 0cca86022087f85b6d5703bd6288e4b8b2f2e170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCpzq
z;uumf=k3LfoD2#)tQR@@9vMX*biI4fZf>Yp;2j6))`IJQz8yUO$r7j-1RQ)01kA18
pJu~F{7ny)4@1lq^+z^R|*<y{goFX^aH<*J2JYD@<);T3K0RSz(Er|dC

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
deleted file mode 100644
index 56802dc04378d4ea522fb7ae54763c4849681673..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCp<u
z;uumf=k3LVybJ;YtQYUPxSK37a?NO-%qHT%>%t!6k@D=*di|ena_m6WAn-#tVX}O7
qb!JfQmDde#nogzF$3Y|*=9n-(pTeoMUew?rNW|0C&t;ucLK6UwsVd|E

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
deleted file mode 100644
index 5ac134cb54b5c3e8c1e8e04cc5059eb8eb7e741e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCqC$
z;uumf=k3LfybJ;&t{3$;wx5fz3if=nXjAh!hI+OnW+|ba+biFC&YOCi5vU#n{;_;{
sa{N|Ms8d+6?1LoZO*iL@LnIi~eR<S49{djb69p3RboFyt=akR{0EzrAC;$Ke

diff --git a/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png b/Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
deleted file mode 100644
index 5ebec4feeeb3039f1943eb6d534a4cd324eb508c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>Y@B
z;uumf=k3KnUIqaP*N6AjIyIbDC^ZXkaVR&;%sgcBp!Mvz%AM=)mu<D-1F8ps59$Y6
t&8}U$r0TwU9rGk}FSFmDnIJL`mT>yWa~%D0H}Momz|+;wWt~$(69A*fFO2{I

diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-charging.png b/Resources/Textures/Structures/Power/apc.rsi/display-charging.png
index 67e3b3df19b80ff3a55403d46b12617316b41bcb..0f26ba31bd31de4d7dcedb7a37e94fbac440a1a3 100644
GIT binary patch
literal 809
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58aUX1<dd!2K@yC`LGDfr>(0r%WME)=?CIhd
zQZeW4UE82f4h#(suP&S<U9;8o+yTa-#a~|T3=BFf85B|79AWr4TtPx0Imtup@Mn`h
z9eXa$J>b`MR{&%<3TXHtw`*U)?!Vvn#n`nzEh_v}Gc8o{{Cwxw{jFDDZT<ZF>(ce>
z>;L|H^nCi8TJiYxll$HMYj5v;@%s3?d^3H;7J*A9otMskuKj;ukK6v^><6yb*M0u>
z+2Pni`Tg-Czr$v!1^zl4)>9Yx?)~zYHOKyc+|IrwPW||c8})zIe(7FhHIK#cS7g{+
zo*!5KZsIvU`GMT=`o6#Cj2m{{+v?Z&s_Oge<`=i}XEXU;%&%iU@?!qw>+-kcYXm<C
z^p^^{#K+hFu|xKYz)aPHU%tNIk?(0x`?s&wyUFxSs;A1|cR<$L_t8Q+XVN{F*y(Vl
zd2ZPGRhRSHVxYReAl9<=>-mw*!N!jHWbkDA_S^OEPd^Qg&=XfbpB^dt>5t`=uh9`}
z<Je8VeEoX-wf?QTACuoddR_YI<BQA_w_m@$UsJ!il2fr|!ZOb(b@Sf;Zcn@a?*M<p
z`u~5Py?x%;<7{8IU*p?a6W>K&X0Mg_yXnq-|I7O=|Mg$DS@6}$((U-a$N5X+MXr8S
z>9}}))2oyN%im2;wV229-Qr*UUi%ETfa|-jX$Hi;Z`)J5yzaJ0MpxZuX$80cbN1EE
z|ED3&$p0}y+!5ri_srNl1QvU)mnUt~UVHxQ*RS<ug~b=5Z<NQz+o$c%y?k5qSMKb4
zahw02Wq0^f`~2(UZ~W2omS+kry`OXRg?V}Hyw5-E%PKF%-}zp%V$q5|b;q8%X`$-O
zcBT7u4u4eHas1={>Hm&OI>f$@TJ8}1ruv>4>#Rlh|FCsjv|qm7-fjPN*8|Qq?|#n%
hhEcIRit~1;{%7RxoaJMay;lh&;pyt<vd$@?2>^s+d%^$!

literal 434
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?!3HFsniTOdFfdknx;TbZ%z1m;(2Lno;^@cx
zqu0W8g#rZfAF!?weUqa9fKg}77Ne;h>?c^ovTa+^IhvZX^Yb?vx$2l@rImepd-&=9
z)sxOnGM_wsf@T^I&|C(F1@^8vmtMTs6j|o~*P^p-e~97FeE#csKOaBVp8j+F@q0UV
zmS$A{w%)(*pH21FTWTwRUQGIATY1)gSHsTV-FM#~e}4JayK`=3Ri7VO{ZxFeE-v8o
zzv^9X#?Nd`^Z7mVC#_o_b%OK$jvIxQPq!bRFnRtT?u!3EVs?~mxM;b5@;8ZJ=eA#y
zDEbu1>iQ{)btiAc!pv!PZtJ>~{yz5k#ed*cV1oo}2RX!z1!c!9^GzPtG<>RYIPkN9
z@maB*!<_jc4ma52r#*G5*imPF`<#@=^gll(ru=ja4W0XWbC_dd{~!P7tiP6=JAYJ5
kV_wNWaQHAVeCVHfQ{38T<EP??2NobPPgg&ebxsLQ01Gk1#{d8T

diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-full.png b/Resources/Textures/Structures/Power/apc.rsi/display-full.png
index 1739853e2b74824c2cd5ce82178aa05284d89b17..9b1e28db26d9ab8853db0f0d307df28ddcb94d78 100644
GIT binary patch
delta 367
zcmbQt^p|OZczpv08v_Hw?#BEqAjMc5<nF|<?wrg^Aluy2#WAE}&f8mtd50VXSTCq{
zIZaY)U+Clh_VSX&3qLRxNv)fpXXzs)ec3{kV~T5Ja-??ty~!Fm>wjER2t4D%0W^={
zkAC-+=KTBX|9(o8oF_NG-ZuNY?+d=ziu#`(|Mo2`dfr~|yZhbYbc@<o`*!WPx8-%+
zrVpH-Cu@g&zdE1s_R+je@d>N`{8nt=9>2T$byeuxcUM<uWqeE6_-ErJ?hEf`XFT{A
zw>#f${~6t%&(G%<POsWvT@voxSML;jYA!zmLx70x#*nBa7zDWo1dL6xR%(8K74`0q
zQrPnhx6tJ+S9dyQ7hP<ax&B<QmILSN;*;4$hC9Qr7d>YNYcNp1crx?d&T62BXa80%
z3e`z`H~-bEikf%D|3fY^O)>cHFM5~%gl+kGkfjbU>li{-AJ&OCeCQ0)?dj_0vd$@?
F2>@!9sZ0O>

delta 260
zcmV+f0sH>_0+Rxe7k?lK1^@s6qMd$(0002mNkl<ZXo2m}K??yv7zW@^iG!SIIr;-G
z;_gVUPW}QvhqIfLtCpLq$YuY4LNRed8yA|gThg}k&9oHnbDEi^dFOix00000;6KGw
zr?%SVd)S?Qcdq;%SFTeD%@@4|J3p>^F_}-3RWAgG+beE1OMO)N$^}SA=isjsR*IUX
zDh-!Yx`~TcI9C+;tO8oK#@m_v#9%x!7|Sf*w0u?p-k`F5dJg|dLHTm;ZqCsckSS(g
z_LJ?*KNp%GFwOVQT+KI?3%Kr1wC+2aG3LIV4*&oF0000#gNPn&21IoY-A3mC0000<
KMNUMnLSTZ}9CMKX

diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png
index c4c103eeb9637ba3dd9fa8325d5cfc68a16a8bb1..e360f9c6bb03889b661d04fb010294d449fd8beb 100644
GIT binary patch
literal 557
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zpL@DEhE&XX
zd&e;Aj)Mr>gXs?%93*O5WYVR>6+;W&E9c4wv4-c>%#l${U}4sLbf_ZmNu<%e$jT*m
z->(*PdojH%y|wFm91GA`FetFHn<Dq)^{-#=ub$7pc-L-ERJBZ-L{QiH@86F;uU?&5
zcPp=Ke)RL@Z`JDR{~A`;-7hV?`F;JT?05eceL1l2^|y6<W3J4ZHYa{lUC$r?`}<wG
zexyHkb%{y)H)W~aG`S!9^()`WJO2Cp^SJ+mk8Tzw`zx4z4o9E3`$y>0{ohf?`u|5A
zm3~ktQPw}F_I2^BXa4J#rUGrer&_O*YrZ@CMV>t0IsH0zpnLv3)7y1s@w2C@DSns#
ze6(Ls`fvX1-IMp%LwphD;dw*w)6^DC&S0T3J=MsypQpB@+HF4<E+po4XiCf63ePE%
z44^)SQ?ph`Wv7+g`Q?6Gw7=tI<fj+guKiSfef-3FS=sN)G!uipCFhpC`)RuP@hY<e
zCVN;HKb|LRWwkDgSweREzl(*T?-|^VOUkmtjRP{aOn57M{rmoZ`~C;rymvtL``zv5
z^ds%v>T>Vbugod`5cKQbdE5QV-tWJ1?^{9b|JUz+>rcJQ@ay08``_cWe)BDOAAjE-
bV%&x@f6mDT`gvbNjX?sQu6{1-oD!M<o<aet

literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0002tNkl<ZXo2n0
zuMUDx6bA5vgHa4NXk<sX`v%$#CacM)L7#v(Akgs*>;@Vm)1VnF3^p7%gG|T$=iK!B
zmAgCc&UfzN5&!@I0Kk9JSZ}?xth(>aKFgTv@!HvTZ~h_Ax$||_gJaXAiR-@oevV__
zY%ZV5XCA<V;W$tGdNHT!dLdeEgc=aZZ!)zYRFcm<fUdTYG?gvGtej2B2*Ue%JW1yd
zlytRTDk;N~qYp>zUvJiC2(tOyFQ9xiZO<2OfQ#o-)$K<zpLqaDQBV>^3T`3h+xY+h
g00000@H2?$1|ncVj%3iX=>Px#07*qoM6N<$f-?Ji%>V!Z

diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png
index be343a987b0cc7cde7d68596c08969209dccc843..089eb9345e78d51c68b75681f40f1d1ebb87f34d 100644
GIT binary patch
literal 510
zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgAGXbBqvD&DaPU;cPEB*=VV?2**iR4978JR
zyuIt_ci2FHH6Yw6hFR}|?00*|$il`VUbDnTt;k%Cjgu>UKHXauDE_z5<ZPD7WFeq2
zP;lTK?_mR;>GS*V+nJyJuUx%jN$%&l^^-r(PrHAhhk4$;XaD0gfBrsGueERT^XbRm
z@3ZT!Uv^9Pe~s_U$EJGr<y-#zxv76fU;n`8uOD}RKl`uZ^3UzBSNxf+{OtMnjSBns
zFnm7Mf5G|RU+D#<b$M$PqMzx9#5L%~f8YCTd(GpXr_ZDAdw==N4s}aJ>$H;R*C*-M
zm;a3Vl>NEb{q*%o_2sokru}$Pqx-WFC>Xw2b-!A?w;jy&$aKkpS4_|2tNyuuj{UyN
z%As!epHGq(ldB?RCrrA^JMrh#)za5A55$GBKe_H6Ggn}4{Kj30bD7>GmO7Q}yUH61
zlzVaUukDlQyU1pO*aa-l?pfBa{@l+ec=PZb%b)+1>#HmR`HP<i8GY9`+F$hUe#~Xo
z8>jE={PU}$`1_*I+Ry%-HH~esJ#)AFocZ_s;LEHMw%^yb*A)MUncNV$kMYOCfK56+
Qf|4LHPgg&ebxsLQ0H*We{Qv*}

literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq003YB002M)0{{R37aDIp0000IP)t-sz`(%&
znE?OH0RPe-|NsBMz`zEdNW}mE00DGTPE!Ct=GbNc004P<R9JLGWpiV4X>fFDZ*Bkp
zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY
zR3K9+u^>6$Sl3vIi!&v&s2C_>$i<mfl$e_eVw(a*Q*#n4LBa+)Mi9uQtl;YB0=5hQ
zrf?p;Z^w2t0001JNkl<ZNQv#0!41GL2m={`GD1cuogmHrGqvA96y#?s-_J@c3m#a6
zkPXL+0$QxKrhpc6Kc^3V2R*-wjnNg*i-e%Bn1IdzZ;22>J`a59%3GQY)wNEBst*<k
jecL$6fX=`^Aiv}R1o0G`!(t==00000NkvXXu0mjfLfVDE

diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
index 2713c5506a26dd8ce21e650e66dac594f0164c6f..140ae850be75c670e691701c33df11db87fc403c 100644
GIT binary patch
delta 423
zcmZo>-oiXVyuN{hje&t-cVm7QkYX$ja(7}_cTVOdke%o0;uumf=j|<9FXli2h6jQn
z0!&ISZ+OBO{TIe&aqB;n-P3yQn%K&>k2EjcIASC*#lb;9F|5nJbKi7dkFvk})NbBA
zkkeLq_KXYAWQKs4^*3eWW#9Bq|0}0?Ex7(hM(O`Q&fn|J+p`4)x9guTG?x*pT<`R;
zSVdhyDQSIN_vXvX<-hB%D_>+UQ5z$lo9CM2e&lh@<Ox#t?qN(yO1I|T<t&fiAEUd7
zsp!%36J7_ZzulgD*TS;y$EP=ciXK1yy+}*Jw65=o@#T!t<JDhpU3vcZV8$}z9dCX_
ziW<DOoIQQ%vG=C4AJ?Cs4|Lr9%uX0QJ9FBNO^>rX89|N)g8Im-S9iWqU3q@h2CHxl
zM!~1?bG7F*bQG;WC+g>LGyFN%+O469rRxe<Bj$3iE(U8kV83xy@&6EE_vFwSzn9Ol
zlGgcs$NuX2!xxRt{|)x_b-4Nb-%7Q4i?z-Gc?xS8ivJsYXJ=qovBrGjcl!$|T$y?x
OQ#@V$T-G@yGywo@zrMEs

delta 373
zcmdnO+{`>dyk3EWje&t-(cHQg1_nkiPZ!6KjK*XM*2M`TJxzfITy6(7K%5jNx1?I#
zEQ^o!il*z&Jr&HATj_8nL&))W{QUFkH|xZbM2k9i8+CMlcrc~@=QHjZdOB;8Ey`bN
zHNS1$`#;!KRpLqhodsSC1hVZ{HoRbHXneEbyF^lOIOn4J53VjQ66<!i82e2SN`Ik#
zI&#WQe=Y?}hHG!dk1G9QZ~gx4taJre!i)SxS=$tj)dewlGBR-2PEc-=iC=u;s&8`Z
z=FF)~9b4y%I0P{$==?lT@X#uc8zxl3P*c5gHb>~Jgh^tW4HmyW*<IKfG(+bsUTb(&
z)~n}lPfy-YmD%1~mjC;&9>Lq(xN90G*Z*f*ja96>Vh)_}sLD%Tv`x9}@9$6dPv7l!
zbiY2MF*>5<*0EsO09%H%{dEUFytwII;AjC0C0LLtu=4QmFg!kzZFMp3pa(E`89ZJ6
KT-G@yGywn&NS)*W

diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png
index 7d3529f63f585d058a609a523196e357fe83a8d1..4f8ba4d56effeee7f96e45ec924337bb6f6d9b2b 100644
GIT binary patch
literal 610
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V3P54aSW-L
z^LCbD-XRA8*ZM^z5sU6f1uN}V{C<LUMKOcl#IC+(g^Q7oSPHp<ldpU4y|RR}gX!Aq
z*nalopS8T@)*hd~apuQ(2MII%JDfK>COx@x%<A{we-CT-Z7pQ<3R^Au$ihv;wPVqX
z#5sm+$0VktcAEGyGPnjN?2L)JUSGw?kYF{}>UdgYn~Cqjt!~p&w|?9!z`*dxVqLH1
z=}jMZ?G-#A(R}&kmk)n3Og=?@ziPhle-p=nxeVreE7=+To!{AekE6gwZf^3{Yv(rZ
z6?jl!VUpFN$0Xt!xVub0>fz0twv#EJ4A!k$_4?=S$8XEH58UIj-^#$SV2V}t+K;>s
zWakHDF|V~>aD|OwL)`j_&n=&QwmkOOux$6;uN5039I|uwy1!PwaMa+@DRG7e&)4s%
zUza-Xx#g-=yN=zJ+nwO6<2k8V`mjd_gV)Lh@`@{%^aA*lORwB@&^Y&>DdaGR`8lQl
zUgbMH`$WYUcL+aN7N~va`tv(&n;AfIeoR2ccdnE*F}yW6<eQsx1*HBx!>Ys<>E&D;
zI}dCQZ&2W90wJC$$7-#nMjv_VRJrqTNc8m;+mGBmd|PgLQTML0g-zes19rN`?h0^Z
zg3!(1SzQ?3vFzZyr{elltn{f9E2jgHe(6-n4Wi#VRc=3&yW2HJZ_0J^YOU=Zhg-R-
qphnyi6(|afW(`=Q4Ys(TKVG!?@I}9CHM+n=!{F)a=d#Wzp$P!LVGZ2?

literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Zb?KzR9J=Wl)p;?VHn3hMT3Z87eQc$6>kJC9+A{gkW)dUOARgl18p^gThb5&
z{t^8XIXTqO5P^#j9C2a?!j(uCZZ?F6zs@^Pp@#RfJP$n2`#fKshxY-AL?ZcPrrZ)X
zb`M(PHhI3kbL=zYrNCZd3n5hh3XW1OU9XVKUG@oa74Y?L0if$851nQaLM4+q?~A0<
zrvqPjnn2mC5{(2Y6bb++ibAbc>++MyBxSRT5GsK{U|<d30y<F?rOWpE0HILGbG>Ol
z%_qr70tRt)@&-VC|Iyd`kynsP9ov2)c*Di*5-Vp-!uf6Ld;`#EG$tz`8d(HB(KM~=
zH|QLqX+XX+51P%ULk*t-0ECFS=ID9_fNb{KG1iOgC0vhfj(rJVN>7e`Tm``IIbMw{
zJB|^cSbQKJ-?44ktnz9aL(edbuma1nhQ<xUU~XZ}wr=@tJWasM8tNYv!t<(a+YB4O
eL?V&=3w{6_wQnF&fYZtV0000<MNUMnLSTa2bhM`c

diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
index 45562de8a662c387f05d1685b25ed63dc88b5c01..20f2e17d94c50daa37bd596d91b0b51f3f10bf19 100644
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&~5ZLn`LH
zz3IpcRK@Ig=fVApmW-lLJZ1!5$lol;z;GZ<e{)?vP$gfH8;}G7z1gc=wM2k28`%D+
Va%_!Xu>CDa*wfX|Wt~$(69A9_B_03(

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pn<20V@QPi+hYp_85DRJHp<=JXtl2|_CQIa
w+=(N9*cll9Y<h09Rd?~PoYZTK7X%9#zlE?onH%=<08lT3r>mdKI;Vst0Nr^n-2eap

diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
deleted file mode 100644
index f6377a36b127b33b6209ce3c8704f33b2c08f5d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+hZFA83Y6v4$AAU^q4v;pd~_B
z<$i<W9p86M3=DNE7r(uut@=CX>rD0oy&cRiBUv8jg_@oLYG?3t^>bP0l+XkK6U{F8

diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
index f92c04aac46374de8c4d906075a9c0e424b7c63c..3dfeb215d2ff01d79fb46bf242d484906ca36ce3 100644
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&~5ZLn`LH
zz3IpcRK@Ig=fVApmW-lLoMr@G$lol;z;J*~e{)?vP$gfH8;}G7z1gc=wM2k26WF%3
Va%^2SnQI?N*wfX|Wt~$(6999eBoqJu

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!puVSzV@QPi+hYp_85DRJHp<=JXtl2|_CQHP
v*Qq0a*cljnc31DeH7!)O*yuIGi;f@XeOR8P^-Em>YGv?r^>bP0l+XkKsT40S

diff --git a/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png b/Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
deleted file mode 100644
index 44f9af733faa8274b9eed4cb3bd2add8b2d10d28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ps}ZmV@QPi+hc};3<^998|9`2w0QX_G)W3?
y2ytLPmhzLIf#Jv6^@YXWQQu}8m&-AT3i2O{WO=+I&R{!GJA<dIpUXO@geCxuG%G6r

diff --git a/Resources/Textures/Structures/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json
index 82f78ccb875d..66df303df946 100644
--- a/Resources/Textures/Structures/Power/apc.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/apc.rsi/meta.json
@@ -1,88 +1,106 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and heavily modified by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "base"
+      "name": "base",
+      "directions": 4
     },
 	{
       "name": "static"
     },
     {
-      "name": "broken"
+      "name": "broken",
+      "directions": 4
     },
     {
-      "name": "frame"
+      "name": "frame",
+      "directions": 4
     },
     {
-      "name": "panel"
+      "name": "panel",
+      "directions": 4
     },
     {
-      "name": "lock0-unlocked"
+      "name": "lock0-locked",
+      "directions": 4
     },
     {
-      "name": "lock0-locked"
-    },
-    {
-      "name": "lock1-unlocked"
-    },
-    {
-      "name": "lock1-locked"
-    },
-    {
-      "name": "channel0-auto_off"
-    },
-    {
-      "name": "channel0-manual_off"
-    },
-    {
-      "name": "channel0-auto_on"
-    },
-    {
-      "name": "channel0-manual_on"
-    },
-    {
-      "name": "channel1-auto_off"
-    },
-    {
-      "name": "channel1-manual_off"
-    },
-    {
-      "name": "channel1-auto_on"
-    },
-    {
-      "name": "channel1-manual_on"
-    },
-    {
-      "name": "channel2-auto_off"
-    },
-    {
-      "name": "channel2-manual_off"
-    },
-    {
-      "name": "channel2-auto_on"
-    },
-    {
-      "name": "channel2-manual_on"
+      "name": "lock1-locked",
+      "directions": 4
     },
     {
       "name": "display-lack",
+      "directions": 4,
       "delays": [
         [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
           1,
-          2
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
         ]
       ]
     },
     {
       "name": "display-charging",
+      "directions": 4,
       "delays": [
         [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ],
+        [
+          0.1,
+          0.1,
           0.1,
           0.1,
           0.1,
@@ -94,7 +112,20 @@
     },
     {
       "name": "display-full",
+      "directions": 4,
       "delays": [
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
         [
           1,
           1
@@ -103,7 +134,29 @@
     },
     {
       "name": "display-remote",
+      "directions": 4,
       "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
         [
           0.1,
           0.1,
@@ -115,7 +168,20 @@
     },
     {
       "name": "emag-unlit",
+      "directions": 4,
       "delays": [
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
         [
           0.5,
           0.5
diff --git a/Resources/Textures/Structures/Power/apc.rsi/panel.png b/Resources/Textures/Structures/Power/apc.rsi/panel.png
index 97f8471f29e30df700fcd88f2e89db8ebb290d77..9e64b70a503745fe9a4001e5a9249cdf822f3f6a 100644
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Vmw_OLn`LH
zy}6sW!GVW4Ab+B(M62YCX>*+#TaGXscmE#u_{vKib)d=*p?lTm=ER1E&-*S@<!cpb
zwf&3<KLbO<bPeTG96)&n27}Fk*%$M}Rs?2G6y;)gz{xIO>Jln7pS=_$>FMg{vd$@?
F2>|c6G7A6z

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJP)`@fkcie~3D(64B0Wuk23&3j
zH6&P-<qReXF`PPe>c8#2y0nP3Ql}17Wb;P!w70iEe0O)Z%FJe-86H;?jvqgLKs$wf
mn?#E{NEgtE02T=e35F}-TufZmLFPaU7(8A5T-G@yGywocj4ZkU

diff --git a/Resources/Textures/Structures/Power/apc.rsi/static.png b/Resources/Textures/Structures/Power/apc.rsi/static.png
index 43089d0d81144d506157dafe4d56335d3d60f0a3..7275cfc9feb5182fb6fd1c14eaf65a667ea4a70f 100644
GIT binary patch
delta 427
zcmV;c0aX5g1H=Q6BYyw^b5ch_0Itp)=>Px$en~_@R9J=Wl|5_1P!xtAp{SJ<C&{di
zAubt9m(E%GGwhh5;L^dxEu))`{RM7;Y(hIoA)!k_gJb9<Ui@0@Pz-+5<Z6X3d8d2N
zd2`Nllbd@XRjO2}{#lv0q^|4hOEmF)|7f49q=#+Wrc$Y(D1Qoyq8#-JArL|^8jYyc
zY5;hihh<r@^%DUAs@1BD4FJb+Q0pqCDZD&6iGC>n9>HqelFR0}&KC~S^TmwiYKh(G
z15ld6*QXq?8~~8Z=4gGm(Y$GxJP&%&yrJDk<GUN#swV(k=L<9qb0@Yxk2C<r7X|=!
zR=fe&#I|8x^?wfG_>KA{0p^R@uPfff=8IVrd+(TliRXEj16Zz>0I{2JqqyJoJb*UX
z?Y>;a2kGAO0K?(%q=QHZAq^mP6l<DBxm-T#3xXiZZ;yMupACBUQSAGEMpf0dX_^>@
zL9tjo@JuEXfGF>}ZZz(8yM$pFyGW@|5CnmAKFPbUSR^_CRaO6VBPP9pRH;&>`Ub7&
ViNA_R8r=W@002ovPDHLkV1k@l%Zva3

delta 358
zcmV-s0h#{91AqgNBYy!$Nkl<ZSi@sr7zLwX6pVra28@Ih7}~i1r__@3M|R@0hlLme
z>`lxVl$B-3vV7jkb$I0oI^gTuHw+963=GXTW)rk5iq(@rSy_hR?%gLC`Y8&5N6%g|
zu<P<Nh<PgDRP$>41BOSJUot2w%P<^{fjHpp<u?p$I~gc<0Dla;y^Qb;n;17kh>-)s
znsWyje!cpNqRw^+EV^VEwlO@To&%yhyfMT=j2sx2?bwPUMzaurS;QvB4YwQ{pjikA
z>x!W8cRoD{7k~BS3++NcPD-5N$cu9fkLO<|sE%eKP^*zjPz@~mky2(5<$!HFw+&oT
z3@eTmrR3p3j9(2Lj(NghyF>;~KYI3(;r_FSc#C0@qTtON{3Y6}?GG3pJ!6H_gw&H1
z0&1GZ1S_PE@18L53(3G~7`S!)EF;4x7zLwX6bxnn00FUl$Y5zb(*OVf07*qoM6N<$
Ef-a$)!T<mO

diff --git a/Resources/Textures/Structures/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png
index 538dc2b7a84725b3e452fb9a460b24e371e07177..7675535164c696445d22a30336b8736b6b4b9958 100644
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a_T)@978f1
z-(E4~YB3OSd$_!UD^a`u!L;g{Zjrde*&K0)byF0dig1cm#+$ZG_-Q<$LB(?t2$iN(
zSUDWo`uW%O!?PDZySb2Y3y;7XTXFC7vpmTL4r!{)J7wImk3JRF=JYraV|-ZT=9jw-
sZ`V!tUwf@k_jmb!mR<i@R99x(f7DPr?YK+$B+w}gp00i_>zopr0K*kYegFUf

literal 1105
zcmZ`&J8aWH7<Pd`6H#D6DpiGyc?^j79P<#doS?LB8zWLhNsv+&;@Fqeienq!MKK*1
z5Dd&PRoxI0Q&kou2DT1NNFY`O10Z!_fq?-D?(8&iqU5A|`1kkykMHh(Qe0h`Nz5e}
zhM7_GN{Q?&ozsWOiZ(WWlWhu>Ru-7;_w#$?;~1=}jY5IBNY2w_(($qUl&o<#zlI24
zi_WPd&&r<}=Adg<s<>LXCFxF^*9@l)dB5!jEZLXHu??}t`fbZblAqxMghbBN3^+D`
z;8upK7K-em<3aWsFYp4FO|UF0dqzVlDa$=N`O0wX7`qYx-ENofUgjOI2~z2F8VDi~
z#Uw!_(R~|he$qx~Lnr%w6o_=sbg}8!EcL6^oes`$91YYTVV;KGkK=YcD~Mv~09vpO
zZHz#QPl0hfY&HfN+NdW75eCpdgeHuosV>&95T%xUl25NblBgcUMc4ol01yS?dQuRR
zVjA@8Bk9YAE@2Z}Fc7X^PoQAV!oyaIrxI8uRaUYzyP4tqqyZaR$HH6|b?OLfR4EyR
zxM6;19d;{&F&W6TZfUIqkz;kJzij%d9EdSw99%(2sE#8<jiZF(x`Q3^qC8VqZ45ov
zBd;rnC-%ZkMvVFz#J+8tIJ@s)#2jHoZb!;_xa)YWN^lcV87G2zjzUQzZ!~OxKz`Bz
z*@O)G-IPt-d@~;-Eml*NT%{V<YqPQEXN0)}6PDS<ue<kt{CoHF&a16oH}Xdx<t!t;
zxwBV~fBJrD_Yd=pjXl0wdvW~qPD)W8G|w%6dAa%F1bg8SbL#KOx8?J#*R-A0rB!8n
Hq4w}UEmlj8

diff --git a/Resources/Textures/Structures/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png
index 9fbff744ca74ec82634e041fb8fa3282c7f97b12..27440c1c7704fb77a945727db1d5c5adaf4244aa 100644
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a$-DP978f1
z-(KFxdBA{&^`dc#;Q0xE%|Ebd8g*S#S#T^iM|>YUQ)8Dt3zO$06%e{)cj^^u71OKh
z;yae>Ur=CL<ap*B-wI26`N#S0`2~BodY!XpfA)iE(vn`=sA5sRR}(uI0_|b&boFyt
I=akR{0BGqq#sB~S

literal 1110
zcmZ`&PiWIn7|)cstuPT!b?lJEgD5mFjelxG8tB%!MeHbDh4y6A<aG;6lbH8P;w}Rb
zMG!A~Dmy8H7sqbm#fuj~5a&fa2t)ATT~Kd(FX`H}v=82&eEI#p?|Z-ZeUD3PE3=8Y
z1j8`1>T01(c9zcRQ)ETk+keP5fyyh3%--ku-{j*otg6jok-0?9(`3@|b^RGxXWZ2q
zB7j{wC#IgS|6rJtu34$#YVnq&J1t%_oCf5BmK(C<KqAK$#2Op4EE`EdjtdbIIa4#>
z*bsuZa$L1oVwW5bve$Tl7dR!svaIYGO{rYC(WR5G9Jh(FD*@p9KJQ=V9d84qv)L>V
zL?DVOf=HozHr9fajm}3-j{OuM(mm6~rem|zuhwwdILC1`P;W$e8hS5|+xDz5ilGB&
z!4|YJ0%<-CM)9!O>}P1Bt{g-dK>rY$Fp{RaSieG)S`J7)-TRS5^)N2N28aQGC<xb6
zf|wGspm#r#zHI0cHn9am;d=K870g?B&`R-C0?VYzN|t7C<hUSZz^2x=FsGn)17VFS
zC4&ez$d9apZe=hc1DW1is+A#ftTy$hWUtDh7z4)s6GVjSC_>ygOek$S*dZ0=nYwCY
z=(!%Lt}ve14L2S!?5iL9wryhN*ujuF#)`d;l=rajcw3e5CE_xU1$7-olE!K@YJgCF
z(g8|B2EA@l5;xz?Pm&gcY9U{#&gk{z<jVzN?!=fSxpbJ!{M|A9H_iILo!v)MPx6+L
z?d)g1d^r31Q*HnMVWz`={3gnB{oul#_re2GV=peA`}Oo8^L>F~#Dg=Pw|9TOqCKrH
LuNC$d>-UcUeh*F)

diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png
index d179742669917dc41f20ab033580a2627040ed23..d0b9726cacf1f8b56586214f2694b0c88393ffb7 100644
GIT binary patch
delta 81
zcmV-X0IvVk2z-z+OEyVFK~z|U?ai?b03Zwl!7tc<s+3uQS<DI)DM0$GUp7dRBuV-~
nnj|DmrnlEkv<s-|Ye|nd+q(+;$2_|d00000NkvXXu0mjfN^~IL

literal 1108
zcmZ`&O=#0l9M3G%tuQZwjIu)-PYTUTQzs^*k=AT$#g5W-(B76MuUlA}guGXp?chNV
zQxGrHn>WFmgB|r$Jb0T2J&Ww%LC=C9xcXkw^^5kw`^Z1P-~Z$H-v3#7eQhD0h%*ec
zP%LN_va@u~T_!6!IQUJr8B|%zGsmBoev*%?uvTo8O3W>Co+FcvFB?Z>o%afLL;$bp
zoVoIH;~T@oJgZv6wbDb`aGShty4#QsnqJ6K0+}3}5bJEvv>hY|SuRA#<V?+gV?zku
z%W}0+nZ57&kiEkTyuhh(mSq*+Y{(UDwMQpkS#B3&PX?gfZu9L7@A^9+ElCm(L?DVO
zf=Ho#2kSw~K{p~N7k)H|4Bzsw<vJ|&t8cq4oaHzgs6V1SO`{*jYx#B<#WVo4VG}wS
zfi#~6lX%!_3^H_3PYxmspnnKWm`E#n*tkuUS_w!#z4}O^Mi>`i6AS@>C<u2`f|wE|
z(65iAub766Eo{S3xPCpMf;k(HS}C4NU|UpK+18z%EEl9q*w9-x=2X<$Mp&mxDImg)
z@+0f0TLnzWK%sTZ^$J9;-J<?fX;}%y7%>j6AR^Qz5r&Q9gz~P7UGk!Q%P2Y+`kqf-
zR~S$1g`18T_ce&U=~!63a4=>bVh!Dnobz$p_4lgbO$^I871VPSNjmgKqXr1&Cmo>1
z70~Y{HU8lJ(ky8)qp0PowRvM}arRA8NL-q-bdsH?r;pyQo^`vwzJL6&_;3F_lQ?<u
z>ipiHqqFWO;7Ru1o7ZFY!bws~bn?&T4~I<pMPf5!=NYE;?wTGuJ^V^Ly125g9p|?m
F{|Df0Pmllr

diff --git a/Resources/Textures/Structures/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json
index 0125458641c7..d19066274d15 100644
--- a/Resources/Textures/Structures/Power/substation.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/substation.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser.",
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -13,8 +13,39 @@
 	{
 	  "name": "substation_static"
 	},
-    {		
-      "name": "substation_wall"
+    {
+      "name": "substation_wall",
+      "directions": 4
+    },
+    {
+      "name": "screen_wall",
+      "directions": 4,
+      "delays": [
+        [
+          5.0,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          5.0,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          5.0,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          5.0,
+          0.5,
+          0.5,
+          0.5
+        ]
+      ]
     },
 	{
 	  "name": "substation_wall_static"
@@ -23,21 +54,31 @@
       "name": "full"
     },
     {
-      "name": "charging"
+      "name": "charging",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
-      "name": "dead"
+      "name": "dead",
+      "delays": [
+        [
+          0.3,
+          0.1
+        ]
+      ]
     },
     {
       "name": "screen",
       "delays": [
         [
-          0.15,
-          0.15,
-          0.15,
-          0.15,
-          0.15,
-          0.15
+          5.0,
+          0.5,
+          0.5,
+          0.5
         ]
       ]
     }
diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png
index 60c922c53f622e8de11faeb00b4aa198b0404c04..24420ec31ca2d5dd80bb669b47d3d8e334345aa8 100644
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW&!DaPU;cPEB*=VV?2IR&0Bjv*Cu
z-d?%O*`Of87SLUmG5OA7$J>j|GP|m{6xS>_xKJGTXXlA_C36;_au8Tx7MoWrb@*dh
z#_i9~_bKg<`S&3t;<-t`chvExt6!9VI{oA|L+|tN{;jW%-#s4or}lo(`*qAG*uh%!
Y)H&8$t@*seG#|wEboFyt=akR{0GeS&g8%>k

literal 1652
zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQjEnx?oJHr&dIz4a`;jsJkxxA
z8MJ_G4j=}BOTm+YBxiv~WHAGS#w-wK6t_~`#K6Ful^GII65;D(m7Jfemza{Dl&V*e
zTL9K&Q(*;U=BAb;Dpcg=<P}?0*eZclSOM7}VSOb9u#%E&Tcrr!00rm#qErPlJp(-h
zB|9z!1qGX;lr*a#7dNPOAkS7Qqokz3N?*Ucyj-u`STDaQUEk2s(o)~RNZ-gv7pOwF
zxH7LKu|hYmSQ%mn%p8~0;^d;tf|AVqJOz-siAnjTCALaRAdBDt;?9(0xIG1>MLA$w
zQj+ykb5e6t^Gb^K4fPE5vFR(xOhdRZuNWE}z<|*Q$pEz(VAbYXP?Br{3@O(NpnIVH
z13EMrY;SQ%iawG8eIo+{3ta;vT_a0<xc`98w@FF1D#<L#Nd*TS+&|zDbj&G16$PmW
z1wl?GC}gd267$k+l`3>oQqvMkb4rx#fB}`7nrEXAQG==%B8qCHjXoCJZ9smuiVR9E
z&d(_Yg}R-QnTZWJBv3>V;SbRffmH{xD7ub-jQo;(V0tRbO!mwxNi8ZU0;Vm9jZph=
zt3WpkVR>j?W{I5<)BrSLBwa{xW93*>Ql4Lw9RiLASRmq505t>>ph&3`lJvoW4@~=Z
zTsHdfd}PP<ai?-00|Qg1r;B4q1>@W4-g&}~0uI@4EG7uXG;nmXm~n_5;ov;T^-ZSn
z@PSYZrVXv4r!9o!4>C0}vOZ<FCLw%u*{-*n?r!RAEhu;YmaVyR=Et7<S6;vBcg>JE
zz`$nEz{r!pz>LNWyX7F5@_mPlhw>hgnmQYS%CNab&IRB1&p&Xy{?V`79IHxp>wWE(
z-c<U3R>}REc}I5dzGVMP_v-Glg5Q_?{~f#j{iXcBrv2;wy^o#x?|j^pfBfm6+n=*-
zx;|s&>rFeAx4!*+sq$CYlTiJdv}f=B@A%;GbNkfw+-FNZ|M6D-_xi-2XPQ6lFaAmX
z{642^P7Bkqf59J$pU<BWKU>d4dk=U2y5Fb8R$mK$Y4hJAc*eoar>!pTGhgR=zJB2!
zm$N&>j{jW#Ap4{A^`xME&oW}VSD)eE?r>Sw#`OH`4nObo10ipDKKxy9z2>@U{p(ku
z=jz`vypaF)C+GdQyXztqXH2+p@yD^P60@`K=l@wdd-~Gf|J=9z@!uEzZ)(xg{Fv@%
z>Sb^C{CV>F{0_0?g2TEOIs&%t`=Px3%g!*f^1t)#JwN5|U@xnVzc^JveE*FrKNZ#Y
zue&>W;{4O~m9M+jZxZ>lQ@eqA_oM9*vM(Aq>ZiNPvR!qo{`B{h@7ehWzG^Vrm;c-O
zQ}gfnSjHyt72-kf-m1hh%H-cM`jGqd^ZN;n^R55i`BQj*ck_vV>ER5qMZ16BFL}DQ
zH|b$G^LHiBS<km`{?z@iAWotxV*j7rzbpSPU$cM1s(cf%{1Q8v_VYT$AqS5CUsTl<
qS>Ju5rVm@BV^0dmq6Noz{xB|UYPx>(f6XCKiSOy^=d#Wzp$P!kmv_$q

diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png b/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1dfb87b1c1fd33618dd05d25aa959fdd005fd18
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zSv*}FLn`LH
zy>pPa$v~tb(d69&wN32Jo7(dpiBuU0G`?cIb?EoLZYifagJt5Uv!#Igp`h&jmXZf$
zxp6Cn<<CDYzP@1o@_J9%J>`dgZ<Dv%{#WYd{V&_!M>95kKfkhhe*B&9*&<8dn;-w4
z$9jPsVgTRC`v(vH-qykjR+Y=?tx>ywTgyxF*UT^*pmadz{$)N>=7lZXA8T)^nxk{*
z$eNB?ZHEtaMP4^%bS9R5xxSB2yTJ}c*KecBWoy0^XZ))Cz4<d^-!Gj#|E7p4RMeN*
oHAFI$ekqP=7j=*a>u6Y9#T<M0)!IY7o<$%5Pgg&ebxsLQ07$xh)Bpeg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png
index b9d1eb18d8fc4e3583acdf6ac0a8aa11d53deee7..68ef981ae5f3ca0804a5e4256f7281ececa23eec 100644
GIT binary patch
delta 620
zcmV-y0+apo5s?LuFn<C|Nkl<ZScT<Qzl-8P6#n+Ga}YbbgWUB(Y6F67Ay{t_uo2~2
zxl;cDuRFB2lcd<(b%L-UNJ6R=uUnhDz(R^?Wl~rixk3{rIwskRk%RkS$jqDf<C~W^
zKY)K2eo9#;n|C6iVHiIDy(G(ObCH1Sx-bj_uIt9ivf3o!|9|)eg`gwLa;U_oE|804
zJl<-v*=+724rE#OJ<sz!&+{pzJ^-Im8Y|=5TWokT1)c<B4D0ne9P|BCS-oBlWvkUH
zwGCq|GFLd$=A83E_&Gjc78~F~5dwhcd8uSsZO$@ankG!sj5PwHEBzar0AVG{vg|Jw
zi$o{aK(pBlcYi@71H<9)CIomy2uvoEuu4y>H2@(b@;%i(wd3`IzM?2%0*o;X1_P+7
z8p~SOb&N(M5JJ%Hb|FbptbPE;aWI`uBeDnqLI_k<MZ4XObu^pJ!qrHUghrzQ04SA8
zLjB!t2LM<umuGXra{vH3oep}v9=6*pEX#tXY1r@g!hcnX9E;#MPI>~0qM%l*B|6P5
z1D0ha1_yG?fTn4woQ}uiurJy<qFs<kfKr+&H~{qf{p;<507>V!ZQEf#w;K3dEaE+Y
zR{+010UtgBzkULfuTgTj)xi4L007Uxk7u#oRWraCgRbiUfG<x^LT9#ZL)Udwt5py}
zGG`!i8)aISb+fxbcpJXF6!GwIsOZPX1KZQ_{eAp=8vSy)e7>^dL(vD|fB$x9d5!r;
z>D>u|n<4lGk+*rJQt?}@R<42P^EoJ`VcatUxkf*NC-4Ufo(>}r6%T0u0000<MNUMn
GLSTY!yB_8M

literal 2291
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

diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png
index 9d5b8598f4b8d92b0a1af88b799a6f72c26186c4..eee995843f194939f7b115fd33950de15b7016e1 100644
GIT binary patch
delta 613
zcmV-r0-F7d6N&|pFn<C>Nkl<ZScT<QF^k(U6#lMciwN05mx9Mz0;a<)fk3!IAY0)E
zL$~~Z&@t&;(lyySWGi?$H(MYO2m~8LOHIa`ilE@ZYmmFDLt;mg9miM4q0kS6o}S**
z`}F)|3HXP>bLtBDyhu}8mc_;Xl&+}HNdms_!?G;+zMrWp>VI<%|Hmh&M1rpCv5}a%
zNS~$?@m!znc6%c&pzAsh!;ptz$b%r@0C*4tnL4pO$44Yn5lJw{;CWs=7G+h}ZntCI
zX0yrd!x)q1DhX?0aWRNECk8Cy1Dq&A00_e{m#(N!A_KN<!?x{ACqUlm-}pp`D^b^V
zzFaQPE^-NUyMNvI6i68ujYd}?AVMNAolfH_RjV}uAw=p`Th&jri{w_Tl}>;$hT(7s
z!!R;go2H5Jcnm@a`u#pMP0O^8Kq<v+Hj{J`0YV52!@!4kZ!#D9_+=IEM$<HOIvoH&
ztyW95-|cn)fc1Kvm`nW+0Km7mNBM4k9N*1lJ4$Kl!hdO?l;$U(22#fnO3gsDbFo)Z
zdIr>9#bh#x<+PKNb_&iC_#T|1mBe5$xZEj-aPI%@x^66&Rs-*=RlEZ53&7_e0A2&|
zfZw+=xzcLDJ2U|J=>Tx{^2=M<?xGoBjKMTb0Kli!>d0KMp{@(lG|_A}K?o_F0qHh$
z9Or6xL0;-@`1Dl8!^6I!A0PK@)$#p(_Iw`udcB_9+2Ntc0r2_PeJg7$K1y#C0#`%y
z38c4qqtW2KUa!=^i^T##5X5m41WJv5fJopEs)!0GE2M_400000NkvXXu0mjf1NJ8<

literal 2444
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

diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png
index 155ced7128aadd1cd7719d655ee751d5741d5e57..ab250c6747ddcc8bb5486ae9b54352e4557df9c9 100644
GIT binary patch
literal 588
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U}E!haSW-L
z^LD1~rX~l0mfxX!Cm5-=F-N4XnP~p;x!Am;Q<5ce^Rk|#O<OXp^I~;lYbe(mZ5`XL
z&#ElVXD*#n%4I%P{#ki%gIbT<;{9s#Z|7}a`ulJ0ei_LgLxzUWKWoZ$Iu^ZnXED=9
zYyIbqObiE-HabjFIaj=9YsC8NTfg>;DR>I`EDvTlkYKQ5^;|!7h68Dv3*#QYWvNK5
zkItTdZ^71Uk@eP$4X^*zZQI^B&(Gmtfknx+@4sv7)fXg~%}(4IleGQzL5XIa(*-+Y
z^1jCTGZg%NDb;^`>(_h!4j-fA-QTM#oHk0|dtKOI{`rZ|EgxB|vthEG&v5<h`Y>&V
zM70GICAl))R;|nJIry<+jjejuqT9b4){A>w7O9-qZtT49%n9Z8!;G1;%wn&d-g1jc
z5y%g{A2fZ7kirpXk6Du#a*UOHpRyR7?J(II-H__Gq|lC8BF#l=IRlTeQg1Lro8-h}
znhb|~Jc6|uPQ%Hnw<)s)GrhRG9`BfV`SU|r)&LRLKp@&T_1gMnv27|nagK{Nu5%J{
zTc2<<L0pk@akv5FjQYNoH%~<xBqw>W8u_b(XcnWmXdu0TS@L~4gRx5Dw@+d~u0eGr
z_W>Ty8GHAzCbX%XiHl=0a26_4c&rLi!fxc}e2B+$36tb<hBFgfm?gpXiWvR>vvz79
UQ<L~bVDez_boFyt=akR{05x^?`v3p{

literal 1364
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=7^q+l2s5%z3BJp~z+8|S5>XQ2>tmIipR1RclAn~SSCLx)
z)@4&+1!U%?mLw`v<mTiRTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1v5PZJp&~>
zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw
zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj>
z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o
zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA<EXhd)2OQi#;1G1oDM1wlsRso?
zP9`X1t#T6c(ruM0bW>8(5=(PRl<bO2lZs0cK_O+M4^fAzA0mostc^Yv7ubOOZ50`m
zTAZI#3Np{m($oeV7$|~>D1c~)z@`CN5M4t+Mt(^?Fhvz*CVS?Uq!twv0aF*)J|n1g
zxK*H=g|Is`FSEoBW&oNnk}jm!v2rXbDbFv;4gtpmaxmgl1T_c}q)2HLk^#WM56l5}
zTsHdf++@e)wNr)_m~E3iT^vIqINyfu?rnAuknKCo>ENW-$mX%)z$P851&q5G1(gLS
zTQsrBI52y(_$jzHRlHAIy756mE}up0CgrthdyPNedpwiBf#>A`d+P-X^&+lkHm&gu
zTD6Ml{&&lBVh#Q>r#{PsgvQQE?`d4r@v*SXzkrctf(mEGEI0e~ov*Dv*yNY(d!C@g
z!0B^Y<dLl$f1LK|N$Iz@weHR47G|_C;W>Q!rgBH;lV-F1C%^xeEszy7X6F#ex7ouu
z{ZQeYrH_5no!ILp_0Mm){g!P<AICyw7C*lp)}8CTpWcmp!Jw$Wm;I7Ss{zl-)bKjZ
zh8+2L+fAmv%*!uliW~Bt|JStd{Yten9(_uE9i0p+@yZKwZ|^Tu=zF|fJoLILi{pXc
z1^dm__|~vmH_h0wgCX|%LJh8cD>j%(w{6^3y7B$bxqs`n-TYbe%r|n{!|rF1(*AMl
t!^?KY-22v>{v^&yL3RS42Ya052iEn!3SOO+k+lSsXr8WqF6*2UngGcE#qIzA

diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png
index e810e6a5a4a1f05b179ffa3ce073d8b35b632e6d..f4cc933b4a505d373702a5af5eb4eac868e92d88 100644
GIT binary patch
delta 300
zcmV+{0n`5A3)2FSFn<9JNkl<ZScUDCJ#K?A7>1up9W7SR<^YvEWnrRommZ;<qT(!E
zAxEH#mrmTEUh#_PoDPwbP=1m)A|2{yc`@eu@oR|>B9X{{=OH9WYrPAJYno<M?=d71
zfH4MuzV8R>5kd?!%d*Kl!3_WuMS)Uk@f&L`RaMRI-_(Foihn%M0Z5W$u-A1R0Cin2
z<`^|_&HY+y&la%OUe^HZ@Aur@!b%Q!UY_J);K$eZdJcF#Uysk5?Qy-??sZiMP7BSg
z@8W<z`KfyD=D=_Dtm?q?+dIxVq?D5iD?6}Mye!MZ>27skG#s?nJ7WxO+s+0FArAk8
yOJ_lvra0$D^(96xq?AFE?h>XNh(schKj#N`LZQP8e1RAM0000<MNUMnLSTYg7mWD;

literal 1504
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=7^q+l2s5%z3BJp~z+8|S5>XQ2>tmIipR1RclAn~SSCLx)
z)@4&+1!U%?mLw`v<mTiRTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1v5PZJp&~>
zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw
zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj>
z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o
zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA<EXhd)2OQi#;1G1oDM1wlsRso?
zP9`X1t#T6c(ruM0bW>8(5=(PRl<bO2lZs0cK_O+M4^fAzA0mostc^Yv7ubOOZ50`m
zTAZI#3Np{m($oeV7$|~>D1c~)z@`CN5M4t+Mt(^?Fhvz*CVS?Uq!twv0aF*)J|n1g
zxK*H=g|Is`FSEoBW&oNnk}jm!v2rXbDbFv;4gtpmaxmgl1T_c}q)2HLk^#WM56l5}
zTsHdf++@e)wNr)_m~G#Cx;TbJaJ~&W=*1K$VtZL+$`z#&W!+O56E7@dGXKn~^eCU@
z(K7zbM2^}P>COurx6V3gt~HzHaZ726+13>+HEQ>kzkbQ%t7a^m`|Qx;xM%mO&pkXd
zoAJ*F*&pfbA_wQ6ei~sSRjRTyZoTqcKjA*%2G5NlT2mLSTJ_d0nWyWM@xB|S!YU3-
zIWKP?xN<(FBKgMUvL`##Zz?fxYhBstc_u@<;@a$Ho4q?ZzFlZ8yry=^YpIi^Socn`
zMA3qOZTF-;R1|m~P|_A=*!|vd=JWL(-#4;UIO<F-t_a>^u;9GG><HPEZ|4%`Z23@f
zg~erl`?}X9KC}D0S2L$cTn?S#TUV#pf0cXI1(UNjFIR07y|BOb>Auh58{^drW~v4+
z3|L?^)$62t-{!RpNzW%V_Hy(@aW{TVRWeu=K4q`Mw60uMiLKk-Ocq;QrfYifbB$fU
z-|}W3HRCzO5s~^2#XS;ijaq_5-#N7G{`j&fgX2?yh0UD8z}oVL_<heWn~C^*s5!iu
zY4I(l9RiX~F&!V2)-b*M<?u1|&i;uP-<JJ9*7*4D;fY5U-OMnVa5gQ|?@Hd`R|jTf
z#0hw72?_A91?o+IdE(d(OA)SK>nv;Y9g%--r+uuL)7EuV>BsrB3&#0slRc+-sMO6h
ke*a_Z`vx#Ppuuj(uuE|MhnTxx_kl`RPgg&ebxsLQ08&vLBme*a


From 9e32c4b8955694a8cc2134af7017c6a9ed8c0590 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Tue, 18 Jun 2024 20:04:15 +0300
Subject: [PATCH 546/568] sry Artur

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

diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index ee7d6f55b7f1..13860436af0b 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -150,8 +150,8 @@ public HumanoidCharacterProfile(
             PreferenceUnavailableMode preferenceUnavailable,
             HashSet<ProtoId<AntagPrototype>> antagPreferences,
             HashSet<ProtoId<TraitPrototype>> traitPreferences,
-            Dictionary<string, RoleLoadout> loadouts),
-            bool teleportAfkToCryoStorage = true /* SS220 Cryo-Teleport */)
+            Dictionary<string, RoleLoadout> loadouts,
+            bool teleportAfkToCryoStorage = true) //SS220 Cryo-Teleport
         {
             Name = name;
             FlavorText = flavortext;

From f2a6a7939fd25ca4d80b7d71b931c8e53c57f46d Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Fri, 28 Jun 2024 19:27:23 +0300
Subject: [PATCH 547/568] post-merge fixes

---
 .../JobRequirementsManager.cs                 | 16 ++++-
 .../SS220/AdmemeEvents/EventRoleIcons.cs      | 27 +++----
 .../SS220/BloomLight/BloomLightOverlay.cs     |  2 +-
 .../UI/CharacterVisualisation.xaml.cs         |  5 +-
 .../SS220/CustomFoV/CustomFoVOverlay.cs       |  9 +--
 .../ForcefieldGenerator/ForcefieldOverlay.cs  |  2 +-
 .../SS220/MindSlave/MindSlaveSystem.cs        | 31 +++++---
 .../Commands/GarbageClearUpCommand.cs         |  3 +-
 .../Administration/Systems/AdminSystem.cs     |  2 +-
 Content.Server/Antag/AntagSelectionSystem.cs  | 12 ++++
 .../HiddenDescriptionSystem.cs                |  6 +-
 .../Damage/Systems/DamageOtherOnHitSystem.cs  |  2 -
 Content.Server/Fax/FaxSystem.cs               | 72 -------------------
 .../GameTicking/Rules/NukeopsRuleSystem.cs    | 17 +++--
 .../GameTicking/Rules/TraitorRuleSystem.cs    | 27 +------
 Content.Server/Ghost/Roles/GhostRoleSystem.cs |  2 +-
 .../Managers/ServerPreferencesManager.cs      |  5 +-
 .../AddSleepAction/AddSleepActionSystem.cs    |  2 +-
 Content.Server/SS220/CQC/CQCCombatSystem.cs   |  2 +-
 .../Helpers/ClearEbentTrashCommand.cs         | 40 ++++++-----
 .../CryopodSSD/SSDStorageConsoleSystem.cs     |  3 +-
 .../DarkReaper/DarkReaperMajorRuleSystem.cs   |  2 +-
 .../SS220/DarkReaper/DarkReaperSystem.cs      | 24 ++++---
 .../ForcefieldGeneratorSystem.cs              |  2 +-
 .../EmergencyShuttleAutoCallRuleSystem.cs     |  2 +-
 .../ItemOfferVerb/Systems/ItemOfferSystem.cs  | 12 ++--
 .../SS220/MindSlave/MindSlaveSystem.cs        |  9 +--
 .../StationEvents/CableRandomSpawnRule.cs     |  2 +-
 .../Systems/EmergencyShuttleSystem.cs         |  4 +-
 .../Teleportation/HandTeleporterSystem.cs     |  1 -
 .../VendingMachines/VendingMachineSystem.cs   |  4 +-
 .../SS220/AdmemeEvents/EventRoleComponent.cs  |  5 +-
 .../SS220/MindSlave/MindSlaveComponent.cs     |  4 +-
 .../MindSlave/MindSlaveMasterComponent.cs     |  2 +-
 .../Weapons/Reflect/ReflectSystem.cs          |  2 +-
 .../Prototypes/SS220/Alerts/categories.yml    |  0
 .../Prototypes/SS220/StatusIcons/antag.yml    |  2 +
 37 files changed, 161 insertions(+), 203 deletions(-)
 create mode 100644 Resources/Prototypes/SS220/Alerts/categories.yml

diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index e3c0b7ab5fbf..8cc82cc5dc79 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -133,7 +133,9 @@ public bool CheckAllowed(JobPrototype job, HumanoidCharacterProfile profile, [No
         ReasonList reasons = new();
 
         var bCheckSpecies = CheckSpeciesRestrict(job, profile, reasons);
-        var bCheckRoleTime = CheckRoleTime(job.Requirements, reasons);
+        var bCheckRoleTime = CheckRoleTime(job, out var roleTimeReason);
+        if (roleTimeReason is not null)
+            reasons.Add(roleTimeReason.ToMarkup());
 
         if (bCheckSpecies && bCheckRoleTime)
         {
@@ -153,7 +155,11 @@ public bool CheckSpeciesRestrict(JobPrototype job, HumanoidCharacterProfile prof
             if (JobRequirements.TryRequirementsSpeciesMet(job, species, profile.Sex, out var reason, _prototypeManager)) //ss220-arahFix
                 return true;
 
-        return CheckRoleTime(job.Requirements, out reason);
+            reasons.Add(reason.ToMarkup());
+            return false;
+        }
+
+        return true;
     }
 
     // for compatible things like xaml for ghost roles
@@ -171,6 +177,12 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
     }
     //SS220 Species-Job-Requirement end
 
+    public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        var reqs = _entManager.System<SharedRoleSystem>().GetJobRequirement(job);
+        return CheckRoleTime(reqs, out reason);
+    }
+
     public bool CheckRoleTime(HashSet<JobRequirement>? requirements, ReasonList reasons)
     {
         if (requirements == null || !_cfg.GetCVar(CCVars.GameRoleTimers))
diff --git a/Content.Client/SS220/AdmemeEvents/EventRoleIcons.cs b/Content.Client/SS220/AdmemeEvents/EventRoleIcons.cs
index ebaa9ff05da2..27e53367515f 100644
--- a/Content.Client/SS220/AdmemeEvents/EventRoleIcons.cs
+++ b/Content.Client/SS220/AdmemeEvents/EventRoleIcons.cs
@@ -1,6 +1,5 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
-using Content.Client.Antag;
 using Content.Shared.Antag;
 using Content.Shared.Ghost;
 using Content.Shared.SS220.AdmemeEvents;
@@ -15,32 +14,26 @@ namespace Content.Client.SS220.AdmemeEvents;
 /// </summary>
 public sealed class EventRoleIconsSystem : EntitySystem
 {
-    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<EventRoleComponent, CanDisplayStatusIconsEvent>(OnCanShowRevIcon);
-    }
-
-    private void OnCanShowRevIcon(Entity<EventRoleComponent> entity, ref CanDisplayStatusIconsEvent args)
-    {
-        args.Cancelled = !CanDisplayIcon(args.User, entity.Comp.IconVisibleToGhost, entity.Comp.RoleGroupKey);
+        SubscribeLocalEvent<EventRoleComponent, GetStatusIconsEvent>(OnGetStatusIcons);
     }
 
-    private bool CanDisplayIcon(EntityUid? ent, bool visibleToGhost, string roleGroupKey)
+    private void OnGetStatusIcons(Entity<EventRoleComponent> entity, ref GetStatusIconsEvent args)
     {
-        if (HasComp<GhostComponent>(ent) && visibleToGhost)
-            return true;
-
-        if (!TryComp<EventRoleComponent>(ent, out var comp))
-            return false;
+        var viewer = _player.LocalSession?.AttachedEntity;
 
-        if (!string.IsNullOrEmpty(roleGroupKey) && roleGroupKey == comp.RoleGroupKey)
-            return true;
+        if (viewer != entity &&
+            (!TryComp<EventRoleComponent>(viewer, out var viewerComp) ||
+            viewerComp.RoleGroupKey != entity.Comp.RoleGroupKey))
+            return;
 
-        return false;
+        var iconPrototype = _prototype.Index(entity.Comp.StatusIcon);
+        args.StatusIcons.Add(iconPrototype);
     }
 }
diff --git a/Content.Client/SS220/BloomLight/BloomLightOverlay.cs b/Content.Client/SS220/BloomLight/BloomLightOverlay.cs
index c1641b0786a0..62352e95f3f4 100644
--- a/Content.Client/SS220/BloomLight/BloomLightOverlay.cs
+++ b/Content.Client/SS220/BloomLight/BloomLightOverlay.cs
@@ -92,6 +92,6 @@ protected override void Draw(in OverlayDrawArgs args)
         }
 
         handle.UseShader(null);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/SS220/CriminalRecords/UI/CharacterVisualisation.xaml.cs b/Content.Client/SS220/CriminalRecords/UI/CharacterVisualisation.xaml.cs
index 5c09e4eff844..bac03b977ae7 100644
--- a/Content.Client/SS220/CriminalRecords/UI/CharacterVisualisation.xaml.cs
+++ b/Content.Client/SS220/CriminalRecords/UI/CharacterVisualisation.xaml.cs
@@ -13,6 +13,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Content.Shared.Clothing;
+using Robust.Client.Player;
 
 namespace Content.Client.SS220.CriminalRecords.UI;
 
@@ -21,6 +22,7 @@ public sealed partial class CharacterVisualisation : BoxContainer
 {
     private readonly IEntityManager _entMan;
     private readonly IPrototypeManager _prototype;
+    private readonly IPlayerManager _player;
     private readonly ClientInventorySystem _inventorySystem;
     private EntityUid _previewDummy;
     private readonly SpriteView _face;
@@ -32,6 +34,7 @@ public CharacterVisualisation()
 
         _entMan = IoCManager.Resolve<IEntityManager>();
         _prototype = IoCManager.Resolve<IPrototypeManager>();
+        _player = IoCManager.Resolve<IPlayerManager>();
         _inventorySystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ClientInventorySystem>();
 
         _face = new SpriteView() { Scale = new Vector2(5, 5) };
@@ -94,7 +97,7 @@ private void GiveDummyJobClothes(EntityUid dummy, HumanoidCharacterProfile profi
         else
         {
             jobLoadout = new RoleLoadout(LoadoutSystem.GetJobPrototype(job.ID));
-            jobLoadout.SetDefault(_prototype);
+            jobLoadout.SetDefault(profile, _player.LocalSession, _prototype);
             GiveDummyLoadout(dummy, jobLoadout);
         }
     }
diff --git a/Content.Client/SS220/CustomFoV/CustomFoVOverlay.cs b/Content.Client/SS220/CustomFoV/CustomFoVOverlay.cs
index 8251ec2e2e59..cbde1a3d290f 100644
--- a/Content.Client/SS220/CustomFoV/CustomFoVOverlay.cs
+++ b/Content.Client/SS220/CustomFoV/CustomFoVOverlay.cs
@@ -84,7 +84,7 @@ void DrawFoVCorner(Vector2 worldPosition, Angle worldRot)
             if (handle is null || texture is null)
                 return;
 
-            var rotatedMatrix = Matrix3.CreateTransform(worldPosition, worldRot);
+            var rotatedMatrix = Matrix3Helpers.CreateTransform(worldPosition, worldRot);
             handle.SetTransform(rotatedMatrix);
             handle.DrawTexture(texture, new Vector2(-0.5f, -0.5f));
         }
@@ -98,8 +98,9 @@ void DrawFoVCorner(Vector2 worldPosition, Angle worldRot)
 
                 Vector2i GetDirRelativeToEdge(Vector2i edge)
                 {
-                    var invGridTransform = Matrix3.CreateTransform(worldPosition, gridRot).Invert();
-                    var relativePos = invGridTransform.Transform(eye!.Position.Position) + edge * 0.5f;
+                    var invGridTransform = Matrix3Helpers.CreateInverseTransform(worldPosition, gridRot);
+                    //var relativePos = invGridTransform.Transform(eye!.Position.Position) + edge * 0.5f;
+                    var relativePos = Vector2.Transform(eye!.Position.Position, invGridTransform) + edge * 0.5f;
                     return new Vector2i(MathF.Sign(relativePos.X), MathF.Sign(relativePos.Y));
                 }
 
@@ -146,7 +147,7 @@ Vector2i GetDirRelativeToEdge(Vector2i edge)
         }
 
         handle.UseShader(null);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
         _entMapDict.Clear();
     }
 }
diff --git a/Content.Client/SS220/ForcefieldGenerator/ForcefieldOverlay.cs b/Content.Client/SS220/ForcefieldGenerator/ForcefieldOverlay.cs
index 036a30817911..f9baf2cd705d 100644
--- a/Content.Client/SS220/ForcefieldGenerator/ForcefieldOverlay.cs
+++ b/Content.Client/SS220/ForcefieldGenerator/ForcefieldOverlay.cs
@@ -71,6 +71,6 @@ protected override void Draw(in OverlayDrawArgs args)
         }
 
         handle.UseShader(null);
-        handle.SetTransform(Matrix3.Identity);
+        handle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/SS220/MindSlave/MindSlaveSystem.cs b/Content.Client/SS220/MindSlave/MindSlaveSystem.cs
index ace2db4fac6e..52dc067fe4dc 100644
--- a/Content.Client/SS220/MindSlave/MindSlaveSystem.cs
+++ b/Content.Client/SS220/MindSlave/MindSlaveSystem.cs
@@ -2,33 +2,48 @@
 
 using Content.Shared.SS220.MindSlave;
 using Content.Shared.StatusIcon.Components;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.SS220.MindSlave;
 
 public sealed class MindSlaveSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<MindSlaveComponent, CanDisplayStatusIconsEvent>(OnSlaveGetIcons);
-        SubscribeLocalEvent<MindSlaveMasterComponent, CanDisplayStatusIconsEvent>(OnMasterGetIcons);
+        SubscribeLocalEvent<MindSlaveComponent, GetStatusIconsEvent>(OnSlaveGetIcons);
+        SubscribeLocalEvent<MindSlaveMasterComponent, GetStatusIconsEvent>(OnMasterGetIcons);
     }
 
-    private void OnSlaveGetIcons(Entity<MindSlaveComponent> entity, ref CanDisplayStatusIconsEvent args)
+    private void OnSlaveGetIcons(Entity<MindSlaveComponent> entity, ref GetStatusIconsEvent args)
     {
-        if (TryComp<MindSlaveMasterComponent>(args.User, out var masterComp) && masterComp.EnslavedEntities.Contains(entity))
+        var viewer = _player.LocalSession?.AttachedEntity;
+
+        if (viewer != entity &&
+            (!TryComp<MindSlaveMasterComponent>(viewer, out var masterComp) ||
+            !masterComp.EnslavedEntities.Contains(entity)))
             return;
 
-        args.Cancelled = true;
+        var iconPrototype = _prototype.Index(entity.Comp.StatusIcon);
+        args.StatusIcons.Add(iconPrototype);
     }
 
-    private void OnMasterGetIcons(Entity<MindSlaveMasterComponent> entity, ref CanDisplayStatusIconsEvent args)
+    private void OnMasterGetIcons(Entity<MindSlaveMasterComponent> entity, ref GetStatusIconsEvent args)
     {
-        if (HasComp<MindSlaveComponent>(args.User) && entity.Comp.EnslavedEntities.Contains(args.User.Value))
+        var viewer = _player.LocalSession?.AttachedEntity;
+
+        if (viewer != entity &&
+            (!HasComp<MindSlaveComponent>(viewer) ||
+            !entity.Comp.EnslavedEntities.Contains(viewer.Value)))
             return;
 
-        args.Cancelled = true;
+        var iconPrototype = _prototype.Index(entity.Comp.StatusIcon);
+        args.StatusIcons.Add(iconPrototype);
     }
 }
 
diff --git a/Content.Server/Administration/Commands/GarbageClearUpCommand.cs b/Content.Server/Administration/Commands/GarbageClearUpCommand.cs
index e9a879874abc..6894949122c8 100644
--- a/Content.Server/Administration/Commands/GarbageClearUpCommand.cs
+++ b/Content.Server/Administration/Commands/GarbageClearUpCommand.cs
@@ -11,6 +11,7 @@ namespace Content.Server.Administration.Commands
     public sealed partial class GarbageClearUpCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entMan = default!;
+        [Dependency] private readonly TagSystem _tag = default!;
 
         //SS220-clearupgarbage
         public string Command => "clearupgarbage";
@@ -25,7 +26,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             {
                 if (!_entMan.TryGetComponent<TagComponent>(ent, out var component))
                     continue;
-                if (!component.Tags.Contains("Trash") || _containerSystem.IsEntityOrParentInContainer(ent))
+                if (!_tag.HasTag(ent, "Trash") || _containerSystem.IsEntityOrParentInContainer(ent))
                     continue;
 
                 _entMan.DeleteEntity(ent);
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 9c76d7096cd9..0550feb996f3 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -30,7 +30,7 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.Administration.Systems
 {
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 1d517c60695b..4a04e8312385 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -28,6 +28,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Content.Server.SS220.MindSlave;
 
 namespace Content.Server.Antag;
 
@@ -45,6 +46,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly MindSlaveSystem _mindSlave = default!;
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -467,6 +469,16 @@ private void OnObjectivesTextGetInfo(Entity<AntagSelectionComponent> ent, ref Ob
             return;
 
         args.Minds = ent.Comp.SelectedMinds;
+
+        //SS22-mindslave-begin
+        //such a hack, and I'm lazy to do a shit about this
+        if (_mindSlave.EnslavedMinds.Count > 0)
+        {
+            foreach (var slave in _mindSlave.EnslavedMinds)
+                args.Minds.Add((slave.Key, Name(slave.Key)));
+        }
+        //SS22-mindslave-end
+
         args.AgentName = Loc.GetString(name);
     }
 }
diff --git a/Content.Server/Corvax/HiddenDescription/HiddenDescriptionSystem.cs b/Content.Server/Corvax/HiddenDescription/HiddenDescriptionSystem.cs
index 1a88e87df384..5bc1e8af8a48 100644
--- a/Content.Server/Corvax/HiddenDescription/HiddenDescriptionSystem.cs
+++ b/Content.Server/Corvax/HiddenDescription/HiddenDescriptionSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Mind;
 using Content.Shared.Examine;
 using Content.Shared.Roles.Jobs;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.Corvax.HiddenDescription;
 
@@ -8,6 +9,7 @@ public sealed partial class HiddenDescriptionSystem : EntitySystem
 {
 
     [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; //SS220
 
     public override void Initialize()
     {
@@ -24,8 +26,8 @@ private void OnExamine(Entity<HiddenDescriptionComponent> hiddenDesc, ref Examin
         foreach (var item in hiddenDesc.Comp.Entries)
         {
             var isJobAllow = job?.Prototype != null && item.JobRequired.Contains(job.Prototype.Value);
-            var isMindWhitelistPassed = item.WhitelistMind.IsValid(mindId);
-            var isBodyWhitelistPassed = item.WhitelistMind.IsValid(args.Examiner);
+            var isMindWhitelistPassed = _whitelist.IsValid(item.WhitelistMind, mindId);
+            var isBodyWhitelistPassed = _whitelist.IsValid(item.WhitelistMind, args.Examiner);
             var passed = item.NeedAllCheck
                 ? isMindWhitelistPassed && isBodyWhitelistPassed && isJobAllow
                 : isMindWhitelistPassed || isBodyWhitelistPassed || isJobAllow;
diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
index 10903ebb3188..46da6b7d88a6 100644
--- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
@@ -39,8 +39,6 @@ private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDo
 
             if (hitEv.Handled)
                 return;
-
-            var dmg = _damageable.TryChangeDamage(args.Target, component.Damage, component.IgnoreResistances, origin: args.Component.Thrower);
             // SS220-Stunbaton-rework end
 
             if (!TerminatingOrDeleted(args.Target))
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index c3f9a6a18790..d29204af70aa 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -385,75 +385,6 @@ public void Refresh(EntityUid uid, FaxMachineComponent? component = null)
         _deviceNetworkSystem.QueuePacket(uid, null, payload);
     }
 
-    /// <summary>
-    ///     Makes fax print from a file from the computer. A timeout is set after copying,
-    ///     which is shared by the send button.
-    /// </summary>
-    public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
-    {
-        string prototype;
-        if (args.OfficePaper)
-            prototype = OfficePaperPrototypeId;
-        else
-            prototype = DefaultPaperPrototypeId;
-
-        var name = Loc.GetString("fax-machine-printed-paper-name");
-
-        var printout = new FaxPrintout(args.Content, name, args.Label, prototype);
-        component.PrintingQueue.Enqueue(printout);
-        component.SendTimeoutRemaining += component.SendTimeout;
-
-        UpdateUserInterface(uid, component);
-
-        // Unfortunately, since a paper entity does not yet exist, we have to emulate what LabelSystem will do.
-        var nameWithLabel = (args.Label is { } label) ? $"{name} ({label})" : name;
-        _adminLogger.Add(LogType.Action, LogImpact.Low,
-            $"{ToPrettyString(args.Actor):actor} " +
-            $"added print job to \"{component.FaxName}\" {ToPrettyString(uid):tool} " +
-            $"of {nameWithLabel}: {args.Content}");
-    }
-
-    /// <summary>
-    ///     Copies the paper in the fax. A timeout is set after copying,
-    ///     which is shared by the send button.
-    /// </summary>
-    public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage args)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        var sendEntity = component.PaperSlot.Item;
-        if (sendEntity == null)
-            return;
-
-        if (!TryComp(sendEntity, out MetaDataComponent? metadata) ||
-            !TryComp<PaperComponent>(sendEntity, out var paper))
-            return;
-
-        TryComp<LabelComponent>(sendEntity, out var labelComponent);
-
-        // TODO: See comment in 'Send()' about not being able to copy whole entities
-        var printout = new FaxPrintout(paper.Content,
-                                       labelComponent?.OriginalName ?? metadata.EntityName,
-                                       labelComponent?.CurrentLabel,
-                                       metadata.EntityPrototype?.ID ?? DefaultPaperPrototypeId,
-                                       paper.StampState,
-                                       paper.StampedBy);
-
-        component.PrintingQueue.Enqueue(printout);
-        component.SendTimeoutRemaining += component.SendTimeout;
-
-        // Don't play component.SendSound - it clashes with the printing sound, which
-        // will start immediately.
-
-        UpdateUserInterface(uid, component);
-
-        _adminLogger.Add(LogType.Action, LogImpact.Low,
-            $"{ToPrettyString(args.Actor):actor} " +
-            $"added copy job to \"{component.FaxName}\" {ToPrettyString(uid):tool} " +
-            $"of {ToPrettyString(sendEntity):subject}: {printout.Content}");
-    }
-
     /// <summary>
     ///     Sends message to addressee if paper is set and a known fax is selected
     ///     A timeout is set after sending
@@ -472,9 +403,6 @@ public void Send(EntityUid uid, FaxMachineComponent? component, FaxSendMessage a
         if (!component.KnownFaxes.TryGetValue(component.DestinationFaxAddress, out var faxName))
             return;
 
-        if (!TryComp(sendEntity, out MetaDataComponent? metadata) ||
-           !TryComp<PaperComponent>(sendEntity, out var paper))
-
         if (!_photocopierSystem.TryGetPhotocopyableMetaData(sendEntity, out var metaData))
             return;
 
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 878a0a817381..69682047f070 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -27,6 +27,8 @@
 using Content.Server.StationEvents.Components;
 using System.Linq;
 using Content.Shared.Store.Components;
+using Robust.Shared.Prototypes;
+using Content.Server.Maps;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -39,6 +41,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
     [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
     [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     [ValidatePrototypeId<CurrencyPrototype>]
     private const string TelecrystalCurrencyPrototype = "Telecrystal";
@@ -378,14 +381,18 @@ private void DistributeExtraTc(Entity<NukeopsRuleComponent> nukieRule)
             // if (GetOutpost(nukieRule.Owner) is not { } outpost)
             //     continue;
 
-            MapId? startMap = null;
+            ProtoId<GameMapPrototype>? startMapProto = null;
             if (TryComp<LoadMapRuleComponent>(nukieRule.Owner, out var loadMap))
-                startMap = loadMap.Map;
-            // SS220 Lone-Ops-War end
+                startMapProto = loadMap.GameMap;
+
+            var mapProto = string.Empty;
+            var mapUid = Transform(uid).MapUid;
+            if (mapUid != null)
+                mapProto = MetaData(mapUid.Value).EntityPrototype?.ID;
 
-            // SS220 Lone-Ops-War
-            if (Transform(uid).MapID != startMap) // Will receive bonus TC only on their start outpost
+            if (mapProto != startMapProto.ToString()) // Will receive bonus TC only on their start outpost
                 continue;
+            // SS220 Lone-Ops-War end
 
             _store.TryAddCurrency(new () { { TelecrystalCurrencyPrototype, nukieRule.Comp.WarTcAmountPerNukie } }, uid, component);
 
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 679aced87c39..73ceff2ee494 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -16,7 +16,7 @@
 using Robust.Shared.Random;
 using System.Linq;
 using System.Text;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Server.SS220.MindSlave;
 
 namespace Content.Server.GameTicking.Rules;
@@ -32,7 +32,6 @@ 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 MindSlaveSystem _mindSlave = default!;
 
     public override void Initialize()
     {
@@ -67,24 +66,6 @@ private void MakeCodewords(TraitorRuleComponent component)
         }
     }
 
-    //SS220-mindslave begin
-    public void AddToTraitorList(EntityUid mind, EntityUid gameRuleEntity, TraitorRuleComponent? component = null)
-    {
-        if (!Resolve(gameRuleEntity, ref component))
-            return;
-
-        component.TraitorMinds.Add(mind);
-    }
-
-    public void RemoveFromTraitorList(EntityUid mind, EntityUid gameRuleEntity, TraitorRuleComponent? component = null)
-    {
-        if (!Resolve(gameRuleEntity, ref component))
-            return;
-
-        component.TraitorMinds.Remove(mind);
-    }
-    //SS220-mindslave end
-
     public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true, bool giveObjectives = true)
     {
         //Grab the mind if it wasnt provided
@@ -133,12 +114,6 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool
         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");
-    }
-
     private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, ref ObjectivesTextPrependEvent args)
     {
         args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 40496955f715..2fe1b63c5a56 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -710,7 +710,7 @@ private void OnSpawnerTakeRole(EntityUid uid, GhostRoleMobSpawnerComponent compo
 
         private bool IsRoleBanned(string prototypeName, NetUserId userId)
         {
-            var bans = _banManager.GetJobBans(userId) ?? new HashSet<string>();
+            var bans = _banManager.GetJobBans(userId) ?? new HashSet<ProtoId<JobPrototype>>();
 
             var isBanned =
                 prototypeName == "MobHumanLoneNuclearOperative" && bans.Contains("Nukeops")
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index 593ef9b986fa..f2e634fd8dca 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -37,6 +37,7 @@ public sealed class ServerPreferencesManager : IServerPreferencesManager, IPostI
         private readonly Dictionary<NetUserId, PlayerPrefData> _cachedPlayerPrefs =
             new();
 
+        private ISawmill _sawmill = default!;
         // private int MaxCharacterSlots => _cfg.GetCVar(CCVars.GameMaxCharacterSlots); // Corvax-Sponsors
 
         public void Init()
@@ -102,6 +103,7 @@ public async Task SetProfile(NetUserId userId, int slot, ICharacterProfile profi
             if (slot < 0 || slot >= GetMaxUserCharacterSlots(userId)) // Corvax-Sponsors
             {
                 return;
+            }
 
             var curPrefs = prefsData.Prefs!;
             var session = _playerManager.GetSessionById(userId);
@@ -128,7 +130,6 @@ public async Task SetProfile(NetUserId userId, int slot, ICharacterProfile profi
                     }
                 }
                 profile = human;
-                message.Profile = human;
             }
             //ss-220 arahFixend
 
@@ -142,7 +143,7 @@ public async Task SetProfile(NetUserId userId, int slot, ICharacterProfile profi
 
             prefsData.Prefs = new PlayerPreferences(profiles, slot, curPrefs.AdminOOCColor);
 
-            if (ShouldStorePrefs(session.Channel.AuthType))
+            if (session != null && ShouldStorePrefs(session.Channel.AuthType))
                 await _db.SaveCharacterSlotAsync(userId, profile, slot);
         }
 
diff --git a/Content.Server/SS220/AddSleepAction/AddSleepActionSystem.cs b/Content.Server/SS220/AddSleepAction/AddSleepActionSystem.cs
index c157d31f45a1..bddbea2a1f0e 100644
--- a/Content.Server/SS220/AddSleepAction/AddSleepActionSystem.cs
+++ b/Content.Server/SS220/AddSleepAction/AddSleepActionSystem.cs
@@ -1,7 +1,7 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
 using Content.Server.Actions;
-using Content.Server.Bed.Sleep;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Buckle.Components;
 
 namespace Content.Server.SS220.AddSleepAction;
diff --git a/Content.Server/SS220/CQC/CQCCombatSystem.cs b/Content.Server/SS220/CQC/CQCCombatSystem.cs
index ea7236934866..a7edc4a32292 100644
--- a/Content.Server/SS220/CQC/CQCCombatSystem.cs
+++ b/Content.Server/SS220/CQC/CQCCombatSystem.cs
@@ -7,7 +7,7 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Damage;
 using Content.Server.Hands.Systems;
-using Content.Server.Bed.Sleep;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.StatusEffect;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Stunnable;
diff --git a/Content.Server/SS220/Commands/Helpers/ClearEbentTrashCommand.cs b/Content.Server/SS220/Commands/Helpers/ClearEbentTrashCommand.cs
index dd39ce93f6f4..96e9f7a708a3 100644
--- a/Content.Server/SS220/Commands/Helpers/ClearEbentTrashCommand.cs
+++ b/Content.Server/SS220/Commands/Helpers/ClearEbentTrashCommand.cs
@@ -22,24 +22,26 @@ public sealed partial class ClearEbentTrashCommand : IConsoleCommand
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            ClearTrash (shell);
-            ClearAmmo (shell);
+            ClearTrash(shell);
+            ClearAmmo(shell);
         }
-        private void ClearTrash (IConsoleShell shell)
-        {var _containerSystem = _entMan.System<SharedContainerSystem>();
+        private void ClearTrash(IConsoleShell shell)
+        {
+            var _containerSystem = _entMan.System<SharedContainerSystem>();
+            var _tag = _entMan.System<TagSystem>();
             int processed = 0;
-           foreach (var ent in _entMan.GetEntities())
+            foreach (var ent in _entMan.GetEntities())
             {
 
                 if (_entMan.TryGetComponent<TagComponent>(ent, out var component))
                 {
-                    if (component.Tags.Contains("Trash") && !_containerSystem.IsEntityOrParentInContainer(ent))
+                    if (_tag.HasTag(ent, "Trash") && !_containerSystem.IsEntityOrParentInContainer(ent))
                     {
                         _entMan.DeleteEntity(ent);
                         processed++;
                         continue;
                     }
-                    else if (!_containerSystem.IsEntityOrParentInContainer(ent)&&component.Tags.Any(x=>x.Contains("Magazine")))
+                    else if (!_containerSystem.IsEntityOrParentInContainer(ent) && _tag.HasTag(ent, "Magazine"))
                     {
                         _entMan.DeleteEntity(ent);
                         processed++;
@@ -49,24 +51,28 @@ private void ClearTrash (IConsoleShell shell)
 
                 if (_entMan.TryGetComponent(ent, out MetaDataComponent? comp))
                 {
-                    if (!_containerSystem.IsEntityOrParentInContainer(ent)&&(comp.EntityPrototype?.ID == "MaterialWoodPlank1" || comp.EntityPrototype?.ID == "SheetSteel1"))
+                    if (!_containerSystem.IsEntityOrParentInContainer(ent) && (comp.EntityPrototype?.ID == "MaterialWoodPlank1" || comp.EntityPrototype?.ID == "SheetSteel1"))
                     {
                         _entMan.DeleteEntity(ent);
                         processed++;
                     }
                 }
             }
-            shell.WriteLine($"Удалено {processed} мусора и магазинов.");}
-        public void ClearAmmo (IConsoleShell shell)
-        {var processed = 0;
-        var _containerSystem = _entMan.System<SharedContainerSystem>();
-        var query = _entMan.AllEntityQueryEnumerator<CartridgeAmmoComponent>();
-        while (query.MoveNext(out var entity, out var comp))
-            {if (!_containerSystem.IsEntityOrParentInContainer(entity))
-                _entMan.QueueDeleteEntity(entity);
+            shell.WriteLine($"Удалено {processed} мусора и магазинов.");
+        }
+        public void ClearAmmo(IConsoleShell shell)
+        {
+            var processed = 0;
+            var _containerSystem = _entMan.System<SharedContainerSystem>();
+            var query = _entMan.AllEntityQueryEnumerator<CartridgeAmmoComponent>();
+            while (query.MoveNext(out var entity, out var comp))
+            {
+                if (!_containerSystem.IsEntityOrParentInContainer(entity))
+                    _entMan.QueueDeleteEntity(entity);
                 processed++;
             }
 
-        shell.WriteLine($"Удалено {processed} патронов.");}
+            shell.WriteLine($"Удалено {processed} патронов.");
+        }
     }
 }
diff --git a/Content.Server/SS220/CryopodSSD/SSDStorageConsoleSystem.cs b/Content.Server/SS220/CryopodSSD/SSDStorageConsoleSystem.cs
index a1e250ca7939..98793b1595ea 100644
--- a/Content.Server/SS220/CryopodSSD/SSDStorageConsoleSystem.cs
+++ b/Content.Server/SS220/CryopodSSD/SSDStorageConsoleSystem.cs
@@ -51,6 +51,7 @@ public sealed class SSDStorageConsoleSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
     private ISawmill _sawmill = default!;
 
@@ -306,7 +307,7 @@ private void SortContainedItems(in EntityUid storageToLook, ref List<EntityUid>
                     continue;
                 }
 
-                if (whitelist is null || whitelist.IsValid(childUid))
+                if (whitelist is null || _whitelist.IsValid(whitelist, childUid))
                 {
                     whitelistedItems.Add(childUid);
                 }
diff --git a/Content.Server/SS220/DarkReaper/DarkReaperMajorRuleSystem.cs b/Content.Server/SS220/DarkReaper/DarkReaperMajorRuleSystem.cs
index 99567a1938dd..34726a9a0e2e 100644
--- a/Content.Server/SS220/DarkReaper/DarkReaperMajorRuleSystem.cs
+++ b/Content.Server/SS220/DarkReaper/DarkReaperMajorRuleSystem.cs
@@ -3,7 +3,7 @@
 using Content.Server.Antag;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.Mind;
 using Content.Server.Respawn;
diff --git a/Content.Server/SS220/DarkReaper/DarkReaperSystem.cs b/Content.Server/SS220/DarkReaper/DarkReaperSystem.cs
index 505c6ac083a3..21eb9cebd55c 100644
--- a/Content.Server/SS220/DarkReaper/DarkReaperSystem.cs
+++ b/Content.Server/SS220/DarkReaper/DarkReaperSystem.cs
@@ -39,6 +39,12 @@ public sealed class DarkReaperSystem : SharedDarkReaperSystem
 
     private readonly ISawmill _sawmill = Logger.GetSawmill("DarkReaper");
 
+    [ValidatePrototypeId<AlertPrototype>]
+    private const string DeadscoreStage1Alert = "DeadscoreStage1";
+
+    [ValidatePrototypeId<AlertPrototype>]
+    private const string DeadscoreStage2Alert = "DeadscoreStage2";
+
     private const int MaxBooEntities = 30;
 
     public override void Initialize()
@@ -139,14 +145,14 @@ protected override void OnAfterConsumed(EntityUid uid, DarkReaperComponent comp,
 
     private void UpdateAlert(EntityUid uid, DarkReaperComponent comp)
     {
-        _alerts.ClearAlert(uid, AlertType.DeadscoreStage1);
-        _alerts.ClearAlert(uid, AlertType.DeadscoreStage2);
+        _alerts.ClearAlert(uid, DeadscoreStage1Alert);
+        _alerts.ClearAlert(uid, DeadscoreStage2Alert);
 
-        AlertType alert;
+        string alert;
         if (comp.CurrentStage == 1)
-            alert = AlertType.DeadscoreStage1;
+            alert = DeadscoreStage1Alert;
         else if (comp.CurrentStage == 2)
-            alert = AlertType.DeadscoreStage2;
+            alert = DeadscoreStage2Alert;
         else
         {
             return;
@@ -157,12 +163,12 @@ private void UpdateAlert(EntityUid uid, DarkReaperComponent comp)
 
         severity -= comp.Consumed;
 
-        if (alert == AlertType.DeadscoreStage1 && severity > 3)
+        if (alert == DeadscoreStage1Alert && severity > 3)
         {
             severity = 3; // 3 is a max value our sprite can display at stage 1
             _sawmill.Error("Had to clamp alert severity. It shouldn't happen. Report it to Artur.");
         }
-        else if (alert == AlertType.DeadscoreStage2 && severity > 8)
+        else if (alert == DeadscoreStage2Alert && severity > 8)
         {
             severity = 8; // 8 is a max value our sprite can display at stage 2
             _sawmill.Error("Had to clamp alert severity. It shouldn't happen. Report it to Artur.");
@@ -170,8 +176,8 @@ private void UpdateAlert(EntityUid uid, DarkReaperComponent comp)
 
         if (severity <= 0)
         {
-            _alerts.ClearAlert(uid, AlertType.DeadscoreStage1);
-            _alerts.ClearAlert(uid, AlertType.DeadscoreStage2);
+            _alerts.ClearAlert(uid, DeadscoreStage1Alert);
+            _alerts.ClearAlert(uid, DeadscoreStage2Alert);
             return;
         }
 
diff --git a/Content.Server/SS220/ForcefieldGenerator/ForcefieldGeneratorSystem.cs b/Content.Server/SS220/ForcefieldGenerator/ForcefieldGeneratorSystem.cs
index c30d62764ef2..89f175dc53a4 100644
--- a/Content.Server/SS220/ForcefieldGenerator/ForcefieldGeneratorSystem.cs
+++ b/Content.Server/SS220/ForcefieldGenerator/ForcefieldGeneratorSystem.cs
@@ -185,7 +185,7 @@ private void UpdateFieldPosition(EntityUid entity, ForcefieldGeneratorSS220Compo
             return;
 
         var genTransform = Transform(entity);
-        var pos = Matrix3.CreateRotation(component.Angle).Transform(new Vector2(0, component.Radius));
+        var pos = Vector2.Transform(new Vector2(0, component.Radius), Matrix3Helpers.CreateRotation(component.Angle));
         _transform.SetCoordinates(fieldEntity.Value, new EntityCoordinates(entity, pos));
         _transform.SetWorldRotation(fieldEntity.Value, _transform.GetWorldRotation(genTransform) + component.Angle);
 
diff --git a/Content.Server/SS220/GameTicking/Rules/EmergencyShuttleAutoCallRuleSystem.cs b/Content.Server/SS220/GameTicking/Rules/EmergencyShuttleAutoCallRuleSystem.cs
index dfd01d5d13d6..d36d4f5eddb6 100644
--- a/Content.Server/SS220/GameTicking/Rules/EmergencyShuttleAutoCallRuleSystem.cs
+++ b/Content.Server/SS220/GameTicking/Rules/EmergencyShuttleAutoCallRuleSystem.cs
@@ -1,6 +1,6 @@
 // © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 
diff --git a/Content.Server/SS220/ItemOfferVerb/Systems/ItemOfferSystem.cs b/Content.Server/SS220/ItemOfferVerb/Systems/ItemOfferSystem.cs
index 5b3ad426e80f..a1a0f2b0d786 100644
--- a/Content.Server/SS220/ItemOfferVerb/Systems/ItemOfferSystem.cs
+++ b/Content.Server/SS220/ItemOfferVerb/Systems/ItemOfferSystem.cs
@@ -19,6 +19,10 @@ public sealed class ItemOfferSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
         [Dependency] private readonly HandsSystem _hands = default!;
+
+        [ValidatePrototypeId<AlertPrototype>]
+        private const string ItemOfferAlert = "ItemOffer";
+
         public override void Initialize()
         {
             base.Initialize();
@@ -38,7 +42,7 @@ public override void Update(float frameTime)
                 var giverHands = Comp<HandsComponent>(comp.Giver);
                 if (distance > comp.ReceiveRange)
                 {
-                    _alerts.ClearAlert(uid, AlertType.ItemOffer);
+                    _alerts.ClearAlert(uid, ItemOfferAlert);
                     _entMan.RemoveComponent<ItemReceiverComponent>(uid);
                 }
                 //FunTust: added a new variable responsible for whether the object is still in the hand during transmission
@@ -60,7 +64,7 @@ then when we checked the first hand we didn't find it and deleted the transfer r
                 //but it should work and it shouldn't affect performance too much because there are only 2 hands.
                 if (!foundInHand)
                 {
-                    _alerts.ClearAlert(uid, AlertType.ItemOffer);
+                    _alerts.ClearAlert(uid, ItemOfferAlert);
                     _entMan.RemoveComponent<ItemReceiverComponent>(uid);
                 }
             }
@@ -80,7 +84,7 @@ private void AddOfferVerb(EntityUid uid, HandsComponent component, GetVerbsEvent
                     var itemReceiver = EnsureComp<ItemReceiverComponent>(uid);
                     itemReceiver.Giver = args.User;
                     itemReceiver.Item = args.Hands.ActiveHandEntity;
-                    _alerts.ShowAlert(uid, AlertType.ItemOffer);
+                    _alerts.ShowAlert(uid, ItemOfferAlert);
                     _popupSystem.PopupEntity($"{Name(args.User)} протягивает {Name(args.Hands.ActiveHandEntity!.Value)} {Name(uid)}", args.User, PopupType.Small);
                 },
             };
@@ -95,7 +99,7 @@ public void TransferItemInHands(EntityUid receiver, ItemReceiverComponent? itemR
             if (_hands.TryPickupAnyHand(receiver, itemReceiver.Item!.Value))
             {
                 _popupSystem.PopupEntity($"{Name(itemReceiver.Giver)} передал {Name(itemReceiver.Item!.Value)} {Name(receiver)}!", itemReceiver.Giver, PopupType.Medium);
-                _alerts.ClearAlert(receiver, AlertType.ItemOffer);
+                _alerts.ClearAlert(receiver, ItemOfferAlert);
                 _entMan.RemoveComponent<ItemReceiverComponent>(receiver);
             };
         }
diff --git a/Content.Server/SS220/MindSlave/MindSlaveSystem.cs b/Content.Server/SS220/MindSlave/MindSlaveSystem.cs
index c1d4c779e975..135fc38ff15d 100644
--- a/Content.Server/SS220/MindSlave/MindSlaveSystem.cs
+++ b/Content.Server/SS220/MindSlave/MindSlaveSystem.cs
@@ -65,7 +65,8 @@ public sealed class MindSlaveSystem : EntitySystem
 
     private readonly SoundSpecifier GreetSoundNotification = new SoundPathSpecifier("/Audio/Ambience/Antag/traitor_start.ogg");
 
-    private const AlertType EnslavedAlert = AlertType.MindSlaved;
+    [ValidatePrototypeId<AlertPrototype>]
+    private const string EnslavedAlert = "MindSlaved";
 
     /// <summary>
     /// Dictionary, containing list of all enslaved minds (as a key), and their master (as a value).
@@ -206,9 +207,6 @@ public bool TryMakeSlave(EntityUid slave, EntityUid master)
         _npcFaction.AddFaction(slave, SyndicateFactionId);
 
         EnslavedMinds.Add(mindId, masterMindId);
-        GetTraitorGamerule(out var gameRuleEntity, out var gameRule);
-        if (gameRule != null && gameRuleEntity != null)
-            _traitorRule.AddToTraitorList(mindId, gameRuleEntity.Value, gameRule);
 
         if (mindComp.UserId != null && _playerManager.TryGetSessionById(mindComp.UserId.Value, out var session))
             _eui.OpenEui(new MindSlaveNotificationEui(masterName, true), session);
@@ -270,9 +268,6 @@ public bool TryRemoveSlave(EntityUid slave)
         _npcFaction.AddFaction(slave, NanoTrasenFactionId);
 
         EnslavedMinds.Remove(mindId);
-        GetTraitorGamerule(out var gameRuleEntity, out var gameRule);
-        if (gameRule != null && gameRuleEntity != null)
-            _traitorRule.RemoveFromTraitorList(mindId, gameRuleEntity.Value, gameRule);
 
         if (mindComp.UserId != null && master != null && _playerManager.TryGetSessionById(mindComp.UserId.Value, out var session))
             _eui.OpenEui(new MindSlaveNotificationEui(masterName, false), session);
diff --git a/Content.Server/SS220/StationEvents/CableRandomSpawnRule.cs b/Content.Server/SS220/StationEvents/CableRandomSpawnRule.cs
index 8927ea1895d7..67a1af3b2a69 100644
--- a/Content.Server/SS220/StationEvents/CableRandomSpawnRule.cs
+++ b/Content.Server/SS220/StationEvents/CableRandomSpawnRule.cs
@@ -4,7 +4,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Content.Server.Power.Components;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components;
 
 namespace Content.Server.SS220.StationEvents;
 
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index c332aa0dcf85..69a296139b70 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -290,7 +290,7 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
                 var direction = ContentLocalizationManager.FormatDirection(angle.GetDir());
                 var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playDefaultSound: false);
+                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playSound: false);
             }
 
             // shuttle timers
@@ -321,7 +321,7 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo
                 var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery);
                 var direction = ContentLocalizationManager.FormatDirection(angle.GetDir());
                 var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform)));
-                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playDefaultSound: false);
+                _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playSound: false);
             }
 
             _logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle {ToPrettyString(stationUid)} unable to find a valid docking port for {ToPrettyString(stationUid)}");
diff --git a/Content.Server/Teleportation/HandTeleporterSystem.cs b/Content.Server/Teleportation/HandTeleporterSystem.cs
index e04f5f4a2fc1..8a7c8b9e88a7 100644
--- a/Content.Server/Teleportation/HandTeleporterSystem.cs
+++ b/Content.Server/Teleportation/HandTeleporterSystem.cs
@@ -168,6 +168,5 @@ private void FizzlePortals(EntityUid uid, HandTeleporterComponent component, Ent
 
         if (instability)
             _popup.PopupEntity(Loc.GetString("handheld-teleporter-instability-fizzle"), uid, user, PopupType.MediumCaution);
-        }
     }
 }
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 74bbf59a4b26..67045abdfdc1 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -32,6 +32,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Content.Server.Advertise.EntitySystems;
+using Content.Shared.Whitelist;
 
 namespace Content.Server.VendingMachines
 {
@@ -50,6 +51,7 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
+        [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
 
         private const float WallVendEjectDistanceFromWall = 1f;
 
@@ -319,7 +321,7 @@ private bool ItemIsInWhitelist(EntityUid item, string itemCode, VendingMachineCo
             if (vendComponent.Inventory.ContainsKey(itemCode))
                 return true;
 
-            return vendComponent.Whitelist != null && vendComponent.Whitelist.IsValid(item);
+            return vendComponent.Whitelist != null && _whitelist.IsValid(vendComponent.Whitelist, item);
         }
 
         private bool TryGetItemCode(EntityUid entityUid, out string code)
diff --git a/Content.Shared/SS220/AdmemeEvents/EventRoleComponent.cs b/Content.Shared/SS220/AdmemeEvents/EventRoleComponent.cs
index db1a72629784..6ff2bdae88df 100644
--- a/Content.Shared/SS220/AdmemeEvents/EventRoleComponent.cs
+++ b/Content.Shared/SS220/AdmemeEvents/EventRoleComponent.cs
@@ -12,14 +12,11 @@ namespace Content.Shared.SS220.AdmemeEvents;
 /// Используется чтобы ивентовые рольки видели друг-друга.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class EventRoleComponent : Component, IAntagStatusIconComponent
+public sealed partial class EventRoleComponent : Component
 {
     [DataField(required: true), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public ProtoId<StatusIconPrototype> StatusIcon { get; set; }
 
     [DataField(required: true), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public string RoleGroupKey;
-
-    [DataField]
-    public bool IconVisibleToGhost { get; set; } = true;
 }
diff --git a/Content.Shared/SS220/MindSlave/MindSlaveComponent.cs b/Content.Shared/SS220/MindSlave/MindSlaveComponent.cs
index 1f4191ad86a0..ba2358d4cfc7 100644
--- a/Content.Shared/SS220/MindSlave/MindSlaveComponent.cs
+++ b/Content.Shared/SS220/MindSlave/MindSlaveComponent.cs
@@ -11,9 +11,7 @@ namespace Content.Shared.SS220.MindSlave;
 /// Used to mark an entity as a mind-slave.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class MindSlaveComponent : Component, IAntagStatusIconComponent
+public sealed partial class MindSlaveComponent : Component
 {
     public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "MindSlaveIcon";
-
-    public bool IconVisibleToGhost { get; set; } = false;
 }
diff --git a/Content.Shared/SS220/MindSlave/MindSlaveMasterComponent.cs b/Content.Shared/SS220/MindSlave/MindSlaveMasterComponent.cs
index 9d4ff013faed..a7ed28ece48b 100644
--- a/Content.Shared/SS220/MindSlave/MindSlaveMasterComponent.cs
+++ b/Content.Shared/SS220/MindSlave/MindSlaveMasterComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.SS220.MindSlave;
 /// Component, used to mark the master of some enslaved minds.
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class MindSlaveMasterComponent : Component, IAntagStatusIconComponent
+public sealed partial class MindSlaveMasterComponent : Component
 {
     /// <summary>
     /// List of all enslaved entities, which were enslaved by the owner.
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 87f369a64169..88944b837248 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -164,7 +164,7 @@ private bool TryReflectProjectile(EntityUid user, Entity<ReflectComponent> refle
         if (!_random.Prob(GetReflectChance(reflector)))
             return false;
 
-        var rotation = _random.NextAngle(-reflect.SpreadProjectile / 2, reflect.SpreadProjectile / 2).Opposite(); // ss220 FixESword
+        var rotation = _random.NextAngle(-reflector.Comp.SpreadProjectile / 2, reflector.Comp.SpreadProjectile / 2).Opposite(); // ss220 FixESword
         var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
         var relativeVelocity = existingVelocity - _physics.GetMapLinearVelocity(user);
         var newVelocity = rotation.RotateVec(relativeVelocity);
diff --git a/Resources/Prototypes/SS220/Alerts/categories.yml b/Resources/Prototypes/SS220/Alerts/categories.yml
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/Resources/Prototypes/SS220/StatusIcons/antag.yml b/Resources/Prototypes/SS220/StatusIcons/antag.yml
index 15b1ed7fc0d9..b0c46617b155 100644
--- a/Resources/Prototypes/SS220/StatusIcons/antag.yml
+++ b/Resources/Prototypes/SS220/StatusIcons/antag.yml
@@ -114,6 +114,7 @@
   id: MindSlaveIcon
   priority: 11
   locationPreference: Right
+  visibleToGhosts: false
   icon:
     sprite: /Textures/SS220/Interface/Misc/job_icons.rsi
     state: slave
@@ -122,6 +123,7 @@
   id: MindSlaveMasterIcon
   priority: 11
   locationPreference: Right
+  visibleToGhosts: false
   icon:
     sprite: /Textures/SS220/Interface/Misc/job_icons.rsi
     state: master

From eaa45b9e54fbd30041b2caabecbee00496d702aa Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 01:27:25 +0300
Subject: [PATCH 548/568] delete locale duplicates

---
 Resources/Locale/ru-RU/accent/pirate.ftl      |  2 +-
 .../Locale/ru-RU/actions/actions/vehicle.ftl  |  2 -
 .../ru-RU/administration/ui/admin-logs.ftl    |  1 -
 .../components/ame-controller-component.ftl   |  1 -
 .../ru-RU/chat/sanitizer-replacements.ftl     |  1 -
 .../configurable/configuration-component.ftl  |  4 -
 .../Locale/ru-RU/corvax/accent/italian.ftl    | 82 ----------------
 .../ru-RU/corvax/markings/slime_cat.ftl       |  2 -
 .../meta/consumable/drink/alcohol.ftl         | 40 --------
 .../components/disposal-tagger-window.ftl     |  4 -
 .../components/disposal-unit-component.ftl    |  2 -
 Resources/Locale/ru-RU/dragon/dragon.ftl      |  3 -
 Resources/Locale/ru-RU/dragon/rifts.ftl       |  9 --
 .../ru-RU/escape-menu/ui/options-menu.ftl     |  1 -
 .../ru-RU/guidebook/chemistry/effects.ftl     |  5 -
 .../interaction-popup-component.ftl           |  1 -
 Resources/Locale/ru-RU/markings/cat.ftl       |  1 -
 .../conditions/doorjack-condition.ftl         | 11 ---
 .../objectives/conditions/kill-person.ftl     |  1 -
 .../other-traitor-alive-condition.ftl         |  2 -
 .../conditions/other-traitor-progress.ftl     |  1 -
 .../objectives/conditions/spider-charge.ftl   |  2 -
 .../objectives/conditions/steal-condition.ftl |  5 -
 .../conditions/steal-research-condition.ftl   |  7 --
 .../Locale/ru-RU/pinpointer/station_map.ftl   | 13 ---
 .../Locale/ru-RU/prototypes/barricades.ftl    |  4 -
 .../catalog/cargo/cargo-livestock.ftl         | 30 ------
 .../catalog/fills/crates/armory-crates.ftl    | 12 ---
 .../catalog/fills/crates/botany-crates.ftl    | 10 --
 .../fills/crates/circuitboard-crates.ftl      |  2 -
 .../catalog/fills/crates/emergency-crates.ftl | 14 ---
 .../catalog/fills/crates/food-crates.ftl      | 16 ---
 .../catalog/fills/crates/fun-crates.ftl       | 41 --------
 .../catalog/fills/crates/livestock-crates.ftl | 44 ---------
 .../catalog/fills/crates/materials-crates.ftl | 18 ----
 .../catalog/fills/crates/salvage-crates.ftl   |  2 -
 .../catalog/fills/crates/security-crates.ftl  | 14 ---
 .../catalog/fills/crates/service-crates.ftl   | 26 -----
 .../catalog/fills/crates/syndicate-crates.ftl |  6 --
 .../catalog/fills/crates/vending-crates.ftl   | 46 ---------
 .../structures/shuttles/thrusters.ftl         | 10 --
 .../storage/canisters/gas-canisters.ftl       | 54 ----------
 .../structures/storage/tanks/tanks.ftl        | 14 ---
 .../ru-RU/reagents/meta/physical-desc.ftl     |  1 -
 .../Locale/ru-RU/salvage/salvage-system.ftl   |  4 -
 .../prototypes/body/mechanisms/human.ftl      | 33 -------
 .../prototypes/body/mechanisms/rat.ftl        |  6 --
 .../prototypes/body/mechanisms/reptilian.ftl  |  3 -
 .../prototypes/body/mechanisms/slime.ftl      |  6 --
 .../prototypes/body/mechanisms/vox.ftl        |  3 -
 .../ss14-ru/prototypes/body/organs/animal.ftl | 12 ---
 .../catalog/fills/backpacks/duffelbag.ftl     |  2 -
 .../fills/backpacks/starter gear/backpack.ftl | 20 ----
 .../backpacks/starter gear/duffelbag.ftl      | 18 ----
 .../fills/backpacks/starter gear/satchel.ftl  | 16 ---
 .../catalog/fills/boxes/medical.ftl           |  2 -
 .../catalog/fills/crates/cargo-crates.ftl     |  0
 .../prototypes/catalog/fills/crates/cargo.ftl |  4 -
 .../catalog/fills/crates/chemistry-crates.ftl |  0
 .../fills/crates/engineering-crates.ftl       |  0
 .../catalog/fills/crates/engineering.ftl      | 30 ------
 .../catalog/fills/crates/engines-crates.ftl   |  0
 .../catalog/fills/crates/engines.ftl          | 28 ------
 .../catalog/fills/crates/medical-crates.ftl   |  0
 .../catalog/fills/crates/medical.ftl          | 26 -----
 .../catalog/fills/crates/science-crates.ftl   |  0
 .../catalog/fills/crates/science.ftl          |  2 -
 .../prototypes/catalog/fills/firstaidkits.ftl |  9 --
 .../corvax/entities/clothing/neck/mantles.ftl |  2 -
 .../entities/clothing/uniforms/jumpskirts.ftl |  2 -
 .../objects/consumable/drinks/drinks.ftl      | 42 --------
 .../corvax/entities/objects/misc/stamps.ftl   |  6 --
 .../entities/structures/furniture/chairs.ftl  |  2 -
 .../structures/storage/tanks/tanks.ftl        |  6 --
 .../corvax/objectives/traitorObjectives.ftl   |  2 -
 .../nekish/entities/clothing/back/satchel.ftl |  3 -
 .../nekish/entities/clothing/belt/belts.ftl   |  3 -
 .../nekish/entities/clothing/hands/gloves.ftl |  3 -
 .../nekish/entities/clothing/head/hats.ftl    |  3 -
 .../entities/clothing/outerclothing/coats.ftl |  3 -
 .../clothing/uniforms/jumpsuit/jumpsuits.ftl  |  3 -
 .../entities/markers/spawners/ghost_roles.ftl |  3 -
 .../entities/clothing/head/helmets.ftl        |  7 --
 .../clothing/outerclothing/hardsuits.ftl      |  7 --
 .../entities/clothing/outerclothing/misc.ftl  |  2 -
 .../clothing/outerclothing/wintercoats.ftl    |  2 -
 .../clothing/uniforms/color_jumpskirts.ftl    | 32 ------
 .../clothing/uniforms/color_jumpsuits.ftl     | 34 -------
 .../prototypes/entities/fun/figurines.ftl     | 98 -------------------
 .../spawners/food_drinks/drinks_bottles.ftl   |  3 -
 .../spawners/food_drinks/drinks_glass.ftl     |  3 -
 .../food_drinks/food_baked_single.ftl         |  3 -
 .../spawners/food_drinks/food_baked_whole.ftl |  3 -
 .../spawners/food_drinks/food_meal.ftl        |  3 -
 .../spawners/food_drinks/food_single.ftl      |  3 -
 .../spawners/food_drinks/food_snacks.ftl      |  3 -
 .../prototypes/entities/mobs/npcs/bear.ftl    |  5 -
 .../objects/consumable/food/food_base.ftl     |  2 -
 .../objects/consumable/food/produce.ftl       |  3 -
 .../food/randomspawns/food_snacks.ftl         |  3 -
 .../objects/devices/electronics/apc.ftl       |  3 -
 .../objects/devices/electronics/solar.ftl     |  3 -
 .../entities/objects/fun/instruments.ftl      | 54 ----------
 .../fun/instruments/base_instruments.ftl      |  6 --
 .../instruments/instruments_percussion.ftl    |  2 -
 .../prototypes/entities/objects/fun/toys.ftl  |  6 --
 .../entities/objects/misc/authorbooks.ftl     | 62 ------------
 .../entities/objects/misc/filing_cabinets.ftl |  9 --
 .../entities/objects/misc/rubber_stamp.ftl    | 55 -----------
 .../entities/objects/specific/AnomalyCore.ftl | 34 -------
 .../objects/specific/chemistry-vials.ftl      |  4 +-
 .../objects/specific/janitorial/janitor.ftl   |  9 --
 .../objects/specific/mech/mecha_equipment.ftl |  2 -
 .../objects/specific/mining/ore_bag.ftl       |  2 -
 .../objects/specific/rehydrateable.ftl        |  2 -
 .../specific/robotics/borg_modules.ftl        |  2 -
 .../xenoarchaeology/artifact_equipment.ftl    |  2 -
 .../weapons/guns/ammunition/boxes/shotgun.ftl | 20 ----
 .../ammunition/cartridges/BaseCartridge.ftl   |  3 -
 .../guns/ammunition/cartridges/hrifle.ftl     |  3 -
 .../weapons/guns/explosives/clusterbang.ftl   |  5 -
 .../weapons/guns/explosives/grenades.ftl      | 13 ---
 .../weapons/guns/revolvers/revolvers.ftl      |  3 -
 .../entities/structures/cargo_console.ftl     |  2 -
 .../doors/airlocks/base_structureairlocks.ftl |  2 -
 .../structures/furniture/instruments.ftl      | 18 ----
 .../structures/machines/disease_diagnoser.ftl |  3 -
 .../structures/machines/vaccinator.ftl        |  3 -
 .../structures/power/generation/generator.ftl |  3 -
 .../structures/specific/anomalies.ftl         | 26 -----
 .../structures/storage/closets/big_boxes.ftl  |  2 -
 .../storage/closets/lockers/lockers.ftl       |  4 -
 .../structures/wallmounts/lighting.ftl        | 36 -------
 .../wallmounts/surveillance_camera.ftl        |  3 -
 .../entities/structures/walls/girder.ftl      |  3 -
 .../prototypes/entities/tile/basalt.ftl       | 18 ----
 Resources/Locale/ru-RU/ss220/bed.ftl          |  2 -
 Resources/Locale/ru-RU/ss220/chat/emotes.ftl  |  4 +-
 .../ru-RU/ss220/mobs/ghost-role-pets.ftl      |  2 -
 .../prototypes/body/mechanisms/vulpkanin.ftl  |  3 -
 .../entities/objects/tools/lighters.ftl       |  2 -
 .../components/handheld-radio-component.ftl   |  5 -
 Resources/Locale/ru-RU/ss220/stamps.ftl       |  4 -
 .../station-events/events/immovable-rod.ftl   |  1 -
 Resources/Locale/ru-RU/ss220/traits.ftl       |  3 -
 Resources/Locale/ru-RU/tiles/tiles.ftl        |  1 -
 Resources/Locale/ru-RU/ui/verbs.ftl           |  4 -
 .../Locale/ru-RU/window/window-component.ftl  |  3 -
 148 files changed, 3 insertions(+), 1548 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/actions/actions/vehicle.ftl
 delete mode 100644 Resources/Locale/ru-RU/corvax/accent/italian.ftl
 delete mode 100644 Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl
 delete mode 100644 Resources/Locale/ru-RU/dragon/dragon.ftl
 delete mode 100644 Resources/Locale/ru-RU/dragon/rifts.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/doorjack-condition.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/kill-person.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/other-traitor-alive-condition.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/other-traitor-progress.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/spider-charge.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/steal-condition.ftl
 delete mode 100644 Resources/Locale/ru-RU/objectives/conditions/steal-research-condition.ftl
 delete mode 100644 Resources/Locale/ru-RU/pinpointer/station_map.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/barricades.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-livestock.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/armory-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/botany-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/circuitboard-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/emergency-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/materials-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/salvage-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/security-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/service-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/syndicate-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/catalog/fills/crates/vending-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/entities/structures/shuttles/thrusters.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/entities/structures/storage/canisters/gas-canisters.ftl
 delete mode 100644 Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/human.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/rat.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/reptilian.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/slime.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/vox.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl
 rename Resources/Locale/ru-RU/{ => ss14-ru}/prototypes/catalog/fills/crates/cargo-crates.ftl (100%)
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl
 rename Resources/Locale/ru-RU/{ => ss14-ru}/prototypes/catalog/fills/crates/chemistry-crates.ftl (100%)
 rename Resources/Locale/ru-RU/{ => ss14-ru}/prototypes/catalog/fills/crates/engineering-crates.ftl (100%)
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl
 rename Resources/Locale/ru-RU/{ => ss14-ru}/prototypes/catalog/fills/crates/engines-crates.ftl (100%)
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engines.ftl
 rename Resources/Locale/ru-RU/{ => ss14-ru}/prototypes/catalog/fills/crates/medical-crates.ftl (100%)
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/medical.ftl
 rename Resources/Locale/ru-RU/{ => ss14-ru}/prototypes/catalog/fills/crates/science-crates.ftl (100%)
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/science.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/stamps.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/objectives/traitorObjectives.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvaxsecrets/entities/markers/spawners/ghost_roles.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/fun/figurines.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifact_equipment.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/cargo_console.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/anomalies.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girder.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/tile/basalt.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss220/bed.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss220/prototypes/body/mechanisms/vulpkanin.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss220/station-events/events/immovable-rod.ftl
 delete mode 100644 Resources/Locale/ru-RU/ui/verbs.ftl

diff --git a/Resources/Locale/ru-RU/accent/pirate.ftl b/Resources/Locale/ru-RU/accent/pirate.ftl
index 3cf58360d794..ed973b0e5e1b 100644
--- a/Resources/Locale/ru-RU/accent/pirate.ftl
+++ b/Resources/Locale/ru-RU/accent/pirate.ftl
@@ -232,7 +232,7 @@ accent-pirate-replaced-78 = казнить
 accent-pirate-replacement-78 = вздернуть на рее
 
 accent-pirate-replaced-79 = казнен
-accent-pirate-replaced-79 = вздернут на рее
+accent-pirate-replacement-79 = вздернут на рее
 
 accent-pirate-replaced-80 = зарплата
 accent-pirate-replacement-80 = доля
diff --git a/Resources/Locale/ru-RU/actions/actions/vehicle.ftl b/Resources/Locale/ru-RU/actions/actions/vehicle.ftl
deleted file mode 100644
index 7c8da8a135f2..000000000000
--- a/Resources/Locale/ru-RU/actions/actions/vehicle.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-action-name-honk = Хонк
-action-desc-honk = Хонк!
diff --git a/Resources/Locale/ru-RU/administration/ui/admin-logs.ftl b/Resources/Locale/ru-RU/administration/ui/admin-logs.ftl
index 989e323197b3..15302eae3717 100644
--- a/Resources/Locale/ru-RU/administration/ui/admin-logs.ftl
+++ b/Resources/Locale/ru-RU/administration/ui/admin-logs.ftl
@@ -11,7 +11,6 @@ admin-logs-select-all = Все
 admin-logs-select-none = Никакие
 # Players
 admin-logs-search-players-placeholder = Поиск игрока... (ИЛИ)
-admin-logs-select-none = Никакие
 admin-logs-include-non-player = Включая не-игроков
 # Logs
 admin-logs-search-logs-placeholder = Поиск по логам...
diff --git a/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl b/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl
index 2dc4d84f22d7..630cfff253c0 100644
--- a/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl
+++ b/Resources/Locale/ru-RU/ame/components/ame-controller-component.ftl
@@ -16,7 +16,6 @@ ame-window-refresh-parts-button = Обновить детали
 ame-window-core-count-label = Количество ядер:
 ame-window-power-currentsupply-label = Текущее электроснабжение:
 ame-window-power-targetsupply-label = Целевое электроснабжение:
-ame-window-toggle-injection-button = Переключение впрыска
 ame-window-eject-button = Извлечь
 ame-window-increase-fuel-button = Увеличить
 ame-window-decrease-fuel-button = Уменьшить
diff --git a/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl b/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl
index e36940afc65e..f5af77cb0525 100644
--- a/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl
+++ b/Resources/Locale/ru-RU/chat/sanitizer-replacements.ftl
@@ -13,7 +13,6 @@ chatsan-annoyed = выглядит раздражённым
 chatsan-sighs = вздыхает
 chatsan-stick-out-tongue = показывает язык
 chatsan-wide-eyed = выглядит шокированным
-chatsan-surprised = выглядит удивлённым
 chatsan-confused = выглядит смущённым
 chatsan-unimpressed = кажется не впечатлённым
 chatsan-waves = машет
diff --git a/Resources/Locale/ru-RU/configurable/configuration-component.ftl b/Resources/Locale/ru-RU/configurable/configuration-component.ftl
index 116ee2b3b6c1..9bcb47dec0e9 100644
--- a/Resources/Locale/ru-RU/configurable/configuration-component.ftl
+++ b/Resources/Locale/ru-RU/configurable/configuration-component.ftl
@@ -1,6 +1,2 @@
 configuration-menu-confirm = Подтвердить
 configuration-menu-device-title = Конфигурация устройств
-
-## ConfigureVerb
-
-configure-verb-get-data-text = Открыть конфигурацию
diff --git a/Resources/Locale/ru-RU/corvax/accent/italian.ftl b/Resources/Locale/ru-RU/corvax/accent/italian.ftl
deleted file mode 100644
index 638eb24d2374..000000000000
--- a/Resources/Locale/ru-RU/corvax/accent/italian.ftl
+++ /dev/null
@@ -1,82 +0,0 @@
-accent-italian-words-301 = малышка
-accent-italian-words-replace-301 = bambino
-accent-italian-words-401 = плохая
-accent-italian-words-replace-401 = molto male
-accent-italian-words-402 = плохие
-accent-italian-words-replace-402 = molto male
-accent-italian-words-403 = плохое
-accent-italian-words-replace-403 = molto male
-accent-italian-words-501 = досвидания
-accent-italian-words-replace-501 = arrivederci
-accent-italian-words-502 = до-свидания
-accent-italian-words-replace-502 = arrivederci
-accent-italian-words-601 = кэп
-accent-italian-words-replace-601 = capitano
-accent-italian-words-701 = сыра
-accent-italian-words-replace-701 = parmesano
-accent-italian-words-801 = приготовить
-accent-italian-words-replace-801 = cucinare
-accent-italian-words-802 = приготовлю
-accent-italian-words-replace-802 = cucinare
-accent-italian-words-803 = пожарь
-accent-italian-words-replace-803 = cucinare
-accent-italian-words-804 = пожарить
-accent-italian-words-replace-804 = cucinare
-accent-italian-words-805 = пожарю
-accent-italian-words-replace-805 = cucinare
-accent-italian-words-901 = можешь
-accent-italian-words-replace-901 = potrebbe
-accent-italian-words-1001 = отец
-accent-italian-words-replace-1001 = pappa
-accent-italian-words-1101 = хорошая
-accent-italian-words-replace-1101 = molto bene
-accent-italian-words-1102 = хорошие
-accent-italian-words-replace-1102 = molto bene
-accent-italian-words-1103 = хорошее
-accent-italian-words-replace-1103 = molto bene
-accent-italian-words-1501 = приветик
-accent-italian-words-replace-1501 = ciao
-accent-italian-words-1701 = сделаю
-accent-italian-words-replace-1701 = fare una
-accent-italian-words-1702 = сделаем
-accent-italian-words-replace-1702 = fare una
-accent-italian-words-1703 = сделайте
-accent-italian-words-replace-1703 = fare una
-accent-italian-words-1801 = мяса
-accent-italian-words-replace-1801 = prosciutto
-accent-italian-words-1901 = мать
-accent-italian-words-replace-1901 = mamma
-accent-italian-words-2001 = моя
-accent-italian-words-replace-2001 = il mio
-accent-italian-words-2002 = моё
-accent-italian-words-replace-2002 = il mio
-accent-italian-words-2003 = мои
-accent-italian-words-replace-2003 = il mio
-accent-italian-words-2101 = ядерка
-accent-italian-words-replace-2101 = polpetta di carne
-accent-italian-words-2801 = щиткюрити
-accent-italian-words-replace-2801 = carabinieri
-accent-italian-words-3001 = пою
-accent-italian-words-replace-3001 = cantare
-accent-italian-words-3002 = спой
-accent-italian-words-replace-3002 = cantare
-accent-italian-words-3101 = макарон
-accent-italian-words-replace-3101 = SPAGHETT
-accent-italian-words-3102 = макароны
-accent-italian-words-replace-3102 = SPAGHETT
-accent-italian-words-3201 = острая
-accent-italian-words-replace-3201 = piccante
-accent-italian-words-3202 = острые
-accent-italian-words-replace-3202 = piccante
-accent-italian-words-3203 = острое
-accent-italian-words-replace-3203 = piccante
-accent-italian-words-3401 = штука
-accent-italian-words-replace-3401 = una cosa
-accent-italian-words-3402 = штук
-accent-italian-words-replace-3402 = pezzi
-accent-italian-words-3701 = использовать
-accent-italian-words-replace-3701 = usare
-accent-italian-words-3801 = хотеть
-accent-italian-words-replace-3801 = desiderare
-accent-italian-words-4301 = вина
-accent-italian-words-replace-4301 = vino
diff --git a/Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl b/Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl
index 032f0dde8db6..06e8a494d4f7 100644
--- a/Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl
+++ b/Resources/Locale/ru-RU/corvax/markings/slime_cat.ftl
@@ -6,8 +6,6 @@ marking-SlimeCatEars-ears_slime_cat_inner = Внутреннее ухо
 marking-SlimeCatTailStripes = Кошачий хвост из слизи (Полосатый)
 marking-SlimeCatTailStripes-slime_tail_cat_wag_stripes_prime = Первичные полосы
 marking-SlimeCatTailStripes-slime_tail_cat_wag_stripes_second = Вторичные полосы
-marking-SlimeCatEars-ears_slime_cat_outer = Наружное ухо
-marking-SlimeCatEars-ears_slime_cat_inner = Внутреннее ухо
 marking-SlimeCatEarsStubby = Короткие ушки из слизи
 marking-SlimeCatEarsStubby-ears_slime_stubby_outer = Наружное ухо
 marking-SlimeCatEarsStubby-ears_slime_stubby_inner = Внутреннее ухо
diff --git a/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl
deleted file mode 100644
index 1fd904f4eded..000000000000
--- a/Resources/Locale/ru-RU/corvax/reagents/meta/consumable/drink/alcohol.ftl
+++ /dev/null
@@ -1,40 +0,0 @@
-reagent-name-yorsh = ёрш
-reagent-desc-yorsh = Вкус беззаботного детства.
-
-reagent-name-alexander = Александр
-reagent-desc-alexander = В ходе производства ни один Александр не пострадал. Наверное...
-
-reagent-name-daiquiri = дайкири
-reagent-desc-daiquiri = Хотите почувствовать себя шахтёром из 19-го века? Шахтёр не хотел, поэтому предпочёл забыться в алкоголе.
-reagent-name-campari = кампари
-reagent-desc-campari = Настойка на основе ароматических трав и цитрусовых. Без ГМО!
-
-reagent-name-negroni = негрони
-reagent-desc-negroni = Американо для алкоголиков.
-
-reagent-name-espressoMartini = эспрессо мартини
-reagent-desc-espressoMartini = Разбуди меня и тра... Э-э-э... Ладно, просто разбуди.
-
-reagent-name-oldFashioned = олд фэшен
-reagent-desc-oldFashioned = Как сказал величайший классик: "Это классика".
-
-reagent-name-badTouch = проникновение
-reagent-desc-badTouch = Входит... И выходит... И входит... Замечательно выходит!
-
-reagent-name-darkAndStormy = тьма и буря
-reagent-desc-darkAndStormy = Прямиком с Бермудских Островов! Пират слева говорит, что именно поэтому напиток и пропадает с барной стойки.
-
-reagent-name-bramble = брамбл
-reagent-desc-bramble = Ягодки, джин, и довольно стрёмный вид.
-
-reagent-name-maiTai = май тай
-reagent-desc-maiTai = Первый человек, попробовавший этот коктейль, воскликнул: ”Mai tai — roa ae!”. Что в переводе с тайского означает... Да откуда мне знать? Звучит круто!
-
-reagent-name-moscowMule = московский мул
-reagent-desc-moscowMule = Коктейль из США. Почему Московский? Потому что водка. Водка Московская? Нет. Так почему Московский? ВОДКА!
-
-reagent-name-paloma = палома
-reagent-desc-paloma = Сверху ковбои. Снизу маракасы. Что же выбрать?
-
-reagent-name-boyarsky = Боярский
-reagent-desc-boyarsky = Что делать, если ты устал от жизни? СМЕШИВАТЬ ВОДКУ!
diff --git a/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl b/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl
index 4bb3fe252481..e4ff3eb5ae5c 100644
--- a/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl
+++ b/Resources/Locale/ru-RU/disposal/tube/components/disposal-tagger-window.ftl
@@ -2,7 +2,3 @@ disposal-tagger-window-title = Разметка утилизации
 disposal-tagger-window-tag-input-label = Метка:
 disposal-tagger-window-tag-confirm-button = Подтвердить
 disposal-tagger-window-activate-no-hands = У вас нет рук.
-
-## ConfigureVerb
-
-configure-verb-get-data-text = Открыть настройки
diff --git a/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl b/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl
index 122e6192c056..183793a132ab 100644
--- a/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl
+++ b/Resources/Locale/ru-RU/disposal/unit/components/disposal-unit-component.ftl
@@ -19,7 +19,6 @@ disposal-self-insert-verb-get-data-text = Залезть внутрь
 ## No hands
 
 disposal-unit-no-hands = У вас нет рук!
-disposal-flush-verb-get-data-text = Смыть
 disposal-unit-thrown-missed = Промах!
 # state
 disposal-unit-state-Ready = Готов
@@ -28,5 +27,4 @@ disposal-unit-state-Flushed = Нагнетание
 disposal-unit-state-Pressurizing = Нагнетание
 # putting people in
 disposal-unit-being-inserted = { CAPITALIZE($user) } пытается затолкать вас в мусоропровод!
-disposal-self-insert-verb-get-data-text = Залезть внутрь
 disposal-eject-verb-get-data-text = Извлечь всё
diff --git a/Resources/Locale/ru-RU/dragon/dragon.ftl b/Resources/Locale/ru-RU/dragon/dragon.ftl
deleted file mode 100644
index f8742286c44a..000000000000
--- a/Resources/Locale/ru-RU/dragon/dragon.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-dragon-round-end-agent-name = дракон
-objective-issuer-dragon = [color=#7567b6]Космический дракон[/color]
-dragon-role-briefing = Создайте 3 карповых разлома и захватите этот квадрант!
diff --git a/Resources/Locale/ru-RU/dragon/rifts.ftl b/Resources/Locale/ru-RU/dragon/rifts.ftl
deleted file mode 100644
index b27d81ab7ea3..000000000000
--- a/Resources/Locale/ru-RU/dragon/rifts.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-carp-rift-warning = Разлом { $location } порождает неестественно большой поток энергии. Остановите это любой ценой!
-carp-rift-duplicate = Невозможно иметь 2 заряжающихся разлома одновременно!
-carp-rift-examine = Он заряжен на [color=yellow]{ $percentage }%[/color]!
-carp-rift-max = Вы достигли максимального количества разломов
-carp-rift-anchor = Для появления разлома требуется стабильная поверхность.
-carp-rift-proximity = Слишком близко к соседнему разлому! Необходимо находиться на расстоянии не менее { $proximity } метров.
-carp-rift-space-proximity = Слишком близко к космосу! Необходимо находиться на расстоянии не менее { $proximity } метров.
-carp-rift-weakened = В своём ослабленном состоянии вы не можете создать больше разломов.
-carp-rift-destroyed = Разлом был уничтожен! Теперь вы временно ослаблены.
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index 062089491b17..968309c7d807 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -206,7 +206,6 @@ ui-options-function-editor-line-place = Размещать в линию
 ui-options-function-editor-rotate-object = Повернуть
 ui-options-function-editor-flip-object = Перевернуть
 ui-options-function-editor-copy-object = Копировать
-ui-options-function-open-abilities-menu = Открыть меню действий
 ui-options-function-show-debug-console = Открыть консоль
 ui-options-function-show-debug-monitors = Показать дебаг информацию
 ui-options-function-inspect-entity = Изучить сущность
diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
index 5ca7e050f0ae..c1f7ca6cd676 100644
--- a/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl
@@ -316,11 +316,6 @@ reagent-effect-guidebook-innoculate-zombie-infection =
         [1] Лечит
        *[other] лечат
     } зомби-вирус и обеспечивает иммунитет к нему в будущем
-reagent-effect-guidebook-reduce-rotting =
-    { $chance ->
-        [1] Regenerates
-        *[other] regenerate
-    } {NATURALFIXED($time, 3)} {MANY("second", $time)} of rotting
 reagent-effect-guidebook-missing =
     { $chance ->
         [1] Вызывает
diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
index 11a9d7efe212..e39ef3d3cf25 100644
--- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
@@ -43,7 +43,6 @@ petting-failure-goose = Вы тянетесь погладить { $target }, н
 petting-failure-possum = Вы тянетесь погладить { $target }, но на вас шипят и рычат.
 petting-failure-pig = Вы тянетесь погладить { $target }, но сталкиваетесь с раздражённым хрюканьем и визгом!
 petting-failure-sloth = Вы тянетесь погладить { $target }, но { $target } с невероятной скоростью уклоняется!
-petting-failure-pig = Вы тянетесь погладить { $target }, но сталкиваетесь с раздражённым хрюканьем и визгом!
 petting-failure-holo = Вы тянетесь погладить { $target }, но { $target } едва не пронзает шипами вашу руку!
 petting-failure-raccoon = Вы тянетесь погладить { $target }, но { $target } енотится от вас.
 petting-failure-dragon = Вы поднимаете руку, но { $target } издаёт рёв, и вы решаете, что не хотите стать кормом для карпов.
diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl
index 01f259833878..8bccdb2e863f 100644
--- a/Resources/Locale/ru-RU/markings/cat.ftl
+++ b/Resources/Locale/ru-RU/markings/cat.ftl
@@ -1,2 +1 @@
-marking-CatEars = Кошачьи уши
 marking-CatTail = Кошачий хвост
diff --git a/Resources/Locale/ru-RU/objectives/conditions/doorjack-condition.ftl b/Resources/Locale/ru-RU/objectives/conditions/doorjack-condition.ftl
deleted file mode 100644
index d056d8ad2015..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/doorjack-condition.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-objective-condition-doorjack-title = Взломайте { $count } { $count ->
-        [one] дверь
-        [few] двери
-       *[other] дверей
-    } на станции.
-objective-condition-doorjack-description =
-    Ваши перчатки могут взламывать шлюзы. Сделайте это с { $count } { $count ->
-        [one] дверью
-        [few] дверьми
-       *[other] дверьми
-    }.
diff --git a/Resources/Locale/ru-RU/objectives/conditions/kill-person.ftl b/Resources/Locale/ru-RU/objectives/conditions/kill-person.ftl
deleted file mode 100644
index a59cea4c4069..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/kill-person.ftl
+++ /dev/null
@@ -1 +0,0 @@
-objective-condition-kill-person-title = Убить или не дать покинуть станцию { $targetName }, должность: { CAPITALIZE($job) }.
diff --git a/Resources/Locale/ru-RU/objectives/conditions/other-traitor-alive-condition.ftl b/Resources/Locale/ru-RU/objectives/conditions/other-traitor-alive-condition.ftl
deleted file mode 100644
index 28d04ee6d89a..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/other-traitor-alive-condition.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-objective-condition-other-traitor-alive-title = Убедиться, что коллега-предатель { $targetName }, { CAPITALIZE($job) }, останется в живых.
-objective-condition-other-traitor-alive-description = Раскрывать себя или нет — решайте сами. Просто сделайте всё, чтобы он выжил.
diff --git a/Resources/Locale/ru-RU/objectives/conditions/other-traitor-progress.ftl b/Resources/Locale/ru-RU/objectives/conditions/other-traitor-progress.ftl
deleted file mode 100644
index 1f4531521e1e..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/other-traitor-progress.ftl
+++ /dev/null
@@ -1 +0,0 @@
-objective-condition-other-traitor-progress-title = Убедиться, что коллега-предатель { $targetName }, должность: { CAPITALIZE($job) }, выполнит хотя бы половину своих целей.
diff --git a/Resources/Locale/ru-RU/objectives/conditions/spider-charge.ftl b/Resources/Locale/ru-RU/objectives/conditions/spider-charge.ftl
deleted file mode 100644
index 64a463dbe071..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/spider-charge.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-objective-condition-spider-charge-title-no-target = Взорвать бомбу клана Паука (нет цели)
-objective-condition-spider-charge-title = Взорвать бомбу клана Паука в { $location }.
diff --git a/Resources/Locale/ru-RU/objectives/conditions/steal-condition.ftl b/Resources/Locale/ru-RU/objectives/conditions/steal-condition.ftl
deleted file mode 100644
index ab4e54265d19..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/steal-condition.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-objective-condition-steal-title-no-owner = Украсть { $itemName }.
-objective-condition-steal-title = Украсть { $itemName }, владелец: { $owner }.
-objective-condition-steal-description = Нам нужно, чтобы вы украли { $itemName }. Не попадитесь.
-objective-condition-steal-station = станция
-objective-condition-steal-Ian = корги главы персонала
diff --git a/Resources/Locale/ru-RU/objectives/conditions/steal-research-condition.ftl b/Resources/Locale/ru-RU/objectives/conditions/steal-research-condition.ftl
deleted file mode 100644
index 179c1d28bfa1..000000000000
--- a/Resources/Locale/ru-RU/objectives/conditions/steal-research-condition.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-objective-condition-steal-research-title =
-    Украдите { $count } { $count ->
-        [one] технологию
-        [few] технологии
-       *[other] технологий
-    }.
-objective-condition-steal-research-description = Ваши перчатки могут быть использованы для взлома сервера РНД и кражи его технологий. Если учёные дают слабину, вам придётся взяться за работу.
diff --git a/Resources/Locale/ru-RU/pinpointer/station_map.ftl b/Resources/Locale/ru-RU/pinpointer/station_map.ftl
deleted file mode 100644
index 2c965ceb8b70..000000000000
--- a/Resources/Locale/ru-RU/pinpointer/station_map.ftl
+++ /dev/null
@@ -1,13 +0,0 @@
-station-map-window-title = Карта станции
-station-map-user-interface-flavor-left = Не паникуй
-station-map-user-interface-flavor-right = v1.42
-nav-beacon-window-title = Станционный маяк
-nav-beacon-toggle-visible = Видимый
-nav-beacon-toggle-invisible = Невидимый
-nav-beacon-text-label = Метка:
-nav-beacon-button-apply = Применить
-nav-beacon-examine-text =
-    Он [color={ $enabled ->
-        [true] forestgreen]включён
-       *[false] crimson]выключен
-    }[/color] и на дисплее отображается [color={ $color }]"{ $label }"[/color].
diff --git a/Resources/Locale/ru-RU/prototypes/barricades.ftl b/Resources/Locale/ru-RU/prototypes/barricades.ftl
deleted file mode 100644
index 10c8fc005739..000000000000
--- a/Resources/Locale/ru-RU/prototypes/barricades.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-### Barricades entity prototype data.
-
-ent-barricade = деревянная баррикада
-    .desc = Дешёвое заграждение, выглядит так себе.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-livestock.ftl b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-livestock.ftl
deleted file mode 100644
index a4f382e17e4e..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-livestock.ftl
+++ /dev/null
@@ -1,30 +0,0 @@
-ent-LivestockBee = { ent-CrateNPCBee }
-    .desc = { ent-CrateNPCBee.desc }
-ent-LivestockButterfly = { ent-CrateNPCButterflies }
-    .desc = { ent-CrateNPCButterflies.desc }
-ent-LivestockCat = { ent-CrateNPCCat }
-    .desc = { ent-CrateNPCCat.desc }
-ent-LivestockChicken = { ent-CrateNPCChicken }
-    .desc = { ent-CrateNPCChicken.desc }
-ent-LivestockDuck = { ent-CrateNPCDuck }
-    .desc = { ent-CrateNPCDuck.desc }
-ent-LivestockCorgi = { ent-CrateNPCCorgi }
-    .desc = { ent-CrateNPCCorgi.desc }
-ent-LivestockCow = { ent-CrateNPCCow }
-    .desc = { ent-CrateNPCCow.desc }
-ent-LivestockGoat = { ent-CrateNPCGoat }
-    .desc = { ent-CrateNPCGoat.desc }
-ent-LivestockGoose = { ent-CrateNPCGoose }
-    .desc = { ent-CrateNPCGoose.desc }
-ent-LivestockGorilla = { ent-CrateNPCGorilla }
-    .desc = { ent-CrateNPCGorilla.desc }
-ent-LivestockMonkeyCube = { ent-CrateNPCMonkeyCube }
-    .desc = { ent-CrateNPCMonkeyCube.desc }
-ent-LivestockMouse = { ent-CrateNPCMouse }
-    .desc = { ent-CrateNPCMouse.desc }
-ent-LivestockParrot = { ent-CrateNPCParrot }
-    .desc = { ent-CrateNPCParrot.desc }
-ent-LivestockPenguin = { ent-CrateNPCPenguin }
-    .desc = { ent-CrateNPCPenguin.desc }
-ent-LivestockSnake = { ent-CrateNPCSnake }
-    .desc = { ent-CrateNPCSnake.desc }
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/armory-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/armory-crates.ftl
deleted file mode 100644
index d0a154b81173..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/armory-crates.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-CrateArmorySMG = ящик пистолетов-пулемётов
-    .desc = Содержит два мощных пистолета-пулемёта и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной.
-ent-CrateArmoryShotgun = ящик дробовиков
-    .desc = Когда необходимо нашпиговать врага свинцом. Содержит два дробовика Силовик, и немного обычных ружейных патронов. Чтобы открыть необходим доступ уровня Оружейной.
-ent-CrateTrackingImplants = ящик имплантов трекера
-    .desc = Содержит несколько имплантов трекера. Хороши для заключённых, за которыми вы хотите следить после освобождения.
-ent-CrateTrainingBombs = ящик учебных бомб
-    .desc = Содержит три маломощные учебные бомбы для обучения обезвреживанию и безопасной утилизации бомб, костюм сапёра в комплект не входит. Чтобы открыть необходим доступ уровня Оружейной.
-ent-CrateArmoryLaser = ящик лазеров
-    .desc = Содержит три стандартные лазерные винтовки. Чтобы открыть необходим доступ уровня Оружейной.
-ent-CrateArmoryPistols = ящик пистолетов
-    .desc = Содержит два стандартных пистолета Nanotrasen, и 4 магазина к ним. Чтобы открыть необходим доступ уровня Оружейной.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/botany-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/botany-crates.ftl
deleted file mode 100644
index cd11def6243b..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/botany-crates.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-ent-CrateHydroponicsSeedsExotic = ящик экзотических семян
-    .desc = Мечта любого практикующего ботаника. Содержит много экзотических семян. Чтобы открыть необходим уровень доступа Гидропоника.
-ent-CrateHydroponicsSeedsMedicinal = ящик лекарственных семян
-    .desc = Мечта любого начинающего химика. Сила медицины у вас под рукой! Чтобы открыть необходим уровень доступа Гидропоника.
-ent-CrateHydroponicsTools = ящик снаряжения для гидропоники
-    .desc = Припасы для выращивания превосходного сада! Содержит несколько спреев с химикатами для растений, топорик, грабли, косу, несколько пар кожаных перчаток и ботанический фартук.
-ent-CrateHydroponicsSeeds = ящик семян
-    .desc = Большие дела начинаются с малого. Содержит 12 различных семян.
-ent-CratePlantBGone = ящик гербицида Plant-B-Gone
-    .desc = Из Монстано. "Назойливые сорняки, встречайте свой смерть!"
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/circuitboard-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/circuitboard-crates.ftl
deleted file mode 100644
index 65c2c5219f76..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/circuitboard-crates.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CrateCrewMonitoringBoards = платы мониторинга экипажа
-    .desc = Содержит две машинные платы мониторинга экипажа, для сервера и консоли. Чтобы открыть необходим уровень доступа Инженерный.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/emergency-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/emergency-crates.ftl
deleted file mode 100644
index 3df274f824ac..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/emergency-crates.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-ent-CrateEmergencyExplosive = ящик сапёрного снаряжения
-    .desc = Учёные обезумели? Что-то пикает за шлюзом? Купите сейчас и станьте героем, которого станция засл... Я имею в виду, в котором нуждается! (время в комплект не входит).
-ent-CrateEmergencyFire = ящик пожарного снаряжения
-    .desc = Только вы можете предотвратить пожар на станции. Вместе с двумя противопожарными костюмами, противогазами, фонариками, большими кислородными баллонами, огнетушителями и касками!
-ent-CrateEmergencyInternals = ящик аварийного снаряжения
-    .desc = Управляйте своей жизнью и контролируйте своё дыхание с помощью трёх дыхательных масок, трёх аварийных кислородных баллонов и трёх больших баллонов с воздухом.
-ent-CrateEmergencyRadiation = ящик противорадиационного снаряжения
-    .desc = Переживите ядерный апокалипсис и двигатель суперматерии благодаря двум комплектам противорадиационных костюмов. Каждый комплект включает в себя шлем, костюм и счетчик Гейгера. Мы даже подарим бутылку водки и несколько стаканов, учитывая продолжительность жизни тех, кто это заказывает.
-ent-CrateEmergencyInflatablewall = ящик надувных стен
-    .desc = Три стопки надувных стен для случаев, когда металлические стены станции больше не удерживают атмосферу.
-ent-CrateGenericBiosuit = ящик аварийных биозащитных костюмов
-    .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от того, чем вы там занимаетесь.
-ent-CrateSlimepersonLifeSupport = ящик жизнеобеспечения слаймолюдов
-    .desc = Содержит четыре дыхательные маски и четыре больших баллона азота.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl
deleted file mode 100644
index df6875525181..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-ent-CrateFoodPizza = экстренная доставка пиццы
-    .desc = Внесите свой вклад в борьбу с голодом на станции, доставляя пиццу в отделы с недостаточным финансированием! В комплект входят 4 пиццы.
-ent-CrateFoodPizzaLarge = катастрофическая доставка пиццы
-    .desc = Даже когда всё вокруг рушится, найдите утешение в том, что много пиццы решит все проблемы. В комплект входят 16 пицц.
-ent-CrateFoodMRE = ящик ИРП
-    .desc = Армейские обеды, которыми можно накормить целый отдел.
-ent-CrateFoodCooking = ящик кухонных припасов
-    .desc = Дополнительные кухонные припасы на случай отсутствия ботаников.
-ent-CrateFoodDinnerware = ящик кухонных принадлежностей
-    .desc = Дополнительные кухонные припасы на случай, если клоуна оставили на кухне без надзора.
-ent-CrateFoodBarSupply = ящик барных принадлежностей
-    .desc = Дополнительные барные припасы на случай, если клоуна оставили за барной стойкой без надзора.
-ent-CrateFoodSoftdrinks = ящик газировки
-    .desc = Разнообразная газировка для небольшой вечеринки, без необходимости опустошать соответствующие торгоматы. В комплект входят 14 банок газировки.
-ent-CrateFoodSoftdrinksLarge = оптовый ящик газировки
-    .desc = Большое количество банок газировки, извлеченных прямо из торгоматов Центкома, ведь вы просто не можете покинуть свой отдел. Включает 28 банок газировки.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl
deleted file mode 100644
index 1973580590c5..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl
+++ /dev/null
@@ -1,41 +0,0 @@
-ent-CrateFunPlushie = ящик плюшевых игрушек
-    .desc = Куча мягких плюшевых игрушек. Разложите их повсюду, а потом подумайте, как вы объясните эту покупку NT.
-ent-CrateFunLizardPlushieBulk = оптовый ящик плюшевых унатхов
-    .desc = Куча мягких плюшевых унатхов. Разложите их повсюду, а потом подумайте, как вы объясните эту покупку NT.
-ent-CrateFunInstrumentsVariety = набор различных музыкальных инструментов
-    .desc = Развеселите и расшевелите станцию с этой разнообразной коллекцией! Содержит семь музыкальных инструментов.
-ent-CrateFunInstrumentsBrass = набор духовых инструментов
-    .desc = Поддайте джаза в жизнь станции с набором духовых инструментов. Содержит разнообразные духовые инструменты, на которых может играть вся станция.
-ent-CrateFunInstrumentsString = набор струнных инструментов
-    .desc = Ударяйте или щипайте, дёргайте или бейте по струнам! Играйте нежные мелодии или крушите лица благодаря этому набору струнных инструментов.
-ent-CrateFunInstrumentsWoodwind = набор деревянных духовых инструментов
-    .desc = Если атмос-инженеры хорошо справляется со своей работой, воспользуйтесь воздухом, чтобы сыграть на этих деревянных духовых инструментах музыку! Наличие настоящего дерева в каждом экземпляре не гарантируется.
-ent-CrateFunInstrumentsKeyedPercussion = набор клавишных и перкуссионных инструментов
-    .desc = Вдарьте по клавишам при помощи рук или палочек, воспользовавшись этим набором клавишных и перкуссионных инструментов.
-ent-CrateFunInstrumentsSpecial = набор специальных коллекционных инструментов
-    .desc = Поднимите шум при помощи этой специальной коллекции почти-инструментов! Центком не несет ответственности за любые травмы, вызванные содержимым ящика.
-ent-CrateFunArtSupplies = художественные принадлежности
-    .desc = Устройте парочку счастливых случайностей с этими мелками!
-ent-CrateFunBoardGames = ящик настольных игр
-    .desc = Доказано, что игровые вечера либо сводят на нет скуку, либо усиливают убийственную ярость в зависимости от игры.
-ent-CrateFunATV = ящик с квадроциклом
-    .desc = { ent-CrateLivestock.desc }
-ent-CrateFunSadTromboneImplants = ящик имплантов Грустный тромбон
-    .desc = Умирать ещё никогда не было так весело! Имплантируйте его, чтобы сделать смерть немного ярче.
-ent-CrateFunLightImplants = ящик имплантов Свет
-    .desc = Заставьте свою кожу светиться с помощью этих имплантов!
-ent-CrateFunParty = набор для вечеринок
-    .desc = Все участники вечеринки ждут, когда вы его откроете. Включает в себя подарки, напитки и даже торт.
-ent-CrateFunWaterGuns = ящик водяных пистолетов
-    .desc = Специальное летнее предложение с набором ярких водяных пистолетов. Не содержит воды.
-ent-CrateFunSyndicateSegway = { ent-CrateLivestock }
-    .suffix = ящик с сегвеем синдиката
-    .desc = { ent-CrateLivestock.desc } На дне виднеются следы от шин.
-ent-CrateFunBoxing = ящик боксерского снаряжения
-    .desc = Хотите организовать подпольный бойцовский клуб или провести турнир среди сотрудников станции? Этот ящик для вас!
-ent-CrateFunBikeHornImplants = ящик хонк-имплантов
-    .desc = Тысяча гудков за день отпугнёт СБ на день!
-ent-CrateFunMysteryFigurines = ящик минифигурок Загадочные космонавты
-    .desc = Коллекция из 10 коробок загадочных минифигурок. Дубликаты возврату не подлежат.
-ent-CrateFunDartsSet = набор для дартса
-    .desc = Коробка со всем необходимым для увлекательной игры в дартс.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl
deleted file mode 100644
index 6d1b5f7b4968..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl
+++ /dev/null
@@ -1,44 +0,0 @@
-ent-CrateNPCBee = ящик с пчёлами
-    .desc = Ящик, содержащий рой из восьми пчел.
-ent-CrateNPCButterflies = ящик с бабочками
-    .desc = Ящик, содержащий пять бабочек.
-ent-CrateNPCCat = ящик с кошкой
-    .desc = Ящик, содержащий одну кошку.
-ent-CrateNPCChicken = ящик кур
-    .desc = Ящик, содержащий четыре взрослые курицы.
-ent-CrateNPCCrab = ящик крабов
-    .desc = Ящик, содержащий трёх крупных крабов.
-ent-CrateNPCDuck = ящик уток
-    .desc = Ящик, содержащий шесть взрослых уток.
-ent-CrateNPCCorgi = ящик корги
-    .desc = Ящик, содержащий одного корги.
-ent-CrateNPCPuppyCorgi = ящик с щенком корги
-    .desc = Ящик, содержащий одного щенка корги. Аввв.
-ent-CrateNPCCow = ящик с коровой
-    .desc = Ящик, содержащий одну корову.
-ent-CrateNPCGoat = ящик с козой
-    .desc = Ящик, содержащий одну козу.
-ent-CrateNPCGoose = ящик гусей
-    .desc = Ящик, содержащий двух гусей.
-ent-CrateNPCGorilla = ящик с гориллой
-    .desc = Ящик, содержащий одну гориллу.
-ent-CrateNPCMonkeyCube = ящик обезьяньих кубиков
-    .desc = Ящик, содержащий коробку обезьяньих кубиков.
-ent-CrateNPCKoboldCube = ящик кобольдовых кубиков
-    .desc = Ящик, содержащий три коробки кобольдовых кубиков.
-ent-CrateNPCMouse = ящик мышей
-    .desc = Ящик, содержащий пять мышей.
-ent-CrateNPCParrot = ящик попугаев
-    .desc = Ящик, содержащий трёх попугаев.
-ent-CrateNPCPenguin = ящик пингвинов
-    .desc = Ящик, содержащий двух пингвинов.
-ent-CrateNPCMothroach = ящик таракамолей
-    .desc = Ящик, содержащий четырёх таракамолей.
-ent-CrateNPCPig = ящик со свиньёй
-    .desc = Ящик, содержащий одну свинью.
-ent-CrateNPCSnake = ящик змей
-    .desc = Ящик, содержащий трёх змей.
-ent-CrateNPCLizard = ящик с ящерицей
-    .desc = Ящик, содержащий одну ящерицу.
-ent-CrateNPCKangaroo = ящик с кенгуру
-    .desc = Ящик, содержащий одного кенгуру.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/materials-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/materials-crates.ftl
deleted file mode 100644
index 280fb69425b3..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/materials-crates.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-ent-CrateMaterialGlass = ящик стекла
-    .desc = 90 единиц стекла, упакованных с заботой.
-ent-CrateMaterialSteel = ящик стали
-    .desc = 90 единиц стали.
-ent-CrateMaterialTextiles = ящик текстиля
-    .desc = 60 единиц ткани и 30 единиц дюраткани.
-ent-CrateMaterialPlastic = ящик пластика
-    .desc = 90 единиц пластика.
-ent-CrateMaterialWood = ящик дерева
-    .desc = Куча деревянных досок.
-ent-CrateMaterialPlasteel = ящик пластали
-    .desc = 90 единиц пластали.
-ent-CrateMaterialPlasma = ящик твёрдой плазмы
-    .desc = 90 единиц плазмы.
-ent-CrateMaterialCardboard = ящик картона
-    .desc = 60 единиц картона.
-ent-CrateMaterialPaper = ящик бумаги
-    .desc = 90 листов бумаги.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/salvage-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/salvage-crates.ftl
deleted file mode 100644
index c35375f14b01..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/salvage-crates.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CrateSalvageEquipment = ящик снаряжения утилизатора
-    .desc = Для отважных.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/security-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/security-crates.ftl
deleted file mode 100644
index 038f765d4a38..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/security-crates.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-ent-CrateSecurityArmor = ящик с бронёй
-    .desc = Три универсальных бронежилета с неплохой защитой. Чтобы открыть необходим уровень доступа Служба безопасности.
-ent-CrateSecurityHelmet = ящик со шлемами
-    .desc = Содержит три стандартных ведра для мозгов. Чтобы открыть необходим уровень доступа Служба безопасности.
-ent-CrateSecurityNonlethal = ящик нелетального снаряжения
-    .desc = Несмертельное оружие. Чтобы открыть необходим уровень доступа Служба безопасности.
-ent-CrateSecurityRiot = ящик снаряжения против беспорядков
-    .desc = Содержит два комплекта бронежилетов, шлемов, щитов и дробовиков "Силовик", заряженных травматическими патронами. Дополнительные боеприпасы входят в комплект. Чтобы открыть необходим уровень доступа Оружейная.
-ent-CrateSecuritySupplies = ящик припасов СБ
-    .desc = Содержит различные припасы для службы безопасности станции. Чтобы открыть необходим уровень доступа Служба безопасности.
-ent-CrateRestraints = ящик наручников
-    .desc = Содержит по две коробки наручников и стяжек. Чтобы открыть необходим уровень доступа Служба безопасности.
-ent-CrateSecurityBiosuit = ящик биозащитных костюмов СБ
-    .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от исполнения своего долга. Чтобы открыть необходим уровень доступа Служба безопасности.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/service-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/service-crates.ftl
deleted file mode 100644
index ffa60f539126..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/service-crates.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-ent-CrateServiceJanitorialSupplies = ящик с уборочным инвентарем
-    .desc = Победите копоть и грязь с Незаменимыми Припасами для Уборки от Nanotrasen! Содержит три ведра, таблички мокрого пола, и очищающие гранаты. Также содержит одну швабру, тряпку, щётку, чистящий спрей, и мусорный пакет.
-ent-CrateServiceReplacementLights = ящик запасных лампочек
-    .desc = Да воссияет над станцией Свет Эфира! Или хотя бы свет сорока двух лампочек-труб и двадцати одной обычной лампочки.
-ent-CrateMousetrapBoxes = ящик мышеловок
-    .desc = Мышеловки - на случай, когда орда мышей заполонила отделы станции. Используйте экономно... или нет.
-ent-CrateServiceSmokeables = ящик табачных изделий
-    .desc = Устали от быстрой смерти на станции? Закажите этот ящик и прокурите свой путь к кашляющей погибели!
-ent-CrateServiceCustomSmokable = ящик табачных изделий (собери-сам)
-    .desc = Хотите проявить творческий подход к тому, что вы используете для уничтожения своих легких? Этот ящик для вас! В нем есть все, что нужно, чтобы скрутить свои сигареты.
-ent-CrateServiceBureaucracy = ящик бюрократических припасов
-    .desc = Стопка бумаги, папки, несколько ручек - всё о чем можно мечтать.
-ent-CrateServicePersonnel = ящик для найма персонала
-    .desc = Содержит коробку с КПК и чистыми ID картами.
-ent-CrateServiceBooks = ящик книг
-    .desc = Содержит 10 пустых книг случайного вида.
-ent-CrateServiceGuidebooks = ящик руководств
-    .desc = Содержит руководства.
-ent-CrateServiceBox = ящик коробок
-    .desc = Содержит 6 пустых универсальных коробок.
-ent-CrateJanitorBiosuit = ящик биозащитных костюмов уборщика
-    .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от уборки станции.
-ent-CrateServiceTheatre = ящик театрального реквизита
-    .desc = Содержит плащ моли, парикмахерские ножницы, униформу горничной, атрибутику клоуна и мима, а также другие прелести для выступлений.
-ent-CrateJanitorExplosive = ящик с сапёрно-уборочным костюмом
-    .desc = Содержит костюм для уборки любых взрывчатых веществ, купите один сегодня!
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/syndicate-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/syndicate-crates.ftl
deleted file mode 100644
index 3f8a09512862..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/syndicate-crates.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-CrateSyndicate = ящик синдиката
-    .desc = Стальной ящик тёмного цвета с красными полосами и выдавленной на передней панели литерой S.
-ent-CrateSyndicateSurplusBundle = ящик припасов синдиката
-    .desc = Содержит случайное снаряжение Синдиката, общей стоимостью в 50 телекристаллов. Оно может быть как бесполезным хламом, так и реально крутым.
-ent-CrateSyndicateSuperSurplusBundle = ящик суперприпасов синдиката
-    .desc = Содержит случайное снаряжение Синдиката, общей стоимостью в 125 телекристаллов.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/vending-crates.ftl
deleted file mode 100644
index 76962e83d065..000000000000
--- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/vending-crates.ftl
+++ /dev/null
@@ -1,46 +0,0 @@
-ent-CrateVendingMachineRestockBoozeFilled = ящик пополнения АлкоМат
-    .desc = Содержит набор пополнения торгомата АлкоМат.
-ent-CrateVendingMachineRestockClothesFilled = ящик пополнения одежды
-    .desc = Содержит несколько наборов пополнения торгоматов, ОдеждоМата и ТеатроШкафа.
-ent-CrateVendingMachineRestockDinnerwareFilled = ящик пополнения ПосудоМат
-    .desc = Содержит набор пополнения торгомата ПосудоМат.
-ent-CrateVendingMachineRestockEngineeringFilled = ящик пополнения ИнжеМат
-    .desc = Содержит набор пополнения торгомата ИнжеМат. Он же может пополнить торгомат ТвоИнструменты.
-ent-CrateVendingMachineRestockGamesFilled = ящик пополнения Безобидные развлечения
-    .desc = Содержит набор пополнения торгомата Безобидные развлечения.
-ent-CrateVendingMachineRestockHotDrinksFilled = ящик пополнения Лучшие горячие напитки Солнечной
-    .desc = Содержит два набора пополнения кофейного автомата Лучшие горячие напитки Солнечной.
-ent-CrateVendingMachineRestockMedicalFilled = ящик пополнения НаноМед
-    .desc = Содержит набор пополнения, совместимый с торгоматами НаноМед и НаноМед Плюс.
-ent-CrateVendingMachineRestockNutriMaxFilled = ящик пополнения БотаМакс
-    .desc = Содержит набор пополнения торгомата БотаМакс.
-ent-CrateVendingMachineRestockPTechFilled = ящик пополнения ПТех
-    .desc = Содержит набор пополнения раздатчика бюрократии ПТех.
-ent-CrateVendingMachineRestockRobustSoftdrinksFilled = ящик пополнения Прохладительные напитки Робаст
-    .desc = Содержит два набора пополнения торгоматов компании Robust Softdrinks LLC.
-ent-CrateVendingMachineRestockSalvageEquipmentFilled = ящик пополнения Утильмаг
-    .desc = Содержит набор пополнения торгомата Утильмаг.
-ent-CrateVendingMachineRestockSecTechFilled = ящик пополнения СБТех
-    .desc = Содержит набор пополнения торгомата СБТех.
-ent-CrateVendingMachineRestockSeedsFilled = ящик пополнения МегаРаздатчик Семян
-    .desc = Содержит набор пополнения торгомата МегаРаздатчик Семян.
-ent-CrateVendingMachineRestockSmokesFilled = ящик пополнения ШейдиСиг Делюкс
-    .desc = Содержит два набора пополнения торгоматов ШейдиСиг Делюкс.
-ent-CrateVendingMachineRestockVendomatFilled = ящик пополнения Вендомат
-    .desc = Содержит набор пополнения торгомата Вендомат.
-ent-CrateVendingMachineRestockRoboticsFilled = ящик пополнения Роботех Делюкс
-    .desc = Содержит набор пополнения торгомата Роботех Делюкс.
-ent-CrateVendingMachineRestockTankDispenserFilled = ящик пополнения газовых баллонов
-    .desc = Содержит набор пополнения атмосферного или инженерного раздатчика газовых баллонов.
-ent-CrateVendingMachineRestockGetmoreChocolateCorpFilled = ящик пополнения Гетмор Шоколад
-    .desc = Содержит набор пополнения торгомата Гетмор Шоколад Корп.
-ent-CrateVendingMachineRestockChangFilled = ящик пополнения Чанг
-    .desc = Содержит набор пополнения торгомата Мистер Чанг.
-ent-CrateVendingMachineRestockDiscountDansFilled = ящик пополнения Дискаунтер Дэна
-    .desc = Содержит набор пополнения торгомата Дискаунтер Дэна.
-ent-CrateVendingMachineRestockDonutFilled = ящик пополнения Пончики Монкинс
-    .desc = Содержит набор пополнения торгомата Пончики Монкинс.
-ent-CrateVendingMachineRestockHappyHonkFilled = ящик пополнения Хэппи Хонк
-    .desc = Содержит набор пополнения торгомата Хэппи Хонк.
-ent-CrateVendingMachineRestockChemVendFilled = ящик пополнения ХимкоМат
-    .desc = Содержит набор пополнения торгомата ХимкоМат.
diff --git a/Resources/Locale/ru-RU/prototypes/entities/structures/shuttles/thrusters.ftl b/Resources/Locale/ru-RU/prototypes/entities/structures/shuttles/thrusters.ftl
deleted file mode 100644
index 7624107fe5ba..000000000000
--- a/Resources/Locale/ru-RU/prototypes/entities/structures/shuttles/thrusters.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-ent-BaseThruster = двигатель
-    .desc = Ускоритель, заставляющий шаттл двигаться.
-ent-Thruster = { ent-BaseThruster }
-    .desc = { ent-BaseThruster.desc }
-ent-DebugThruster = DEBUG двигатель
-    .desc = Делает ньооооооом. Не требует ни питания, ни свободного места.
-ent-Gyroscope = гироскоп
-    .desc = Увеличивает потенциальное угловое вращение шаттла.
-ent-DebugGyroscope = DEBUG гироскоп
-    .desc = { ent-Gyroscope.desc }
diff --git a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/canisters/gas-canisters.ftl b/Resources/Locale/ru-RU/prototypes/entities/structures/storage/canisters/gas-canisters.ftl
deleted file mode 100644
index c14bf040997b..000000000000
--- a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/canisters/gas-canisters.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-ent-GasCanister = канистра для газа
-    .desc = Канистра, в которой может содержаться газ любого вида. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-StorageCanister = канистра для хранения
-    .desc = { ent-GasCanister.desc }
-ent-AirCanister = канистра воздуха
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится воздушная смесь. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-OxygenCanister = канистра кислорода
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится кислород. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-LiquidOxygenCanister = канистра сжиженного кислорода
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится сжиженный кислород. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-NitrogenCanister = канистра азота
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится азот. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-LiquidNitrogenCanister = канистра сжиженного азота
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится сжиженный азот. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-CarbonDioxideCanister = канистра углекислого газа
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится углекислый газ. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-LiquidCarbonDioxideCanister = канистра сжиженного углекислого газа
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится сжиженный углекислый газ. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-PlasmaCanister = канистра плазмы
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится плазма. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-TritiumCanister = канистра трития
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится тритий. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-WaterVaporCanister = канистра водяного пара
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится водяной пар. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-AmmoniaCanister = канистра аммиака
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится аммиак. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-NitrousOxideCanister = канистра оксида азота
-    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится оксид азота. Можно прикрепить к порту коннектора с помощью гаечного ключа.
-ent-FrezonCanister = канистра фрезона
-    .desc = Хладагент с лёгкими галлюциногенными свойствами. Развлекайтесь.
-ent-GasCanisterBrokenBase = разбитая канистра для газа
-    .desc = Разбитая канистра для газа. Не совсем бесполезна, так как может быть разобрана для получения высококачественных материалов.
-ent-StorageCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-AirCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-OxygenCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-NitrogenCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-CarbonDioxideCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-PlasmaCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-TritiumCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-WaterVaporCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-MiasmaCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-NitrousOxideCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
-ent-FrezonCanisterBroken = { ent-GasCanisterBrokenBase }
-    .desc = { ent-GasCanisterBrokenBase.desc }
diff --git a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl
deleted file mode 100644
index c89b5ee3fa0e..000000000000
--- a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-ent-WeldingFuelTank = топливный резервуар
-    .desc = Топливный резервуар. Используется для хранения большого количества топлива.
-ent-WeldingFuelTankFull = { ent-WeldingFuelTank }
-    .desc = { ent-WeldingFuelTank.desc }
-ent-WeldingFuelTankHighCapacity = топливный резервуар большой ёмкости
-    .desc = Резервуар для жидкости под высоким давлением, предназначенный для хранения гигантских объемов сварочного топлива.
-ent-WaterTank = водяной резервуар
-    .desc = Резервуар для воды. Используется для хранения большого количества воды.
-ent-WaterTankFull = { ent-WaterTank }
-    .desc = { ent-WaterTank.desc }
-ent-WaterCooler = кулер с водой
-    .desc = Хорошее место, чтобы постоять и потратить время. Сбоку имеется запас бумажных стаканчиков.
-ent-WaterTankHighCapacity = водяной резервуар большой ёмкости
-    .desc = Резервуар для жидкости под высоким давлением, предназначенный для хранения гигантских объемов воды.
diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl
index 4dca52944450..547eed8b18f7 100644
--- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl
@@ -76,7 +76,6 @@ reagent-physical-desc-overpowering = очень мощное
 reagent-physical-desc-sour = кислое
 reagent-physical-desc-pungent = жгучее
 reagent-physical-desc-clumpy = комковатое
-reagent-physical-desc-strong-smelling = сильно пахнущее
 reagent-physical-desc-odorless = не имеющее запаха
 reagent-physical-desc-gloopy = вязкое
 reagent-physical-desc-cloudy = облачное
diff --git a/Resources/Locale/ru-RU/salvage/salvage-system.ftl b/Resources/Locale/ru-RU/salvage/salvage-system.ftl
index abe802765162..9e6983a43cd3 100644
--- a/Resources/Locale/ru-RU/salvage/salvage-system.ftl
+++ b/Resources/Locale/ru-RU/salvage/salvage-system.ftl
@@ -1,10 +1,6 @@
 salvage-system-announcement-source = Система контроля магнита
-salvage-system-announcement-arrived = Кусок обломков был притянут для утилизации. Расчетное время удержания: { $timeLeft } секунд.
-salvage-system-announcement-losing = Магнит больше не может удерживать обломок. Оставшееся время удержания: { $timeLeft } секунд.
 salvage-system-announcement-lost = Магнит перестал удерживать обломок.
 salvage-system-announcement-spawn-magnet-lost = Магнит был потерян.
-salvage-system-announcement-spawn-no-debris-available = Нет обломков которые можно притянуть магнитом.
-salvage-system-announcement-spawn-debris-disintegrated = Обломок развалился при орбитальном перемещении.
 salvage-system-report-already-active = Магнит уже активен.
 salvage-system-report-cooling-down = Магнит остывает.
 salvage-system-report-activate-success = Магнит притягивает кусок обломков!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/human.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/human.ftl
deleted file mode 100644
index 05d0232badb0..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/human.ftl
+++ /dev/null
@@ -1,33 +0,0 @@
-ent-BaseHumanOrgan = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-    .suffix = { "" }
-ent-OrganHumanBrain = мозг
-    .desc = Источник невероятного, бесконечного интеллекта. Хонк.
-    .suffix = { "" }
-ent-OrganHumanEyes = глаза
-    .desc = Я тебя вижу!
-    .suffix = { "" }
-ent-OrganHumanTongue = язык
-    .desc = Мясистая мышца, используемая в основном для обмана.
-    .suffix = { "" }
-ent-OrganHumanAppendix = аппендикс
-    .desc = { ent-BaseHumanOrgan.desc }
-    .suffix = { "" }
-ent-OrganHumanEars = уши
-    .desc = Ухо состоит из трёх частей. Внутренней, средней, и наружной. В нормальных условиях видно только одну.
-    .suffix = { "" }
-ent-OrganHumanLungs = лёгкие
-    .desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов.
-    .suffix = { "" }
-ent-OrganHumanHeart = сердце
-    .desc = Мне жаль того бессердечного ублюдка, который его потерял.
-    .suffix = { "" }
-ent-OrganHumanStomach = желудок
-    .desc = Мерзость. Не перевариваю его.
-    .suffix = { "" }
-ent-OrganHumanLiver = печень
-    .desc = Рекомендуется подавать с бобами, под кьянти.
-    .suffix = { "" }
-ent-OrganHumanKidneys = почки
-    .desc = Выводят токсины из кровеносной системы.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/rat.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/rat.ftl
deleted file mode 100644
index 98da14e3a0ee..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/rat.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-OrganRatLungs = { ent-OrganHumanLungs }
-    .suffix = крыса
-    .desc = { ent-OrganHumanLungs.desc }
-ent-OrganRatStomach = { ent-OrganAnimalStomach }
-    .suffix = крыса
-    .desc = { ent-OrganAnimalStomach.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/reptilian.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/reptilian.ftl
deleted file mode 100644
index 93e3ce097074..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/reptilian.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-OrganReptilianStomach = { ent-OrganAnimalStomach }
-    .desc = { ent-OrganAnimalStomach.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/slime.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/slime.ftl
deleted file mode 100644
index 3204096e6a88..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/slime.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-SentientSlimeCore = разумное ядро слайма
-    .desc = Источник невероятной, бесконечной липкости.
-    .suffix = { "" }
-ent-OrganSlimeLungs = газовые мешки слайма
-    .desc = Собирают азот, который клетки слайма используют для поддержания жизнедеятельности.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/vox.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/vox.ftl
deleted file mode 100644
index f839466f96e8..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/mechanisms/vox.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-OrganVoxLungs = { ent-OrganHumanLungs }
-    .suffix = вокс
-    .desc = { ent-OrganHumanLungs.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal.ftl
deleted file mode 100644
index dad5aa1828f1..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-BaseAnimalOrgan = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-ent-OrganAnimalLungs = лёгкие
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalStomach = желудок
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalLiver = печень
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalHeart = сердце
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalKidneys = почки
-    .desc = { ent-BaseAnimalOrgan.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
index 6f79d5fcd8af..f9be97b0be13 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl
@@ -1,7 +1,5 @@
 ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещмешок
     .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения - похоже, этот мешок предназначен для хранения хирургических инструментов.
-ent-ClothingBackpackDuffelCBURN = вещмешок отряда РХБЗЗ
-    .desc = Вещмешок, содержащий различное оборудование для сдерживания биологической угрозы.
 ent-ClothingBackpackDuffelCBURNFilled = { ent-ClothingBackpackDuffelCBURN }
     .suffix = Заполненный
     .desc = { ent-ClothingBackpackDuffelCBURN.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl
deleted file mode 100644
index 16563a2395f5..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl	
+++ /dev/null
@@ -1,20 +0,0 @@
-ent-ClothingBackpackFilled = { ent-ClothingBackpack }
-    .desc = { ent-ClothingBackpack.desc }
-ent-ClothingBackpackClownFilled = { ent-ClothingBackpackClown }
-    .desc = { ent-ClothingBackpackClown.desc }
-ent-ClothingBackpackSecurityFilled = { ent-ClothingBackpackSecurity }
-    .desc = { ent-ClothingBackpackSecurity.desc }
-ent-ClothingBackpackMedicalFilled = { ent-ClothingBackpackMedical }
-    .desc = { ent-ClothingBackpackMedical.desc }
-ent-ClothingBackpackCaptainFilled = { ent-ClothingBackpackCaptain }
-    .desc = { ent-ClothingBackpackCaptain.desc }
-ent-ClothingBackpackEngineeringFilled = { ent-ClothingBackpackEngineering }
-    .desc = { ent-ClothingBackpackEngineering.desc }
-ent-ClothingBackpackScienceFilled = { ent-ClothingBackpackScience }
-    .desc = { ent-ClothingBackpackScience.desc }
-ent-ClothingBackpackHydroponicsFilled = { ent-ClothingBackpackHydroponics }
-    .desc = { ent-ClothingBackpackHydroponics.desc }
-ent-ClothingBackpackMimeFilled = { ent-ClothingBackpackMime }
-    .desc = { ent-ClothingBackpackMime.desc }
-ent-ClothingBackpackChemistryFilled = { ent-ClothingBackpackChemistry }
-    .desc = { ent-ClothingBackpackChemistry.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl
deleted file mode 100644
index 54a3cc3655a4..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl	
+++ /dev/null
@@ -1,18 +0,0 @@
-ent-ClothingBackpackDuffelFilled = { ent-ClothingBackpackDuffel }
-    .desc = { ent-ClothingBackpackDuffel.desc }
-ent-ClothingBackpackDuffelClownFilled = { ent-ClothingBackpackDuffelClown }
-    .desc = { ent-ClothingBackpackDuffelClown.desc }
-ent-ClothingBackpackDuffelSecurityFilled = { ent-ClothingBackpackDuffelSecurity }
-    .desc = { ent-ClothingBackpackDuffelSecurity.desc }
-ent-ClothingBackpackDuffelMedicalFilled = { ent-ClothingBackpackDuffelMedical }
-    .desc = { ent-ClothingBackpackDuffelMedical.desc }
-ent-ClothingBackpackDuffelCaptainFilled = { ent-ClothingBackpackDuffelCaptain }
-    .desc = { ent-ClothingBackpackDuffelCaptain.desc }
-ent-ClothingBackpackDuffelEngineeringFilled = { ent-ClothingBackpackDuffelEngineering }
-    .desc = { ent-ClothingBackpackDuffelEngineering.desc }
-ent-ClothingBackpackDuffelScienceFilled = { ent-ClothingBackpackDuffelScience }
-    .desc = { ent-ClothingBackpackDuffelScience.desc }
-ent-ClothingBackpackDuffelMimeFilled = { ent-ClothingBackpackDuffelMime }
-    .desc = { ent-ClothingBackpackDuffelMime.desc }
-ent-ClothingBackpackDuffelChemistryFilled = { ent-ClothingBackpackDuffelChemistry }
-    .desc = { ent-ClothingBackpackDuffelChemistry.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl
deleted file mode 100644
index 380253d7a3b4..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl	
+++ /dev/null
@@ -1,16 +0,0 @@
-ent-ClothingBackpackSatchelFilled = { ent-ClothingBackpackSatchel }
-    .desc = { ent-ClothingBackpackSatchel.desc }
-ent-ClothingBackpackSatchelSecurityFilled = { ent-ClothingBackpackSatchelSecurity }
-    .desc = { ent-ClothingBackpackSatchelSecurity.desc }
-ent-ClothingBackpackSatchelMedicalFilled = { ent-ClothingBackpackSatchelMedical }
-    .desc = { ent-ClothingBackpackSatchelMedical.desc }
-ent-ClothingBackpackSatchelCaptainFilled = { ent-ClothingBackpackSatchelCaptain }
-    .desc = { ent-ClothingBackpackSatchelCaptain.desc }
-ent-ClothingBackpackSatchelEngineeringFilled = { ent-ClothingBackpackSatchelEngineering }
-    .desc = { ent-ClothingBackpackSatchelEngineering.desc }
-ent-ClothingBackpackSatchelScienceFilled = { ent-ClothingBackpackSatchelScience }
-    .desc = { ent-ClothingBackpackSatchelScience.desc }
-ent-ClothingBackpackSatchelHydroponicsFilled = { ent-ClothingBackpackSatchelHydroponics }
-    .desc = { ent-ClothingBackpackSatchelHydroponics.desc }
-ent-ClothingBackpackSatchelChemistryFilled = { ent-ClothingBackpackSatchelChemistry }
-    .desc = { ent-ClothingBackpackSatchelChemistry.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl
index 846a72bc1216..afa69068b2bb 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl
@@ -10,7 +10,5 @@ ent-BoxLatexGloves = коробка латексных перчаток
     .desc = Содержит стерильные латексные перчатки.
 ent-BoxNitrileGloves = коробка нитриловых перчаток
     .desc = Содержит стерильные нитриловые перчатки. Лучше латексных.
-ent-BoxMouthSwab = коробка стерильных палочек
-    .desc = { ent-BoxCardboard.desc }
 ent-BoxBodyBag = коробка мешков для тел
     .desc = Содержит мешки для тел.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/cargo-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo-crates.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/prototypes/catalog/fills/crates/cargo-crates.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo-crates.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl
deleted file mode 100644
index e00be0bd5863..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/cargo.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-ent-CrateCargoLuxuryHardsuit = ящик элитного шахтёрского скафандра
-    .desc = Наконец-то, скафандр, который квартирмейстеры могут назвать своим собственным. Центком услышал вас, а теперь перестаньте спрашивать.
-ent-CrateCargoGambling = грандиозная лотерея $$$
-    .desc = Ящик с сокровищами, не поддающимися воображению!
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/chemistry-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/chemistry-crates.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/prototypes/catalog/fills/crates/chemistry-crates.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/chemistry-crates.ftl
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/engineering-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering-crates.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/prototypes/catalog/fills/crates/engineering-crates.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering-crates.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl
deleted file mode 100644
index 83c93fa4630f..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl
+++ /dev/null
@@ -1,30 +0,0 @@
-ent-CrateEngineeringGear = ящик инженерного оборудования
-    .desc = Различные инженерные компоненты.
-ent-CrateEngineeringToolbox = ящик ящиков для инструментов
-    .desc = Два обычных и два электромонтанжных ящика для инструментов.
-ent-CrateEngineeringCableLV = ящик кабеля НВ
-    .desc = 3 мотка низковольтного кабеля.
-ent-CrateEngineeringCableMV = ящик кабеля СВ
-    .desc = 3 мотка средневольтного кабеля.
-ent-CrateEngineeringCableHV = ящик кабеля ВВ
-    .desc = 3 мотка высоковольтного кабеля.
-ent-CrateEngineeringCableBulk = ящик кабеля различного вольтажа
-    .desc = 2 мотка кабеля каждого типа.
-ent-CrateEngineeringElectricalSupplies = ящик электромонтажного снаряжения
-    .desc = NT не несёт ответственности за любые рабочие конфликты, связанные с изолированными перчатками, входящими в комплект этих ящиков.
-ent-CrateEngineeringStationBeaconBundle = набор станционных маяков
-    .desc = Ящик, содержащий 5 корпусов станционных маяков для модификации карты станции.
-ent-CrateEngineeringJetpack = ящик джетпаков
-    .desc = Два джетпака для тех, кто не умеет пользоваться огнетушителями.
-ent-CrateEngineeringMiniJetpack = ящик мини-джетпаков
-    .desc = Два мини-джетпака для тех, кому хочется вызова.
-ent-CrateAirlockKit = ящик компонентов шлюза
-    .desc = Набор для строительства 6 воздушных шлюзов, инструменты в комплект не входят.
-ent-CrateEvaKit = набор EVA
-    .desc = Набор, состоящий из двух престижных EVA скафандров и шлемов.
-ent-CrateRCDAmmo = ящик зарядов РСУ
-    .desc = 3 обоймы для РСУ, каждая из которых восстанавливает 5 зарядов.
-ent-CrateRCD = ящик РСУ
-    .desc = Ящик, содержащий одно ручное строительное устройство.
-ent-CrateParticleDecelerators = ящик с замедлителями частиц
-    .desc = Ящик, содержащий три замедлителя частиц.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/engines-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engines-crates.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/prototypes/catalog/fills/crates/engines-crates.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engines-crates.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engines.ftl
deleted file mode 100644
index c376e68fb536..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engines.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-ent-CrateEngineeringAMEShielding = ящик компонентов ДАМ
-    .desc = 12 частей, для создания нового или расширения существующего двигателя антиматерии.
-ent-CrateEngineeringAMEJar = ящик антиматериевого топлива
-    .desc = Три канистры антиматериевого топлива, для заправки двигателя антиматерии.
-ent-CrateEngineeringAMEControl = ящик с контроллером управления ДАМ
-    .desc = Управляющий компьютер ДАМ.
-ent-CrateEngineeringSingularityEmitter = ящик с эмиттером
-    .desc = Эмиттер, использующийся в сингулярном двигателе.
-ent-CrateEngineeringSingularityCollector = ящик с коллектором радиации
-    .desc = Коллектор для радиации, использующийся в сингулярном двигателе. Плазма входит в комплект.
-ent-CrateEngineeringSingularityContainment = ящик с генератором сдерживающего поля
-    .desc = Генератор сдерживающего поля, удерживает сингулярность под контролем.
-ent-CrateEngineeringSingularityGenerator = ящик с генератором сингулярности
-    .desc = Генератор сингулярности, матерь монстра.
-ent-CrateEngineeringParticleAccelerator = ящик с ускорителем частиц
-    .desc = Сложная в настройке, но чертовски полезная.
-ent-CrateEngineeringGenerator = ящик с генератором
-    .desc = { ent-CrateEngineering.desc }
-ent-CrateEngineeringSolar = ящик сборных солнечных панелей
-    .desc = Детали для создания солнечных панелей и трекеров.
-ent-CrateEngineeringShuttle = ящик электропитания шаттла
-    .desc = Ящик, содержащий всё необходимое для обеспечения шаттла электропитанием.
-ent-CrateEngineeringTeslaGenerator = ящик с генератором Теслы
-    .desc = Генератор Теслы. Храни вас Господь.
-ent-CrateEngineeringTeslaCoil = ящик с катушкой Теслы
-    .desc = Катушка Теслы. Притягивает молнии и вырабатывает из них энергию.
-ent-CrateEngineeringTeslaGroundingRod = ящик с заземляющим стержнем Теслы
-    .desc = Заземляющий стержень, идеально для защиты от молний.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/medical-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/medical-crates.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/prototypes/catalog/fills/crates/medical-crates.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/medical-crates.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/medical.ftl
deleted file mode 100644
index b824e03b40b1..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/medical.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-ent-CrateMedicalSupplies = ящик медицинских припасов
-    .desc = Стандартные медикаменты.
-ent-CrateChemistrySupplies = ящик химического оборудования
-    .desc = Стандартное химическое оборудование.
-ent-CrateMindShieldImplants = ящик имплантов Щит разума
-    .desc = Ящик, содержащий 3 импланта Щит разума.
-ent-CrateMedicalSurgery = ящик хирургических инструментов
-    .desc = Хирургические инструменты.
-ent-CrateMedicalScrubs = ящик медицинских роб
-    .desc = Врачебная одежда.
-ent-CrateEmergencyBurnKit = аварийный набор лечения физических травм
-    .desc = Ящик, содержащий набор для лечения физических травм.
-ent-CrateEmergencyToxinKit = аварийный набор лечения токсинов
-    .desc = Ящик, содержащий набор для лечения токсинов.
-ent-CrateEmergencyO2Kit = аварийный набор лечения кислородного голодания
-    .desc = Ящик, содержащий набор для лечения кислородного голодания.
-ent-CrateEmergencyBruteKit = аварийный набор лечения механических травм
-    .desc = Ящик, содержащий набор для лечения механических травм.
-ent-CrateEmergencyAdvancedKit = продвинутый аварийный набор
-    .desc = Ящик, содержащий продвинутую аптечку первой помощи.
-ent-CrateEmergencyRadiationKit = аварийный набор выведения радиации
-    .desc = Ящик, содержащий набор для выведения радиации.
-ent-CrateBodyBags = ящик мешков для тела
-    .desc = Содержит 10 мешков тела.
-ent-CrateVirologyBiosuit = ящик вирусологических биозащитных костюмов
-    .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от лечения экипажа. Чтобы открыть, необходим уровень доступа Медицинский.
diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/science-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/science-crates.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/prototypes/catalog/fills/crates/science-crates.ftl
rename to Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/science-crates.ftl
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/science.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/science.ftl
deleted file mode 100644
index bb12a14c19c1..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/science.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CrateScienceBiosuit = ящик научных биозащитных костюмов
-    .desc = Содержит 2 костюма биологической защиты, чтобы никакая зараза не отвлекала вас от занятия исследованиями. Чтобы открыть, необходим уровень доступа Научный.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl
deleted file mode 100644
index a7f93ef20cd4..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-ent-MedkitFilled = { ent-Medkit }
-    .suffix = Заполненная
-    .desc = { ent-Medkit.desc }
-ent-MedkitBurnFilled = { ent-MedkitBurn }
-    .suffix = Заполненная
-    .desc = { ent-MedkitBurn.desc }
-ent-MedkitBruteFilled = { ent-MedkitBrute }
-    .suffix = Заполненная
-    .desc = { ent-MedkitBrute.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/mantles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/mantles.ftl
index d6c7ea5b77db..102f28c2fb37 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/mantles.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/neck/mantles.ftl
@@ -1,4 +1,2 @@
-ent-ClothingNeckMantleQM = мантия квартирмейстера
-    .desc = Удобная облегающая накидка на плечи, создающая атмосферу бунтарства и независимости. Или раздражения и заблуждения - решать вам.
 ent-ClothingNeckMantleERTLeader = мантия лидера ОБР
     .desc = Необыкновенно украшенная драпировка на плечи.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
index 4d1ad19e4b0b..ca32ef63983e 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
@@ -2,8 +2,6 @@ ent-ClothingUniformJumpskirtCentcomOfficial = юбка-костюм офицер
     .desc = Это костюм с юбкой, который носят офицеры Центком высшего звена.
 ent-ClothingUniformJumpskirtCentcomOfficer = водолазка с юбкой Центком
     .desc = Версия водолазки Центком с юбкой, более редкая и востребованная, чем оригинал.
-ent-ClothingUniformJumpskirtLibrarian = практичная юбка-костюм
-    .desc = Она очень... практичная.
 ent-ClothingUniformColorJumpskirtRainbow = радужная юбка-комбинезон
     .desc = Разноцветная юбка-комбинезон!
 ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психолога
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl
deleted file mode 100644
index ae1b58fab413..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl
+++ /dev/null
@@ -1,42 +0,0 @@
-ent-DrinkAlexanderGlass = { ent-DrinkGlass }
-    .suffix = Александр
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkBadTouchGlass = { ent-DrinkGlass }
-    .suffix = Проникновение
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkBoyarskyGlass = { ent-DrinkGlass }
-    .suffix = Боярский
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkBrambleGlass = { ent-DrinkGlass }
-    .suffix = Брамбл
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkDaiquiriGlass = { ent-DrinkGlass }
-    .suffix = Дайкири
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkDarkAndStormyGlass = { ent-DrinkGlass }
-    .suffix = Тьма и буря
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkEspressoMartiniGlass = { ent-DrinkGlass }
-    .suffix = Эспрессо мартини
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkKvassGlass = { ent-DrinkGlass }
-    .suffix = Квас
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkMaiTaiGlass = { ent-DrinkGlass }
-    .suffix = Май Тай
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkMoscowMuleGlass = { ent-DrinkGlass }
-    .suffix = Московский мул
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkNegroniGlass = { ent-DrinkGlass }
-    .suffix = Негрони
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkOldFashionedGlass = { ent-DrinkGlass }
-    .suffix = Олд фэшен
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkPalomaGlass = { ent-DrinkGlass }
-    .suffix = Палома
-    .desc = { ent-DrinkGlass.desc }
-ent-DrinkYorshGlass = { ent-DrinkGlass }
-    .suffix = Ёрш
-    .desc = { ent-DrinkGlass.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/stamps.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/stamps.ftl
deleted file mode 100644
index 945f9c546bda..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/stamps.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-RubberStampIAA = печать агента внутренних дел
-    .desc = { ent-RubberStampMime.desc }
-    .suffix = НЕ МАППИТЬ
-ent-RubberStampPsychologist = печать психолога
-    .desc = { ent-RubberStampMime.desc }
-    .suffix = НЕ МАППИТЬ
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl
index d80d9837185e..753eba7be0c0 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/furniture/chairs.ftl
@@ -1,4 +1,2 @@
 ent-ChairCarp = кресло из карпа
     .desc = Роскошное кресло, множество фиолетовых чешуек отражают свет самым приятным образом.
-ent-ChairBrass = латунный стул
-    .desc = Крутящийся стул из латуни. У него маленькие шестеренки вместо колесиков!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl
deleted file mode 100644
index c7509794f8a8..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-KvassTank = { ent-StorageTank }
-    .suffix = Пустой
-    .desc = { ent-StorageTank.desc }
-ent-KvassTankFull = { ent-KvassTank }
-    .suffix = Полный
-    .desc = { ent-KvassTank.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/objectives/traitorObjectives.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/objectives/traitorObjectives.ftl
deleted file mode 100644
index 5b6abe2f631f..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/objectives/traitorObjectives.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-HijackShuttleObjective = Завладейте эвакуационным шаттлом
-    .desc = Улетите на шаттле свободным и без лояльного экипажа Nanotrasen на борту. Используйте ЛЮБЫЕ доступные вам методы. Агенты Синдиката, враги Nanotrasen и заложники в наручниках могут оставаться на шаттле живыми. Игнорируйте помощь от кого-либо, кроме агента поддержки.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
deleted file mode 100644
index b1eca2772f20..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingBackpackSatchelHoS = сумка главы службы безопасности
-    .desc = Стильная кожаная чёрная сумка.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
deleted file mode 100644
index 10a4da3c46cc..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingBeltHoS = кожаный ремень главы службы безопасности
-    .desc = Стильный кожаный черный ремень
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
deleted file mode 100644
index 85f1f11fc314..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingHandsGlovesLeatherHoS = кожаные перчатки
-    .desc = Стильные чёрные кожаные перчатки.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
deleted file mode 100644
index 006704b18226..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingHeadHatCapHoS = кожаная фуражка главы службы безопасности
-    .desc = Довольно старая вещь для этих времён, навевающая старые воспоминания...
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
deleted file mode 100644
index a6012ae7cf44..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingOuterCoatHoSOvercoat = бронированная шинель
-    .desc = Довольно старая вещь для этих времён, навевающая старые воспоминания...
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
deleted file mode 100644
index 5b26a28aeead..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingUniformJumpsuitHoSOld = старый комбинезон главы службы безопасности
-    .desc = Довольно старая вещь для этих времён, навевающая старые воспоминания...
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvaxsecrets/entities/markers/spawners/ghost_roles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvaxsecrets/entities/markers/spawners/ghost_roles.ftl
deleted file mode 100644
index 303a5898ed88..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvaxsecrets/entities/markers/spawners/ghost_roles.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-SpawnPointEvilTwin = спавнер злой двойник
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
index 6776df815b5d..1046bd745a82 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl
@@ -2,8 +2,6 @@ ent-ClothingHeadHelmetBasic = шлем
     .desc = Стандартная защитная экипировка. Защищает голову от ударов.
 ent-ClothingHeadHelmetBombSuit = сапёрный шлем
     .desc = Тяжёлый шлем, предназначенный для защиты от осколков и давления, создаваемого взрывом.
-ent-ClothingHeadHelmetCosmonaut = шлем космонавта
-    .desc = На первый взгляд хорошо защищенный космический шлем. Старинный дизайн, но современное производство.
 ent-ClothingHeadHelmetSwat = шлем спецназа
     .desc = Очень прочный шлем, широко используемый военизированными организациями. На его верхней части выгравирован логотип Nanotrasen.
 ent-ClothingHeadHelmetMerc = шлем наёмника
@@ -22,9 +20,6 @@ ent-ClothingHeadHelmetScaf = шлем скафандра
     .desc = Надежный, крепкий шлем.
 ent-ClothingHeadHelmetSpaceNinja = шлем космического ниндзя
     .desc = То, что может показаться простой чёрной одеждой, на самом деле является сложнейшим шлемом с нано-плетением. Стандартное снаряжение ниндзя.
-ent-ClothingHeadHelmetSyndicate = стильный шлем
-    .suffix =  шлем синдиката
-    .desc = Стильный, герметичный, прочный шлем.
 ent-ClothingHeadHelmetTemplar = шлем тамплиера
     .desc = DEUS VULT
 ent-ClothingHeadHelmetThunderdome = шлем громовержца
@@ -47,8 +42,6 @@ ent-ClothingHeadHelmetAtmosFire = пожарный атмос-шлем
     .desc = Пожарный шлем атмосферных техников, способный охладить пыл пользователя в любой ситуации.
 ent-ClothingHeadHelmetLing = хитиновый шлем
     .desc = Раздувает тело генокрада во всепоглощающий массив хитиновый брони. Обеспечивает высокую защиту от физических повреждений, более низкую от других типов. Его вес замедляет движение генокрада, а его поддержание замедляет выработку химических веществ.
-ent-ClothingHeadHelmetVoidParamed = шлем скафандра парамедика
-    .desc = Шлем от скафандра парамедика.
 ent-ClothingHeadHelmetBone = костяной шлем
     .desc = Круто выглядящий шлем, сделанный из черепов ваших врагов.
 ent-ClothingHeadHelmetPodWars = шлем Броненосец II
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
index 1f37f4bd7014..e4e7f065bc9f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl
@@ -14,13 +14,6 @@ ent-ClothingOuterHardsuitEngineeringWhite = скафандр старшего и
     .desc = Специальный костюм, защищающий от опасной среды с низким давлением, сделанный специально для старшего инженера станции.
 ent-IHSVoidsuit = пустотный скафандр IHS
     .desc = Специальный пустотный костюм, защищающий от опасной среды с низким давлением.
-ent-ClothingOuterHardsuitEVA = скафандр EVA
-    .desc = Легкий космический скафандр, способный защитить владельца от космического вакуума во время аварийной ситуации.
-ent-ClothingOuterHardsuitSyndicate = кроваво-красный скафандр EVA
-    .suffix = скафандр EVA Синдиката
-    .desc = { ent-ClothingOuterHardsuitEVA.desc } На бирке написано 'Совершенно не собственность вражеской корпорации, честно!'.
-ent-ClothingOuterHardsuitEVAPrisoner = тюремный скафандр EVA
-    .desc = Легкий космический скафандр, способный защитить заключённого от космического вакуума во время аварийной ситуации.
 ent-ClothingOuterHardsuitMedical = скафандр главного врача
     .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для удобства передвижения.
 ent-ClothingOuterHardsuitRd = скафандр научного руководителя
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl
index 96126eb48a0a..99465d79e689 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/misc.ftl
@@ -29,8 +29,6 @@ ent-ClothingOuterPoncho = пончо
     .desc = Тёплое и удобное пончо.
 ent-ClothingOuterSanta = костюм Санты
     .desc = Хо хо хо!
-ent-ClothingOuterStraightjacket = смирительная рубашка
-    .desc = Смирительная рубашка.
 ent-ClothingOuterWizardViolet = фиолетовая мантия волшебника
     .desc = Причудливая инкрустированная драгоценными камнями фиолетовая мантия, излучающая магическую энергию.
 ent-ClothingOuterWizard = мантия волшебника
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl
index 090e7196f288..e62369c82bb0 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl
@@ -70,5 +70,3 @@ ent-ClothingOuterWinterMusician = зимняя куртка музыканта
     .desc = Безразмерный пластилиновый космический фрак, который заставит людей спрашивать: "Вы меня знаете?".
 ent-ClothingOuterWinterWeb = паутинная зимняя куртка
     .desc = Даёт ощущение, словно вы внутри кокона, не то чтобы из-за этого вам стало менее страшно оказаться в настоящем.
-ent-ClothingOuterHardsuitVoidParamed = пустотный скафандр парамедика
-    .desc = Пустотный скафандр сделанный специально для парамедиков.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl
deleted file mode 100644
index ea20a72de11c..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpskirts.ftl
+++ /dev/null
@@ -1,32 +0,0 @@
-ent-ClothingUniformJumpskirtColorWhite = белая юбка-комбинезон
-    .desc = Обычная белая юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorGrey = серая юбка-комбинезон
-    .desc = Серая юбка-комбинезон, напоминающая вам о старых добрых временах.
-ent-ClothingUniformJumpskirtColorBlack = чёрная юбка-комбинезон
-    .desc = Обычная чёрная юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorBlue = синяя юбка-комбинезон
-    .desc = Обычная синяя юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorDarkBlue = тёмно-синяя юбка-комбинезон
-    .desc = Обычная тёмно-синяя юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorTeal = аквамариновая юбка-комбинезон
-    .desc = Обычная аквамариновая юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorGreen = зелёная юбка-комбинезон
-    .desc = Обычная зелёная юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorDarkGreen = тёмно-зелёная юбка-комбинезон
-    .desc = Обычная тёмно-зелёная юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorOrange = оранжевая юбка-комбинезон
-    .desc = Не носите её рядом с параноидальными сотрудниками службы безопасности.
-ent-ClothingUniformJumpskirtColorPink = розовая юбка-комбинезон
-    .desc = Просто глядя на это, вы чувствуете себя <i>потрясающе</i>.
-ent-ClothingUniformJumpskirtColorRed = красная юбка-комбинезон
-    .desc = Обычная красная юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorYellow = жёлтая юбка-комбинезон
-    .desc = Обычная жёлтая юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorPurple = фиолетовая юбка-комбинезон
-    .desc = Обычная фиолетовая юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorLightBrown = светло-коричневая юбка-комбинезон
-    .desc = Обычная светло-коричневая юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorBrown = коричневая юбка-комбинезон
-    .desc = Обычная коричневая юбка-комбинезон без знаков различия.
-ent-ClothingUniformJumpskirtColorMaroon = бордовая юбка-комбинезон
-    .desc = Обычная бордовая юбка-комбинезон без знаков различия.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl
deleted file mode 100644
index b3b922fe5d33..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_jumpsuits.ftl
+++ /dev/null
@@ -1,34 +0,0 @@
-ent-ClothingUniformJumpsuitColorWhite = белый комбинезон
-    .desc = Обычный белый комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorGrey = серый комбинезон
-    .desc = Серый комбинезон, напоминающая вам о старых добрых временах.
-ent-ClothingUniformJumpsuitColorBlack = чёрный комбинезон
-    .desc = Обычный чёрный комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorBlue = синий комбинезон
-    .desc = Обычный синий комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorDarkBlue = тёмно-синий комбинезон
-    .desc = Обычный тёмно-синий комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorTeal = аквамариновый комбинезон
-    .desc = Обычный аквамариновый комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorGreen = зелёный комбинезон
-    .desc = Обычный зелёный комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorDarkGreen = тёмно-зелёный комбинезон
-    .desc = Обычный тёмно-зелёный комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorOrange = оранжевый комбинезон
-    .desc = Не носите его рядом с параноидальными сотрудниками службы безопасности.
-ent-ClothingUniformJumpsuitColorPink = розовый комбинезон
-    .desc = Просто глядя на это, вы чувствуете себя <i>потрясающе</i>.
-ent-ClothingUniformJumpsuitColorRed = красный комбинезон
-    .desc = Обычный красный комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorYellow = жёлтый комбинезон
-    .desc = Обычный жёлтый комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorPurple = фиолетовый комбинезон
-    .desc = Обычный фиолетовый комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorLightBrown = светло-коричневый комбинезон
-    .desc = Обычный светло-коричневый комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorBrown = коричневый комбинезон
-    .desc = Обычный коричневый комбинезон без знаков различия.
-ent-ClothingUniformJumpsuitColorMaroon = бордовый комбинезон
-    .desc = Обычный бордовый комбинезон без знаков различия.
-ent-ClothingUniformColorRainbow = радужный комбинезон
-    .desc = Разноцветный комбинезон!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/fun/figurines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/fun/figurines.ftl
deleted file mode 100644
index a4bd638067de..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/fun/figurines.ftl
+++ /dev/null
@@ -1,98 +0,0 @@
-ent-BaseFigurine = фигурка
-    .desc = Небольшая миниатюра.
-ent-ToyFigurineHeadOfPersonnel = фигурка главы персонала
-    .desc = Фигурка, изображающая прославленного главу всея персонала, как обычно, отсутствующего в своем кабинете.
-ent-ToyFigurinePassenger = фигурка пассажира
-    .desc = Фигурка, изображающая обычного заурядного пассажира. Никаких приколов.
-ent-ToyFigurineGreytider = фигурка грейтайдера
-    .desc = Фигурка, изображающая подозрительного вида пассажира. Greytide worldwide!
-ent-ToyFigurineClown = фигурка клоуна
-    .desc = Фигурка, изображающая клоуна. Вы с содроганием думаете о том, что же, возможно, люди уже успели сделать с этой фигуркой.
-ent-ToyFigurineHoloClown = фигурка голоклоуна
-    .desc = Фигурка, изображающая голоклоуна. Ещё более раздражающий, чем клоун, и не менее реальный.
-ent-ToyFigurineMime = фигурка мима
-    .desc = Фигурка, изображающая того самого молчаливого ублюдка, который вам так хорошо знаком.
-ent-ToyFigurineMusician = фигурка музыканта
-    .desc = Фигурка, изображающая музыканта, его музыка была просто поразительной.
-ent-ToyFigurineBoxer = фигурка боксёра
-    .desc = Фигурка, изображающая боксера, держащего в руках красные перчатки.
-ent-ToyFigurineCaptain = фигурка капитана
-    .desc = Фигурка, изображающая стандартно экипированного капитана гражданского космического актива Nanotrasen.
-ent-ToyFigurineHeadOfSecurity = фигурка главы службы безопасности
-    .desc = Фигурка, изображающая прославленного главу отдела службы безопасности.
-ent-ToyFigurineWarden = фигурка смотрителя
-    .desc = Фигурка, изображающая смотрителя, готового в любой момент отправить человека за решётку.
-ent-ToyFigurineDetective = фигурка детектива
-    .desc = Фигурка, изображающая детектива в его знаковом плаще.
-ent-ToyFigurineSecurity = фигурка офицера службы безопасности
-    .desc = Фигурка, изображающая сотрудника службы безопасности, готового защищать станцию с дубинкой-шокером в руках.
-ent-ToyFigurineLawyer = фигурка адвоката
-    .desc = Фигурка, изображающая юриста в свежепошитом костюме.
-ent-ToyFigurineCargoTech = фигурка грузчика
-    .desc = Фигурка, изображающая грузчика расы рептилий.
-ent-ToyFigurineSalvage = фигурка утилизатора
-    .desc = Фигурка, изображающая утилизатора с ножом для выживания.
-ent-ToyFigurineQuartermaster = фигурка квартирмейстера
-    .desc = Фигурка, изображающая прославленного главу отдела снабжения.
-ent-ToyFigurineChiefEngineer = фигурка старшего инженера
-    .desc = Фигурка, изображающая прославленного главу инженерного отдела.
-ent-ToyFigurineEngineer = фигурка инженера
-    .desc = Фигурка, изображающая инженера станции, держащего наготове лом.
-ent-ToyFigurineAtmosTech = фигурка атмосферного техника
-    .desc = Фигурка, изображающая атмосферного техника, держащего в руках незажженный сварочный аппарат.
-ent-ToyFigurineResearchDirector = фигурка научного руководителя
-    .desc = Фигурка, изображающая прославленного главу научного отдела.
-ent-ToyFigurineScientist = фигурка учёного
-    .desc = Фигурка, изображающая учёного в лабораторном халате.
-ent-ToyFigurineChiefMedicalOfficer = фигурка главного врача
-    .desc = Фигурка, изображающая прославленного главу медицинского отдела.
-ent-ToyFigurineChemist = фигурка химика
-    .desc = Фигурка, изображающая химика, который, по всей видимости, собирается приготовить метамфетамин.
-ent-ToyFigurineParamedic = фигурка парамедика
-    .desc = Фигурка, изображающая парамедика в пустотном скафандре.
-ent-ToyFigurineMedicalDoctor = фигурка врача
-    .desc = Фигурка, изображающая врача, в халате и со шприцем.
-ent-ToyFigurineLibrarian = фигурка библиотекаря
-    .desc = Фигурка, изображающая единственного и неповторимого библиотекаря.
-ent-ToyFigurineChaplain = фигурка священника
-    .desc = Фигурка, изображающая священника, молящегося о богоугодных вещах.
-ent-ToyFigurineChef = фигурка повара
-    .desc = Фигурка, изображающая шеф-повара, мастера кулинарных искусств!... большую часть времени.
-ent-ToyFigurineBartender = фигурка бармена
-    .desc = Фигурка, изображающая бармена, стильно выглядящего в своих очках и цилиндре.
-ent-ToyFigurineBotanist = фигурка ботаника
-    .desc = Фигурка, изображающая ботаника, который точно не позволит кудзу выйти из-под контроля.
-ent-ToyFigurineJanitor = фигурка уборщика
-    .desc = Фигурка, изображающая уборщика в галошах.
-ent-ToyFigurineNukie = фигурка оперативника Синдиката
-    .desc = Фигурка, изображающая кого-то в кроваво-красном скафандре, напоминающем тот, который носят ядерные оперативники.
-ent-ToyFigurineNukieElite = фигурка элитного оперативника Синдиката
-    .desc = Фигурка, изображающая кого-то в элитном кроваво-красном скафандре, напоминающем тот, который могли бы носить медики отрядов ядерных оперативников.
-ent-ToyFigurineNukieCommander = фигурка командира Синдиката
-    .desc = Фигурка, изображающая кого-то в усиленном кроваво-красном скафандре, напоминающем тот, который могли бы носить командиры отрядов ядерных оперативников.
-ent-ToyFigurineFootsoldier = фигурка пехотинца Синдиката
-    .desc = Фигурка, изображающая пехотинца в экипировке Синдиката.
-ent-ToyFigurineWizard = фигурка волшебника
-    .desc = Фигурка, изображающая кого-то с длинной шелковистой бородой в костюме волшебника. Колдуны жалеют, что у них ничего подобного нет.
-ent-ToyFigurineWizardFake = фигурка ненастоящего волшебника
-    .desc = Фигурка, изображающая кого-то в поддельном костюме волшебника. Ну и скам!
-ent-ToyFigurineSpaceDragon = фигурка космического дракона
-    .desc = Большая фигурка, изображающая космического дракона с красными глазами, устремленными на добычу.
-ent-ToyFigurineQueen = фигурка королевы ксено
-    .desc = Большая фигурка, изображающая королеву ксено, приготовившуюся к нападению.
-ent-ToyFigurineRatKing = фигурка крысиного короля
-    .desc = Большая фигурка, изображающая крысиного короля, приготовившегося свить гнездо.
-ent-ToyFigurineRatServant = фигурка крысиного слуги
-    .desc = Фигурка, изображающая крысу, прислуживающую крысиному королю!
-ent-ToyFigurineMouse = фигурка мыши
-    .desc = Фигурка, изображающая мышь, бегущую к ближайшему кусочку еды.
-ent-ToyFigurineSlime = фигурка слайма
-    .desc = Фигурка, изображающая полупрозрачного голубого слайма.
-ent-ToyFigurineHamlet = фигурка Гамлета
-    .desc = Фигурка, изображающая Гамлета, микроволновка в комплект не входит.
-ent-ToyGriffin = фигурка гриффина
-    .desc = Экшен-фигурка, созданная по образу и подобию "Гриффина", криминального главаря.
-ent-ToyOwlman = фигурка совы
-    .desc = Экшен-фигурка, созданная по образу и подобию 'Совы', защитника справедливости.
-ent-ToySkeleton = фигурка скелета
-    .desc = Буу, испугал!
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl
deleted file mode 100644
index 59d26f8ad5a7..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomDrinkBottle = спавнер случайный напиток
-    .suffix = Бутылка
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl
deleted file mode 100644
index 0b518c75b641..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomDrinkGlass = спавнер случайный напиток
-    .suffix = Стакан
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl
deleted file mode 100644
index aaddb6d40971..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodBakedSingle = спавнер случайная выпечка
-    .suffix = Одна порция
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl
deleted file mode 100644
index ad793608f3f9..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodBakedWhole = спавнер случайная выпечка
-    .suffix = Целиком
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl
deleted file mode 100644
index bf58d7dabe22..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodMeal = спавнер случайная еда
-    .suffix = Блюдо
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl
deleted file mode 100644
index 20c6a8f71bd6..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodSingle = спавнер случайная еда
-    .suffix = Одна порция
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl
deleted file mode 100644
index 9aa900e56da4..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomSnacks = спавнер случайная закуска
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl
deleted file mode 100644
index d03c0e0f5b92..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-ent-MobBearSpace = космический медведь
-    .desc = Он выглядит дружелюбным. Почему бы тебе не обнять его?
-ent-MobBearSpaceSalvage = { ent-MobBearSpace }
-    .suffix = Salvage Ruleset
-    .desc = { ent-MobBearSpace.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/food_base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/food_base.ftl
index 40df71d932ea..4f97a613a5d8 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/food_base.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/food_base.ftl
@@ -1,4 +1,2 @@
 ent-FoodBase = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
-ent-FoodInjectableBase = { ent-FoodBase }
-    .desc = { ent-FoodBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
index 752512e60a74..4748cd023d1f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl
@@ -30,9 +30,6 @@ ent-TrashMimanaPeel = мимановая кожура
     .desc = { ent-TrashBananaPeel.desc }
 ent-TrashBananiumPeel = бананиумовая кожура
     .desc = { ent-TrashBananaPeel.desc }
-ent-TrashBananaPeelExplosive = { ent-TrashBananaPeel }
-    .suffix = Взрывчатка
-    .desc = { ent-TrashBananaPeel.desc }
 ent-FoodCarrot = морковь
     .desc = Полезна для глаз!
 ent-FoodCabbage = кочан капусты
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl
deleted file mode 100644
index 9aa900e56da4..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomSnacks = спавнер случайная закуска
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl
deleted file mode 100644
index ebc29258545b..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-APCElectronics = микросхема ЛКП
-    .desc = Микросхема, используемая в строительстве ЛКП.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl
deleted file mode 100644
index f8d00d349318..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-SolarTrackerElectronics = микросхема трекера солнечных лучей
-    .desc = Отслеживает позицию солнца и автоматически поворачивает вслед солнечные панели, что значительно повышает их эффективность.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments.ftl
index 251830bccecd..3e4ee4c96cac 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments.ftl
@@ -4,57 +4,3 @@ ent-BaseHandheldInstrument = { ent-BaseItem }
 ent-SynthesizerInstrument = синтезатор
     .desc = { ent-BaseHandheldInstrument.desc }
     .suffix = { "" }
-ent-AcousticGuitarInstrument = акустическая гитара
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-ViolinInstrument = скрипка
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-TrumpetInstrument = труба
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-GunpetInstrument = писольлет
-    .desc = Зачем вам проверять его? Разве это не очевидно?
-    .suffix = { "" }
-ent-ElectricGuitarInstrument = электрогитара
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-AccordionInstrument = аккордеон
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-HarmonicaInstrument = губная гармошка
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-RecorderInstrument = блокфлейта
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-TromboneInstrument = тромбон
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-EuphoniumInstrument = эуфониум
-    .desc = Детская туба? Баритон? Что бы это ни было, это довольно крутое переплетение труб.
-    .suffix = { "" }
-ent-FrenchHornInstrument = валторна
-    .desc = Французский рожок. Тот факт, что при удержании его приходится заслонять рукой раструб для приглушения звука, может навести на определённые мысли о его звучании.
-    .suffix = { "" }
-ent-SaxophoneInstrument = саксофон
-    .desc = Инструмент. Вероятно, вы можете перемолоть его в сырой джаз.
-    .suffix = { "" }
-ent-GlockenspielInstrument = глокеншпиль
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-BanjoInstrument = банджо
-    .desc = { ent-BaseHandheldInstrument.desc }
-    .suffix = { "" }
-ent-BikeHornInstrument = позолоченный велосипедный клаксон
-    .desc = Изысканно украшенный велосипедный клаксон, способный издавать разнообразные ноты.
-    .suffix = { "" }
-ent-SuperSynthesizerInstrument = суперсинтезатор
-    .desc = Разрываем гетто с помощью Touhou MIDIs с 2020 года.
-    .suffix = { "" }
-ent-XylophoneInstrument = ксилофон
-    .desc = Разноцветный колокольчик.
-    .suffix = { "" }
-ent-PhoneInstrument = красный телефон
-    .desc = Если что-то пойдёт не так...
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl
deleted file mode 100644
index e108036226fe..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-BaseHandheldInstrument = { ent-BaseItem }
-    .desc = Это музыкальный инструмент.
-ent-BasePlaceableInstrument = baseinstrument
-    .desc = { ent-BaseStructureDynamic.desc }
-ent-BasePlaceableInstrumentRotatable = baseinstrumentrotatable
-    .desc = { ent-BasePlaceableInstrument.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl
index c1ea6376dbc4..a23d9c7d09e1 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl
@@ -6,8 +6,6 @@ ent-XylophoneInstrument = ксилофон
     .desc = Радужный глокеншпиль.
 ent-MicrophoneInstrument = микрофон
     .desc = Идеален чтобы петь во весь голос.
-ent-SynthesizerInstrument = синтезатор
-    .desc = { ent-BaseHandheldInstrument.desc }
 ent-KalimbaInstrument = калимба
     .desc = Мощь фортепиано прямо под вашими пальцами.
 ent-WoodblockInstrument = коробочка
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl
index 1e4ab906d585..eec2dc635f00 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl
@@ -67,8 +67,6 @@ ent-ToyNuke = игрушечная ядерка
     .desc = Пластиковая модель взрывного ядерного устройства. Без урана внутри... скорее всего.
 ent-ToyAssistant = игрушечный ассистент
     .desc = Грейтайд всегда и везде.
-ent-ToyGriffin = игрушечный гриффин
-    .desc = Фигурка, созданная по образу "Гриффина", криминального гения.
 ent-ToyHonk = игрушечный х.о.н.к.
     .desc = Фигурка Мини-Мех!'Меха номер 6/12' написано на обороте.
 ent-ToyIan = игрушечный иан
@@ -81,8 +79,6 @@ ent-ToyGygax = игрушечный гайгэкс
     .desc = Фигурка Мини-Мех! 'Меха номер 4/12' написано на обороте.
 ent-ToyOdysseus = игрушечный одиссей
     .desc = Фигурка Мини-Мех! 'Меха номер 10/12' написано на обороте.
-ent-ToyOwlman = игрушечная сова
-    .desc = Фигурка, созданная по образу "Совы", защитник справедливости.
 ent-ToyDeathRipley = игрушечный смерть-рипли
     .desc = Фигурка Мини-Мех! 'Меха номер 3/12' написано на обороте.
 ent-ToyPhazon = игрушечный фазон
@@ -97,8 +93,6 @@ ent-ToySeraph = игрушечный серафим
     .desc = Фигурка Мини-Мех! 'Меха номер 8/12' написано на обороте.
 ent-ToyDurand = игрушечный дюранд
     .desc = Фигурка Мини-Мех! 'Меха номер 5/12' написано на обороте.
-ent-ToySkeleton = игрушечный скелет
-    .desc = Ха, испугался!
 ent-FoamWeaponBase = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
 ent-FoamCrossbow = поролоновый арбалет
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
deleted file mode 100644
index 6f9989c02a72..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/authorbooks.ftl
+++ /dev/null
@@ -1,62 +0,0 @@
-ent-BookNarsieLegend = легенда о Нар'Си
-    .desc = Книга представляет собой старинный томик в кожаном переплете с замысловатыми гравюрами на обложке. Страницы пожелтели и стали хрупкими от возраста, в некоторых местах в тексте выцвели чернила. Судя по всему, книга была хорошо исчитана и любима: многие страницы подогнуты, а на полях нацарапаны пометки. Несмотря на свой состаренный вид, книга по-прежнему излучает ощущение мистической силы и диковинности, намекая на тайны и знания, содержащиеся на ее страницах.
-ent-BookTruth = изучение различных философских взглядов на истину и сложности лжи
-    .desc = Книга, исследующая различные философские взгляды на правду и ложь, имеет потрепанную обложку со складками и пометками, свидетельствующими о частом использовании и глубоких размышлениях. На корешке видны следы износа от того, что ее снова и снова доставали с полки. Сами страницы испещрены подчеркиваниями, заметками на полях и выделенными отрывками, за всё время пока читатели пытались разобраться в тонкостях и сложностях темы.
-ent-BookWorld = формирование состояния мира - взаимодействие сил и выбора
-    .desc = Книга в хорошо сохранившемся твердом переплете с простым, элегантным рисунком на обложке, изображающим мир в движении. Страницы четкие и чистые, без следов износа, что говорит о том, что предыдущий владелец хорошо заботился о книге и ценил ее. Текст напечатан четким, разборчивым шрифтом, а главы организованы логично и легко, что делает его доступным для читателей любого уровня подготовки.
-ent-BookIanAntarctica = приключения Роберта и Иана - исследование Антарктики
-    .desc = Книга в небольшой мягкой обложке в хорошем состоянии, с иллюстрацией корги Иана и колонии пингвинов на обложке. На синем фоне жирными белыми буквами написано "Антарктическое приключение Иана и Роберта". На задней стороне обложки написано краткое изложение истории, в котором подчеркиваются темы смирения, стойкости и красоты природы.
-ent-BookSlothClownSSS = ленивец и клоун - проделки на космической станции
-    .desc = Книга выглядит новой, на глянцевой обложке изображены клоун Хохотун и ленивец Калачик, парящие в космосе на фоне звезд и планет. Хохотун одет в свой костюм банана, а Калачик спит в гамаке из космических канатов. Название "Ленивец и клоун - Проделки на космической станции" написано жирными и красочными буквами.
-ent-BookSlothClownPranks = ленивец и клоун - пранк над Зоргс
-    .desc = Книга в отличном состоянии, с четкими страницами и яркой обложкой. На обложке книги изображены Хохотун и Калачик в окружении различных существ, с которыми они столкнулись во время своих приключений в космосе. На заднем плане виден Зоргс, выглядывающий из-за космического корабля.
-ent-BookSlothClownMMD = ленивец и клоун - опасный лабиринт
-    .desc = Книга выглядит новой и яркой, на обложке изображены Хохотун и Калачик, стоящие перед меняющимся лабиринтом. Название "Ленивец и клоун - Опасный лабиринт" написано жирными разноцветными буквами, которые хорошо выделяются на фоне космоса и звезд.
-ent-BookStruck = смиряющий и преображающий опыт удара молнией
-    .desc = Обложка книги представляет собой изображение молнии, бьющей в землю, с силуэтом человека, стоящего посреди нее. Название книги написано жирными буквами белым шрифтом на черном фоне, передавая силу и интенсивность переживаний. Подзаголовок написан более мелкими буквами под заголовком, давая намек на философские и духовные темы, рассматриваемые в книге.
-ent-BookSun = дотянуться до солнца - жизненное стремление растения
-    .desc = Книга новая, с яркой и красочной обложкой, на которой изображено растение, протягивающее свои листья к солнцу. Название "Дотянуться до солнца - жизненное стремление растения" написано жирными зелеными буквами, а за растением изображено восходящее солнце. Обложка вызывает ощущение роста, энергии и красоты природы.
-ent-BookPossum = падшие амбиции - трагическая история опоссума Морти
-    .desc = Книга в хорошем состоянии, в твердом переплете с темно-зеленым лесом на фоне. В центре обложки изображен грустный опоссум, сидящий на ветке, с отчужденным и одиноким выражением лица. Название "Падшие амбиции - Трагическая история опоссума Морти" написано жирными золотыми буквами над опоссумом.
-ent-BookCafe = опоссум и кафе
-    .desc = Книга в хорошем состоянии, с яркой и причудливой обложкой, на которой изображен очаровательный опоссум, выглядывающий из-за кофейной чашки, а на заднем плане - красочная и шумная сцена в кафе. Название "Опоссум и кафе" написано жирным, игривым шрифтом, а имя автора напечатано более мелким шрифтом под ним.
-ent-BookFeather = волшебное перо - путь странствующей птицы к принадлежности
-    .desc = Книга находится в хорошем состоянии, на глянцевой обложке изображена странствующая птица в окружении светящегося леса, а в центре - волшебное перо. Название "Волшебное перо" написано жирными, сверкающими буквами, а подзаголовок "Путь бродячей птицы к принадлежности" написан более мелким шрифтом. На задней стороне обложки есть краткое содержание истории, а также отзывы критиков, восхваляющих темы надежды и обновления.
-ent-BookIanLostWolfPup = приключения Иана и Алисы - поиски потерявшегося волчонка
-    .desc = Книга в хорошем состоянии с красочной обложкой, на которой изображены корги Иан и лиса Алиса, отправившиеся в путешествие по лесу, и потерявшийся волчий щенок у их ног. Название "Приключения Иана и Алисы - поиски потерявшегося волчонка" красуется вверху, а имя автора - внизу. Обложка имеет причудливый и авантюрный характер, что привлекает читателей всех возрастов.
-ent-BookIanRanch = приключения Иана и Алисы - экспедиция на ранчо
-    .desc = Книга выглядит как новая, с чистыми страницами и неповрежденной обложкой. На обложке изображены красочные иллюстрации Иана и Алисы в окружении различных животных, с которыми они столкнулись на ранчо, включая лошадей, коров и цыплят. Над изображением жирными буквами написано название - "Приключения Иана и Алисы - экспедиция на ранчо", а ниже - подзаголовок "Помощь животным в беде".
-ent-BookIanOcean = приключения Иана и Алисы - океанское приключение
-    .desc = Книга новая и находится в отличном состоянии. На обложке изображены Иан и Алиса, бегающие и играющие на пляже, на фоне голубого океана и золотого песка. Название книги написано жирными игривыми буквами, а подзаголовок гласит: "Океанское приключение".
-ent-BookIanMountain = приключения Иана и Алисы - горная экспедиция
-    .desc = Книга находится в хорошем состоянии. На обложке изображен потрясающий горный пейзаж с Ианом и Алисой на переднем плане, смотрящими на окружающие вершины и долины. Заголовок "приключения Иана и Алисы" написан жирными печатными буквами вверху, а под ним - подзаголовок "Горная экспедиция".
-ent-BookIanCity = приключения Иана и Алисы - знакомство с городом
-    .desc = Книга в хорошем состоянии, с четкими страницами и глянцевой обложкой. На обложке изображена красочная иллюстрация, на которой Иан и Алиса исследуют город, на фоне высоких зданий и оживленных улиц. Иан идет впереди, возбужденно виляя хвостом, а Алиса следует за ним, навострив уши и широко раскрыв глаза от удивления. Заголовок "Приключения Иана и Алисы" написан жирными игривыми буквами, а подзаголовок "Исследуя город" - более мелким шрифтом.
-ent-BookIanArctic = приключения Иана и Алисы - арктическое путешествие с храбростью и дружбой
-    .desc = Книга выглядит новой и авантюрной, на ней изображены Иан и Алиса, стоящие перед ледяным пейзажем, вокруг которого падают снежинки. Название "Приключения Иана и Алисы" написано жирными буквами вверху, а подзаголовок гласит: "Арктическое путешествие с храбростью и дружбой".
-ent-BookIanDesert = приключения Иана и Алисы - исследование таинственной пустыни
-    .desc = Книга выглядит новой и имеет красочную обложку с изображением Иана и Алисы на фоне пустыни. На обложке изображены животные, с которыми они столкнулись во время своего приключения - гремучая змея и койоты, а так же изображены песчаные дюны и оазис. Название "Приключения Иана и Алисы" выделено на обложке жирными буквами, а подзаголовок "Исследование таинственной пустыни" написан более мелкими буквами.
-ent-BookNames = сила имен - философское исследование
-    .desc = Книга представляет собой бережно использованный учебник по философии, на обложке которого крупным планом изображен рот человека, на губах которого написано слово "имена". Название книги - "Сила имен - философское исследование", а под ним на видном месте указано имя автора. Общий дизайн прост и элегантен, акцент сделан на тексте, а не на броской графике или изображениях.
-ent-BookEarth = тоска по Земле
-    .desc = Книга находится в хорошем состоянии, обложка немного выцвела из-за воздействия солнечного света.  На обложке книги изображен панорамный вид Земли из космоса с ярко-синим океаном и зелеными материками. На переднем плане изображен одинокий астронавт, сидящий перед иллюминатором и с тоской смотрящий на Землю. Название книги - "Тоска по Земле" - написано жирными белыми буквами на черном фоне в верхней части обложки.
-ent-BookAurora = путешествие за пределы - миссия звездолета "Аврора"
-    .desc = Книга в отличном состоянии, на блестящей обложке изображен космический корабль, парящий над планетой, возможно Землей, на заднем плане. Название «Путешествие за пределы - Миссия звездолета "Аврора"» написано жирными серебристыми буквами. На обложке также имеется цитата из рецензии: "Это необычайно захватывающий рассказ о человеческих достижениях и исследованиях", чтобы привлечь потенциальных читателей.
-ent-BookTemple = природа божественного - принятие многочисленности богов
-    .desc = Книга выглядит новой, с чистыми страницами и неповрежденным корешком. На обложке изображен храм со светящейся разноцветной аурой вокруг него, символизирующей различных богов, о которых идет речь в книге. Название книги выделено золотым шрифтом, а имя автора и краткое содержание книги написаны более мелким шрифтом.
-ent-BookWatched = Смотрящие
-    .desc = Книга в хорошем состоянии, со слегка потертой обложкой, на которой изображена мрачная и зловещая космическая станция, маячащая на заднем плане. Название "Смотрящие" написано жирными буквами, которые, кажется, смотрят на читателя, передавая ощущение постоянного наблюдения. Краткое изложение на задней обложке намекает на захватывающий и напряженный рассказ о паранойе и опасности в замкнутом пространстве.
-ent-BookMedicalOfficer = Битва за Горизонт - рассказ медицинского работника о доверии и выживании
-    .desc = На обложке изображен медик Смит в своей униформе, выглядящий решительным и готовым принять любой вызов. На заднем плане изображена космическая станция "Горизонт" под нападением, взрывы и дым заполняют космическую станцию. На переднем плане виден волшебник с посохом, что придает сцене элемент загадочности и интриги. Название книги выделено жирными буквами, а имя автора и теглайн указывают на захватывающий и напряженный характер книги.
-ent-BookMorgue = Призрачные обитатели заброшенного морга
-    .desc = Книга выглядит старой и потрепанной, с выцветшей надписью на обложке. На обложке изображен мрачный и жуткий морг, а полная луна отбрасывает зловещий свет на сцену. На переднем плане - опоссум Морти и енот Мортиша с озорными выражениями на мордочках, выглядывающие из-за металлической полки. Название книги написано жирными жуткими буквами, а подзаголовок "Сказка о духах животных" написан более мелким шрифтом ниже.
-ent-BookRufus = Руфус и озорная фея
-    .desc = Книга почти как новая, с яркими цветами и иллюстрациями на обложке. На обложке изображен Руфус на велосипеде, а рядом с ним в игривой манере летит Блоссом. Название написано жирным, причудливым шрифтом, а имена персонажей выделены контрастным цветом. Общая эстетика очаровательна и привлекательна, она понравится и детям, и взрослым.
-ent-BookMap = Карта приключений
-    .desc = Книга в хорошем состоянии, с глянцевой обложкой, на которой изображена замысловатая сцена джунглей с яркими цветами и мельчайшими деталями. Название "Карта приключений" написано жирным золотым шрифтом. На обложке также изображен загадочный чемодан, из которого высыпается карта.
-ent-BookJourney = путешествие по музыке, горам и самопознанию
-    .desc = Книга в отличном состоянии, с четкими страницами и глянцевой обложкой. На обложке изображен яркий горный хребет, на переднем плане - силуэт альпиниста с гитарой на спине. Название книги - смелое и привлекающее внимание, с подзаголовком "Путешествие музыки, гор и самопознания".
-ent-BookInspiration = поиск вдохновения - путешествие писателя по лесу
-    .desc = Книга в новом состоянии, на обложке изображена безмятежная лесная сцена с водопадом и красочными полевыми цветами. Название книги "Поиск вдохновения - путешествие писателя по лесу" и имя автора крупно указаны внизу.
-ent-BookJanitorTale = Рассказы усталого уборщика
-    .desc = Чистая на вид книга, смутно пахнущая мылом и отбеливателем.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl
deleted file mode 100644
index 155e44064e3f..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-ent-filingCabinet = картотечный шкаф
-    .desc = Шкаф для хранения документов.
-    .suffix = { "" }
-ent-filingCabinetTall = высокий шкаф
-    .desc = { ent-filingCabinet.desc }
-    .suffix = { "" }
-ent-filingCabinetDrawer = комод
-    .desc = Маленький шкафчик для хранения предметов. Теперь на колёсиках!
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
deleted file mode 100644
index c24ef8e38937..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-ent-RubberStampBase = универсальная печать
-    .desc = Печать из резины, для проставления печатей на важных документах.
-ent-RubberStampBaseAlt = альтернативная печать
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampCaptain = печать капитана
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampCentcom = печать Центком
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampChaplain = печать священника
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampLawyer = печать адвоката
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampClown = печать клоуна
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampCE = печать старшего инженера
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampCMO = печать главврача
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampHop = печать главы персонала
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampHos = печать главы службы безопасности
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampMime = печать мима
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampQm = печать квартирмейстера
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampRd = печать научного руководителя
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampTrader = печать торговца
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampSyndicate = печать Синдиката
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampWarden = печать смотрителя
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
-ent-RubberStampApproved = печать ОДОБРЕНО
-    .desc = { ent-RubberStampBaseAlt.desc }
-ent-RubberStampDenied = печать ОТКАЗАНО
-    .desc = { ent-RubberStampBaseAlt.desc }
-ent-RubberStampDetective = печать детектива
-    .suffix = НЕ МАППИТЬ
-    .desc = { ent-RubberStampBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/AnomalyCore.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/AnomalyCore.ftl
index 53e5eb0639fc..8bcb7dc253c0 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/AnomalyCore.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/AnomalyCore.ftl
@@ -1,36 +1,2 @@
 ent-AnomalyCore = ядро аномалии
     .desc = Ядро аномалии от неописуемого объета. Успей продать пока не остыло! Если оно вообще теплое... и можно его подобрать.
-ent-AnomalyCoreGravity = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreGravityInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreFlesh = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreFleshInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreFlesh = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreFleshInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreRock = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreRockInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreElectricity = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreElectricityInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCorePyroclastic = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCorePyroclasticInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreIce = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreIceInertInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreBluespaceInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-ent-AnomalyCoreBluespaceInertInert = { ent-AnomalyCore }
-    .desc = { ent-AnomalyCore.desc }
-
-
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry-vials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry-vials.ftl
index ab6d4142c4af..a3e03d94b2d4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry-vials.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry-vials.ftl
@@ -1,4 +1,2 @@
-ent-BaseChemistryEmptyVial = пробирка
-    .desc = Маленькая пробирка.
 ent-VestineChemistryVial = пробирка вестина
-    .desc = { ent-BaseChemistryEmptyVial.desc }
\ No newline at end of file
+    .desc = { ent-BaseChemistryEmptyVial.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl
index ead206098c87..ff70375f3e01 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl
@@ -2,20 +2,11 @@ ent-MopItem = швабра
     .desc = Швабра, которую невозможно остановить, viscera cleanup detail ждёт вас.
 ent-AdvMopItem = продвинутая швабра
     .desc = Моторизованная швабра с увеличенным резервуаром и возможностью уборки нескольких луж одновременно. Система автоматического противодействия клоунам в комплект не входит.
-ent-MopBucket = ведро для швабры
-    .desc = Содержит воду и слезы уборщика.
-ent-MopBucketFull = ведро для швабры
-    .suffix = Полный
-    .desc = { ent-MopBucket.desc }
 ent-WetFloorSign = знак "мокрый пол"
     .desc = Осторожно! Мокрый пол!
 ent-WetFloorSignMineExplosive = { ent-WetFloorSign }
     .desc = { ent-WetFloorSign.desc }
     .suffix = Взрывчатка
-ent-JanitorialTrolley = тележка уборщика
-    .desc = Это альфа и омега санитарии.
-ent-FloorDrain = дренаж
-    .desc = Сливает лужи вокруг в себя. Пригодится для опорожнения ведер или поддержания чистоты в определенных помещениях.
 ent-Plunger = вантуз
     .desc = Вантуз с красной пластиковой присоской и деревянной ручкой. Используется для прочистки засоров.
 ent-RagItem = тряпка
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mecha_equipment.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mecha_equipment.ftl
index dc4d5b1ea21c..3a20fb5ea6a8 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mecha_equipment.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mech/mecha_equipment.ftl
@@ -6,5 +6,3 @@ ent-MechEquipmentGrabberSmall = малая гидравлическая клеш
     .desc = Даёт меху возможность хватать и перемещать предметы.
 ent-MechEquipmentHorn = гудок мехи
     .desc = Усиленный велосипедный гудок, воспроизводящий множество уморительных звуков на радость экипажу. ХОНК!
-ent-MechEquipmentGrabberSmall = маленькая гидравлическая клешня
-    .desc = Дает меху возможность хватать и перемещать предметы.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl
deleted file mode 100644
index fe48899c4e81..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-OreBag = сумка для руды
-    .desc = Прочная сумка для утилизаторов и шахтёров, для переноски больших объёмов руды.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl
index 826b31929b51..bc4537831488 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl
@@ -21,8 +21,6 @@ ent-SpaceTickCube = клещевой кубик
     .desc = Просто добавь воды! На свой страх и риск.
 ent-AbominationCube = мерзостный кубик
     .desc = Просто добавь крови!
-ent-DehydratedSpaceCarp = обезвоженный космический карп
-    .desc = Выглядит как плюшевый игрушечный карп, но стоит только добавить воды, и он превращается в настоящего космического карпа!
 ent-SyndicateSponge = обезьяний кубик
     .desc = Просто добавь воды!
     .suffix = Синдикат
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
index aa28bdb0eb1e..5477f6e02ce6 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
@@ -42,8 +42,6 @@ ent-BorgModuleLightReplacer = лампозаменительный модуль
   .desc = { ent-BaseBorgModule.desc }
 ent-BorgModuleCleaning = чистящий модуль киборга
   .desc = { ent-BaseBorgModule.desc }
-ent-BorgModuleTrashCollection = мусоросборный модуль киборга
-    .desc = { ent-BaseBorgModule.desc }
 ent-BorgModuleTrashCollection = мусороуборочный модуль киборга
     .desc = { ent-BaseBorgModuleJanitor.desc }
 ent-BorgModuleAdvancedCleaning = продвинутый чистящий модуль киборга
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifact_equipment.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifact_equipment.ftl
deleted file mode 100644
index c8edb677915f..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifact_equipment.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CrateArtifactContainer = контейнер артефактов
-    .desc = Используется для безопасного хранения и перемещения артефактов.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
deleted file mode 100644
index 3d688523b82f..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-ent-BaseAmmoProvider = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-ent-AmmoProviderShotgunShell = { ent-BaseAmmoProvider }
-    .desc = { ent-BaseAmmoProvider.desc }
-ent-BoxBeanbag = раздатчик ружейных патронов (травматические)
-    .desc = Полная коробка травматических ружейных патронов.
-ent-BoxLethalshot = раздатчик ружейных патронов (летальные)
-    .desc = Полная коробка летальных ружейных патронов.
-ent-BoxShotgunSlug = раздатчик ружейных патронов (картечь)
-    .desc = Полная коробка картечных ружейных патронов
-ent-BoxShotgunFlare = раздатчик ружейных патронов (фальшфейеры)
-    .desc = Полная коробка ружейных патронов-фальшфейеров.
-ent-BoxShotgunIncendiary = раздатчик ружейных патронов (зажигательные)
-    .desc = Полная коробка зажигательных ружейных патронов.
-ent-BoxShotgunUranium = раздатчик ружейных патронов (урановые)
-    .desc = Полная коробка урановых ружейных патронов.
-ent-BoxShotgunPractice = раздатчик ружейных патронов (учебные)
-    .desc = Полная коробка учебных ружейных патронов.
-ent-BoxShellTranquilizer = раздатчик ружейных патронов (транквилизаторы)
-    .desc = Полная коробка ружейных патронов-транквилизаторов.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl
deleted file mode 100644
index eff494365885..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-BaseCartridge = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl
index 04c117c5bd9a..c0ace6329613 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl
@@ -1,6 +1,3 @@
 ent-CartridgeHRifleBase = патрон (.20 винтовочный)
     .desc = { ent-BaseCartridge.desc }
     .suffix = { "" }
-ent-CartridgeMinigun = патрон (.10 винтовочный)
-    .desc = { ent-CartridgeHRifleBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl
deleted file mode 100644
index 4b210ba80c35..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-ent-ClusterBang = связка гранат
-    .desc = Используется только со светошумовыми гранатами. Взрывается несколько раз.
-ent-ClusterBangFull = { ent-ClusterBang }
-    .suffix = Полная
-    .desc = { ent-ClusterBang.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl
deleted file mode 100644
index 3616323c11d5..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl
+++ /dev/null
@@ -1,13 +0,0 @@
-ent-ExGrenade = разрывная граната
-    .desc = Граната, создающая небольшой но разрушительный взрыв.
-ent-GrenadeFlashBang = светошумовая граната
-    .desc = Пиииииииииииииииииииии
-
-# Corvax-HiddenDesc-Start
-ent-SyndieMiniBomb = минибомба с таймером
-    .suffix = Синдикат
-    .desc = Аккуратное, стильное взрывное устройство с приятно-потрескивающим таймером, предназначенное сеять хаос и разрушение.
-# Corvax-HiddenDesc-End
-
-ent-NuclearGrenade = критическая масса
-    .desc = Пожалуйста не бросай её, подумай о детях.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
index cdb6fcda88bd..40458c63bfe9 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/revolvers/revolvers.ftl
@@ -18,6 +18,3 @@ ent-WeaponRevolverPythonAP = Питон
 ent-WeaponRevolverPirate = пиратский револьвер
     .desc = Странный дульнозарядный револьвер, который использовали пираты. Использует патроны калибра .45 магнум.
     .suffix = Револьвер
-ent-WeaponPistolCHIMP = М.А.Р.Т.Ы.Х.
-    .desc = То, что это маленький М.А.Р.Т.Ы.Х., не означает, что он не может бить как М.А.К.А.К.
-    .suffix = Револьвер, мартых
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/cargo_console.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/cargo_console.ftl
deleted file mode 100644
index 9804f8e266bf..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/cargo_console.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CargoTelepad = грузовой телепад
-    .desc = { ent-BaseStructureDynamic.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl
index 1e006ce03a79..107ca3d659e8 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/base_structureairlocks.ftl
@@ -2,5 +2,3 @@ ent-Airlock = шлюз
     .desc = Он открывается, он закрывается, и он может вас раздавить.
 ent-AirlockRCDResistant = { ent-Airlock }
     .desc = { ent-Airlock.desc }
-ent-AirlockGlass = стеклянный шлюз
-    .desc = { ent-Airlock.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl
index 5eee57a927e2..750d789f8d82 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl
@@ -4,21 +4,3 @@ ent-BasePlaceableInstrument = baseinstrument
 ent-BasePlaceableInstrumentRotatable = baseinstrumentrotatable
     .desc = { ent-BasePlaceableInstrument.desc }
     .suffix = { "" }
-ent-PianoInstrument = фортепиано
-    .desc = При необходимости поднять на девятый этаж зовите карго.
-    .suffix = { "" }
-ent-UprightPianoInstrument = пианино
-    .desc = Я сказал пьянино.
-    .suffix = { "" }
-ent-MinimoogInstrument = минимуг
-    .desc = Это минимуг, как космическое фортепиано, но ещё более космическое!
-    .suffix = { "" }
-ent-ChurchOrganInstrument = церковный орган
-    .desc = Эта штука действительно бахает.
-    .suffix = { "" }
-ent-TubaInstrument = туба
-    .desc = Большой папочка семейства духовых. Рядом с его великолепием чувствуешь себя неуверенно.
-    .suffix = { "" }
-ent-DawInstrument = цифровая звуковая рабочая станция
-    .desc = Передовые музыкальные технологии прямо из 90-х.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl
deleted file mode 100644
index c3d3034483cc..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-DiseaseDiagnoser = Диагностировщик заболеваний Дельта Экстрим
-    .desc = Машина, анализирующая пробы на наличие заболеваний.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl
deleted file mode 100644
index e5068e80b204..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-Vaccinator = Вакцинатор
-    .desc = Машина для создания вакцин.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl
deleted file mode 100644
index f99d23d37f95..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-BaseGenerator = генератор
-    .desc = Высокоэффективный термоэлектрический генератор.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/anomalies.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/anomalies.ftl
deleted file mode 100644
index d7771bf2fdb8..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/anomalies.ftl
+++ /dev/null
@@ -1,26 +0,0 @@
-ent-BaseAnomaly = аномалия
-    .desc = Непостижимый объект в пространстве. Стоит ли стоять так близко к нему?
-ent-AnomalyPyroclastic = { ent-BaseAnomaly }
-    .suffix = Пирокластика
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyGravity = { ent-BaseAnomaly }
-    .suffix = Гравитация
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyElectricity = { ent-BaseAnomaly }
-    .suffix = Электричество
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyFlesh = { ent-BaseAnomaly }
-    .suffix = Плоть
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyBluespace = { ent-BaseAnomaly }
-    .suffix = Блюспейс
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyIce = { ent-BaseAnomaly }
-    .suffix = Лёд
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyRock = { ent-BaseAnomaly }
-    .suffix = Камень
-    .desc = { ent-BaseAnomaly.desc }
-ent-AnomalyLiquid = { ent-BaseAnomaly }
-    .suffix = Жидкость
-    .desc = { ent-BaseAnomaly.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/big_boxes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/big_boxes.ftl
index 7f6df2f64635..6a4bbc2fc9da 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/big_boxes.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/big_boxes.ftl
@@ -7,5 +7,3 @@ ent-BigBox = { ent-BaseBigBox }
     .desc = { ent-BaseBigBox.desc }
 ent-GhostBox = призрачная коробка
     .desc = Остерегайтесь!
-ent-Exclamation = восклицание
-    .desc = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
index c9d7e6c871e8..eca41c8a82bc 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl
@@ -61,9 +61,5 @@ ent-LockerSyndicatePersonal = оружейный шкаф
 ent-LockerBluespaceStation = блюспейс шкаф
     .desc = Передовая технология шкафчикостроения.
     .suffix = Один на станцию
-ent-LockerClown = шкаф клоуна
-    .desc = { ent-LockerBaseSecure.desc }
-ent-LockerMime = шкаф мима
-    .desc = { ent-LockerBaseSecure.desc }
 ent-LockerRepresentative = шкаф представителя Nanotrasen
     .desc = { ent-LockerBaseSecure.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl
deleted file mode 100644
index 486aa8af1ba7..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl
+++ /dev/null
@@ -1,36 +0,0 @@
-ent-WallLight = светильник
-    .desc = Обесточенный светильник.
-    .suffix = Обесточенный
-ent-PoweredlightEmpty = светильник
-    .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампочкой-трубкой.
-    .suffix = Пустой, Запитанный
-ent-Poweredlight = { ent-PoweredlightEmpty }
-    .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампочкой-трубкой.
-    .suffix = Запитанный
-ent-PoweredlightLED = { ent-Poweredlight }
-    .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампочкой-трубкой.
-    .suffix = Запитанный, LED, Светодиод
-ent-UnpoweredLightLED = { ent-WallLight }
-    .suffix = Обесточенный, LED, Светодиод
-    .desc = { ent-WallLight.desc }
-ent-PoweredlightExterior = { ent-Poweredlight }
-    .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампочкой-трубкой.
-    .suffix = Запитанный, Синий
-ent-UnpoweredLightExterior = { ent-WallLight }
-    .suffix = Обесточенный, Синий
-    .desc = { ent-WallLight.desc }
-ent-PoweredlightSodium = { ent-Poweredlight }
-    .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампочкой-трубкой.
-    .suffix = Запитанный, Оранжевый, Натриевый
-ent-UnpoweredLightSodium = { ent-WallLight }
-    .suffix = Обесточенный, Оранжевый, Натриевый
-    .desc = { ent-WallLight.desc }
-ent-SmallLight = маленький светильник
-    .desc = Обесточенный светильник.
-    .suffix = Обесточенный
-ent-PoweredSmallLightEmpty = маленький светильник
-    .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампой накаливания.
-    .suffix = Пустой, Запитанный
-ent-PoweredSmallLight = { ent-PoweredSmallLightEmpty }
-    .suffix = Запитанный
-    .desc = { ent-PoweredSmallLightEmpty.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl
index 92dd84cee41b..0eef13ea61ee 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/surveillance_camera.ftl
@@ -15,9 +15,6 @@ ent-SurveillanceCameraScience = камера
 ent-SurveillanceCameraSupply = камера
     .suffix = Карго, Снабжение
     .desc = { ent-SurveillanceCameraBase.desc }
-ent-SurveillanceCameraScience = камера
-    .suffix = Научный
-    .desc = { ent-SurveillanceCameraBase.desc }
 ent-SurveillanceCameraCommand = камера
     .suffix = Командный
     .desc = { ent-SurveillanceCameraBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girder.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girder.ftl
deleted file mode 100644
index 195658c84132..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/girder.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-Girder = каркас
-    .desc = Большой металлический каркас; Необходимо покрыть листами металла, чтобы он считался стеной.
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/tile/basalt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/tile/basalt.ftl
deleted file mode 100644
index f635377cef0e..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/tile/basalt.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-ent-BasaltOne = базальт
-    .desc = Камень
-    .suffix = { "" }
-ent-BasaltTwo = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltThree = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltFour = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltFive = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltRandom = { ent-BasaltOne }
-    .suffix = Случайный
-    .desc = { ent-BasaltOne.desc }
diff --git a/Resources/Locale/ru-RU/ss220/bed.ftl b/Resources/Locale/ru-RU/ss220/bed.ftl
deleted file mode 100644
index 375c175044f2..000000000000
--- a/Resources/Locale/ru-RU/ss220/bed.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-PsychBed = кушетка психолога
-    .desc = Должна помогать при проведении психоанализа. Никто не знает, работает ли это.
diff --git a/Resources/Locale/ru-RU/ss220/chat/emotes.ftl b/Resources/Locale/ru-RU/ss220/chat/emotes.ftl
index 1f1d4386b509..6f9792109ceb 100644
--- a/Resources/Locale/ru-RU/ss220/chat/emotes.ftl
+++ b/Resources/Locale/ru-RU/ss220/chat/emotes.ftl
@@ -1,9 +1,7 @@
-# Имена 
+# Имена
 chat-emote-name-howl = Выть
-chat-emote-name-growl = Рычать
 chat-emote-name-bark = Лаять
 
 # Сообщение
 chat-emote-msg-howl = воет
-chat-emote-msg-growl = рычит
 chat-emote-msg-bark = лает
diff --git a/Resources/Locale/ru-RU/ss220/mobs/ghost-role-pets.ftl b/Resources/Locale/ru-RU/ss220/mobs/ghost-role-pets.ftl
index 8e7ba58ba153..61dacbd6d3c4 100644
--- a/Resources/Locale/ru-RU/ss220/mobs/ghost-role-pets.ftl
+++ b/Resources/Locale/ru-RU/ss220/mobs/ghost-role-pets.ftl
@@ -73,8 +73,6 @@ ghost-role-information-shiva-description = { ent-MobSpiderShiva.desc }
 ent-MobKangarooWillowGhostRole = { ent-MobKangarooWillow }
     .desc = { ent-MobKangarooWillow.desc }
 ent-SpawnMobKangarooWillowGhostRole = Спавнер { ent-MobKangarooWillow }
-ghost-role-information-willow-name = { ent-MobKangarooWillow }
-ghost-role-information-willow-description = { ent-MobKangarooWillow.desc }
 
 ent-MobSlimesPetGhostRole = { ent-MobSlimesPet }
     .desc = { ent-MobSlimesPet.desc }
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/body/mechanisms/vulpkanin.ftl b/Resources/Locale/ru-RU/ss220/prototypes/body/mechanisms/vulpkanin.ftl
deleted file mode 100644
index 68c8aeee9702..000000000000
--- a/Resources/Locale/ru-RU/ss220/prototypes/body/mechanisms/vulpkanin.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-OrganVulpkaninStomach = { ent-OrganAnimalStomach }
-    .desc = { ent-OrganAnimalStomach.desc }
-    .suffix = { "" }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tools/lighters.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tools/lighters.ftl
index 169f4bc17dd8..2486f688a847 100644
--- a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tools/lighters.ftl
+++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/tools/lighters.ftl
@@ -1,5 +1,3 @@
-ent-FlippoLighter = дорогая зажигалка
-    .desc = Дорогая металлическая зажигалка. Она выглядит слишком брутально для вас. Положите её обратно.
 ent-ExpensiveLighterNanotrasen = дорогая зажигалка из золота
     .desc = Зажигалка, которая достается только лучшим в своем деле в рядах Nanotrasen. На задней стороне, на металле, выгравирована надпись: «За 10 смен без происшествий».
 ent-ExpensiveLighterShield = дорогая зажигалка щита
diff --git a/Resources/Locale/ru-RU/ss220/radio/components/handheld-radio-component.ftl b/Resources/Locale/ru-RU/ss220/radio/components/handheld-radio-component.ftl
index a3623c8c052a..5e01448025d0 100644
--- a/Resources/Locale/ru-RU/ss220/radio/components/handheld-radio-component.ftl
+++ b/Resources/Locale/ru-RU/ss220/radio/components/handheld-radio-component.ftl
@@ -1,8 +1,3 @@
-handheld-radio-component-on-use = Радио { $radioState }.
-handheld-radio-component-on-examine = Настроено на работу на частоте { $frequency }.
-handheld-radio-component-on-state = включено
-handheld-radio-component-off-state = выключено
-handheld-radio-component-channel-set = Включён { $channel } канал
 handheld-radio-component-channel-examine = Выбранный канал: { $channel }.
 handheld-radio-component-on-channel-set = Настроить
 handheld-radio-component-title = Настройка радиочастот
diff --git a/Resources/Locale/ru-RU/ss220/stamps.ftl b/Resources/Locale/ru-RU/ss220/stamps.ftl
index ccdaa9661efe..2e082c399adc 100644
--- a/Resources/Locale/ru-RU/ss220/stamps.ftl
+++ b/Resources/Locale/ru-RU/ss220/stamps.ftl
@@ -1,7 +1,3 @@
-stamp-component-stamped-name-detective = Детектив
-ent-RubberStampDetective = печать детектива
-    .desc = { ent-RubberStampBase.desc }
-
 # Clown Fake Stamp
 
 ent-RubberStampFakeApproved = печать БЛАТА НЕТ
diff --git a/Resources/Locale/ru-RU/ss220/station-events/events/immovable-rod.ftl b/Resources/Locale/ru-RU/ss220/station-events/events/immovable-rod.ftl
deleted file mode 100644
index 49128eb95c61..000000000000
--- a/Resources/Locale/ru-RU/ss220/station-events/events/immovable-rod.ftl
+++ /dev/null
@@ -1 +0,0 @@
-station-event-immovable-rod-start-announcement = На курсе движения станции обнаружен объект высокой скорости неопределенного происхождения. Столкновение практически неизбежно.
diff --git a/Resources/Locale/ru-RU/ss220/traits.ftl b/Resources/Locale/ru-RU/ss220/traits.ftl
index b551e93b6c6f..edb96be108c2 100644
--- a/Resources/Locale/ru-RU/ss220/traits.ftl
+++ b/Resources/Locale/ru-RU/ss220/traits.ftl
@@ -1,5 +1,2 @@
 trait-tourette-name = Синдром Туретта
 trait-tourette-desc = Иногда вы непроизвольно издаете какие-то звуки или нецензурную брань. Иногда. И не факт, что вы будете именно ругаться.
-
-trait-wheelchair-bound-name = Привязанность к креслу-коляске
-trait-wheelchair-bound-desc = Вы не можете передвигаться без своего кресла-коляски. Кресло-коляска прилагается.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/tiles/tiles.ftl b/Resources/Locale/ru-RU/tiles/tiles.ftl
index 8db590b42144..14cf8994c944 100644
--- a/Resources/Locale/ru-RU/tiles/tiles.ftl
+++ b/Resources/Locale/ru-RU/tiles/tiles.ftl
@@ -101,7 +101,6 @@ tiles-dark-grass-floor = тёмная трава
 tiles-light-grass-floor = светлая трава
 tiles-dirt-floor = грязь
 tiles-asteroid-floor = пол астероида
-tiles-asteroid-tile = плитка астероида
 tiles-asteroid-sand = астероидный песок
 tiles-asteroid-sand-dug = копаный астероидный песок
 tiles-asteroid-plating = астероидное покрытие
diff --git a/Resources/Locale/ru-RU/ui/verbs.ftl b/Resources/Locale/ru-RU/ui/verbs.ftl
deleted file mode 100644
index 57148c98b266..000000000000
--- a/Resources/Locale/ru-RU/ui/verbs.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-### Loc for the various UI-related verbs
-
-ui-verb-toggle-open = Переключить UI
-verb-instrument-openui = Играть музыку
diff --git a/Resources/Locale/ru-RU/window/window-component.ftl b/Resources/Locale/ru-RU/window/window-component.ftl
index 1443402d381b..d591e3e7f8f6 100644
--- a/Resources/Locale/ru-RU/window/window-component.ftl
+++ b/Resources/Locale/ru-RU/window/window-component.ftl
@@ -9,6 +9,3 @@ comp-window-damaged-5 = Имеется множество глубоких бо
 comp-window-damaged-6 = Всё в глубоких трещинах, вот-вот разрушится.
 
 ### Interaction Messages
-
-# Shown when knocking on a window
-comp-window-knock = *тук тук*

From 04791383309dec0577b37c397f83e30e71abdedd Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 01:33:04 +0300
Subject: [PATCH 549/568] delete locale duplicates 2

---
 .../catalog/fills/crates/chemistry-crates.ftl        |  6 ------
 .../markers/spawners/random/donkpocketbox.ftl        |  3 ---
 .../objects/specific/xenoarchaeology/artifacts.ftl   | 12 ------------
 .../entities/structures/walls/barricades.ftl         |  2 --
 4 files changed, 23 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/chemistry-crates.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl
 delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/barricades.ftl

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/chemistry-crates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/chemistry-crates.ftl
deleted file mode 100644
index 75a8044e4260..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/chemistry-crates.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-CrateChemistryP = ящик химикатов (P-элементы)
-    .desc = Содержит химические вещества из P-блока элементов. Чтобы открыть необходим уровень доступа Химия.
-ent-CrateChemistryS = ящик химикатов (S-элементы)
-    .desc = Содержит химические вещества из S-блока элементов. Чтобы открыть необходим уровень доступа Химия.
-ent-CrateChemistryD = ящик химикатов (D-элементы)
-    .desc = Содержит химические вещества из D-блока элементов. Чтобы открыть необходим уровень доступа Химия.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl
deleted file mode 100644
index 77570497257b..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-DonkpocketBoxSpawner = спавнер коробка донк-покет
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl
deleted file mode 100644
index c36e615071a7..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-BaseXenoArtifact = инопланетный артефакт
-    .desc = Странное устройство пришельцев.
-    .suffix = { "" }
-ent-SimpleXenoArtifact = { ent-BaseXenoArtifact }
-    .suffix = Простой
-    .desc = { ent-BaseXenoArtifact.desc }
-ent-MediumXenoArtifact = { ent-BaseXenoArtifact }
-    .suffix = Средний
-    .desc = { ent-BaseXenoArtifact.desc }
-ent-ComplexXenoArtifact = { ent-BaseXenoArtifact }
-    .suffix = Сложный
-    .desc = { ent-BaseXenoArtifact.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/barricades.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/barricades.ftl
deleted file mode 100644
index 5fcd650786e1..000000000000
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/barricades.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-Barricade = баррикада
-    .desc = { ent-BaseStructure.desc }

From 9820280fcc12e414e67e5e51429d4262b2b1574c Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 02:04:06 +0300
Subject: [PATCH 550/568] delete locale duplicates 3 (this is a mess)

---
 .../Locale/en-US/connection-messages.ftl      |  1 -
 .../prototypes/body/mechanisms/human.ftl      | 33 -----------------
 .../prototypes/body/mechanisms/rat.ftl        |  6 ----
 .../prototypes/body/mechanisms/reptilian.ftl  |  3 --
 .../prototypes/body/mechanisms/slime.ftl      |  6 ----
 .../prototypes/body/mechanisms/tests.ftl      |  6 ----
 .../prototypes/body/mechanisms/vox.ftl        |  3 --
 .../ss14-ru/prototypes/body/organs/animal.ftl | 12 -------
 .../fills/backpacks/starter gear/backpack.ftl | 20 -----------
 .../backpacks/starter gear/duffelbag.ftl      | 18 ----------
 .../fills/backpacks/starter gear/satchel.ftl  | 16 ---------
 .../prototypes/catalog/fills/firstaidkits.ftl |  9 -----
 .../nekish/entities/clothing/back/satchel.ftl |  3 --
 .../nekish/entities/clothing/belt/belts.ftl   |  3 --
 .../nekish/entities/clothing/hands/gloves.ftl |  3 --
 .../nekish/entities/clothing/head/hats.ftl    |  3 --
 .../entities/clothing/outerclothing/coats.ftl |  3 --
 .../clothing/uniforms/jumpsuit/jumpsuits.ftl  |  3 --
 .../spawners/food_drinks/drinks_bottles.ftl   |  3 --
 .../spawners/food_drinks/drinks_glass.ftl     |  3 --
 .../food_drinks/food_baked_single.ftl         |  3 --
 .../spawners/food_drinks/food_baked_whole.ftl |  3 --
 .../spawners/food_drinks/food_meal.ftl        |  3 --
 .../spawners/food_drinks/food_single.ftl      |  3 --
 .../spawners/food_drinks/food_snacks.ftl      |  3 --
 .../prototypes/entities/mobs/npcs/bear.ftl    |  5 ---
 .../consumable/food/injectable_base.ftl       |  2 --
 .../food/randomspawns/food_snacks.ftl         |  3 --
 .../objects/devices/electronics/apc.ftl       |  3 --
 .../objects/devices/electronics/solar.ftl     |  3 --
 .../fun/instruments/base_instruments.ftl      |  6 ----
 .../fun/instruments/instruments_brass.ftl     |  8 -----
 .../fun/instruments/instruments_misc.ftl      |  6 ----
 .../instruments/instruments_percussion.ftl    |  8 -----
 .../fun/instruments/instruments_string.ftl    |  8 -----
 .../fun/instruments/instruments_wind.ftl      |  8 -----
 .../entities/objects/misc/filing_cabinets.ftl |  9 -----
 .../objects/specific/mining/ore_bag.ftl       |  2 --
 .../specific/xenoarchaeology/artifacts.ftl    | 12 -------
 .../ammunition/cartridges/BaseCartridge.ftl   |  3 --
 .../guns/ammunition/cartridges/hrifle.ftl     |  3 --
 .../weapons/guns/explosives/clusterbang.ftl   |  5 ---
 .../weapons/guns/explosives/grenades.ftl      |  8 -----
 .../entities/structures/cargo_console.ftl     |  2 --
 .../structures/furniture/instruments.ftl      | 18 ----------
 .../structures/machines/disease_diagnoser.ftl |  3 --
 .../structures/machines/vaccinator.ftl        |  3 --
 .../structures/power/generation/generator.ftl |  3 --
 .../structures/wallmounts/lighting.ftl        | 36 -------------------
 .../entities/structures/walls/girder.ftl      |  3 --
 .../prototypes/entities/tile/basalt.ftl       | 18 ----------
 .../entities/mobs/species/vulpkanin.ftl       |  4 ---
 .../components/handheld-radio-component.ftl   |  7 +---
 53 files changed, 1 insertion(+), 370 deletions(-)
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/human.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/rat.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/reptilian.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/slime.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/tests.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/vox.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/injectable_base.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_brass.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/cargo_console.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girder.ftl
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/tile/basalt.ftl
 delete mode 100644 Resources/Locale/en-US/ss220/prototypes/entities/mobs/species/vulpkanin.ftl

diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index 8e6d08ada1f3..28de17c0955e 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -46,5 +46,4 @@ baby-jail-account-denied-reason = This server is a newbie server, intended for n
 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
 
-panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$hours} hours
 kick-afk = You were kicked for AFK
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/human.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/human.ftl
deleted file mode 100644
index daafef35e27c..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/human.ftl
+++ /dev/null
@@ -1,33 +0,0 @@
-ent-BaseHumanOrgan = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-    .suffix = { "" }
-ent-OrganHumanBrain = brain
-    .desc = The source of incredible, unending intelligence. Honk.
-    .suffix = { "" }
-ent-OrganHumanEyes = eyes
-    .desc = I see you!
-    .suffix = { "" }
-ent-OrganHumanTongue = tongue
-    .desc = A fleshy muscle mostly used for lying.
-    .suffix = { "" }
-ent-OrganHumanAppendix = appendix
-    .desc = { ent-BaseHumanOrgan.desc }
-    .suffix = { "" }
-ent-OrganHumanEars = ears
-    .desc = There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible.
-    .suffix = { "" }
-ent-OrganHumanLungs = lungs
-    .desc = Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier.
-    .suffix = { "" }
-ent-OrganHumanHeart = heart
-    .desc = I feel bad for the heartless bastard who lost this.
-    .suffix = { "" }
-ent-OrganHumanStomach = stomach
-    .desc = Gross. This is hard to stomach.
-    .suffix = { "" }
-ent-OrganHumanLiver = liver
-    .desc = Pairing suggestion: chianti and fava beans.
-    .suffix = { "" }
-ent-OrganHumanKidneys = kidneys
-    .desc = Filters toxins from the bloodstream.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/rat.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/rat.ftl
deleted file mode 100644
index ddf35dfc7bcd..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/rat.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-OrganRatLungs = { ent-OrganHumanLungs }
-    .suffix = rat
-    .desc = { ent-OrganHumanLungs.desc }
-ent-OrganRatStomach = { ent-OrganAnimalStomach }
-    .suffix = rat
-    .desc = { ent-OrganAnimalStomach.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/reptilian.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/reptilian.ftl
deleted file mode 100644
index 93e3ce097074..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/reptilian.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-OrganReptilianStomach = { ent-OrganAnimalStomach }
-    .desc = { ent-OrganAnimalStomach.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/slime.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/slime.ftl
deleted file mode 100644
index f0060b6d3b75..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/slime.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-SentientSlimeCore = sentient slime core
-    .desc = The source of incredible, unending gooeyness.
-    .suffix = { "" }
-ent-OrganSlimeLungs = slime gas sacs
-    .desc = Collects nitrogen, which slime cells use for maintenance.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/tests.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/tests.ftl
deleted file mode 100644
index d64efcaa7ae0..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/tests.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-MechanismEMPStriker = EMP striker
-    .desc = When activated, this arm implant will apply a small EMP on the target of a physical strike for 10 watts per use.
-    .suffix = { "" }
-ent-MechanismHonkModule = HONK module 3000
-    .desc = Mandatory implant for all clowns after the Genevo Convention of 2459.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/vox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/vox.ftl
deleted file mode 100644
index e6bbd055ec9f..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/mechanisms/vox.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-OrganVoxLungs = { ent-OrganHumanLungs }
-    .suffix = vox
-    .desc = { ent-OrganHumanLungs.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal.ftl
deleted file mode 100644
index 8cd7df4a95f5..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-BaseAnimalOrgan = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-ent-OrganAnimalLungs = lungs
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalStomach = stomach
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalLiver = liver
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalHeart = heart
-    .desc = { ent-BaseAnimalOrgan.desc }
-ent-OrganAnimalKidneys = kidneys
-    .desc = { ent-BaseAnimalOrgan.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl
deleted file mode 100644
index 16563a2395f5..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/backpack.ftl	
+++ /dev/null
@@ -1,20 +0,0 @@
-ent-ClothingBackpackFilled = { ent-ClothingBackpack }
-    .desc = { ent-ClothingBackpack.desc }
-ent-ClothingBackpackClownFilled = { ent-ClothingBackpackClown }
-    .desc = { ent-ClothingBackpackClown.desc }
-ent-ClothingBackpackSecurityFilled = { ent-ClothingBackpackSecurity }
-    .desc = { ent-ClothingBackpackSecurity.desc }
-ent-ClothingBackpackMedicalFilled = { ent-ClothingBackpackMedical }
-    .desc = { ent-ClothingBackpackMedical.desc }
-ent-ClothingBackpackCaptainFilled = { ent-ClothingBackpackCaptain }
-    .desc = { ent-ClothingBackpackCaptain.desc }
-ent-ClothingBackpackEngineeringFilled = { ent-ClothingBackpackEngineering }
-    .desc = { ent-ClothingBackpackEngineering.desc }
-ent-ClothingBackpackScienceFilled = { ent-ClothingBackpackScience }
-    .desc = { ent-ClothingBackpackScience.desc }
-ent-ClothingBackpackHydroponicsFilled = { ent-ClothingBackpackHydroponics }
-    .desc = { ent-ClothingBackpackHydroponics.desc }
-ent-ClothingBackpackMimeFilled = { ent-ClothingBackpackMime }
-    .desc = { ent-ClothingBackpackMime.desc }
-ent-ClothingBackpackChemistryFilled = { ent-ClothingBackpackChemistry }
-    .desc = { ent-ClothingBackpackChemistry.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl
deleted file mode 100644
index 54a3cc3655a4..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/duffelbag.ftl	
+++ /dev/null
@@ -1,18 +0,0 @@
-ent-ClothingBackpackDuffelFilled = { ent-ClothingBackpackDuffel }
-    .desc = { ent-ClothingBackpackDuffel.desc }
-ent-ClothingBackpackDuffelClownFilled = { ent-ClothingBackpackDuffelClown }
-    .desc = { ent-ClothingBackpackDuffelClown.desc }
-ent-ClothingBackpackDuffelSecurityFilled = { ent-ClothingBackpackDuffelSecurity }
-    .desc = { ent-ClothingBackpackDuffelSecurity.desc }
-ent-ClothingBackpackDuffelMedicalFilled = { ent-ClothingBackpackDuffelMedical }
-    .desc = { ent-ClothingBackpackDuffelMedical.desc }
-ent-ClothingBackpackDuffelCaptainFilled = { ent-ClothingBackpackDuffelCaptain }
-    .desc = { ent-ClothingBackpackDuffelCaptain.desc }
-ent-ClothingBackpackDuffelEngineeringFilled = { ent-ClothingBackpackDuffelEngineering }
-    .desc = { ent-ClothingBackpackDuffelEngineering.desc }
-ent-ClothingBackpackDuffelScienceFilled = { ent-ClothingBackpackDuffelScience }
-    .desc = { ent-ClothingBackpackDuffelScience.desc }
-ent-ClothingBackpackDuffelMimeFilled = { ent-ClothingBackpackDuffelMime }
-    .desc = { ent-ClothingBackpackDuffelMime.desc }
-ent-ClothingBackpackDuffelChemistryFilled = { ent-ClothingBackpackDuffelChemistry }
-    .desc = { ent-ClothingBackpackDuffelChemistry.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl
deleted file mode 100644
index 380253d7a3b4..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/starter gear/satchel.ftl	
+++ /dev/null
@@ -1,16 +0,0 @@
-ent-ClothingBackpackSatchelFilled = { ent-ClothingBackpackSatchel }
-    .desc = { ent-ClothingBackpackSatchel.desc }
-ent-ClothingBackpackSatchelSecurityFilled = { ent-ClothingBackpackSatchelSecurity }
-    .desc = { ent-ClothingBackpackSatchelSecurity.desc }
-ent-ClothingBackpackSatchelMedicalFilled = { ent-ClothingBackpackSatchelMedical }
-    .desc = { ent-ClothingBackpackSatchelMedical.desc }
-ent-ClothingBackpackSatchelCaptainFilled = { ent-ClothingBackpackSatchelCaptain }
-    .desc = { ent-ClothingBackpackSatchelCaptain.desc }
-ent-ClothingBackpackSatchelEngineeringFilled = { ent-ClothingBackpackSatchelEngineering }
-    .desc = { ent-ClothingBackpackSatchelEngineering.desc }
-ent-ClothingBackpackSatchelScienceFilled = { ent-ClothingBackpackSatchelScience }
-    .desc = { ent-ClothingBackpackSatchelScience.desc }
-ent-ClothingBackpackSatchelHydroponicsFilled = { ent-ClothingBackpackSatchelHydroponics }
-    .desc = { ent-ClothingBackpackSatchelHydroponics.desc }
-ent-ClothingBackpackSatchelChemistryFilled = { ent-ClothingBackpackSatchelChemistry }
-    .desc = { ent-ClothingBackpackSatchelChemistry.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl
deleted file mode 100644
index ac0ede1dcda8..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/firstaidkits.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-ent-MedkitFilled = { ent-Medkit }
-    .suffix = Filled
-    .desc = { ent-Medkit.desc }
-ent-MedkitBurnFilled = { ent-MedkitBurn }
-    .suffix = Filled
-    .desc = { ent-MedkitBurn.desc }
-ent-MedkitBruteFilled = { ent-MedkitBrute }
-    .suffix = Filled
-    .desc = { ent-MedkitBrute.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
deleted file mode 100644
index 0561e6090a98..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/back/satchel.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingBackpackSatchelHoS = head of security's satchel
-    .desc = Stylish, leather black satchel
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
deleted file mode 100644
index 25c75c99bafb..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/belt/belts.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingBeltHoS = leather security belt
-    .desc = Stylish, leather black belt
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
deleted file mode 100644
index ce046f8a4f66..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/hands/gloves.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingHandsGlovesLeatherHoS = leather gloves
-    .desc = Stylish, black leather gloves
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
deleted file mode 100644
index 836fcf520a4b..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/head/hats.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingHeadHatCapHoS = leather head of security's cap
-    .desc = Pretty old stuff for these times, bringing back old memories...
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
deleted file mode 100644
index ac1cfe8fa3fe..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/outerclothing/coats.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingOuterCoatHoSOvercoat = armored overcoat
-    .desc = Pretty old stuff for these times, bringing back old memories...
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
deleted file mode 100644
index 35e16e8a6045..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/sponsor/nekish/entities/clothing/uniforms/jumpsuit/jumpsuits.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ClothingUniformJumpsuitHoSOld = old head of security's jumpsuit
-    .desc = Pretty old stuff for these times, bringing back old memories...
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl
deleted file mode 100644
index 6b7bbd59b378..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_bottles.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomDrinkBottle = random drink spawner
-    .suffix = Bottle
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl
deleted file mode 100644
index 92baa0c6d31e..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/drinks_glass.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomDrinkGlass = random drink spawner
-    .suffix = Glass
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl
deleted file mode 100644
index 71d2f6226fea..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_single.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodBakedSingle = random baked food spawner
-    .suffix = Single Serving
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl
deleted file mode 100644
index 4049add49b34..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_baked_whole.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodBakedWhole = random baked food spawner
-    .suffix = Whole
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl
deleted file mode 100644
index 2110e1d4630f..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_meal.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodMeal = random food spawner
-    .suffix = Meal
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl
deleted file mode 100644
index ac1cc4274b54..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_single.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomFoodSingle = random food spawner
-    .suffix = Single Serving
-    .desc = { ent-MarkerBase.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl
deleted file mode 100644
index e55110c8bfd3..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/food_drinks/food_snacks.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomSnacks = random snack spawner
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl
deleted file mode 100644
index 725b1dc20d1e..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/bear.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-ent-MobBearSpace = space bear
-    .desc = It looks friendly. Why don't you give it a hug?
-ent-MobBearSpaceSalvage = { ent-MobBearSpace }
-    .suffix = Salvage Ruleset
-    .desc = { ent-MobBearSpace.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/injectable_base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/injectable_base.ftl
deleted file mode 100644
index b21b1a9acf4e..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/injectable_base.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-FoodInjectableBase = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl
deleted file mode 100644
index e55110c8bfd3..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/randomspawns/food_snacks.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-RandomSnacks = random snack spawner
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl
deleted file mode 100644
index bf7ce0b61677..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/apc.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-APCElectronics = APC electronics
-    .desc = An electronics board used in APC construction.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl
deleted file mode 100644
index 5a530e916948..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/electronics/solar.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-SolarTrackerElectronics = solar tracker electronics
-    .desc = An electronics board used in solar tracker devices
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl
deleted file mode 100644
index 2b941f6ec882..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/base_instruments.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-ent-BaseHandheldInstrument = { ent-BaseItem }
-    .desc = That's an instrument.
-ent-BasePlaceableInstrument = baseinstrument
-    .desc = { ent-BaseStructureDynamic.desc }
-ent-BasePlaceableInstrumentRotatable = baseinstrumentrotatable
-    .desc = { ent-BasePlaceableInstrument.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_brass.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_brass.ftl
deleted file mode 100644
index 639f7a26b2f0..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_brass.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-ent-TrumpetInstrument = trumpet
-    .desc = The favorite instrument of jazz musicians and egotistical middle schoolers.
-ent-TromboneInstrument = trombone
-    .desc = Everyone's favorite sliding brass instrument.
-ent-FrenchHornInstrument = french horn
-    .desc = The fact that holding it involves using your hand to muffle it may suggest something about its sound.
-ent-EuphoniumInstrument = euphonium
-    .desc = A baby tuba? A Baritone? Whatever it is, it's a pretty cool mess of pipes.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_misc.ftl
index 38f809db41e0..380d54b152fc 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_misc.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_misc.ftl
@@ -4,15 +4,9 @@ ent-SeashellInstrument = seashell
     .desc = For laying down the shoreline beat.
 ent-BirdToyInstrument = bird whistle
     .desc = A delightful little whistle in the shape of a bird. It sings beautifully.
-ent-PhoneInstrument = red phone
-    .desc = Should anything ever go wrong...
 ent-HelicopterInstrument = toy helicopter
     .desc = Ch-ka-ch-ka-ch-ka-ch-ka-ch-ka-ch-ka...
 ent-CannedApplauseInstrument = canned applause
     .desc = Seems like someone already used it all up...
-ent-GunpetInstrument = gunpet
-    .desc = Why do you need to examine this? Is it not self-explanatory?
-ent-BikeHornInstrument = gilded bike horn
-    .desc = An exquisitely decorated bike horn, capable of honking in a variety of notes.
 ent-BananaPhoneInstrument = banana phone
     .desc = A direct line to the Honkmother. Seems to always go to voicemail.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl
index 49e4df3a6208..9ec16fc1e8ad 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_percussion.ftl
@@ -1,18 +1,10 @@
-ent-GlockenspielInstrument = glockenspiel
-    .desc = { ent-BaseHandheldInstrument.desc }
 ent-MusicBoxInstrument = music box
     .desc = Playing this makes you feel safe from scary animatronics.
-ent-XylophoneInstrument = xylophone
-    .desc = Rainbow colored glockenspiel.
 ent-MicrophoneInstrument = microphone
     .desc = Perfect for singing your heart out.
-ent-SynthesizerInstrument = synthesizer
-    .desc = { ent-BaseHandheldInstrument.desc }
 ent-KalimbaInstrument = kalimba
     .desc = The power of a piano right at your thumbs.
 ent-WoodblockInstrument = woodblock
     .desc = If you listen to this enough it'll start driving itself into your mind.
 ent-ReverseCymbalsInstrument = reverse cymbals
     .desc = I think you have it the wrong way around?
-ent-SuperSynthesizerInstrument = super synthesizer
-    .desc = Blasting the ghetto with Touhou MIDIs since 2020.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_string.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_string.ftl
index 52df4275a0cb..addc6a075e87 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_string.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_string.ftl
@@ -1,18 +1,10 @@
-ent-ElectricGuitarInstrument = electric guitar
-    .desc = Now this makes you feel like a rock star!
 ent-BassGuitarInstrument = bass guitar
     .desc = You feel really cool holding this. Shame you're the only one that thinks that.
 ent-RockGuitarInstrument = rock guitar
     .desc = What an axe!
-ent-AcousticGuitarInstrument = acoustic guitar
-    .desc = Anyway, here's Wonderwall.
 ent-GuitarlessFretsInstrument = guitarless frets
     .desc = who even needs a body?
     .suffix = Admeme
-ent-BanjoInstrument = banjo
-    .desc = { ent-BaseHandheldInstrument.desc }
-ent-ViolinInstrument = violin
-    .desc = The favorite of musical virtuosos and bluegrass bands.
 ent-ViolaInstrument = viola
     .desc = Like a violin, but worse.
 ent-CelloInstrument = cello
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl
index df20fbdc1dea..f73cd3036836 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/instruments/instruments_wind.ftl
@@ -1,15 +1,7 @@
-ent-SaxophoneInstrument = saxophone
-    .desc = An instrument. You could probably grind this into raw jazz.
-ent-AccordionInstrument = accordion
-    .desc = { ent-BaseHandheldInstrument.desc }
-ent-HarmonicaInstrument = harmonica
-    .desc = { ent-BaseHandheldInstrument.desc }
 ent-ClarinetInstrument = clarinet
     .desc = Skweedward tintacklays.
 ent-FluteInstrument = flute
     .desc = Reaching new heights of being horrifyingly shrill.
-ent-RecorderInstrument = recorder
-    .desc = Comes in various colors of fashionable plastic!
 ent-PanFluteInstrument = pan flute
     .desc = Perfect for luring ancient mythical beings to dance with you.
 ent-OcarinaInstrument = ocarina
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl
deleted file mode 100644
index cea0f4ebdeed..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/misc/filing_cabinets.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-ent-filingCabinet = filing cabinet
-    .desc = A cabinet for all your filing needs.
-    .suffix = { "" }
-ent-filingCabinetTall = tall cabinet
-    .desc = { ent-filingCabinet.desc }
-    .suffix = { "" }
-ent-filingCabinetDrawer = chest drawer
-    .desc = A small drawer for all your filing needs, Now with wheels!
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl
deleted file mode 100644
index 27f09df0ab8c..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/mining/ore_bag.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-OreBag = ore bag
-    .desc = A robust bag for salvage specialists and miners alike to carry large amounts of ore.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl
deleted file mode 100644
index 96d4bdbd5cd0..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/xenoarchaeology/artifacts.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-ent-BaseXenoArtifact = alien artifact
-    .desc = A strange alien device.
-    .suffix = { "" }
-ent-SimpleXenoArtifact = { ent-BaseXenoArtifact }
-    .suffix = Simple
-    .desc = { ent-BaseXenoArtifact.desc }
-ent-MediumXenoArtifact = { ent-BaseXenoArtifact }
-    .suffix = Medium
-    .desc = { ent-BaseXenoArtifact.desc }
-ent-ComplexXenoArtifact = { ent-BaseXenoArtifact }
-    .suffix = Complex
-    .desc = { ent-BaseXenoArtifact.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl
deleted file mode 100644
index eff494365885..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/BaseCartridge.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-BaseCartridge = { ent-BaseItem }
-    .desc = { ent-BaseItem.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl
index df3081ccc5be..28c965663776 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/hrifle.ftl
@@ -1,6 +1,3 @@
 ent-CartridgeHRifleBase = cartridge (.20 rifle)
     .desc = { ent-BaseCartridge.desc }
     .suffix = { "" }
-ent-CartridgeMinigun = cartridge (.10 rifle)
-    .desc = { ent-CartridgeHRifleBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl
deleted file mode 100644
index 229ad59c2908..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/clusterbang.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-ent-ClusterBang = clusterbang
-    .desc = Can be used only with flashbangs. Explodes several times.
-ent-ClusterBangFull = { ent-ClusterBang }
-    .suffix = Full
-    .desc = { ent-ClusterBang.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl
deleted file mode 100644
index 303b9bdcc663..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/explosives/grenades.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-ent-ExGrenade = explosive grenade
-    .desc = Grenade that creates a small but devastating explosion.
-ent-GrenadeFlashBang = flashbang
-    .desc = Eeeeeeeeeeeeeeeeeeeeee
-ent-SyndieMiniBomb = Syndicate minibomb
-    .desc = A syndicate manufactured explosive used to sow destruction and chaos.
-ent-NuclearGrenade = the nuclear option
-    .desc = Please don't throw it, think of the children.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/cargo_console.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/cargo_console.ftl
deleted file mode 100644
index 265fbaebda9a..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/cargo_console.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-ent-CargoTelepad = cargo telepad
-    .desc = { ent-BaseStructureDynamic.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl
index 2b3c6301a789..750d789f8d82 100644
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl
+++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/furniture/instruments.ftl
@@ -4,21 +4,3 @@ ent-BasePlaceableInstrument = baseinstrument
 ent-BasePlaceableInstrumentRotatable = baseinstrumentrotatable
     .desc = { ent-BasePlaceableInstrument.desc }
     .suffix = { "" }
-ent-PianoInstrument = piano
-    .desc = Play Needles Piano Now.
-    .suffix = { "" }
-ent-UprightPianoInstrument = upright piano
-    .desc = I said Piannie!
-    .suffix = { "" }
-ent-MinimoogInstrument = minimoog
-    .desc = This is a minimoog, like a space piano, but more spacey!
-    .suffix = { "" }
-ent-ChurchOrganInstrument = church organ
-    .desc = This thing really blows!
-    .suffix = { "" }
-ent-TubaInstrument = tuba
-    .desc = The big daddy of the brass family. Standing next to its majesty makes you feel insecure.
-    .suffix = { "" }
-ent-DawInstrument = digital audio workstation
-    .desc = Cutting edge music technology, straight from the 90s.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl
deleted file mode 100644
index b21e10e7f6e1..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/disease_diagnoser.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-DiseaseDiagnoser = Disease Diagnoser Delta Extreme
-    .desc = A machine that analyzes disease samples.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl
deleted file mode 100644
index 1f374e998484..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/vaccinator.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-Vaccinator = Vaccinator
-    .desc = A machine that creates vaccines.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl
deleted file mode 100644
index 484539ed804b..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/power/generation/generator.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-BaseGenerator = generator
-    .desc = A high efficiency thermoelectric generator.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl
deleted file mode 100644
index c23b8deb1db6..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/lighting.ftl
+++ /dev/null
@@ -1,36 +0,0 @@
-ent-WallLight = light
-    .desc = An unpowered light.
-    .suffix = Unpowered
-ent-PoweredlightEmpty = light
-    .desc = A light fixture. Draws power and produces light when equipped with a light tube.
-    .suffix = Powered, Empty
-ent-Poweredlight = { ent-PoweredlightEmpty }
-    .desc = A light fixture. Draws power and produces light when equipped with a light tube.
-    .suffix = Powered
-ent-PoweredlightLED = { ent-Poweredlight }
-    .desc = A light fixture. Draws power and produces light when equipped with a light tube.
-    .suffix = Powered, LED
-ent-UnpoweredLightLED = { ent-WallLight }
-    .suffix = Unpowered, LED
-    .desc = { ent-WallLight.desc }
-ent-PoweredlightExterior = { ent-Poweredlight }
-    .desc = A light fixture. Draws power and produces light when equipped with a light tube.
-    .suffix = Powered, Exterior Blue
-ent-UnpoweredLightExterior = { ent-WallLight }
-    .suffix = Unpowered, Exterior Blue
-    .desc = { ent-WallLight.desc }
-ent-PoweredlightSodium = { ent-Poweredlight }
-    .desc = A light fixture. Draws power and produces light when equipped with a light tube.
-    .suffix = Powered, Sodium Orange
-ent-UnpoweredLightSodium = { ent-WallLight }
-    .suffix = Unpowered, Sodium Orange
-    .desc = { ent-WallLight.desc }
-ent-SmallLight = small light
-    .desc = An unpowered light.
-    .suffix = Unpowered
-ent-PoweredSmallLightEmpty = small light
-    .desc = A light fixture. Draws power and produces light when equipped with a light bulb.
-    .suffix = Powered, Empty
-ent-PoweredSmallLight = { ent-PoweredSmallLightEmpty }
-    .suffix = Powered
-    .desc = { ent-PoweredSmallLightEmpty.desc }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girder.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girder.ftl
deleted file mode 100644
index 198d415a9169..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/girder.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-Girder = girder
-    .desc = A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall.
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/tile/basalt.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/tile/basalt.ftl
deleted file mode 100644
index 1111fd1e8181..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/tile/basalt.ftl
+++ /dev/null
@@ -1,18 +0,0 @@
-ent-BasaltOne = basalt
-    .desc = Rock
-    .suffix = { "" }
-ent-BasaltTwo = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltThree = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltFour = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltFive = { ent-BasaltOne }
-    .desc = { ent-BasaltOne.desc }
-    .suffix = { "" }
-ent-BasaltRandom = { ent-BasaltOne }
-    .suffix = Random
-    .desc = { ent-BasaltOne.desc }
diff --git a/Resources/Locale/en-US/ss220/prototypes/entities/mobs/species/vulpkanin.ftl b/Resources/Locale/en-US/ss220/prototypes/entities/mobs/species/vulpkanin.ftl
deleted file mode 100644
index 1aab937a5097..000000000000
--- a/Resources/Locale/en-US/ss220/prototypes/entities/mobs/species/vulpkanin.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-ent-BaseMobReptilian = Urist McVulp
-    .desc = { ent-BaseMobOrganic.desc }
-ent-MobReptilianDummy = Urist McHands
-    .desc = A dummy vulpkanin meant to be used in character setup.
diff --git a/Resources/Locale/en-US/ss220/radio/components/handheld-radio-component.ftl b/Resources/Locale/en-US/ss220/radio/components/handheld-radio-component.ftl
index 778dacf8226f..0d52ce71fa30 100644
--- a/Resources/Locale/en-US/ss220/radio/components/handheld-radio-component.ftl
+++ b/Resources/Locale/en-US/ss220/radio/components/handheld-radio-component.ftl
@@ -1,12 +1,7 @@
-handheld-radio-component-on-use = The radio is now {$radioState}.
-handheld-radio-component-on-examine = It's set to broadcast over the {$frequency} frequency.
-handheld-radio-component-on-state = on
-handheld-radio-component-off-state = off
-handheld-radio-component-channel-set = Channel set to {$channel}
 handheld-radio-component-channel-examine = The current channel is {$channel}.
 handheld-radio-component-on-channel-set = Tune
 handheld-radio-component-title = Radio Tuning
 handheld-radio-component-flavor-text-left = Everything except 1390-1399 is restricted
 handheld-radio-component-channel-label = Channel:
 handheld-radio-button-text-mic = Microphone
-handheld-radio-button-text-speaker = Speaker
\ No newline at end of file
+handheld-radio-button-text-speaker = Speaker

From 0539a221e69b34bc53d7e2dc491ff71dd1385650 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 02:09:55 +0300
Subject: [PATCH 551/568] ahhhhhhhhhhhhh

---
 .../entities/markers/spawners/random/donkpocketbox.ftl         | 3 ---
 .../en-US/ss220/prototypes/body/mechanisms/vulpkanin.ftl       | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl
 delete mode 100644 Resources/Locale/en-US/ss220/prototypes/body/mechanisms/vulpkanin.ftl

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl
deleted file mode 100644
index d843e96072db..000000000000
--- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/random/donkpocketbox.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-DonkpocketBoxSpawner = Donkpocket Box Spawner
-    .desc = { ent-MarkerBase.desc }
-    .suffix = { "" }
diff --git a/Resources/Locale/en-US/ss220/prototypes/body/mechanisms/vulpkanin.ftl b/Resources/Locale/en-US/ss220/prototypes/body/mechanisms/vulpkanin.ftl
deleted file mode 100644
index 1658d570854a..000000000000
--- a/Resources/Locale/en-US/ss220/prototypes/body/mechanisms/vulpkanin.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-OrganVulpkaninStomach = { ent-OrganAnimalStomach }
-    .desc = { ent-OrganAnimalStomach.desc }
-    .suffix = { "" }

From d8138bd9c0e37f012ed8ebbe96fdc3e582750496 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 14:20:49 +0300
Subject: [PATCH 552/568] more post-merge fixes

---
 .../Administration/Commands/GarbageClearUpCommand.cs      | 3 ++-
 Resources/Prototypes/Entities/Objects/Power/lights.yml    | 4 ++--
 Resources/Prototypes/GameRules/events.yml                 | 4 ----
 Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml | 8 ++++++--
 .../Fills/Backpacks/StartingGear/CultistBackpack.yml      | 4 ++--
 .../Entities/Objects/Consumable/Drinks/brokenjar.yml      | 2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Content.Server/Administration/Commands/GarbageClearUpCommand.cs b/Content.Server/Administration/Commands/GarbageClearUpCommand.cs
index 6894949122c8..a69507625c73 100644
--- a/Content.Server/Administration/Commands/GarbageClearUpCommand.cs
+++ b/Content.Server/Administration/Commands/GarbageClearUpCommand.cs
@@ -11,7 +11,6 @@ namespace Content.Server.Administration.Commands
     public sealed partial class GarbageClearUpCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entMan = default!;
-        [Dependency] private readonly TagSystem _tag = default!;
 
         //SS220-clearupgarbage
         public string Command => "clearupgarbage";
@@ -21,6 +20,8 @@ public sealed partial class GarbageClearUpCommand : IConsoleCommand
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var _containerSystem = _entMan.System<SharedContainerSystem>();
+            var _tag = _entMan.System<TagSystem>();
+
             int processed = 0;
             foreach (var ent in _entMan.GetEntities())
             {
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 5741c011be0c..0950cba46ab1 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -394,7 +394,7 @@
   - type: Construction
     graph: YellowLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalYellow
@@ -414,7 +414,7 @@
   - type: Construction
     graph: PurpleLight
     node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
     - id: ShardCrystalPurple
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 3ed16d132dd9..ab34e8e9c994 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -34,8 +34,6 @@
   components:
   - type: StationEvent
     startAnnouncementColor: "#18abf5"
-    startAudio:
-      path: /Audio/Announcements/announce.ogg
     weight: 8
     duration: 35
     startAudio: # Corvax-Announcements
@@ -54,8 +52,6 @@
       max:  30
   - type: StationEvent
     startAnnouncementColor: "#18abf5"
-    startAudio:
-      path: /Audio/Announcements/announce.ogg
     weight: 8
     duration: 35
     startAudio: # Corvax-Announcements
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 9ef2e815ba32..493e802e3165 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -154,9 +154,11 @@
     outerClothing: ClothingOuterArmorBasic
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
     shoes: ClothingShoesBootsCombat
     id: SyndiPDA
+  storage:
+    back:
+    - BoxSurvival
 
 # Syndicate Footsoldier Gear - No Headset
 - type: startingGear
@@ -250,10 +252,12 @@
     #SS220 deathmatch loadout begin
     gloves: ClothingHandsGlovesCombat
     id: CaptainPDA
-    back: ClothingBackpackFilled
     #SS220 deathmatch loadout end
   inhand:
     - WeaponMeleeToolboxRobust
+  storage: #SS220 deathmatch loadout
+    back:
+    - BoxSurvival
 
 #Brigmedic
 
diff --git a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/StartingGear/CultistBackpack.yml b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/StartingGear/CultistBackpack.yml
index fc453f1e3e4b..bdc6b904666e 100644
--- a/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/StartingGear/CultistBackpack.yml
+++ b/Resources/Prototypes/SS220/Catalog/Fills/Backpacks/StartingGear/CultistBackpack.yml
@@ -1,7 +1,7 @@
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackFilled
-  id: ClothingCultistBackpackFilled
+  parent: ClothingBackpack
+  id: ClothingCultistBackpack
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml
index 2336de2c2eac..659aefc86390 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml
@@ -26,6 +26,6 @@
     materialComposition:
       Glass: 50
   - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
     refineResult:
     - SheetGlass1

From a8ba6cda968b8ce6f5be56f4a16c155de6ead34d Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 14:32:15 +0300
Subject: [PATCH 553/568] man I love duplicates

---
 .../Clothing/Head/hardsuit-helmets.yml        | 16 -----
 .../Prototypes/Voice/speech_emote_sounds.yml  | 64 +++++++++----------
 2 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 8a1b4894b9e1..458eadafe4d1 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -299,22 +299,6 @@
   - type: ExplosionResistance #ss-220 armReb
     damageCoefficient: 0  #ss-220 armReb
 
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitWizard
-  name: wizard hardsuit helmet
-  description: A bizarre gem-encrusted helmet that radiates magical energies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: PointLight
-    color: "#ffadfb"
-  - type: PressureProtection
-    highPressureMultiplier: 0.60
-    lowPressureMultiplier: 1000
-
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitLing
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 0b3b0572ade9..a4ff81752ac8 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -52,10 +52,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: MaleGasp
-    DefaultDeathgasp:
-      collection: MaleDeathGasp
+    #Gasp: SS220-emotes
+    #  collection: MaleGasp
+    #DefaultDeathgasp:
+    #  collection: MaleDeathGasp
 
 - type: emoteSounds
   id: FemaleHuman
@@ -110,10 +110,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: FemaleGasp
-    DefaultDeathgasp:
-      collection: FemaleDeathGasp
+    #Gasp: SS220 emotes
+    #  collection: FemaleGasp
+    #DefaultDeathgasp:
+    #  collection: FemaleDeathGasp
 
 - type: emoteSounds
   id: MaleReptilian
@@ -152,10 +152,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: MaleGasp
-    DefaultDeathgasp:
-      collection: DeathGasp
+    #Gasp: SS220 emotes
+    #  collection: MaleGasp
+    #DefaultDeathgasp:
+    #  collection: DeathGasp
 
 - type: emoteSounds
   id: FemaleReptilian
@@ -244,10 +244,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: MaleGasp
-    DefaultDeathgasp:
-      collection: MaleDeathGasp
+    #Gasp: SS220-emotes
+    #  collection: MaleGasp
+    #DefaultDeathgasp:
+    #  collection: MaleDeathGasp
   params:
     variation: 0.125
 
@@ -300,10 +300,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: FemaleGasp
-    DefaultDeathgasp:
-      collection: FemaleDeathGasp
+    #Gasp: SS220 emotes
+    #  collection: FemaleGasp
+    #DefaultDeathgasp:
+    #  collection: FemaleDeathGasp
   params:
     variation: 0.125
 
@@ -369,10 +369,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: MaleGasp
-    DefaultDeathgasp:
-      collection: DeathGasp
+    #Gasp: SS220 emotes
+    #  collection: MaleGasp
+    #DefaultDeathgasp:
+    #  collection: DeathGasp
 
 - type: emoteSounds
   id: UnisexDwarf
@@ -419,10 +419,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: MaleGasp
-    DefaultDeathgasp:
-      collection: MaleDeathGasp
+    #Gasp: SS220 emotes
+    #  collection: MaleGasp
+    #DefaultDeathgasp:
+    #  collection: MaleDeathGasp
   params:
     variation: 0.125
     pitch: 0.75
@@ -496,10 +496,10 @@
     #SS220 emote sounds end
     Weh:
       collection: Weh
-    Gasp:
-      collection: MaleGasp
-    DefaultDeathgasp:
-      collection: MothDeathGasp
+    #Gasp: SS220 emotes
+    #  collection: MaleGasp
+    #DefaultDeathgasp:
+    #  collection: MothDeathGasp
 
 - type: emoteSounds
   id: UnisexSilicon

From 63aec9282e231f28054ca2ce9fab23a7fef8b536 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 16:01:40 +0300
Subject: [PATCH 554/568] post-merge fixes 3

---
 Resources/Prototypes/Datasets/tips.yml        | 127 +---------
 .../Clothing/Head/hardsuit-helmets.yml        |  48 +---
 .../Circuitboards/Machine/production.yml      |  94 +-------
 .../Prototypes/Loadouts/loadout_groups.yml    |  48 ----
 .../Roles/Jobs/Fun/misc_startinggear.yml      | 100 --------
 .../Objects/Consumable/Drinks/brokenjar.yml   |   2 +-
 .../Structures/Storage/Tanks/tanks.yml        |   2 -
 Resources/Prototypes/Voice/disease_emotes.yml |   1 +
 Resources/Prototypes/Voice/speech_emotes.yml  |  35 +--
 .../Power/substation.rsi/substation.png       | Bin 657 -> 2291 bytes
 client_output.txt                             | 225 ++++++++++++++++++
 11 files changed, 259 insertions(+), 423 deletions(-)

diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml
index bf210f60c56d..b710d69fabfd 100644
--- a/Resources/Prototypes/Datasets/tips.yml
+++ b/Resources/Prototypes/Datasets/tips.yml
@@ -1,128 +1,5 @@
 - type: localizedDataset
   id: Tips
-  prefix: tips-dataset-
-  count: 135
   values:
-    - "Если вы загорелись — нажмите на иконку горения в правой части экрана, чтобы упасть на землю и начать сбивать пламя."
-    - "Вы в любое время можете просмотреть и изменить привязки клавиш в меню \"Настройки.\""
-    - "Вы можете открыть внутриигровое Руководство через меню на клавишу Esc, или нажав клавишу 0 на нумпаде (по умолчанию)."
-    - "Некоторые внутриигровые объекты имеют связанные с ними записи в Руководстве. Осмотрев объект и нажав на иконку с вопросительным знаком вы можете прочитать эти записи."
-    - "Вы можете приблизительно оценить состояние чьего-либо здоровья осмотрев его и нажав на иконку сердца."
-    - "Артефакты могут приобретать постоянные эффекты от некоторых активированных узлов, например, становиться интеркомом или чрезвычайно эффективным генератором."
-    - "Вы можете избежать поскальзывания на большинстве луж, если будете идти шагом. Однако некоторые сильные вещества, такие как космическая смазка, все равно заставят вас поскользнуться."
-    - "Некоторые растения, такие как галакточертополох, можно измельчить для получения чрезвычайно полезных и сильнодействующих лекарств."
-    - "Убирайте лужи и выжимайте их в другие ёмкости, чтобы собрать вещества находившиеся в луже."
-    - "Дренажи, обычно находящиеся в морозильной камере повара или в каморке уборщика, быстро поглощают лужи вокруг себя — в том числе и кровь."
-    - "Когнизин, сложное в изготовлении химическое вещество, делает животных, в которых его вводят, разумными."
-    - "Взведенные мышеловки невероятно эффективны для борьбы со всеми видами маленьких существ — в том числе и с крысиными слугами."
-    - "Огнетушители могут быть заправлены абсолютно любым реагентом в игре."
-    - "Некоторые реагенты, например, трифторид хлора (CLF3), обладают уникальными эффектами, проявляющимися через прикосновение, например, будучи выпущенными из распылителя или в виде пены."
-    - "Большинство устройств в игре можно улучшить при помощи высокоуровневых компонентов, которые могут быть созданы учёными или найдены на обломках."
-    - "Травы нету! Личной жизни нету! Вас не существует! Есть только ваш персонаж в компьютерной игре Space Station 14."
-    - "Используйте кнопку Использовать предмет в мире (клавиша Е по умолчанию) чтобы взаимодействовать с объектами, если вам не хочется их брать в руки или у вас они заняты."
-    - "Здравый смысл помогает избегать конфликтов."
-    - "Другие игроки — тоже люди."
-    - "Периодически проверяйте Сингулярность, пока она запущена. Её саботаж может поставить под угрозу всю станцию."
-    - "Химикаты не реагируют между собой, пока находятся в буфере ХимМастера."
-    - "Зажмите ПРОБЕЛ (по умолчанию) чтобы замедлить движение шаттла во время пилотирования. Это позволит выполнять более точные маневры или даже полностью остановиться."
-    - "Дексалин, Дексалин плюс, и Эпинефрин будут выводить Лексорин из вашей кровеносной системы в процессе метаболизма."
-    - "Каждый член экипажа имеет в своем аварийном запасе экстренный медипен, содержищай эпинефрин и транексамовую кислоту."
-    - "ДАМ является целью с высоким приоритетом и легко саботируется. Убедитесь, что вы настроили Сингулярность или солнечные панели чтобы не остаться без энергии, если он взорвется."
-    - "С помощью ручного этикетировщика можно маркировать любые предметы, в том числе продукты питания или баночки с таблетками."
-    - "Противоударная броня значительно эффективнее обычной если противник не использует огнестрельное оружие."
-    - "Будучи призраком, вы можете использовать меню взаимодействия, чтобы автоматически следовать и крутиться вокруг любого объекта в игре."
-    - "Будучи предателем, вам может быть поручено устранить другого предателя, а может быть и наоборот."
-    - "Будучи предателем, вы можете использовать гарнитуру синдиката для поддержания связи с любым другим, купившим гарнитуру, предателем."
-#    - "Будучи предателем, помните силу подозрительного ящика для инструментов. Всего за 2 телекристалла, вы можете получить полный набор инструментов, которые помогут вам в экстренной ситуации, наряду с тем, что ящик имеет приличный урон."
-    - "Будучи предателем, никогда не недооценивайте тактический жилет. Он не обеспечит вам защиту от космоса, но его дешевизна и крепкая защита делают его удобным для любителей пострелять."
-    - "Если вы предатель, то пингвины-гренадёры не будут вас атаковать, и будут взрываться при смерти."
-#    - "Будучи предателем, помните, что поглотители энергии издают громкий звук и оповещают экипаж после достаточно длительной работы. Попробуйте спрятать их в трудно-находимом месте или защитите область вокруг него, чтобы было труднее добратся."
-    - "Будучи предателем, помните о силе разрушения телекоммуникаций. Людям будет гораздо сложнее поймать вас, если они не смогут общатся с другими на больших расстояниях!"
-    - "Будучи предателем, плазма в газообразном виде - отличный способ навести хаос. Её можно поджечь, чтобы сделать область непригодной для жизни, плазма также может отравлять токсинами тех, кто её вдыхает."
-    - "Будучи ядерным оперативником, держитесь в группе! Пусть ваша броня и крепка, ваши соратники гораздо лучше справятся с вашим спасением: и огнём прикроют, и в укрытие лежащего тебя оттащат."
-    - "Будучи ядерным оперативником, помните, что связь имеет ключевое значение! Используйте свою рацию, чтобы поддерживать связь с вашими соратниками и координировать действия."
-    - "Будучи ядерным оперативником, помните о скрытном варианте. Капитану будет сложнее отбиться, если его застанет врасплох тот, кого он считает обычным пассажиром."
-    - "Вы можете осмотреть свою гарнитуру, чтобы узнать, какие радиоканалы вам доступны и как по ним говорить."
-    - "Будучи утилизатором, всегда носите с собой GPS и записывайте координаты станции на случай, если ваш обломок затеряется в космосе."
-    - "Будучи утилизатором, в крайнем случае вы можете использовать протокинетический ускоритель для передвижения в космосе. Просто знайте, что это не очень эффективно."
-    - "Будучи утилизатором, не забывайте копать руду! Руда может быть продана в карго за неплохие деньги, использована для строительства, а также учёными для причудливых технологий."
-    - "Будучи утилизатором, попробуйте попросить учёных о гравипушке. Она может быть использована для экстремально эффективного передвижения объектов с обломков!"
-#    - "Будучи утилизатором, сотрудничайте с грузчиками. Они могут заказать вам самые разные полезные предметы, в том числе те, которые будет трудно получить другим способом, такие как лазерные пушки и строительные материалы для шаттлов."
-#    - "Будучи грузчиком, попробуйте попросить учёных о Рипли АВП. В сочетании с гидравлической клешней, вы можете гораздо проще брать ценные предметы технического обслуживания, такие как топливные баки, и осуществлять доставку в кратчайшие сроки."
-    - "Будучи грузчиком, старайтесь поддерживать избыток материалов. Это чрезвычайно полезно, когда они срочно потребуются учёным или инженерам."
-    - "Будучи грузчиком, помните, что вы можете заказывать оружие в экстренных ситуациях! Дополнительная огневая мощь часто может быть разницей между вами и другими членами экипажа, живущими или умирающими."
-    - "Будучи барменом помните, что вы можете воспользоваться циркулярной пилой на своем ружье, чтобы его стало легче хранить."
-    - "Будучи ботаником, вы можете мутировать и скрещивать растения для создания более эффективных и урожайных сортов."
-    - "Будучи клоуном, разнообразьте свои приколы! Никто не любит шутников с одной шуткой."
-    - "Будучи клоуном помните, что даже если вы потеряли свою банановую кожурку, то на вашем КПК всё ещё можно поскользнуться! Хонк!"
-    - "Будучи мимом помните, что ваш обет молчания - источник вашей силы. Нарушив его, вы лишитесь своих сил... и чести."
-    - "Занимаясь судебным делом, если наказание кажется вам слишком суровым, попытайтесь обсудить это со смотрителем."
-    - "Будучи сотрудником службы безопасности, общайтесь и координируйте свои действия с коллегами при помощи радиоканала службы безопасности, чтобы избежать неразберихи."
-    - "Как сотрудник службы безопасности помните — подозрений мало для обвинений. Возможно кто-то просто оказался не в том месте и не в то время!"
-    - "Будучи детективом, вы можете более эффективно разыскивать преступников, опираясь на данные об оставленных им отпечатках пальцев и волокнах - сканируйте предметы с которым тот мог взаимодействовать."
-    - "Будучи атмосферным техником, помните, что ваш атмос голопроектор блокирует газы, но при этом пропускает предметы. С его помощью вы можете быстро локализовать утечки газа, пожары и пробоины корпуса."
-#    - "Будучи атмосферным техником, постарайтесь сопротивляться искушению использовать канистровые бомбы против ядерных оперативников, до тех пор, пока у вас не будет другого выхода. Этим вы можете нанести много ненужного урона по союзникам."
-    - "Будучи инженером, помните, что вы можете ремонтировать окна сварочным аппаратом, находясь не в боевом режиме."
-    - "Будучи инженером, помните, что вы можете электрифицировать решётку, проложив под ней электрический кабель."
-    - "Будучи инженером, вы можете использовать плазменное стекло для укрепления местности и защиты от радиации. Урановое стекло может быть тоже использовано для защиты от радиации."
-    - "Будучи капитаном, вы являетесь одной из самых приоритетных целей на станции. Всё — от ядерных оперативников, до предателей, которые хотят выкрасть уникальную вещь или вашу жизнь — всё это повод для беспокойства."
-    - "Будучи капитаном, всегда носите с собой диск ядерной аутентификации и поисковый навигатор. Неплохим вариантом будет передать один из них другому главе, которому вы можете доверить его сохранность."
-    - "Будучи капитаном, вы имеете полный доступ и абсолютный контроль над станцией, но это не означает, что если вы будете себя ужасно вести, это не приведет к бунту."
-    - "Будучи капитаном, старайтесь быть активным и патрулировать станцию. Сидеть на мостике может быть соблазнительно, но в итоге вы только привлечете к себе больше внимания!"
-    - "Будучи учёным, вы можете попробовать различные вещи с артфеактом, пока сканер перезаряжается, чтобы значительно ускорить процесс извлечения очков."
-    - "Будучи учёным, вы можете использовать детали машин получше для повышения эффективности машин. Это может сделать некоторые машины, такие как переработчик биомассы, значительно лучше!"
-#    - "Будучи учёным, вы можете попытаться угадать, что делает улучшение машины, исходя их того, какой компонент вы улучшаете. Ёмкости материи увеличивают возможности хранения, конденсаторы увеличивают эффективность, и манипуляторы увеличивают мощность."
-    - "Будучи врачом, постарайтесь быть аккуратным с передозировкой пациентов, особенно если им уже оказали первую помощь. Передозировки могут быть летальны для пациентов в критическом состоянии!"
-    - "Будучи врачом, не недооценивайте криокапсулы! Они лечат почти от каждого вида урона, делая их очень полезными когда вы загружены или нужно отвлечься на лечение других."
-    - "Будучи врачом, будьте осторожны при помещении унатхов в криокапсулы. Они получат много дополнительного урона от холода, но вы всегда сможете смягчить это с помозью мази или лепоразина."
-    - "Будучи врачом, помните, что в вашем анализаторе здоровья есть сменная батарея. Если, на ваш взгляд, батарея разряжается слишком быстро, вы можете попросить ученых напечатать для вас батарею получше!"
-    - "Будучи химиком, как только вы сделали все, что вам нужно, не бойтесь делать больше глупых реагентов. Вы пробовали дезоксиэфедрин?"
-#    - "Будучи СМО, вы стартуете с омнизином в гипоспрее, который может вылечить практически любой вид урона за раз, но не может быть синтерзирован. Используйте его с умом!"
-    - "Будучи врачом, химиком или главным врачом, вы можете использовать хлоральгидрат для нелетального успокоения непослушных пациентов."
-    - "Не бойтесь просить о помощи, будь то у ваших коллег по отделу, или через LOOC-чат, или у администраторов!"
-    - "Ваш интерес к игре быстро угаснет, если вы будете играть ради убийств и на победу. Если вы обнаружили, что так и играете, то сделайте шаг назад и поговорите с людьми — это гораздо лучше!"
-    - "Если вам что-то нужно от другого отдела — попробуйте просто попросить! Эта не одиночная игра, и вы удивитесь, чего можно добиться общими усилиями!"
-    - "Механизм самоуничтожение станции непобедим. Найдите диск вместо того, чтобы уничтожать его."
-    - "Технические помещения полны снаряжения, которое будет случайным каждый раунд. Оглядывайтесь вокруг и смотрите, стоит ли что-то использовать."
-    - "Все мы когда-то были новичками. Будьте терпеливы и подсказывайте новым игрокам, особенно тем, кто играет роли стажеров, направляя их в правильное русло."
-    - "Пожарные костюмы и зимние куртки обеспечивают умеренную защиту от холода, позволяя вам проводить в космосе и в разгерметизированных отсеках больше времени, чем если бы на вас не было ничего."
-    - "В экстренной ситуации не забывайте, что пожарные и экстренные EVA скафандры всегда находятся в соответствующих шкафчиках. В них может быть неудобно передвигаться, но они могут легко спасти вам жизнь в плохой ситуации!"
-    - "В экстренной ситуации помните, что вы можете создать импровизированое оружие! Бейсбольная бита или копьё могут легко стать решающим фактором между отпугиванием нападающего и гибелью от его рук."
-    - "Копья могут быть обработаны химикатами и будут вводить несколько юнитов каждый раз, когда вы бьёте кого-то напрямую."
-    - "Вы можете создать копья с осколков бронированного, плазменного и уранового стекла для увеличения урона."
-    - "Бросайте копья для нанесения дополнительного урона! Однако, будьте осторожны, так как, если вы будете бросать их слишком часто, они могут сломаться."
-    - "Заточки и копья, сделанные с уранового стекла, могут наносить радиационный урон, который требует лекарства для правильного лечения."
-    - "Вы можете бросать созданные болы в людей, для того чтобы замедлить их, позволяя вам преследовать для прощего убийства или для быстрого ухода."
-    - "Вы можете наполнить ранцевый водяной резервуар напалмом для создания огнемёта."
-    - "Большинство работ имеют альтернативную униформу в шкаф-автоматах. Не бойтесь опробовать новый стиль!"
-#    - "Как и в любой другой работе, кроме утилизатора, обычно разумно избегать использование скафандров, если они вам не нужны, поскольку замедленние, которое они вызывают, часто гораздо более вредно, чем любое сопротивление или защита от космоса, которое вы можете получить."
-    - "Просто потому что человек такой профессии не может стать предателем в начале раунда, не значит, что он не станет им больше никогда."
-    - "Противогаз синдиката блокирует свет от вспышек, это означает, что Ядерные Оперативники и другие сомнительные личности, которые носят его, не могут быть ослеплены."
-    - "Для игры за подрывника требуется навык."
-    - "Вы можете пшикать огнетушителем, бросать вещи или стрелять из оружия, когда летаете в космосе, чтобы получить незначительное ускорение. Просто стреляйте в противоположную сторону от той, куда вам нужно попасть."
-#    - "Вы можете перетаскивать других игроков на себя, чтобы открыть меню обыска, позволяющее вам снимать их снаряжение или принудительно надевать что-то. Обратите внимание, что скафандры или шлемы могут блокировать доступ к одежде под ними, и что определенные предметы требуют больше времени для снятия или надевания, чем другие.."
-    - "Вы можете залезть на стол, перетащив себя на него."
-    - "Вы можете переместить объект в сторону, перетащив его, а затем, удерживая CTRL щелкайте правой кнопкой мыши, и двигайте мышь в нужном вам направлении."
-    - "Имея дело со службой безопасности, вы часто можете избежать своего приговора за счёт сотрудничества или обмана."
-    - "Огонь может распространятся на других игроков через прикосновения! Будьте осторожны с горящими телами или с большими толпами людей, находящихся в огне."
-    - "Пробоины в корпусе требуют несколько секунд для полной разгерметизации местности. Вы можете использовать это время, чтобы заделать дыру, если достаточно уверены в своих способностях, или просто убежать."
-    - "Ожоги, например, от сварочного аппарата, можно использовать для прижигания ран и остановки кровотечения."
-    - "Кровотечение не шутка! Если вас посдтрелили или вы получили другую серьёзную травму, позаботьтесь о том, чтобы быстро её вылечить."
-    - "В экстренной ситуации, вы можете разрезать комбинезон острым предметом, чтобы получить ткань, которая может быть использована как менее эффективная версия бинта."
-    - "Вы можете использовать острые предметы для разделки животных или одежды в контекстном меню при нажатии ПКМ. В том числе осколки стекла."
-    - "Большинство взрывчаток имеют таймер, который вы можете установить через ПКМ меню. В том числе пингвин гренадёр!"
-    - "Вы можете оглушить пингвина гренадёра, что может предоставить вам ценное время для его убийства."
-    - "Вы можете кликнуть на имена предметов в ПКМ меню, чтобы подобрать их, вместо того, чтобы наводиться на предмет, а затем подбирать его."
-    - "Космическая Станция 14 - это игра с открытым кодом! Если вы хотите что-то изменить или добавить простой предмет, попробуйте внести вклад в игру. Это не так сложно, как вы думаете."
-    - "В крайнем случае вы можете бросать напитки или другие ёмкости с реагентами позади себя для создания луж, на которых поскользнутся ваши преследователи."
-    - "Некоторые оружия, такие как ножи и заточки, имеют большую скорость атаки."
-    - "Челюсти жизни могут открывать запитанные двери."
-    - "Вы можете пить кровь, для восстановления некоторого количества своего кровотока, хоть и неэффективно."
-    - "Существует предел химического метаболизма, который ограничивает количество реагентов определенного типа, которые вы можете переварить за один раз. Некоторые расы имеют более высокие пределы метаболизма, например, слаймолюды."
-    - "Использование сварки без соответствующей защиты для глаз, может вызвать нарушение зрения, которое можно вылечить окулином."
-    - "Зомби очень уязвимы к ожогам, что делает сварочные аппараты и лазерное оружие экстремально эффективными против них."
-    - "Вы можете сплавить осколки стекла в стеклянные листы, а плитки в сталь."
-    - "Нажатием ПКМ по игроку, а затем нажатием на иконку сердца, вы можете быстро проверить наличие внешних повреждений или наличие кровотечения. Вы так же можете сделать это с собой."
-    - "Обезьяны имеют малый шанс быть разумными. УУК!"
-    - "Вы можете определить, разгерметизирована ли область с пожарными замками, посмотря, есть ли у пожарных замков кроме них огни."
-    - "Вместо поднятия, вы можете альт-кликнуть по еде, чтобы скушать её. Это так же работает для мышей и других существ без рук."
+    prefix: tips-dataset-
+    count: 135
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 458eadafe4d1..eb7f31b6678a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -300,26 +300,20 @@
     damageCoefficient: 0  #ss-220 armReb
 
 - type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitLing
-  noSpawn: true
-  name: organic space helmet
-  description: A spaceworthy biomass of pressure and temperature resistant tissue.
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitWizard
+  name: wizard hardsuit helmet
+  description: A bizarre gem-encrusted helmet that radiates magical energies.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
+    sprite: Clothing/Head/Hardsuits/wizard.rsi
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
+    sprite: Clothing/Head/Hardsuits/wizard.rsi
+  - type: PointLight
+    color: "#ffadfb"
   - type: PressureProtection
-    highPressureMultiplier: 0.45
+    highPressureMultiplier: 0.60
     lowPressureMultiplier: 1000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
 
 #Luxury Mining Hardsuit
 - type: entity
@@ -472,30 +466,6 @@
         Piercing: 0.9
         Heat: 0.9
 
-#Wizard Hardsuit
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitWizard
-  name: wizard hardsuit helmet
-  description: A bizarre gem-encrusted helmet that radiates magical energies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: PointLight
-    color: "#ffadfb"
-  - type: PressureProtection
-    highPressureMultiplier: 0.27
-    lowPressureMultiplier: 1000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
-
 #Organic Space Suit
 - type: entity
   parent: ClothingHeadHardsuitBase
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index f9736438ffab..534e019ce654 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -564,11 +564,9 @@
         Steel: 5
       tagRequirements:
         Scalpel: #SS220 Edit biomasscraft
-          Amount: 2
-          DefaultPrototype: Scalpel #SS220 Edit biomasscraft
-          ExamineName: Scalpel #SS220 Edit biomasscraft
-      materialRequirements:
-        Steel: 5
+          amount: 2
+          defaultPrototype: Scalpel #SS220 Edit biomasscraft
+          examineName: Scalpel #SS220 Edit biomasscraft
 
 - type: entity
   id: HydroponicsTrayMachineCircuitboard
@@ -1242,92 +1240,6 @@
         Steel: 1
         Cable: 2
 
-- type: entity
-  id: ShuttleGunSvalinnMachineGunCircuitboard
-  parent: BaseMachineCircuitboard
-  name: LSE-400c "Svalinn machine gun" machine board
-  description: A machine printed circuit board for an LSE-400c "Svalinn machine gun"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunSvalinnMachineGun
-    requirements:
-      MatterBin: 2
-      Manipulator: 4
-    materialRequirements:
-      Steel: 5
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunPerforatorCircuitboard
-  parent: BaseMachineCircuitboard
-  name: LSE-1200c "Perforator" machine board
-  description: A machine printed circuit board for an LSE-1200c "Perforator"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunPerforator
-    requirements:
-      MatterBin: 4
-      Manipulator: 6
-    materialRequirements:
-      Steel: 10
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunFriendshipCircuitboard
-  parent: BaseMachineCircuitboard
-  name: EXP-320g "Friendship" machine board
-  description: A machine printed circuit board for an EXP-320g "Friendship"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunFriendship
-    requirements:
-      MatterBin: 3
-      Manipulator: 2
-    materialRequirements:
-      Steel: 7
-      CableHV: 5
-
-- type: entity
-  id: ShuttleGunDusterCircuitboard
-  parent: BaseMachineCircuitboard
-  name: EXP-2100g "Duster" machine board
-  description: A machine printed circuit board for an EXP-2100g "Duster"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunDuster
-    requirements:
-      MatterBin: 6
-      Manipulator: 4
-    materialRequirements:
-      Steel: 10
-      CableHV: 5
-      Uranium: 2
-
-- type: entity
-  id: ShuttleGunKineticCircuitboard
-  parent: BaseMachineCircuitboard
-  name: PTK-800 "Matter Dematerializer" machine board
-  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer"
-  components:
-  - type: Sprite
-    state: security
-  - type: MachineBoard
-    prototype: ShuttleGunKinetic
-    requirements:
-      MatterBin: 2
-      Manipulator: 3
-    materialRequirements:
-      Steel: 5
-      CableHV: 2
-
 - type: entity
   parent: BaseMachineCircuitboard
   id: ReagentGrinderIndustrialMachineCircuitboard
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index e09be17e53ce..1bf524ecfaf3 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1269,54 +1269,6 @@
   - MedicalWinterBoots
 #SS220-brigmedic-loadout-end
 
-#SS220-brigmedic-loadout-begin
-- type: loadoutGroup
-  id: BrigmedicHead
-  name: loadout-group-brigmedic-head
-  minLimit: 0
-  loadouts:
-  - BrigmedicHead
-
-- type: loadoutGroup
-  id: BrigmedicMask
-  name: loadout-group-brigmedic-mask
-  minLimit: 0
-  loadouts:
-  - SterileMask
-  - BrigmedicMask
-
-- type: loadoutGroup
-  id: BrigmedicJumpsuit
-  name: loadout-group-brigmedic-jumpsuit
-  loadouts:
-  - BrigmedicJumpsuit
-  - BrigmedicJumpskirt
-
-- type: loadoutGroup
-  id: BrigmedicOuterClothing
-  name: loadout-group-brigmedic-outerclothing
-  minLimit: 0
-  loadouts:
-  - BrigmedicWindAMG
-  - BrigmedicVestSecurity
-
-- type: loadoutGroup
-  id: BrigmedicBackpack
-  name: loadout-group-brigmedic-backpack
-  loadouts:
-  - BrigmedicBackpack
-  - BrigmedicSatchel
-  - BrigmedicDuffel
-
-- type: loadoutGroup
-  id: BrigmedicShoes
-  name: loadout-group-brigmedic-shoes
-  loadouts:
-  - RedShoes
-  - BlueShoes
-  - MedicalWinterBoots
-#SS220-brigmedic-loadout-end
-
 # Wildcards
 - type: loadoutGroup
   id: ReporterJumpsuit
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 493e802e3165..147d28493061 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -60,106 +60,6 @@
     id: SyndiPDA
     ears: ClothingHeadsetAltSyndicate
 
-
-#Syndicate Operative Outfit - Basic
-- type: startingGear
-  id: SyndicateOperativeGearBasic
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
-
-#Syndicate Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-
-#Nuclear Operative Commander Gear
-- type: startingGear
-  id: SyndicateCommanderGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    neck: SyndicateWhistle
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieCommander
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbing
-  inhand:
-    - NukeOpsDeclarationOfWar
-
-#Nuclear Operative Medic Gear
-- type: startingGear
-  id: SyndicateOperativeMedicFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperativeMedic
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicateAgent
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieMedic
-    shoes: ClothingShoesBootsMagSyndie
-    id: SyndiAgentPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
-    belt: ClothingBeltMilitaryWebbingMedFilled
-
-#Syndicate Lone Operative Outfit - Full Kit
-- type: startingGear
-  id: SyndicateLoneOperativeGearFull
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperativeLone # SS220 Lone Ops Loadout
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
-    shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: LoneOpsUplinkRadio40TC # SS220 LoneOps Uplink
-    belt: ClothingBeltMilitaryWebbing
-
-# Syndicate Footsoldier Gear
-- type: startingGear
-  id: SyndicateFootsoldierGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasic
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    shoes: ClothingShoesBootsCombat
-    id: SyndiPDA
-  storage:
-    back:
-    - BoxSurvival
-
 # Syndicate Footsoldier Gear - No Headset
 - type: startingGear
   id: SyndicateFootsoldierGearRuin
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml
index 659aefc86390..de4bbe04aadc 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/brokenjar.yml
@@ -28,4 +28,4 @@
   - type: SpaceGarbage
   - type: ToolRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml
index f804161e4acd..6247e22bcf5b 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml
@@ -47,8 +47,6 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
-    tools:
-    - Welding
     weldingDamage:
       types:
         Heat: 10
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index 2daed189fc34..f8a54ec4edba 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -87,6 +87,7 @@
   category: Vocal
   whitelist:
     components:
+    - Respirator
     - Vocal
   blacklist:
     components:
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index d34ea9225b93..100051406c77 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -505,23 +505,24 @@
     - отдала честь!
     # Corvax-Localization-End
 
-- type: emote
-  id: Gasp
-  name: chat-emote-name-gasp
-  whitelist:
-    components:
-    - Respirator
-  chatMessages: ["chat-emote-msg-gasp"]
-  chatTriggers:
-   - gasp
-   - gasp.
-   - gasp!
-   - gasps
-   - gasps.
-   - gasps!
-   - gasped
-   - gasped.
-   - gasped!
+#- type: emote SS220-gasp-emote begin
+#  id: Gasp
+#  name: chat-emote-name-gasp
+#  whitelist:
+#    components:
+#    - Respirator
+#  chatMessages: ["chat-emote-msg-gasp"]
+#  chatTriggers:
+#   - gasp
+#   - gasp.
+#   - gasp!
+#   - gasps
+#   - gasps.
+#   - gasps!
+#   - gasped
+#   - gasped.
+#   - gasped!
+# SS220-gasp-emote end
 
 - type: emote
   id: DefaultDeathgasp
diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation.png b/Resources/Textures/Structures/Power/substation.rsi/substation.png
index 68ef981ae5f3ca0804a5e4256f7281ececa23eec..b9d1eb18d8fc4e3583acdf6ac0a8aa11d53deee7 100644
GIT binary patch
literal 2291
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

delta 620
zcmV-y0+apo5s?LuFn<C|Nkl<ZScT<Qzl-8P6#n+Ga}YbbgWUB(Y6F67Ay{t_uo2~2
zxl;cDuRFB2lcd<(b%L-UNJ6R=uUnhDz(R^?Wl~rixk3{rIwskRk%RkS$jqDf<C~W^
zKY)K2eo9#;n|C6iVHiIDy(G(ObCH1Sx-bj_uIt9ivf3o!|9|)eg`gwLa;U_oE|804
zJl<-v*=+724rE#OJ<sz!&+{pzJ^-Im8Y|=5TWokT1)c<B4D0ne9P|BCS-oBlWvkUH
zwGCq|GFLd$=A83E_&Gjc78~F~5dwhcd8uSsZO$@ankG!sj5PwHEBzar0AVG{vg|Jw
zi$o{aK(pBlcYi@71H<9)CIomy2uvoEuu4y>H2@(b@;%i(wd3`IzM?2%0*o;X1_P+7
z8p~SOb&N(M5JJ%Hb|FbptbPE;aWI`uBeDnqLI_k<MZ4XObu^pJ!qrHUghrzQ04SA8
zLjB!t2LM<umuGXra{vH3oep}v9=6*pEX#tXY1r@g!hcnX9E;#MPI>~0qM%l*B|6P5
z1D0ha1_yG?fTn4woQ}uiurJy<qFs<kfKr+&H~{qf{p;<507>V!ZQEf#w;K3dEaE+Y
zR{+010UtgBzkULfuTgTj)xi4L007Uxk7u#oRWraCgRbiUfG<x^LT9#ZL)Udwt5py}
zGG`!i8)aISb+fxbcpJXF6!GwIsOZPX1KZQ_{eAp=8vSy)e7>^dL(vD|fB$x9d5!r;
z>D>u|n<4lGk+*rJQt?}@R<42P^EoJ`VcatUxkf*NC-4Ufo(>}r6%T0u0000<MNUMn
GLSTY!yB_8M

diff --git a/client_output.txt b/client_output.txt
index e69de29bb2d1..95aca070e009 100644
--- a/client_output.txt
+++ b/client_output.txt
@@ -0,0 +1,225 @@
+[DEBG] root: OS: Microsoft Windows 10.0.19045 X64
+[DEBG] root: .NET Runtime: .NET 8.0.0 win-x64
+[DEBG] root: Server GC: False
+[DEBG] root: Processor: 4x Intel(R) Core(TM) i5-7500 CPU @ 3.40GHz
+[DEBG] root: Architecture: X64
+[DEBG] root: Robust Version: 225.0.0.0
+[DEBG] root: Compile Options: DEVELOPMENT;TOOLS;DEBUG;CLIENT_SCRIPTING
+[DEBG] root: Intrinsics: X86Aes;Avx;Avx2;Bmi1;Bmi2;Fma;Lzcnt;Pclmulqdq;Popcnt;Sse;Sse2;Sse3;Ssse3;Sse41;Sse42;X86Base
+[INFO] cfg: Configuration loaded from file
+[DEBG] clyde.win: GLFW initialized, version: 3.3.2 Win32 WGL EGL OSMesa VisualC DLL.
+[ERRO] clyde.win.glfw: GLFW Error: [InvalidValue] Invalid scancode
+[DEBG] clyde.ogl: OpenGL Vendor: NVIDIA Corporation
+[DEBG] clyde.ogl: OpenGL Renderer: NVIDIA GeForce GTX 1060 6GB/PCIe/SSE2
+[DEBG] clyde.ogl: OpenGL Version: 3.3.0 NVIDIA 551.61
+[DEBG] clyde.ogl: OpenGL Extensions: GL_AMD_multi_draw_indirect GL_AMD_seamless_cubemap_per_texture GL_AMD_vertex_shader_viewport_index GL_AMD_vertex_shader_layer GL_ARB_arrays_of_arrays GL_ARB_base_instance GL_ARB_bindless_texture GL_ARB_blend_func_extended GL_ARB_buffer_storage GL_ARB_clear_buffer_object GL_ARB_clear_texture GL_ARB_clip_control GL_ARB_color_buffer_float GL_ARB_compressed_texture_pixel_storage GL_ARB_conservative_depth GL_ARB_compute_shader GL_ARB_compute_variable_group_size GL_ARB_conditional_render_inverted GL_ARB_copy_buffer GL_ARB_copy_image GL_ARB_cull_distance GL_ARB_debug_output GL_ARB_depth_buffer_float GL_ARB_depth_clamp GL_ARB_depth_texture GL_ARB_derivative_control GL_ARB_direct_state_access GL_ARB_draw_buffers GL_ARB_draw_buffers_blend GL_ARB_draw_indirect GL_ARB_draw_elements_base_vertex GL_ARB_draw_instanced GL_ARB_enhanced_layouts GL_ARB_ES2_compatibility GL_ARB_ES3_compatibility GL_ARB_ES3_1_compatibility GL_ARB_ES3_2_compatibility GL_ARB_explicit_attrib_location GL_ARB_explicit_uniform_location GL_ARB_fragment_coord_conventions GL_ARB_fragment_layer_viewport GL_ARB_fragment_program GL_ARB_fragment_program_shadow GL_ARB_fragment_shader GL_ARB_fragment_shader_interlock GL_ARB_framebuffer_no_attachments GL_ARB_framebuffer_object GL_ARB_framebuffer_sRGB GL_ARB_geometry_shader4 GL_ARB_get_program_binary GL_ARB_get_texture_sub_image GL_ARB_gl_spirv GL_ARB_gpu_shader5 GL_ARB_gpu_shader_fp64 GL_ARB_gpu_shader_int64 GL_ARB_half_float_pixel GL_ARB_half_float_vertex GL_ARB_imaging GL_ARB_indirect_parameters GL_ARB_instanced_arrays GL_ARB_internalformat_query GL_ARB_internalformat_query2 GL_ARB_invalidate_subdata GL_ARB_map_buffer_alignment GL_ARB_map_buffer_range GL_ARB_multi_bind GL_ARB_multi_draw_indirect GL_ARB_multisample GL_ARB_multitexture GL_ARB_occlusion_query GL_ARB_occlusion_query2 GL_ARB_parallel_shader_compile GL_ARB_pipeline_statistics_query GL_ARB_pixel_buffer_object GL_ARB_point_parameters GL_ARB_point_sprite GL_ARB_polygon_offset_clamp GL_ARB_post_depth_coverage GL_ARB_program_interface_query GL_ARB_provoking_vertex GL_ARB_query_buffer_object GL_ARB_robust_buffer_access_behavior GL_ARB_robustness GL_ARB_sample_locations GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_seamless_cubemap_per_texture GL_ARB_separate_shader_objects GL_ARB_shader_atomic_counter_ops GL_ARB_shader_atomic_counters GL_ARB_shader_ballot GL_ARB_shader_bit_encoding GL_ARB_shader_clock GL_ARB_shader_draw_parameters GL_ARB_shader_group_vote GL_ARB_shader_image_load_store GL_ARB_shader_image_size GL_ARB_shader_objects GL_ARB_shader_precision GL_ARB_shader_storage_buffer_object GL_ARB_shader_subroutine GL_ARB_shader_texture_image_samples GL_ARB_shader_texture_lod GL_ARB_shading_language_100 GL_ARB_shader_viewport_layer_array GL_ARB_shading_language_420pack GL_ARB_shading_language_include GL_ARB_shading_language_packing GL_ARB_shadow GL_ARB_sparse_buffer GL_ARB_sparse_texture GL_ARB_sparse_texture2 GL_ARB_sparse_texture_clamp GL_ARB_spirv_extensions GL_ARB_stencil_texturing GL_ARB_sync GL_ARB_tessellation_shader GL_ARB_texture_barrier GL_ARB_texture_border_clamp GL_ARB_texture_buffer_object GL_ARB_texture_buffer_object_rgb32 GL_ARB_texture_buffer_range GL_ARB_texture_compression GL_ARB_texture_compression_bptc GL_ARB_texture_compression_rgtc GL_ARB_texture_cube_map GL_ARB_texture_cube_map_array GL_ARB_texture_env_add GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_filter_anisotropic GL_ARB_texture_filter_minmax GL_ARB_texture_float GL_ARB_texture_gather GL_ARB_texture_mirror_clamp_to_edge GL_ARB_texture_mirrored_repeat GL_ARB_texture_multisample GL_ARB_texture_non_power_of_two GL_ARB_texture_query_levels GL_ARB_texture_query_lod GL_ARB_texture_rectangle GL_ARB_texture_rg GL_ARB_texture_rgb10_a2ui GL_ARB_texture_stencil8 GL_ARB_texture_storage GL_ARB_texture_storage_multisample GL_ARB_texture_swizzle GL_ARB_texture_view GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ARB_transform_feedback_instanced GL_ARB_transform_feedback_overflow_query GL_ARB_transpose_matrix GL_ARB_uniform_buffer_object GL_ARB_vertex_array_bgra GL_ARB_vertex_array_object GL_ARB_vertex_attrib_64bit GL_ARB_vertex_attrib_binding GL_ARB_vertex_buffer_object GL_ARB_vertex_program GL_ARB_vertex_shader GL_ARB_vertex_type_10f_11f_11f_rev GL_ARB_vertex_type_2_10_10_10_rev GL_ARB_viewport_array GL_ARB_window_pos GL_ATI_draw_buffers GL_ATI_texture_float GL_ATI_texture_mirror_once GL_S3_s3tc GL_EXT_texture_env_add GL_EXT_abgr GL_EXT_bgra GL_EXT_bindable_uniform GL_EXT_blend_color GL_EXT_blend_equation_separate GL_EXT_blend_func_separate GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_compiled_vertex_array GL_EXT_Cg_shader GL_EXT_depth_bounds_test GL_EXT_direct_state_access GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_draw_range_elements GL_EXT_fog_coord GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXTX_framebuffer_mixed_formats GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_framebuffer_object GL_EXT_framebuffer_sRGB GL_EXT_geometry_shader4 GL_EXT_gpu_program_parameters GL_EXT_gpu_shader4 GL_EXT_multi_draw_arrays GL_EXT_multiview_texture_multisample GL_EXT_multiview_timer_query GL_EXT_packed_depth_stencil GL_EXT_packed_float GL_EXT_packed_pixels GL_EXT_pixel_buffer_object GL_EXT_point_parameters GL_EXT_polygon_offset_clamp GL_EXT_post_depth_coverage GL_EXT_provoking_vertex GL_EXT_raster_multisample GL_EXT_rescale_normal GL_EXT_secondary_color GL_EXT_separate_shader_objects GL_EXT_separate_specular_color GL_EXT_shader_image_load_formatted GL_EXT_shader_image_load_store GL_EXT_shader_integer_mix GL_EXT_shadow_funcs GL_EXT_sparse_texture2 GL_EXT_stencil_two_side GL_EXT_stencil_wrap GL_EXT_texture3D GL_EXT_texture_array GL_EXT_texture_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_latc GL_EXT_texture_compression_rgtc GL_EXT_texture_compression_s3tc GL_EXT_texture_cube_map GL_EXT_texture_edge_clamp GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_EXT_texture_filter_anisotropic GL_EXT_texture_filter_minmax GL_EXT_texture_integer GL_EXT_texture_lod GL_EXT_texture_lod_bias GL_EXT_texture_mirror_clamp GL_EXT_texture_object GL_EXT_texture_shadow_lod GL_EXT_texture_shared_exponent GL_EXT_texture_sRGB GL_EXT_texture_sRGB_R8 GL_EXT_texture_sRGB_decode GL_EXT_texture_storage GL_EXT_texture_swizzle GL_EXT_timer_query GL_EXT_transform_feedback2 GL_EXT_vertex_array GL_EXT_vertex_array_bgra GL_EXT_vertex_attrib_64bit GL_EXT_window_rectangles GL_EXT_import_sync_object GL_IBM_rasterpos_clip GL_IBM_texture_mirrored_repeat GL_KHR_context_flush_control GL_KHR_debug GL_EXT_memory_object GL_EXT_memory_object_win32 GL_NV_memory_object_sparse GL_EXT_win32_keyed_mutex GL_KHR_parallel_shader_compile GL_KHR_no_error GL_KHR_robust_buffer_access_behavior GL_KHR_robustness GL_EXT_semaphore GL_EXT_semaphore_win32 GL_NV_timeline_semaphore GL_KHR_shader_subgroup GL_KTX_buffer_region GL_NV_alpha_to_coverage_dither_control GL_NV_bindless_multi_draw_indirect GL_NV_bindless_multi_draw_indirect_count GL_NV_bindless_texture GL_NV_blend_equation_advanced GL_NV_blend_equation_advanced_coherent GL_NVX_blend_equation_advanced_multi_draw_buffers GL_NV_blend_minmax_factor GL_NV_blend_square GL_NV_clip_space_w_scaling GL_NV_command_list GL_NV_compute_program5 GL_NV_conditional_render GL_NV_conservative_raster GL_NV_conservative_raster_dilate GL_NV_conservative_raster_pre_snap_triangles GL_NV_copy_depth_to_color GL_NV_copy_image GL_NV_depth_buffer_float GL_NV_depth_clamp GL_NV_draw_texture GL_NV_draw_vulkan_image GL_NV_ES1_1_compatibility GL_NV_ES3_1_compatibility GL_NV_explicit_multisample GL_NV_feature_query GL_NV_fence GL_NV_fill_rectangle GL_NV_float_buffer GL_NV_fog_distance GL_NV_fragment_coverage_to_color GL_NV_fragment_program GL_NV_fragment_program_option GL_NV_fragment_program2 GL_NV_fragment_shader_interlock GL_NV_framebuffer_mixed_samples GL_NV_framebuffer_multisample_coverage GL_NV_geometry_shader4 GL_NV_geometry_shader_passthrough GL_NV_gpu_program4 GL_NV_internalformat_sample_query GL_NV_gpu_program4_1 GL_NV_gpu_program5 GL_NV_gpu_program5_mem_extended GL_NV_gpu_program_fp64 GL_NV_gpu_shader5 GL_NV_half_float GL_NV_light_max_exponent GL_NV_memory_attachment GL_NV_multisample_coverage GL_NV_multisample_filter_hint GL_NV_occlusion_query GL_NV_packed_depth_stencil GL_NV_parameter_buffer_object GL_NV_parameter_buffer_object2 GL_NV_path_rendering GL_NV_path_rendering_shared_edge GL_NV_pixel_data_range GL_NV_point_sprite GL_NV_primitive_restart GL_NV_query_resource GL_NV_query_resource_tag GL_NV_register_combiners GL_NV_register_combiners2 GL_NV_sample_locations GL_NV_sample_mask_override_coverage GL_NV_shader_atomic_counters GL_NV_shader_atomic_float GL_NV_shader_atomic_float64 GL_NV_shader_atomic_fp16_vector GL_NV_shader_atomic_int64 GL_NV_shader_buffer_load GL_NV_shader_storage_buffer_object GL_NV_shader_subgroup_partitioned GL_NV_stereo_view_rendering GL_NV_texgen_reflection GL_NV_texture_barrier GL_NV_texture_compression_vtc GL_NV_texture_env_combine4 GL_NV_texture_multisample GL_NV_texture_rectangle GL_NV_texture_rectangle_compressed GL_NV_texture_shader GL_NV_texture_shader2 GL_NV_texture_shader3 GL_NV_transform_feedback GL_NV_transform_feedback2 GL_NV_uniform_buffer_unified_memory GL_NV_uniform_buffer_std430_layout GL_NV_vertex_array_range GL_NV_vertex_array_range2 GL_NV_vertex_attrib_integer_64bit GL_NV_vertex_buffer_unified_memory GL_NV_vertex_program GL_NV_vertex_program1_1 GL_NV_vertex_program2 GL_NV_vertex_program2_option GL_NV_vertex_program3 GL_NV_viewport_array2 GL_NV_viewport_swizzle GL_NVX_conditional_render GL_NVX_linked_gpu_multicast GL_NV_gpu_multicast GL_NVX_gpu_multicast2 GL_NVX_progress_fence GL_NVX_gpu_memory_info GL_NVX_multigpu_info GL_NVX_nvenc_interop GL_NV_shader_thread_group GL_NV_shader_thread_shuffle GL_KHR_blend_equation_advanced GL_KHR_blend_equation_advanced_coherent GL_OVR_multiview GL_OVR_multiview2 GL_SGIS_generate_mipmap GL_SGIS_texture_lod GL_SGIX_depth_texture GL_SGIX_shadow GL_SUN_slice_accum GL_WIN_swap_hint WGL_EXT_swap_control
+[DEBG] clyde.ogl: OpenGL capabilities:
+[DEBG] clyde.ogl:   khr_debug: True
+[DEBG] clyde.ogl:   sampler_objects: True
+[DEBG] clyde.ogl:   texture_swizzle: True
+[DEBG] clyde.ogl:   vertex_array_object: True
+[DEBG] clyde.ogl:   fence_sync: True
+[DEBG] clyde.ogl:   map_buffer: True
+[DEBG] clyde.ogl:   map_buffer_range: True
+[DEBG] clyde.ogl:   pixel_buffer_object: True
+[DEBG] clyde.ogl:   standard_derivatives: True
+[DEBG] clyde.ogl:   GLES: False
+[DEBG] clyde.ogl: Loading stock textures...
+[DEBG] clyde.ogl: Loading stock shaders...
+[DEBG] clyde.ogl: Creating various GL objects...
+[DEBG] clyde.ogl: Setting up RenderHandle...
+[DEBG] clyde.ogl: Setting viewport and rendering splash...
+[DEBG] clyde.oal: OpenAL Vendor: OpenAL Community
+[DEBG] clyde.oal: OpenAL Renderer: OpenAL Soft
+[DEBG] clyde.oal: OpenAL Version: 1.1 ALSOFT 1.20.1
+[DEBG] res.mod: DISABLING assembly load context
+[DEBG] res.mod: ENABLING sandboxing
+[DEBG] res.mod: Found module '/Assemblies/Content.Client.dll'
+[DEBG] res.mod: Found module '/Assemblies/Content.Shared.Database.dll'
+[DEBG] res.mod: Found module '/Assemblies/Content.Shared.dll'
+[DEBG] res.mod: LOADING modules
+[DEBG] res.typecheck: Checking assembly...
+[DEBG] res.typecheck: Checking assembly...
+[DEBG] res.typecheck: Checking assembly...
+[DEBG] res.typecheck: Content.Shared.Database: Verifying IL...
+[DEBG] res.typecheck: Content.Client: Verifying IL...
+[DEBG] res.typecheck: Content.Shared: Verifying IL...
+[DEBG] res.typecheck: Content.Shared.Database: Verified IL in 191,6394ms
+[DEBG] res.typecheck: References loaded... 804ms
+[DEBG] res.typecheck: Types... 805ms
+[DEBG] res.typecheck: Inheritance... 805ms
+[DEBG] res.typecheck: Unmanaged methods... 806ms
+[DEBG] res.typecheck: Type abuse... 806ms
+[DEBG] res.typecheck: Checked assembly in 807ms
+[DEBG] res.typecheck: Content.Shared: Verified IL in 810,7169ms
+[DEBG] res.typecheck: Content.Client: Verified IL in 829,1344ms
+[DEBG] res.typecheck: References loaded... 894ms
+[DEBG] res.typecheck: Types... 900ms
+[DEBG] res.typecheck: Inheritance... 910ms
+[DEBG] res.typecheck: Unmanaged methods... 910ms
+[DEBG] res.typecheck: Type abuse... 911ms
+[DEBG] res.typecheck: References loaded... 925ms
+[DEBG] res.typecheck: Checked assembly in 926ms
+[DEBG] res.typecheck: Types... 929ms
+[DEBG] res.typecheck: Inheritance... 932ms
+[DEBG] res.typecheck: Unmanaged methods... 932ms
+[DEBG] res.typecheck: Type abuse... 932ms
+[DEBG] res.typecheck: Checked assembly in 949ms
+[DEBG] res.mod: Verified assemblies in 959ms
+[DEBG] res.mod: Loading module: '/Assemblies/Content.Shared.Database.dll'
+[DEBG] res.mod: Loading module: '/Assemblies/Content.Shared.dll'
+[DEBG] res.mod: Loading module: '/Assemblies/Content.Client.dll'
+[DEBG] res.mod: DONE loading modules: 00:00:01.1164862
+[DEBG] res.preload: Preloading textures...
+[DEBG] res.preload: Preloaded 924 textures (0 errored) in 00:00:05.6799520
+[ERRO] res.preload: Exception while loading RSI /Textures/Structures/Power/substation.rsi:
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.ResourceCache.<>c__DisplayClass44_0.<PreloadRsis>b__4(LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.Preload.cs:line 135
+[DEBG] res.preload: Preloaded 3409 RSIs into 2 Atlas(es?) (2 not atlassed, 1 errored) in 00:00:07.3049909
+[INFO] szr: Serializer Types Hash: 44006B1F67140E576D0F0FCA15BF56E5D5F162D3422717F3224E51F72F73859B
+[DEBG] input: Key function in /keybinds.yml does not exist: 'KeyFunction(OpenScoreboardWindow)'.
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (screen)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (full)
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (screen)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (full)
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation_wall)
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (screen)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (full)
+[ERRO] go.comp.sprite: State 'folder-centcom' not found in RSI: '/Textures/SS220/Objects/Misc/bureaucracy.rsi'.
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation_wall)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (screen_wall)
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation_wall)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (screen_wall)
+[INFO] client: Tickrate changed to: 40 on tick 1
+[DEBG] client: Runlevel changed to: Initialize
+[DEBG] root: Switching to state Content.Client.MainMenu.MainScreen
+[WARN] eng: MainLoop: Cannot keep up!
+[DEBG] client: Runlevel changed to: Connecting
+[DEBG] net: Attempting to connect to localhost port 1212
+[DEBG] net: First attempt IP address is ::1, second attempt 127.0.0.1
+[WARN] eng: MainLoop: Cannot keep up!
+[INFO] net: "::": "Socket bound to [::]:57968: True"
+[INFO] net: "::": "Network thread started"
+[DEBG] net: "[::1]:1212": Status changed to InitiatedConnect, reason: "user called connect"
+[INFO] net: "0.0.0.0": "Socket bound to 0.0.0.0:57971: True"
+[INFO] net: "0.0.0.0": "Network thread started"
+[DEBG] net: "127.0.0.1:1212": Status changed to InitiatedConnect, reason: "user called connect"
+[DEBG] net: "[::1]:1212": Status changed to Connected, reason: "Connected to 96DF8A33077F4701"
+[DEBG] net: First peer status changed.
+[DEBG] net: First peer succeeded.
+[INFO] net: "0.0.0.0": "Shutdown requested"
+[INFO] net: "::": "Expanded Maximum Transmission Unit to: 1232 bytes"
+[INFO] net: "::": "Initiated average roundtrip time to 154,80 ms Remote time is: 107,17780408203126"
+[DEBG] net: Handshake completed, connection established.
+[INFO] net: Received message name string table.
+[INFO] net: Client completed serializer handshake.
+[INFO] cfg: Sending client info...
+[DEBG] client: Synchronized time base: 1: 00:00:00
+[INFO] client: Tickrate changed to: 60 on tick 0
+[INFO] player: Changing local session from null to localhost@JoeGenero.
+[DEBG] admin: Have 23 commands available
+[INFO] admin: Updated admin status: Not admin
+[DEBG] client: Runlevel changed to: Connected
+[INFO] clyde.oal: Set audio attenuation to LinearDistanceClamped
+[DEBG] form-manager: Requested forms from server
+[DEBG] system.map: Starting...
+[DEBG] admin: Have 328 commands available
+[INFO] admin: Updated admin status: True/Хост/ADMIN|BAN|DEBUG|FUN|PERMISSIONS|SERVER|SPAWN|VAREDIT|MAPPING|LOGS|ROUND|QUERY|ADMINHELP|VIEWNOTES|EDITNOTES|ADMINCHAT|MASSBAN|STEALTH|PII|MODERATOR|ADMINWHO|NAMECOLOR|HOST
+[DEBG] job_requirements: Received roleban info containing 0 entries.
+[INFO] state: Received Full GameState: to=1, sz=21574
+[INFO] state: Resetting all entity states to tick 1.
+[DEBG] client: Runlevel changed to: InGame
+[INFO] player: Attaching local player to Мицелий Контроля (3/n2478, MobDiona, localhost@JoeGenero).
+[DEBG] root: Switching to state Content.Client.Gameplay.GameplayState
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] root: SpriteSpecifier failed to load RSI Structures/Power/substation.rsi
+[DEBG] form-manager: Received forms from server, amount of collections: 3
+[ERRO] res: Exception while loading resource Robust.Client.ResourceManagement.RSIResource at '/Textures/Structures/Power/substation.rsi'
+System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values.
+   at Robust.Shared.Utility.ImageOps.Blit[T](ReadOnlySpan`1 source, Int32 sourceWidth, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 45
+   at Robust.Shared.Utility.ImageOps.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Shared\Utility\ImageOps.cs:line 27
+   at Robust.Client.Utility.ImageSharpExt.Blit[T](Image`1 source, UIBox2i sourceRect, Image`1 destination, Vector2i destinationOffset) in E:\repos\space-station-14\RobustToolbox\Robust.Client\Utility\ImageSharpExt.cs:line 36
+   at Robust.Client.ResourceManagement.RSIResource.LoadPreTexture(IResourceManager manager, LoadStepData data) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 167
+   at Robust.Client.ResourceManagement.RSIResource.Load(IDependencyCollection dependencies, ResPath path) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceTypes\RSIResource.cs:line 42
+   at Robust.Client.ResourceManagement.ResourceCache.TryGetResource[T](ResPath path, T& resource) in E:\repos\space-station-14\RobustToolbox\Robust.Client\ResourceManagement\ResourceCache.cs:line 81
+[ERRO] go.comp.sprite: Unable to load RSI '/Textures/Structures/Power/substation.rsi'.
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (substation)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (screen)
+[ERRO] go.comp.sprite: Layer has no RSI to load states from. Cannot use 'state' property. (full)
+[INFO] game: Shutting down! Reason: Main window closed
+[INFO] system.map: Grid Dev (2/n2) changed parent. Old parent: station map - Dev (1/n3). New parent: 0/n0D
+[INFO] player: Detaching local player from Мицелий Контроля (3/n2478, MobDiona, localhost@JoeGenero).
+[INFO] player: Local player is no longer attached to any entity.
+[INFO] system.map: Removing grid Dev (2/n2)
+[INFO] system.mind: Wiping all minds
+[DEBG] game: Window loop exited; waiting for game thread to exit
+[DEBG] clyde.win: Terminating GLFW.
+[DEBG] game: Goodbye

From 14b6f7a32749527117e41511bfb8f71aab73b6c9 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 16:47:20 +0300
Subject: [PATCH 555/568] fix centcomm folder sprite

---
 Resources/Prototypes/Entities/Objects/Misc/paper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index a266a79f61de..336c2dd87ff0 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -428,7 +428,7 @@
   components:
   - type: Sprite
     layers:
-    - state: folder-centcom
+    - state: folder-centcomm
     - state: folder-base
 
 - type: entity

From 656156bcc92102b5e98e279940d84ca36f6a9424 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:10:06 +0300
Subject: [PATCH 556/568] return old substation sprite

---
 .../Power/substation.rsi/charging.png          | Bin 197 -> 1105 bytes
 .../Structures/Power/substation.rsi/dead.png   | Bin 162 -> 1110 bytes
 .../Structures/Power/substation.rsi/full.png   | Bin 124 -> 1108 bytes
 .../Structures/Power/substation.rsi/meta.json  |   8 +-------
 .../Structures/Power/substation.rsi/screen.png | Bin 182 -> 1652 bytes
 .../Power/substation.rsi/substation_static.png | Bin 650 -> 2444 bytes
 .../substation.rsi/substation_wall_static.png  | Bin 339 -> 1504 bytes
 7 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Resources/Textures/Structures/Power/substation.rsi/charging.png b/Resources/Textures/Structures/Power/substation.rsi/charging.png
index 7675535164c696445d22a30336b8736b6b4b9958..538dc2b7a84725b3e452fb9a460b24e371e07177 100644
GIT binary patch
literal 1105
zcmZ`&J8aWH7<Pd`6H#D6DpiGyc?^j79P<#doS?LB8zWLhNsv+&;@Fqeienq!MKK*1
z5Dd&PRoxI0Q&kou2DT1NNFY`O10Z!_fq?-D?(8&iqU5A|`1kkykMHh(Qe0h`Nz5e}
zhM7_GN{Q?&ozsWOiZ(WWlWhu>Ru-7;_w#$?;~1=}jY5IBNY2w_(($qUl&o<#zlI24
zi_WPd&&r<}=Adg<s<>LXCFxF^*9@l)dB5!jEZLXHu??}t`fbZblAqxMghbBN3^+D`
z;8upK7K-em<3aWsFYp4FO|UF0dqzVlDa$=N`O0wX7`qYx-ENofUgjOI2~z2F8VDi~
z#Uw!_(R~|he$qx~Lnr%w6o_=sbg}8!EcL6^oes`$91YYTVV;KGkK=YcD~Mv~09vpO
zZHz#QPl0hfY&HfN+NdW75eCpdgeHuosV>&95T%xUl25NblBgcUMc4ol01yS?dQuRR
zVjA@8Bk9YAE@2Z}Fc7X^PoQAV!oyaIrxI8uRaUYzyP4tqqyZaR$HH6|b?OLfR4EyR
zxM6;19d;{&F&W6TZfUIqkz;kJzij%d9EdSw99%(2sE#8<jiZF(x`Q3^qC8VqZ45ov
zBd;rnC-%ZkMvVFz#J+8tIJ@s)#2jHoZb!;_xa)YWN^lcV87G2zjzUQzZ!~OxKz`Bz
z*@O)G-IPt-d@~;-Eml*NT%{V<YqPQEXN0)}6PDS<ue<kt{CoHF&a16oH}Xdx<t!t;
zxwBV~fBJrD_Yd=pjXl0wdvW~qPD)W8G|w%6dAa%F1bg8SbL#KOx8?J#*R-A0rB!8n
Hq4w}UEmlj8

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a_T)@978f1
z-(E4~YB3OSd$_!UD^a`u!L;g{Zjrde*&K0)byF0dig1cm#+$ZG_-Q<$LB(?t2$iN(
zSUDWo`uW%O!?PDZySb2Y3y;7XTXFC7vpmTL4r!{)J7wImk3JRF=JYraV|-ZT=9jw-
sZ`V!tUwf@k_jmb!mR<i@R99x(f7DPr?YK+$B+w}gp00i_>zopr0K*kYegFUf

diff --git a/Resources/Textures/Structures/Power/substation.rsi/dead.png b/Resources/Textures/Structures/Power/substation.rsi/dead.png
index 27440c1c7704fb77a945727db1d5c5adaf4244aa..9fbff744ca74ec82634e041fb8fa3282c7f97b12 100644
GIT binary patch
literal 1110
zcmZ`&PiWIn7|)cstuPT!b?lJEgD5mFjelxG8tB%!MeHbDh4y6A<aG;6lbH8P;w}Rb
zMG!A~Dmy8H7sqbm#fuj~5a&fa2t)ATT~Kd(FX`H}v=82&eEI#p?|Z-ZeUD3PE3=8Y
z1j8`1>T01(c9zcRQ)ETk+keP5fyyh3%--ku-{j*otg6jok-0?9(`3@|b^RGxXWZ2q
zB7j{wC#IgS|6rJtu34$#YVnq&J1t%_oCf5BmK(C<KqAK$#2Op4EE`EdjtdbIIa4#>
z*bsuZa$L1oVwW5bve$Tl7dR!svaIYGO{rYC(WR5G9Jh(FD*@p9KJQ=V9d84qv)L>V
zL?DVOf=HozHr9fajm}3-j{OuM(mm6~rem|zuhwwdILC1`P;W$e8hS5|+xDz5ilGB&
z!4|YJ0%<-CM)9!O>}P1Bt{g-dK>rY$Fp{RaSieG)S`J7)-TRS5^)N2N28aQGC<xb6
zf|wGspm#r#zHI0cHn9am;d=K870g?B&`R-C0?VYzN|t7C<hUSZz^2x=FsGn)17VFS
zC4&ez$d9apZe=hc1DW1is+A#ftTy$hWUtDh7z4)s6GVjSC_>ygOek$S*dZ0=nYwCY
z=(!%Lt}ve14L2S!?5iL9wryhN*ujuF#)`d;l=rajcw3e5CE_xU1$7-olE!K@YJgCF
z(g8|B2EA@l5;xz?Pm&gcY9U{#&gk{z<jVzN?!=fSxpbJ!{M|A9H_iILo!v)MPx6+L
z?d)g1d^r31Q*HnMVWz`={3gnB{oul#_re2GV=peA`}Oo8^L>F~#Dg=Pw|9TOqCKrH
LuNC$d>-UcUeh*F)

literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a$-DP978f1
z-(KFxdBA{&^`dc#;Q0xE%|Ebd8g*S#S#T^iM|>YUQ)8Dt3zO$06%e{)cj^^u71OKh
z;yae>Ur=CL<ap*B-wI26`N#S0`2~BodY!XpfA)iE(vn`=sA5sRR}(uI0_|b&boFyt
I=akR{0BGqq#sB~S

diff --git a/Resources/Textures/Structures/Power/substation.rsi/full.png b/Resources/Textures/Structures/Power/substation.rsi/full.png
index d0b9726cacf1f8b56586214f2694b0c88393ffb7..d179742669917dc41f20ab033580a2627040ed23 100644
GIT binary patch
literal 1108
zcmZ`&O=#0l9M3G%tuQZwjIu)-PYTUTQzs^*k=AT$#g5W-(B76MuUlA}guGXp?chNV
zQxGrHn>WFmgB|r$Jb0T2J&Ww%LC=C9xcXkw^^5kw`^Z1P-~Z$H-v3#7eQhD0h%*ec
zP%LN_va@u~T_!6!IQUJr8B|%zGsmBoev*%?uvTo8O3W>Co+FcvFB?Z>o%afLL;$bp
zoVoIH;~T@oJgZv6wbDb`aGShty4#QsnqJ6K0+}3}5bJEvv>hY|SuRA#<V?+gV?zku
z%W}0+nZ57&kiEkTyuhh(mSq*+Y{(UDwMQpkS#B3&PX?gfZu9L7@A^9+ElCm(L?DVO
zf=Ho#2kSw~K{p~N7k)H|4Bzsw<vJ|&t8cq4oaHzgs6V1SO`{*jYx#B<#WVo4VG}wS
zfi#~6lX%!_3^H_3PYxmspnnKWm`E#n*tkuUS_w!#z4}O^Mi>`i6AS@>C<u2`f|wE|
z(65iAub766Eo{S3xPCpMf;k(HS}C4NU|UpK+18z%EEl9q*w9-x=2X<$Mp&mxDImg)
z@+0f0TLnzWK%sTZ^$J9;-J<?fX;}%y7%>j6AR^Qz5r&Q9gz~P7UGk!Q%P2Y+`kqf-
zR~S$1g`18T_ce&U=~!63a4=>bVh!Dnobz$p_4lgbO$^I871VPSNjmgKqXr1&Cmo>1
z70~Y{HU8lJ(ky8)qp0PowRvM}arRA8NL-q-bdsH?r;pyQo^`vwzJL6&_;3F_lQ?<u
z>ipiHqqFWO;7Ru1o7ZFY!bws~bn?&T4~I<pMPf5!=NYE;?wTGuJ^V^Ly125g9p|?m
F{|Df0Pmllr

delta 81
zcmV-X0IvVk2z-z+OEyVFK~z|U?ai?b03Zwl!7tc<s+3uQS<DI)DM0$GUp7dRBuV-~
nnj|DmrnlEkv<s-|Ye|nd+q(+;$2_|d00000NkvXXu0mjfN^~IL

diff --git a/Resources/Textures/Structures/Power/substation.rsi/meta.json b/Resources/Textures/Structures/Power/substation.rsi/meta.json
index 519a21a4c6d9..6135a6dda6fd 100644
--- a/Resources/Textures/Structures/Power/substation.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/substation.rsi/meta.json
@@ -24,13 +24,7 @@
       "name": "full"
     },
     {
-      "name": "charging",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "charging"
     },
     {
         "name": "dead"
diff --git a/Resources/Textures/Structures/Power/substation.rsi/screen.png b/Resources/Textures/Structures/Power/substation.rsi/screen.png
index 24420ec31ca2d5dd80bb669b47d3d8e334345aa8..60c922c53f622e8de11faeb00b4aa198b0404c04 100644
GIT binary patch
literal 1652
zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQjEnx?oJHr&dIz4a`;jsJkxxA
z8MJ_G4j=}BOTm+YBxiv~WHAGS#w-wK6t_~`#K6Ful^GII65;D(m7Jfemza{Dl&V*e
zTL9K&Q(*;U=BAb;Dpcg=<P}?0*eZclSOM7}VSOb9u#%E&Tcrr!00rm#qErPlJp(-h
zB|9z!1qGX;lr*a#7dNPOAkS7Qqokz3N?*Ucyj-u`STDaQUEk2s(o)~RNZ-gv7pOwF
zxH7LKu|hYmSQ%mn%p8~0;^d;tf|AVqJOz-siAnjTCALaRAdBDt;?9(0xIG1>MLA$w
zQj+ykb5e6t^Gb^K4fPE5vFR(xOhdRZuNWE}z<|*Q$pEz(VAbYXP?Br{3@O(NpnIVH
z13EMrY;SQ%iawG8eIo+{3ta;vT_a0<xc`98w@FF1D#<L#Nd*TS+&|zDbj&G16$PmW
z1wl?GC}gd267$k+l`3>oQqvMkb4rx#fB}`7nrEXAQG==%B8qCHjXoCJZ9smuiVR9E
z&d(_Yg}R-QnTZWJBv3>V;SbRffmH{xD7ub-jQo;(V0tRbO!mwxNi8ZU0;Vm9jZph=
zt3WpkVR>j?W{I5<)BrSLBwa{xW93*>Ql4Lw9RiLASRmq505t>>ph&3`lJvoW4@~=Z
zTsHdfd}PP<ai?-00|Qg1r;B4q1>@W4-g&}~0uI@4EG7uXG;nmXm~n_5;ov;T^-ZSn
z@PSYZrVXv4r!9o!4>C0}vOZ<FCLw%u*{-*n?r!RAEhu;YmaVyR=Et7<S6;vBcg>JE
zz`$nEz{r!pz>LNWyX7F5@_mPlhw>hgnmQYS%CNab&IRB1&p&Xy{?V`79IHxp>wWE(
z-c<U3R>}REc}I5dzGVMP_v-Glg5Q_?{~f#j{iXcBrv2;wy^o#x?|j^pfBfm6+n=*-
zx;|s&>rFeAx4!*+sq$CYlTiJdv}f=B@A%;GbNkfw+-FNZ|M6D-_xi-2XPQ6lFaAmX
z{642^P7Bkqf59J$pU<BWKU>d4dk=U2y5Fb8R$mK$Y4hJAc*eoar>!pTGhgR=zJB2!
zm$N&>j{jW#Ap4{A^`xME&oW}VSD)eE?r>Sw#`OH`4nObo10ipDKKxy9z2>@U{p(ku
z=jz`vypaF)C+GdQyXztqXH2+p@yD^P60@`K=l@wdd-~Gf|J=9z@!uEzZ)(xg{Fv@%
z>Sb^C{CV>F{0_0?g2TEOIs&%t`=Px3%g!*f^1t)#JwN5|U@xnVzc^JveE*FrKNZ#Y
zue&>W;{4O~m9M+jZxZ>lQ@eqA_oM9*vM(Aq>ZiNPvR!qo{`B{h@7ehWzG^Vrm;c-O
zQ}gfnSjHyt72-kf-m1hh%H-cM`jGqd^ZN;n^R55i`BQj*ck_vV>ER5qMZ16BFL}DQ
zH|b$G^LHiBS<km`{?z@iAWotxV*j7rzbpSPU$cM1s(cf%{1Q8v_VYT$AqS5CUsTl<
qS>Ju5rVm@BV^0dmq6Noz{xB|UYPx>(f6XCKiSOy^=d#Wzp$P!kmv_$q

literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW&!DaPU;cPEB*=VV?2IR&0Bjv*Cu
z-d?%O*`Of87SLUmG5OA7$J>j|GP|m{6xS>_xKJGTXXlA_C36;_au8Tx7MoWrb@*dh
z#_i9~_bKg<`S&3t;<-t`chvExt6!9VI{oA|L+|tN{;jW%-#s4or}lo(`*qAG*uh%!
Y)H&8$t@*seG#|wEboFyt=akR{0GeS&g8%>k

diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_static.png
index eee995843f194939f7b115fd33950de15b7016e1..9d5b8598f4b8d92b0a1af88b799a6f72c26186c4 100644
GIT binary patch
literal 2444
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

delta 613
zcmV-r0-F7d6N&|pFn<C>Nkl<ZScT<QF^k(U6#lMciwN05mx9Mz0;a<)fk3!IAY0)E
zL$~~Z&@t&;(lyySWGi?$H(MYO2m~8LOHIa`ilE@ZYmmFDLt;mg9miM4q0kS6o}S**
z`}F)|3HXP>bLtBDyhu}8mc_;Xl&+}HNdms_!?G;+zMrWp>VI<%|Hmh&M1rpCv5}a%
zNS~$?@m!znc6%c&pzAsh!;ptz$b%r@0C*4tnL4pO$44Yn5lJw{;CWs=7G+h}ZntCI
zX0yrd!x)q1DhX?0aWRNECk8Cy1Dq&A00_e{m#(N!A_KN<!?x{ACqUlm-}pp`D^b^V
zzFaQPE^-NUyMNvI6i68ujYd}?AVMNAolfH_RjV}uAw=p`Th&jri{w_Tl}>;$hT(7s
z!!R;go2H5Jcnm@a`u#pMP0O^8Kq<v+Hj{J`0YV52!@!4kZ!#D9_+=IEM$<HOIvoH&
ztyW95-|cn)fc1Kvm`nW+0Km7mNBM4k9N*1lJ4$Kl!hdO?l;$U(22#fnO3gsDbFo)Z
zdIr>9#bh#x<+PKNb_&iC_#T|1mBe5$xZEj-aPI%@x^66&Rs-*=RlEZ53&7_e0A2&|
zfZw+=xzcLDJ2U|J=>Tx{^2=M<?xGoBjKMTb0Kli!>d0KMp{@(lG|_A}K?o_F0qHh$
z9Or6xL0;-@`1Dl8!^6I!A0PK@)$#p(_Iw`udcB_9+2Ntc0r2_PeJg7$K1y#C0#`%y
z38c4qqtW2KUa!=^i^T##5X5m41WJv5fJopEs)!0GE2M_400000NkvXXu0mjf1NJ8<

diff --git a/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png b/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png
index f4cc933b4a505d373702a5af5eb4eac868e92d88..e810e6a5a4a1f05b179ffa3ce073d8b35b632e6d 100644
GIT binary patch
literal 1504
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=7^q+l2s5%z3BJp~z+8|S5>XQ2>tmIipR1RclAn~SSCLx)
z)@4&+1!U%?mLw`v<mTiRTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1v5PZJp&~>
zE(HYzo1&C7s~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdw
zuOzWTH?LS3VhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&zlw`O)1*JtfU|Uj>
z^;2_Fb5rw5iuDck4E3?;E6GelxG=968XUlY(Fe%@wHaX5=2=jZYyu1^*9xF}p#B3o
zG#PAfaY>3kk^+4r0|N_P10!7{OMSTifX=r`NwzA<EXhd)2OQi#;1G1oDM1wlsRso?
zP9`X1t#T6c(ruM0bW>8(5=(PRl<bO2lZs0cK_O+M4^fAzA0mostc^Yv7ubOOZ50`m
zTAZI#3Np{m($oeV7$|~>D1c~)z@`CN5M4t+Mt(^?Fhvz*CVS?Uq!twv0aF*)J|n1g
zxK*H=g|Is`FSEoBW&oNnk}jm!v2rXbDbFv;4gtpmaxmgl1T_c}q)2HLk^#WM56l5}
zTsHdf++@e)wNr)_m~G#Cx;TbJaJ~&W=*1K$VtZL+$`z#&W!+O56E7@dGXKn~^eCU@
z(K7zbM2^}P>COurx6V3gt~HzHaZ726+13>+HEQ>kzkbQ%t7a^m`|Qx;xM%mO&pkXd
zoAJ*F*&pfbA_wQ6ei~sSRjRTyZoTqcKjA*%2G5NlT2mLSTJ_d0nWyWM@xB|S!YU3-
zIWKP?xN<(FBKgMUvL`##Zz?fxYhBstc_u@<;@a$Ho4q?ZzFlZ8yry=^YpIi^Socn`
zMA3qOZTF-;R1|m~P|_A=*!|vd=JWL(-#4;UIO<F-t_a>^u;9GG><HPEZ|4%`Z23@f
zg~erl`?}X9KC}D0S2L$cTn?S#TUV#pf0cXI1(UNjFIR07y|BOb>Auh58{^drW~v4+
z3|L?^)$62t-{!RpNzW%V_Hy(@aW{TVRWeu=K4q`Mw60uMiLKk-Ocq;QrfYifbB$fU
z-|}W3HRCzO5s~^2#XS;ijaq_5-#N7G{`j&fgX2?yh0UD8z}oVL_<heWn~C^*s5!iu
zY4I(l9RiX~F&!V2)-b*M<?u1|&i;uP-<JJ9*7*4D;fY5U-OMnVa5gQ|?@Hd`R|jTf
z#0hw72?_A91?o+IdE(d(OA)SK>nv;Y9g%--r+uuL)7EuV>BsrB3&#0slRc+-sMO6h
ke*a_Z`vx#Ppuuj(uuE|MhnTxx_kl`RPgg&ebxsLQ08&vLBme*a

delta 300
zcmV+{0n`5A3)2FSFn<9JNkl<ZScUDCJ#K?A7>1up9W7SR<^YvEWnrRommZ;<qT(!E
zAxEH#mrmTEUh#_PoDPwbP=1m)A|2{yc`@eu@oR|>B9X{{=OH9WYrPAJYno<M?=d71
zfH4MuzV8R>5kd?!%d*Kl!3_WuMS)Uk@f&L`RaMRI-_(Foihn%M0Z5W$u-A1R0Cin2
z<`^|_&HY+y&la%OUe^HZ@Aur@!b%Q!UY_J);K$eZdJcF#Uysk5?Qy-??sZiMP7BSg
z@8W<z`KfyD=D=_Dtm?q?+dIxVq?D5iD?6}Mye!MZ>27skG#s?nJ7WxO+s+0FArAk8
yOJ_lvra0$D^(96xq?AFE?h>XNh(schKj#N`LZQP8e1RAM0000<MNUMnLSTYg7mWD;


From b77b809c3cebe6dcef25cfe4eb5cfd16705f888b Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:52:00 +0300
Subject: [PATCH 557/568] post-merge fixes 4

---
 .../Catalog/Fills/Lockers/engineer.yml        |  1 -
 .../Circuitboards/Machine/production.yml      |  4 +--
 .../Entities/Structures/Machines/lathe.yml    |  6 ++---
 Resources/Prototypes/Roles/Antags/nukeops.yml |  2 +-
 .../Roles/Jobs/Medical/brigmedic.yml          |  4 +++
 .../Objects/Consumable/Drinks/bankatejar.yml  |  6 ++---
 .../Circuitboards/Machine/production.yml      | 14 +++++-----
 .../Prototypes/SS220/GameRules/events.yml     |  2 +-
 .../SS220/Loadouts/Jobs/Medical/brigmedic.yml | 15 -----------
 .../Loadouts/Jobs/Security/security_pilot.yml | 10 -------
 Resources/Prototypes/SS220/Maps/NTvsSSSP.yml  |  2 --
 Resources/Prototypes/SS220/Maps/axioma.yml    |  2 --
 Resources/Prototypes/SS220/Maps/eclipse.yml   |  2 --
 .../Prototypes/SS220/Maps/frankenstein.yml    |  2 --
 Resources/Prototypes/SS220/Maps/nox.yml       |  2 --
 Resources/Prototypes/SS220/Maps/snout.yml     |  2 --
 .../Roles/Jobs/Fun/misc_startinggear.yml      |  6 +++--
 .../SS220/Roles/Jobs/security_pilot.yml       |  8 ++++++
 .../Shitspawn/FractWarEbent/other_Items.yml   |  9 +++----
 .../SS220/Stacks/floor_tile_stacks.yml        | 26 -------------------
 20 files changed, 36 insertions(+), 89 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 6512dc72fb67..766e80b9c83b 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -95,7 +95,6 @@
       - id: GasAnalyzer
       - id: MedkitOxygenFilled
       - id: HolofanProjector
-      - id: DoorRemoteFirefight
       - id: ClothingShoesBootsMag
       - id: RCD
       - id: RCDAmmo
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 534e019ce654..b1fa3f4c815a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -566,7 +566,7 @@
         Scalpel: #SS220 Edit biomasscraft
           amount: 2
           defaultPrototype: Scalpel #SS220 Edit biomasscraft
-          examineName: Scalpel #SS220 Edit biomasscraft
+          examineName: ent-Scalpel #SS220 Edit biomasscraft
 
 - type: entity
   id: HydroponicsTrayMachineCircuitboard
@@ -1236,7 +1236,7 @@
   components:
     - type: MachineBoard
       prototype: PDANanotrasenMessengerServer
-      materialRequirements:
+      stackRequirements:
         Steel: 1
         Cable: 2
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 9da41ce695e5..bcf4f409208a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -339,7 +339,7 @@
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
-      - BoxShellTranquilizer
+      # - BoxShellTranquilizer
       - ExplosivePayload
       - GrenadeBlast
       - GrenadeEMP
@@ -763,7 +763,7 @@
       - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
-      - BoxShellTranquilizer
+      # - BoxShellTranquilizer
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast
@@ -847,7 +847,7 @@
         - BoxLethalshot
         - BoxShotgunFlare
         - BoxShotgunSlug
-        - BoxShellTranquilizer
+       #  - BoxShellTranquilizer
         - MagazineBoxLightRifle
         - MagazineBoxMagnum
         - MagazineBoxPistol
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 7cfed348f183..282cd20742db 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -99,4 +99,4 @@
   id: SyndicateLoneOperativeGearFull
   parent: SyndicateOperativeGearFull
   equipment:
-    pocket2: BaseUplinkRadio60TC
+    pocket2: BaseUplinkRadio40TC
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/brigmedic.yml
index 1fba26a67957..22c0359b14ef 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/brigmedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/brigmedic.yml
@@ -25,4 +25,8 @@
     id: BrigmedicPDA
     ears: ClothingHeadsetBrigmedic
     belt: ClothingBeltMedicalFilled
+  storage:
+    back:
+    - BoxSurvivalBrigmedic
+    - Flash
 #SS220-brigmedic-loadout-end
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/bankatejar.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/bankatejar.yml
index 1d1c59e5dac4..a7c6b2e3d952 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/bankatejar.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Drinks/bankatejar.yml
@@ -35,7 +35,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
@@ -55,7 +55,7 @@
   - type: Sprite
     sprite: SS220/Objects/Consumable/Drinks/bankatejar.rsi
   - type: Sealable
-  
+
 - type: entity
   parent: DrinkGlass
   id: DrinkBankateGlass
@@ -71,4 +71,4 @@
             Quantity: 30
     - type: Icon
       sprite: SS220/Objects/Consumable/Drinks/glass_bankate.rsi
-      state: icon
\ No newline at end of file
+      state: icon
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 9dfb67b083aa..4435f8ff20f0 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -8,9 +8,8 @@
     state: engineering
   - type: MachineBoard
     prototype: TegCenter
-    requirements:
-     Capacitor: 4
-    materialRequirements:
+    stackRequirements:
+      Capacitor: 4
       Steel: 5
 
 - type: entity
@@ -23,9 +22,8 @@
     state: engineering
   - type: MachineBoard
     prototype: TegCirculator
-    requirements:
-     Capacitor: 4
-     Manipulator: 1     
-    materialRequirements:
+    stackRequirements:
+      Capacitor: 4
+      Manipulator: 1
       Steel: 5
-      Gold: 1
\ No newline at end of file
+      Gold: 1
diff --git a/Resources/Prototypes/SS220/GameRules/events.yml b/Resources/Prototypes/SS220/GameRules/events.yml
index 69128ef063e1..67b1212052cf 100644
--- a/Resources/Prototypes/SS220/GameRules/events.yml
+++ b/Resources/Prototypes/SS220/GameRules/events.yml
@@ -7,7 +7,7 @@
     startAnnouncement: station-event-banana-rain-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    startDelay: 10
+    reoccurrenceDelay: 10
     earliestStart: 20
     minimumPlayers: 15
     weight: 0
diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml
index 9047161935e3..5290136fbdc6 100644
--- a/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml
+++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml
@@ -42,29 +42,14 @@
   id: BrigmedicBackpack
   equipment: BrigmedicBackpack
 
-- type: startingGear
-  id: BrigmedicBackpack
-  equipment:
-    back: ClothingBackpackBrigmedicFilled
-
 - type: loadout
   id: BrigmedicSatchel
   equipment: BrigmedicSatchel
 
-- type: startingGear
-  id: BrigmedicSatchel
-  equipment:
-    back: ClothingBackpackSatchelBrigmedicFilled
-
 - type: loadout
   id: BrigmedicDuffel
   equipment: BrigmedicDuffel
 
-- type: startingGear
-  id: BrigmedicDuffel
-  equipment:
-    back: ClothingBackpackDuffelBrigmedicFilled
-
 # Outer clothing
 - type: loadout
   id: BrigmedicWindAMG
diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
index 66ac07ef7ac8..7821491782db 100644
--- a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
+++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
@@ -3,11 +3,6 @@
   id: SecurityPilotBackpack
   equipment: SecurityPilotBackpack
 
-- type: startingGear
-  id: SecurityPilotBackpack
-  equipment:
-    back: ClothingBackpackSecurityPilotFilled
-
 - type: loadout
   id: SecurityPilotSatchel
   equipment: SecurityPilotSatchel
@@ -20,8 +15,3 @@
 - type: loadout
   id: SecurityPilotDuffel
   equipment: SecurityPilotDuffel
-
-- type: startingGear
-  id: SecurityPilotDuffel
-  equipment:
-    back: ClothingBackpackDuffelSecurityPilotFilled
diff --git a/Resources/Prototypes/SS220/Maps/NTvsSSSP.yml b/Resources/Prototypes/SS220/Maps/NTvsSSSP.yml
index 31409e44b526..f1f9fad8ee58 100644
--- a/Resources/Prototypes/SS220/Maps/NTvsSSSP.yml
+++ b/Resources/Prototypes/SS220/Maps/NTvsSSSP.yml
@@ -17,8 +17,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '-SS220'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             Passenger: [ -1, -1 ]
             #Command
diff --git a/Resources/Prototypes/SS220/Maps/axioma.yml b/Resources/Prototypes/SS220/Maps/axioma.yml
index d97396c6abad..4785a8082612 100644
--- a/Resources/Prototypes/SS220/Maps/axioma.yml
+++ b/Resources/Prototypes/SS220/Maps/axioma.yml
@@ -20,8 +20,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '-SS220'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             Passenger: [ -1, -1 ]
             #Command
diff --git a/Resources/Prototypes/SS220/Maps/eclipse.yml b/Resources/Prototypes/SS220/Maps/eclipse.yml
index 5c2f5689f34d..83fc33074593 100644
--- a/Resources/Prototypes/SS220/Maps/eclipse.yml
+++ b/Resources/Prototypes/SS220/Maps/eclipse.yml
@@ -20,8 +20,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '-SS220'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             Passenger: [ -1, -1 ]
             #Command
diff --git a/Resources/Prototypes/SS220/Maps/frankenstein.yml b/Resources/Prototypes/SS220/Maps/frankenstein.yml
index dd8a7e37ffe1..d6f46a44d4bb 100644
--- a/Resources/Prototypes/SS220/Maps/frankenstein.yml
+++ b/Resources/Prototypes/SS220/Maps/frankenstein.yml
@@ -20,8 +20,6 @@
           enableStationRotation: false
           maxStationOffset: null
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/SS220/Maps/nox.yml b/Resources/Prototypes/SS220/Maps/nox.yml
index 61957ed6bf73..dcefebdb71e8 100644
--- a/Resources/Prototypes/SS220/Maps/nox.yml
+++ b/Resources/Prototypes/SS220/Maps/nox.yml
@@ -20,8 +20,6 @@
             !type:NanotrasenNameGenerator
             prefixCreator: '-SS220'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #service
             Captain: [ 1, 1 ]
diff --git a/Resources/Prototypes/SS220/Maps/snout.yml b/Resources/Prototypes/SS220/Maps/snout.yml
index 897034705dac..60853710d5a5 100644
--- a/Resources/Prototypes/SS220/Maps/snout.yml
+++ b/Resources/Prototypes/SS220/Maps/snout.yml
@@ -11,8 +11,6 @@
         - type: StationNameSetup
           mapNameTemplate: 'Снаут'
         - type: StationJobs
-          overflowJobs:
-            - Passenger
           availableJobs:
             #civilian
             Passenger: [ -1, -1 ]
diff --git a/Resources/Prototypes/SS220/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/SS220/Roles/Jobs/Fun/misc_startinggear.yml
index 86ceebd67055..29061f98da04 100644
--- a/Resources/Prototypes/SS220/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/SS220/Roles/Jobs/Fun/misc_startinggear.yml
@@ -9,9 +9,11 @@
   id: BloodCultBroter
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingCultistBackpackFilled
     head: ClothingHeadHatHoodCulthood
     outerClothing: ClothingOuterRobesCult
     shoes: ClothingShoesColorRed
     id: PassengerPDA
-    ears: ClothingHeadsetService
\ No newline at end of file
+    ears: ClothingHeadsetService
+  storage:
+    back:
+    - BoxSurvivalSecurity
diff --git a/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml b/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml
index 85139ff95165..65ab9f56df79 100644
--- a/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml
+++ b/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml
@@ -29,3 +29,11 @@
     belt: ClothingBeltSecurityFilled
     gloves: ClothingHandsGlovesCombat #SS220 PilotsGloves
     pocket1: WeaponPistolMk58Nonlethal
+  storage:
+    back:
+    - BoxSurvivalSecurity
+    - Flash
+    - MagazinePistolRubber
+    - MagazinePistolRubber
+    - FlashlightSeclite
+    - DrinkRelaxingPeachCan
diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/other_Items.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/other_Items.yml
index 048390440750..8a3ccb076897 100644
--- a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/other_Items.yml
+++ b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/other_Items.yml
@@ -37,7 +37,7 @@
     - id: RegenerativeMesh
       amount: 50
     - id: SyringeEphedrine
-      amount: 20 
+      amount: 20
   - type: EntityStorage
     capacity: 250
 
@@ -122,8 +122,8 @@
       - Biological
     damage:
       types:
-        Bloodloss: -10 
-    ModifyBloodLevel: 15 
+        Bloodloss: -10
+    ModifyBloodLevel: 15
     healingBeginSound:
       path: "/Audio/Items/Medical/brutepack_begin.ogg"
     healingEndSound:
@@ -141,7 +141,6 @@
   icon: { sprite: "/Textures/SS220/Objects/Specific/Medical/BloodSalveEbent.rsi", state: BloodSalve }
   spawn: BloodSalveEbent
   maxCount: 10
-  itemSize: 1
 
 - type: entity
   parent: ClothingBackpackDuffelEngineering
@@ -188,7 +187,7 @@
   suffix: Shitspawn, Ebent, FractWar
   name: вещмешок осколочных гранат
   description: Большой вещмешок для хранения любого армейского снаряжения.
-  components: 
+  components:
    - type: StorageFill
      contents:
       - id: ExGrenade
diff --git a/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml
index 08d4fd3c1e1e..eeb00f62670d 100644
--- a/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/SS220/Stacks/floor_tile_stacks.yml
@@ -4,179 +4,153 @@
   name: стальная шестиугольная плитка
   spawn: FloorTileItemSteelReinforced
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileWhiteReinforced
   name: белая шестиугольная плитка
   spawn: FloorTileItemWhiteReinforced
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDarkReinforced
   name: тёмная шестиугольная плитка
   spawn: FloorTileItemDarkReinforced
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDutch
   name: керамическая плитка
   spawn: FloorTileItemDutch
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileDutchMini
   name: керамическая мини-плитка
   spawn: FloorTileItemDutchMini
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTilePCircuit
   name: плитка фиолетовых микросхем
   spawn: FloorTileItemPCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileYCircuit
   name: плитка жёлтых микросхем
   spawn: FloorTileItemYCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileOCircuit
   name: плитка оранжевых микросхем
   spawn: FloorTileItemOCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileRCircuit
   name: плитка красных микросхем
   spawn: FloorTileItemRCircuit
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileKitchenRed
   name: красная кухонная плитка
   spawn: FloorTileItemKitchenRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodBlack
   name: black wood floor
   spawn: FloorTileItemWoodBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodDark
   name: dark wood floor
   spawn: FloorTileItemWoodDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodLight
   name: light wood floor
   spawn: FloorTileItemWoodLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodRed
   name: red wood floor
   spawn: FloorTileItemWoodRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodLargeBlack
   name: large black wood floor
   spawn: FloorTileItemWoodLargeBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodLargeDark
   name: large dark wood floor
   spawn: FloorTileItemWoodLargeDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodLargeLight
   name: large light wood floor
   spawn: FloorTileItemWoodLargeLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodLargeRed
   name: large red wood floor
   spawn: FloorTileItemWoodLargeRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodParquetBlack
   name: parquet black wood floor
   spawn: FloorTileItemWoodParquetBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodParquetDark
   name: parquet dark wood floor
   spawn: FloorTileItemWoodParquetDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodParquetLight
   name: parquet light wood floor
   spawn: FloorTileItemWoodParquetLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodParquetRed
   name: parquet red wood floor
   spawn: FloorTileItemWoodParquetRed
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodTileBlack
   name: tile black wood floor
   spawn: FloorTileItemWoodTileBlack
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodTileDark
   name: tile dark wood floor
   spawn: FloorTileItemWoodTileDark
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodTileLight
   name: tile light wood floor
   spawn: FloorTileItemWoodTileLight
   maxCount: 30
-  itemSize: 5
 
 - type: stack
   id: FloorTileItemWoodTileRed
   name: tile red wood floor
   spawn: FloorTileItemWoodTileRed
   maxCount: 30
-  itemSize: 5
\ No newline at end of file

From 9e95889e62036fe9249b95dd374f78fb95f8bf0d Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:23:30 +0300
Subject: [PATCH 558/568] fix our bag loadouts

---
 .../SS220/Loadouts/Jobs/Medical/brigmedic.yml     | 15 +++++++++++++++
 .../Loadouts/Jobs/Security/security_pilot.yml     | 12 +++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml
index 5290136fbdc6..c77313c27b6d 100644
--- a/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml
+++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Medical/brigmedic.yml
@@ -42,14 +42,29 @@
   id: BrigmedicBackpack
   equipment: BrigmedicBackpack
 
+- type: startingGear
+  id: BrigmedicBackpack
+  equipment:
+    back: ClothingBackpackBrigmedic
+
 - type: loadout
   id: BrigmedicSatchel
   equipment: BrigmedicSatchel
 
+- type: startingGear
+  id: BrigmedicSatchel
+  equipment:
+    back: ClothingBackpackSatchelBrigmedic
+
 - type: loadout
   id: BrigmedicDuffel
   equipment: BrigmedicDuffel
 
+- type: startingGear
+  id: BrigmedicDuffel
+  equipment:
+    back: ClothingBackpackDuffelBrigmedic
+
 # Outer clothing
 - type: loadout
   id: BrigmedicWindAMG
diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
index 7821491782db..131849600e09 100644
--- a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
+++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
@@ -3,6 +3,11 @@
   id: SecurityPilotBackpack
   equipment: SecurityPilotBackpack
 
+- type: startingGear
+  id: SecurityPilotBackpack
+  equipment:
+    back: ClothingBackpackSecurityPilot
+
 - type: loadout
   id: SecurityPilotSatchel
   equipment: SecurityPilotSatchel
@@ -10,8 +15,13 @@
 - type: startingGear
   id: SecurityPilotSatchel
   equipment:
-    back: ClothingBackpackSatchelSecurityPilotFilled
+    back: ClothingBackpackSatchelSecurityPilot
 
 - type: loadout
   id: SecurityPilotDuffel
   equipment: SecurityPilotDuffel
+
+- type: startingGear
+  id: SecurityPilotBackpack
+  equipment:
+    back: ClothingBackpackSecurityPilot

From 86b7407bc552297d2df39e9b95839dbb590593a4 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:31:47 +0300
Subject: [PATCH 559/568] delete security pilot bag loadout

---
 .../Loadouts/Jobs/Security/security_pilot.yml | 27 -------------------
 .../SS220/Loadouts/role_loadouts.yml          |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml

diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
deleted file mode 100644
index 131849600e09..000000000000
--- a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security_pilot.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Back
-- type: loadout
-  id: SecurityPilotBackpack
-  equipment: SecurityPilotBackpack
-
-- type: startingGear
-  id: SecurityPilotBackpack
-  equipment:
-    back: ClothingBackpackSecurityPilot
-
-- type: loadout
-  id: SecurityPilotSatchel
-  equipment: SecurityPilotSatchel
-
-- type: startingGear
-  id: SecurityPilotSatchel
-  equipment:
-    back: ClothingBackpackSatchelSecurityPilot
-
-- type: loadout
-  id: SecurityPilotDuffel
-  equipment: SecurityPilotDuffel
-
-- type: startingGear
-  id: SecurityPilotBackpack
-  equipment:
-    back: ClothingBackpackSecurityPilot
diff --git a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml
index 09af97df05bc..cb1c94424300 100644
--- a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml
@@ -22,7 +22,7 @@
   groups:
   - SecurityHead
   - SecurityJumpsuit
-  - SecurityPilotBackpack
+  - SecurityBackpack
   - SecurityOuterClothing
   - SecurityShoes
   - SecurityPDA

From 6c136589a4919ab52fcdb28a5f37a5abd7a1dc28 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:36:41 +0300
Subject: [PATCH 560/568] i forgor

---
 Resources/Prototypes/SS220/Loadouts/loadout_groups.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
index 40237269a12a..816142d1cbab 100644
--- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
@@ -1,12 +1,3 @@
-# Security
-- type: loadoutGroup
-  id: SecurityPilotBackpack
-  name: loadout-group-security-pilot-backpack
-  loadouts:
-  - SecurityPilotBackpack
-  - SecurityPilotSatchel
-  - SecurityPilotDuffel
-
 # InternalAffairs
 - type: loadoutGroup
   id: IAABackpack

From 92b07674b216b7439eb1de63a274718ccf9d3549 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:49:31 +0300
Subject: [PATCH 561/568] change standart meteor announcement sound

---
 Content.Server/StationEvents/Components/MeteorSwarmComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
index 1cde2ac8fad4..737ebfcbca75 100644
--- a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
+++ b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
@@ -33,7 +33,7 @@ public sealed partial class MeteorSwarmComponent : Component
     public LocId? Announcement = "station-event-meteor-swarm-start-announcement";
 
     [DataField]
-    public SoundSpecifier? AnnouncementSound = new SoundPathSpecifier("/Audio/Announcements/meteors.ogg")
+    public SoundSpecifier? AnnouncementSound = new SoundPathSpecifier("/Audio/Announcements/meteors_start.ogg") //SS220-meteor-announcement
     {
         Params = new()
         {

From db6a8f5ca7b414f17b98c2252711ed55ee61e6ab Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 22:21:19 +0300
Subject: [PATCH 562/568] USSPCMO card fix

---
 .../SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
index 1e2f6bb7ae54..b8c01317d416 100644
--- a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
+++ b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
@@ -93,6 +93,7 @@
   parent: UsspIDCard
   id: UsspIDCardCmdCMO
   suffix: Shitspawn, Ebent, FractWar
+  noSpawn: true
   components:
   - type: PresetIdCard
     job: USSPCMO

From 26c74669da7cf976818128d05affa621e59f40b3 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 22:43:37 +0300
Subject: [PATCH 563/568] USSPCMO card fix 2

---
 .../SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
index b8c01317d416..f9527804e6aa 100644
--- a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
+++ b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
@@ -100,6 +100,8 @@
   - type: Sprite
     layers:
     - state: ussp_med
+  - type: StaticPrice
+    price: 10
 
 - type: entity
   parent: UsspMedicalPDA

From 9bd2d50bab9bda8ce09ef593b8a5dd029165931e Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sat, 29 Jun 2024 23:08:46 +0300
Subject: [PATCH 564/568] card fix attempt 3

---
 .../SS220/Entities/Objects/Misc/identification_cards.yml        | 1 -
 .../SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml     | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
index 9e25506a9515..686ac4aa947a 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
@@ -12,7 +12,6 @@
   - type: Sprite
     layers:
     - state: ussp
-  - type: AgentIDCard
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
     inHandsOnly: true
diff --git a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
index f9527804e6aa..b8c01317d416 100644
--- a/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
+++ b/Resources/Prototypes/SS220/Shitspawn/FractWarEbent/ussp/other_Items_sssp.yml
@@ -100,8 +100,6 @@
   - type: Sprite
     layers:
     - state: ussp_med
-  - type: StaticPrice
-    price: 10
 
 - type: entity
   parent: UsspMedicalPDA

From 68cbb043d8d65449816325e6c51c0803066b2f66 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sun, 30 Jun 2024 21:54:23 +0300
Subject: [PATCH 565/568] fix meteorswarm rule && deathsquad backpack

---
 .../Entities/Clothing/Back/backpacks.yml      | 31 +++++++++++++++++++
 .../Prototypes/GameRules/meteorswarms.yml     |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 855ca664ce47..b355a4f8b046 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -267,6 +267,37 @@
       grid:
       - 0,0,7,6
 
+#SS220 RETURNED FOR CENTCOMM MAP
+- type: entity
+  noSpawn: false
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquadFilled
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    #ss220-fix-sprite-begin
+    - type: Sprite
+      sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi
+    #ss220-fix-sprite-end
+    - type: Storage
+      grid:
+      - 0,0,8,6 # SS220 Bigger-Ert-Backpacks
+    - type: StorageFill
+      contents:
+        - id: BoxSurvivalEngineering
+        - id: WeaponPulseRifle
+        - id: WeaponPulsePistol
+        - id: WeaponRevolverMateba
+        - id: SpeedLoaderMagnumAP
+        - id: SpeedLoaderMagnumAP
+        - id: BoxFlashbang
+        - id: ToolDebug # spanish army knife
+        - id: WelderExperimental
+        - id: Hypospray
+        - id: DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
+        - id: FreedomImplanter
+#SS220 RETURNED FOR CENTCOMM MAP
+
 #Syndicate
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml
index 70dd5265b044..fdbe0d2831f3 100644
--- a/Resources/Prototypes/GameRules/meteorswarms.yml
+++ b/Resources/Prototypes/GameRules/meteorswarms.yml
@@ -3,7 +3,7 @@
   id: GameRuleMeteorScheduler
   components:
   - type: GameRule
-    minPlayers: 25
+    minPlayers: 0 #SS220-extended
   - type: MeteorScheduler
 
 - type: weightedRandomEntity

From 87c1aca7bc6330d6d8c6018f2cdf5fc9957209b8 Mon Sep 17 00:00:00 2001
From: Dexler <69513582+DexlerXD@users.noreply.github.com>
Date: Sun, 30 Jun 2024 22:15:29 +0300
Subject: [PATCH 566/568] return cburn filled bag

---
 .../Entities/Clothing/Back/duffel.yml         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 101599d5adc5..e6896c241223 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -256,3 +256,22 @@
     walkModifier: 1
     sprintModifier: 1
   - type: HeldSpeedModifier
+
+#SS220 RETURNED FOR CENTCOMM MAP
+- type: entity
+  id: ClothingBackpackDuffelCBURNFilled
+  parent: ClothingBackpackDuffelCBURN
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxSurvivalEngineering
+    - id: WeaponShotgunDoubleBarreled
+    - id: BoxShotgunIncendiary
+      amount: 2
+    - id: GrenadeFlashBang
+      amount: 2
+    - id: PillAmbuzolPlus
+    - id: PillAmbuzol
+      amount: 4
+#SS220 RETURNED FOR CENTCOMM MAP

From cebfa06d6e27370cfd7acb787156c01796b38ffa Mon Sep 17 00:00:00 2001
From: TheArturZh <thearturzh@gmail.com>
Date: Tue, 2 Jul 2024 01:18:34 +0300
Subject: [PATCH 567/568] Fix dark reaper game rule

---
 Resources/Prototypes/SS220/DemonRofler/rune.yml  | 16 ++++++++++++++++
 .../SS220/GameRules/midround_antags.yml          |  1 +
 2 files changed, 17 insertions(+)

diff --git a/Resources/Prototypes/SS220/DemonRofler/rune.yml b/Resources/Prototypes/SS220/DemonRofler/rune.yml
index 7878081a3bb6..0bb27e7a2dea 100644
--- a/Resources/Prototypes/SS220/DemonRofler/rune.yml
+++ b/Resources/Prototypes/SS220/DemonRofler/rune.yml
@@ -38,3 +38,19 @@
         layer:
         - WallLayer
         hard: false
+
+- type: entity
+  noSpawn: true
+  parent: BaseAntagSpawner
+  id: SpawnPointGhostDarkReaperRune
+  components:
+  - type: GhostRole
+    name: Тёмный Жнец
+    description: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!"
+    rules: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!"
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+      - state: green
+      - sprite: SS220/DemonRofler/dark_reaper.rsi
+        state: jnec_s1
diff --git a/Resources/Prototypes/SS220/GameRules/midround_antags.yml b/Resources/Prototypes/SS220/GameRules/midround_antags.yml
index 4cc3cb9a7f37..9a3224b55991 100644
--- a/Resources/Prototypes/SS220/GameRules/midround_antags.yml
+++ b/Resources/Prototypes/SS220/GameRules/midround_antags.yml
@@ -25,4 +25,5 @@
     - prefRoles: [ DarkReaper ]
       max: 1
       playerRatio: 10
+      spawnerPrototype: SpawnPointGhostDarkReaperRune
   - type: DarkReaperMajorRule

From 7fe4e63eab42f6e3c6b676d333f14994fe77d295 Mon Sep 17 00:00:00 2001
From: TheArturZh <thearturzh@gmail.com>
Date: Tue, 2 Jul 2024 01:44:41 +0300
Subject: [PATCH 568/568] Fix fuel barrel prototype

---
 .../Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml
index 6247e22bcf5b..854fd33bd96d 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Storage/Tanks/tanks.yml
@@ -47,6 +47,7 @@
   - type: ReagentTank
     tankType: Fuel
   - type: DamageOnToolInteract
+    tools: Welding
     weldingDamage:
       types:
         Heat: 10